Signed-off-by: Ross Burton <[email protected]> --- ...on.patch => remove-host-information.patch} | 68 +++++++++++-------- .../lsof/{lsof_4.95.0.bb => lsof_4.96.3.bb} | 11 +-- 2 files changed, 42 insertions(+), 37 deletions(-) rename meta/recipes-extended/lsof/files/{lsof-remove-host-information.patch => remove-host-information.patch} (53%) rename meta/recipes-extended/lsof/{lsof_4.95.0.bb => lsof_4.96.3.bb} (72%)
diff --git a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/meta/recipes-extended/lsof/files/remove-host-information.patch similarity index 53% rename from meta/recipes-extended/lsof/files/lsof-remove-host-information.patch rename to meta/recipes-extended/lsof/files/remove-host-information.patch index 08f083cf83c..fb90366ffa3 100644 --- a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +++ b/meta/recipes-extended/lsof/files/remove-host-information.patch @@ -1,35 +1,29 @@ -From 4233b5ac1629c225a7a80f33efc0eff527a95851 Mon Sep 17 00:00:00 2001 -From: Li Wang <[email protected]> -Date: Wed, 30 Aug 2017 15:05:16 +0800 -Subject: [PATCH] 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. -make lsof not include host information - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Li Wang <[email protected]> - ---- - dialects/linux/Makefile | 48 +++++++---------------------------------- - 1 file changed, 8 insertions(+), 40 deletions(-) +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <[email protected]> diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile -index 46c83c2..50f03cc 100644 +index 176a4c2..ef5a633 100644 --- a/dialects/linux/Makefile +++ b/dialects/linux/Makefile -@@ -84,47 +84,15 @@ version.h: FRC +@@ -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_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_CC ""' >> version.h -+ @echo '#define LSOF_CCV ""' >> version.h -+ @echo '#define LSOF_CCFLAGS ""' >> version.h - @echo '#define LSOF_CINFO "${CINFO}"' >> version.h +- @echo '#define LSOF_CINFO "${CINFO}"' >> version.h - @if [ "X${LSOF_HOST}" = "X" ]; then \ -- echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \ +- 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; \ @@ -39,7 +33,11 @@ index 46c83c2..50f03cc 100644 - fi - @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h - @if [ "X${LSOF_LOGNAME}" = "X" ]; then \ -- echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \ +- 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; \ @@ -48,7 +46,11 @@ index 46c83c2..50f03cc 100644 - 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; \ @@ -57,7 +59,11 @@ index 46c83c2..50f03cc 100644 - fi \ - fi - @if [ "X${LSOF_USER}" = "X" ]; then \ -- echo '#define LSOF_USER "${USER}"' >> version.h; \ +- 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; \ @@ -65,11 +71,17 @@ index 46c83c2..50f03cc 100644 - 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; ++ ++ @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.95.0.bb b/meta/recipes-extended/lsof/lsof_4.96.3.bb similarity index 72% rename from meta/recipes-extended/lsof/lsof_4.95.0.bb rename to meta/recipes-extended/lsof/lsof_4.96.3.bb index f380de0b6b0..c32fcd5583d 100644 --- a/meta/recipes-extended/lsof/lsof_4.95.0.bb +++ b/meta/recipes-extended/lsof/lsof_4.96.3.bb @@ -6,16 +6,9 @@ SECTION = "devel" LICENSE = "Spencer-94" 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 = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ - file://lsof-remove-host-information.patch \ - " - -SRCREV = "67d8c828e7bdc01ba93f8ff79765dd424da0c9d7" + file://remove-host-information.patch" +SRCREV = "eec10fac8f57544e26ff00bf41a2dc09c56049bf" S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#171385): https://lists.openembedded.org/g/openembedded-core/message/171385 Mute This Topic: https://lists.openembedded.org/mt/94110622/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
