summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/lsof
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/lsof')
-rw-r--r--meta/recipes-extended/lsof/files/remove-host-information.patch (renamed from meta/recipes-extended/lsof/files/lsof-remove-host-information.patch)68
-rw-r--r--meta/recipes-extended/lsof/lsof_4.96.3.bb (renamed from meta/recipes-extended/lsof/lsof_4.95.0.bb)11
2 files changed, 42 insertions, 37 deletions
diff --git a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/meta/recipes-extended/lsof/files/remove-host-information.patch
index 08f083cf83..fb90366ffa 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 @@
1From 4233b5ac1629c225a7a80f33efc0eff527a95851 Mon Sep 17 00:00:00 2001 1lsof doesn't embed the username or hostname in the build if SOURCE_DATE_EPOCH is
2From: Li Wang <li.wang@windriver.com> 2defined, but this still embeds build paths. Delete all of the host details to
3Date: Wed, 30 Aug 2017 15:05:16 +0800 3ensure that no host information is leaked into the binary.
4Subject: [PATCH] Remove host information from version.h
5 4
6make lsof not include host information 5Upstream-Status: Inappropriate
7 6Signed-off-by: Ross Burton <ross.burton@arm.com>
8Upstream-Status: Inappropriate [embedded specific]
9
10Signed-off-by: Li Wang <li.wang@windriver.com>
11
12---
13 dialects/linux/Makefile | 48 +++++++----------------------------------
14 1 file changed, 8 insertions(+), 40 deletions(-)
15 7
16diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile 8diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
17index 46c83c2..50f03cc 100644 9index 176a4c2..ef5a633 100644
18--- a/dialects/linux/Makefile 10--- a/dialects/linux/Makefile
19+++ b/dialects/linux/Makefile 11+++ b/dialects/linux/Makefile
20@@ -84,47 +84,15 @@ version.h: FRC 12@@ -83,64 +83,17 @@ ${LIB}: FRC
13 version.h: FRC
21 @echo Constructing version.h 14 @echo Constructing version.h
22 @rm -f version.h 15 @rm -f version.h
23 @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; 16- @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h;
24- @echo '#define LSOF_CC "${CC}"' >> version.h 17- @echo '#define LSOF_CC "${CC}"' >> version.h
25- @echo '#define LSOF_CCV "${CCV}"' >> version.h 18- @echo '#define LSOF_CCV "${CCV}"' >> version.h
26- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h 19- @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
27+ @echo '#define LSOF_CC ""' >> version.h 20- @echo '#define LSOF_CINFO "${CINFO}"' >> version.h
28+ @echo '#define LSOF_CCV ""' >> version.h
29+ @echo '#define LSOF_CCFLAGS ""' >> version.h
30 @echo '#define LSOF_CINFO "${CINFO}"' >> version.h
31- @if [ "X${LSOF_HOST}" = "X" ]; then \ 21- @if [ "X${LSOF_HOST}" = "X" ]; then \
32- echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \ 22- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
23- echo '#define LSOF_HOST "'`uname -n`'"' >> version.h; \
24- else \
25- echo '#define LSOF_HOST ""' >> version.h; \
26- fi \
33- else \ 27- else \
34- if [ "${LSOF_HOST}" = "none" ]; then \ 28- if [ "${LSOF_HOST}" = "none" ]; then \
35- echo '#define LSOF_HOST ""' >> version.h; \ 29- echo '#define LSOF_HOST ""' >> version.h; \
@@ -39,7 +33,11 @@ index 46c83c2..50f03cc 100644
39- fi 33- fi
40- @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h 34- @echo '#define LSOF_LDFLAGS "${CFGL}"' >> version.h
41- @if [ "X${LSOF_LOGNAME}" = "X" ]; then \ 35- @if [ "X${LSOF_LOGNAME}" = "X" ]; then \
42- echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \ 36- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
37- echo '#define LSOF_LOGNAME "${LOGNAME}"' >> version.h; \
38- else \
39- echo '#define LSOF_LOGNAME ""' >> version.h; \
40- fi \
43- else \ 41- else \
44- if [ "${LSOF_LOGNAME}" = "none" ]; then \ 42- if [ "${LSOF_LOGNAME}" = "none" ]; then \
45- echo '#define LSOF_LOGNAME ""' >> version.h; \ 43- echo '#define LSOF_LOGNAME ""' >> version.h; \
@@ -48,7 +46,11 @@ index 46c83c2..50f03cc 100644
48- fi; \ 46- fi; \
49- fi 47- fi
50- @if [ "X${LSOF_SYSINFO}" = "X" ]; then \ 48- @if [ "X${LSOF_SYSINFO}" = "X" ]; then \
49- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
51- echo '#define LSOF_SYSINFO "'`uname -a`'"' >> version.h; \ 50- echo '#define LSOF_SYSINFO "'`uname -a`'"' >> version.h; \
51- else \
52- echo '#define LSOF_SYSINFO ""' >> version.h; \
53- fi \
52- else \ 54- else \
53- if [ "${LSOF_SYSINFO}" = "none" ]; then \ 55- if [ "${LSOF_SYSINFO}" = "none" ]; then \
54- echo '#define LSOF_SYSINFO ""' >> version.h; \ 56- echo '#define LSOF_SYSINFO ""' >> version.h; \
@@ -57,7 +59,11 @@ index 46c83c2..50f03cc 100644
57- fi \ 59- fi \
58- fi 60- fi
59- @if [ "X${LSOF_USER}" = "X" ]; then \ 61- @if [ "X${LSOF_USER}" = "X" ]; then \
60- echo '#define LSOF_USER "${USER}"' >> version.h; \ 62- if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
63- echo '#define LSOF_USER "${USER}"' >> version.h; \
64- else \
65- echo '#define LSOF_USER ""' >> version.h; \
66- fi \
61- else \ 67- else \
62- if [ "${LSOF_USER}" = "none" ]; then \ 68- if [ "${LSOF_USER}" = "none" ]; then \
63- echo '#define LSOF_USER ""' >> version.h; \ 69- echo '#define LSOF_USER ""' >> version.h; \
@@ -65,11 +71,17 @@ index 46c83c2..50f03cc 100644
65- echo '#define LSOF_USER "${LSOF_USER}"' >> version.h; \ 71- echo '#define LSOF_USER "${LSOF_USER}"' >> version.h; \
66- fi \ 72- fi \
67- fi 73- fi
68+ @echo '#define LSOF_HOST ""' >> version.h; 74+
69+ @echo '#define LSOF_LDFLAGS ""' >> version.h 75+ @echo '#define LSOF_BLDCMT ""' > version.h;
70+ @echo '#define LSOF_LOGNAME ""' >> version.h; 76+ @echo '#define LSOF_CC ""' >> version.h
71+ @echo '#define LSOF_SYSINFO ""' >> version.h; 77+ @echo '#define LSOF_CCV ""' >> version.h
72+ @echo '#define LSOF_USER ""' >> version.h; 78+ @echo '#define LSOF_CCFLAGS ""' >> version.h
79+ @echo '#define LSOF_CINFO ""' >> version.h
80+ @echo '#define LSOF_HOST ""' >> version.h
81+ @echo '#define LSOF_LDFLAGS ""' >> version.h
82+ @echo '#define LSOF_LOGNAME ""' >> version.h
83+ @echo '#define LSOF_SYSINFO ""' >> version.h
84+ @echo '#define LSOF_USER ""' >> version.h
73 @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h 85 @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h
74 86
75 FRC: 87 FRC:
diff --git a/meta/recipes-extended/lsof/lsof_4.95.0.bb b/meta/recipes-extended/lsof/lsof_4.96.3.bb
index f380de0b6b..c32fcd5583 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"
6LICENSE = "Spencer-94" 6LICENSE = "Spencer-94"
7LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" 7LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a"
8 8
9# Upstream lsof releases are hosted on an ftp server which times out download
10# attempts from hosts for which it can not perform a DNS reverse-lookup (See:
11# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be
12# the most commonly used alternative.
13
14SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ 9SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
15 file://lsof-remove-host-information.patch \ 10 file://remove-host-information.patch"
16 " 11SRCREV = "eec10fac8f57544e26ff00bf41a2dc09c56049bf"
17
18SRCREV = "67d8c828e7bdc01ba93f8ff79765dd424da0c9d7"
19 12
20S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
21 14
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-05 19:08:17 +0000