diff options
Diffstat (limited to 'meta/recipes-extended/lsof')
4 files changed, 146 insertions, 140 deletions
diff --git a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch deleted file mode 100644 index b7d2323dc9..0000000000 --- a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +++ /dev/null @@ -1,76 +0,0 @@ -Remove host information from version.h - -make lsof not include host information - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - dialects/linux/Makefile | 50 +++++++++-------------------------------------- - 1 file changed, 9 insertions(+), 41 deletions(-) - -diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile -index 2bea108..792142b 100644 ---- a/dialects/linux/Makefile -+++ b/dialects/linux/Makefile -@@ -76,48 +76,16 @@ version.h: FRC - @echo Constructing version.h - @rm -f version.h - @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; -- @echo '#define LSOF_CC "${CC}"' >> version.h -- @echo '#define LSOF_CCV "${CCV}"' >> version.h -- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h -- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h -+ @echo '#define LSOF_CC ""' >> version.h -+ @echo '#define LSOF_CCV ""' >> version.h -+ @echo '#define LSOF_CCDATE ""' >> version.h -+ @echo '#define LSOF_CCFLAGS ""' >> version.h - @echo '#define LSOF_CINFO "${CINFO}"' >> version.h -- @if [ "X${LSOF_HOST}" = "X" ]; then \ -- echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \ -- else \ -- if [ "${LSOF_HOST}" = "none" ]; then \ -- echo '#define LSOF_HOST ""' >> version.h; \ -- else \ -- echo '#define LSOF_HOST "${LSOF_HOST}"' >> version.h; \ -- fi \ -- fi -- @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h -- @if [ "X${LSOF_LOGNAME}" = "X" ]; then \ -- echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \ -- else \ -- if [ "${LSOF_LOGNAME}" = "none" ]; then \ -- echo '#define LSOF_LOGNAME ""' >> version.h; \ -- else \ -- echo '#define LSOF_LOGNAME "${LSOF_LOGNAME}"' >> version.h; \ -- fi; \ -- fi -- @if [ "X${LSOF_SYSINFO}" = "X" ]; then \ -- echo '#define LSOF_SYSINFO "'`uname -a`'"' >> version.h; \ -- else \ -- if [ "${LSOF_SYSINFO}" = "none" ]; then \ -- echo '#define LSOF_SYSINFO ""' >> version.h; \ -- else \ -- echo '#define LSOF_SYSINFO "${LSOF_SYSINFO}"' >> version.h; \ -- fi \ -- fi -- @if [ "X${LSOF_USER}" = "X" ]; then \ -- echo '#define LSOF_USER "${USER}"' >> version.h; \ -- else \ -- if [ "${LSOF_USER}" = "none" ]; then \ -- echo '#define LSOF_USER ""' >> version.h; \ -- else \ -- echo '#define LSOF_USER "${LSOF_USER}"' >> version.h; \ -- fi \ -- fi -+ @echo '#define LSOF_HOST ""' >> version.h; -+ @echo '#define LSOF_LDFLAGS ""' >> version.h -+ @echo '#define LSOF_LOGNAME ""' >> version.h; -+ @echo '#define LSOF_SYSINFO ""' >> version.h; -+ @echo '#define LSOF_USER ""' >> version.h; - @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h - - FRC: --- -1.7.9.5 - diff --git a/meta/recipes-extended/lsof/files/remove-host-information.patch b/meta/recipes-extended/lsof/files/remove-host-information.patch new file mode 100644 index 0000000000..1f2b4afa69 --- /dev/null +++ b/meta/recipes-extended/lsof/files/remove-host-information.patch @@ -0,0 +1,123 @@ +From 4f05492ac07a7bbaf06dd8265b9cba329e1b53e9 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Wed, 30 Aug 2017 15:05:16 +0800 +Subject: [PATCH] lsof: remove host information from version.h + +lsof doesn't embed the username or hostname in the build if SOURCE_DATE_EPOCH is +defined, but this still embeds build paths. Delete all of the host details to +ensure that no host information is leaked into the binary. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + autotools/version.h.in | 16 ++++----- + lib/dialects/linux/Makefile | 69 ++++++------------------------------- + 2 files changed, 19 insertions(+), 66 deletions(-) + +diff --git a/autotools/version.h.in b/autotools/version.h.in +index aac0b80..2e635a5 100644 +--- a/autotools/version.h.in ++++ b/autotools/version.h.in +@@ -37,13 +37,13 @@ + + #include "config.h" + #define LSOF_VERSION PACKAGE_VERSION +-#define LSOF_HOST "@host@" +-#define LSOF_LOGNAME "@logname@" +-#define LSOF_USER "@user@" +-#define LSOF_CC "@cc@" +-#define LSOF_CCV "@ccv@" +-#define LSOF_CCFLAGS "@ccflags@" +-#define LSOF_LDFLAGS "@ldflags@" +-#define LSOF_SYSINFO "@sysinfo@" ++#define LSOF_HOST "" ++#define LSOF_LOGNAME "" ++#define LSOF_USER "" ++#define LSOF_CC "" ++#define LSOF_CCV "" ++#define LSOF_CCFLAGS "" ++#define LSOF_LDFLAGS "" ++#define LSOF_SYSINFO "" + + #endif +diff --git a/lib/dialects/linux/Makefile b/lib/dialects/linux/Makefile +index f8adaa6..7a79ca7 100644 +--- a/lib/dialects/linux/Makefile ++++ b/lib/dialects/linux/Makefile +@@ -83,64 +83,17 @@ ${LIB}: FRC + version.h: FRC + @echo Constructing version.h + @rm -f version.h +- @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; +- @echo '#define LSOF_CC "${CC}"' >> version.h +- @echo '#define LSOF_CCV "${CCV}"' >> version.h +- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h +- @echo '#define LSOF_CINFO "${CINFO}"' >> version.h +- @if [ "X${LSOF_HOST}" = "X" ]; then \ +- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \ +- echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \ +- else \ +- echo '#define LSOF_HOST ""' >> version.h; \ +- fi \ +- else \ +- if [ "${LSOF_HOST}" = "none" ]; then \ +- echo '#define LSOF_HOST ""' >> version.h; \ +- else \ +- echo '#define LSOF_HOST "${LSOF_HOST}"' >> version.h; \ +- fi \ +- fi +- @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h +- @if [ "X${LSOF_LOGNAME}" = "X" ]; then \ +- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \ +- echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \ +- else \ +- echo '#define LSOF_LOGNAME ""' >> version.h; \ +- fi \ +- else \ +- if [ "${LSOF_LOGNAME}" = "none" ]; then \ +- echo '#define LSOF_LOGNAME ""' >> version.h; \ +- else \ +- echo '#define LSOF_LOGNAME "${LSOF_LOGNAME}"' >> version.h; \ +- fi; \ +- fi +- @if [ "X${LSOF_SYSINFO}" = "X" ]; then \ +- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \ +- echo '#define LSOF_SYSINFO "'`uname -a`'"' >> version.h; \ +- else \ +- echo '#define LSOF_SYSINFO ""' >> version.h; \ +- fi \ +- else \ +- if [ "${LSOF_SYSINFO}" = "none" ]; then \ +- echo '#define LSOF_SYSINFO ""' >> version.h; \ +- else \ +- echo '#define LSOF_SYSINFO "${LSOF_SYSINFO}"' >> version.h; \ +- fi \ +- fi +- @if [ "X${LSOF_USER}" = "X" ]; then \ +- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \ +- echo '#define LSOF_USER "${USER}"' >> version.h; \ +- else \ +- echo '#define LSOF_USER ""' >> version.h; \ +- fi \ +- else \ +- if [ "${LSOF_USER}" = "none" ]; then \ +- echo '#define LSOF_USER ""' >> version.h; \ +- else \ +- echo '#define LSOF_USER "${LSOF_USER}"' >> version.h; \ +- fi \ +- fi ++ ++ @echo '#define LSOF_BLDCMT ""' > version.h; ++ @echo '#define LSOF_CC ""' >> version.h ++ @echo '#define LSOF_CCV ""' >> version.h ++ @echo '#define LSOF_CCFLAGS ""' >> version.h ++ @echo '#define LSOF_CINFO ""' >> version.h ++ @echo '#define LSOF_HOST ""' >> version.h ++ @echo '#define LSOF_LDFLAGS ""' >> version.h ++ @echo '#define LSOF_LOGNAME ""' >> version.h ++ @echo '#define LSOF_SYSINFO ""' >> version.h ++ @echo '#define LSOF_USER ""' >> version.h + @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h + + FRC: diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb b/meta/recipes-extended/lsof/lsof_4.89.bb deleted file mode 100644 index 14546db23c..0000000000 --- a/meta/recipes-extended/lsof/lsof_4.89.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "LiSt Open Files tool" -DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ -Its name stands for LiSt Open Files, and it does just that." -HOMEPAGE = "http://people.freebsd.org/~abe/" -SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" - -# Upstream lsof releases are hosted on an ftp server which times out download -# attempts from hosts for which it can not perform a DNS reverse-lookup (See: -# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be -# the most commonly used alternative. - -SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \ - file://lsof-remove-host-information.patch \ - " - -SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386" -SRC_URI[sha256sum] = "81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718" - -LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" - -S = "${WORKDIR}/lsof_${PV}_src" - -python do_unpack () { - # temporarily change S for unpack - # of lsof_${PV} - s = d.getVar('S', False) - d.setVar('S', '${WORKDIR}/lsof_${PV}') - bb.build.exec_func('base_do_unpack', d) - # temporarily change SRC_URI for unpack - # of lsof_${PV}_src - src_uri = d.getVar('SRC_URI', False) - d.setVar('SRC_URI', '${LOCALSRC}') - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('SRC_URI', src_uri) -} - -export LSOF_INCLUDE = "${STAGING_INCDIR}" - -do_configure () { - export LSOF_AR="${AR} cr" - export LSOF_RANLIB="${RANLIB}" - if [ "x${GLIBCVERSION}" != "x" ]; then - LINUX_CLIB=`echo ${GLIBCVERSION} |sed -e 's,\.,,g'` - LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" - export LINUX_CLIB - fi - yes | ./Configure linux -} - -export I = "${STAGING_INCDIR}" -export L = "${STAGING_INCDIR}" - -do_compile () { - oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}' -} - -do_install () { - install -d ${D}${sbindir} ${D}${mandir}/man8 - install -m 0755 lsof ${D}${sbindir}/lsof - install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 -} diff --git a/meta/recipes-extended/lsof/lsof_4.99.3.bb b/meta/recipes-extended/lsof/lsof_4.99.3.bb new file mode 100644 index 0000000000..93e91fb427 --- /dev/null +++ b/meta/recipes-extended/lsof/lsof_4.99.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "LiSt Open Files tool" +DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ +Its name stands for LiSt Open Files, and it does just that." +HOMEPAGE = "http://people.freebsd.org/~abe/" +SECTION = "devel" +LICENSE = "Spencer-94" +LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510" + +SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ + file://remove-host-information.patch" +SRCREV = "2e4c7a1a9bc7258dc5b6a3ab28ebca44174279a8" + +S = "${WORKDIR}/git" + +inherit update-alternatives autotools pkgconfig manpages +PACKAGECONFIG[manpages] = "" + +DEPENDS += "groff-native" + +ALTERNATIVE:${PN} = "lsof" +ALTERNATIVE_LINK_NAME[lsof] = "${bindir}/lsof" +# Make our priority higher than busybox +ALTERNATIVE_PRIORITY = "100" |