Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-process/lsof/files/, sys-process/lsof/
Date: Sat, 28 Feb 2015 23:21:13
Message-Id: 1425165764.3f9babf9bb444d6d335ef1b7a78bd55073b94c14.blueness@gentoo
1 commit: 3f9babf9bb444d6d335ef1b7a78bd55073b94c14
2 Author: Cato Auestad <cato <AT> cato <DOT> ninja>
3 AuthorDate: Sat Feb 28 23:22:07 2015 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 28 23:22:44 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=3f9babf9
7
8 sys-process/lsof: fix bug #541727
9
10 Package-Manager: portage-2.2.14
11 Manifest-Sign-Key: 0xF52D4BBA
12 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
13
14 ---
15 sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch | 15 +++++++++++++++
16 sys-process/lsof/lsof-4.87-r99.ebuild | 2 +-
17 2 files changed, 16 insertions(+), 1 deletion(-)
18
19 diff --git a/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch b/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch
20 new file mode 100644
21 index 0000000..1e121cb
22 --- /dev/null
23 +++ b/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch
24 @@ -0,0 +1,15 @@
25 +--- a/lsof_4.87_src/dialects/linux/dlsof.h 2015-02-28 22:37:00.731421615 +0000
26 ++++ b/lsof_4.87_src/dialects/linux/dlsof.h 2015-02-28 22:37:57.585422124 +0000
27 +@@ -49,12 +49,7 @@
28 + #include <setjmp.h>
29 + #include <unistd.h>
30 + #include <netinet/in.h>
31 +-
32 +-# if defined(GLIBCV) || defined(__UCLIBC__)
33 + #include <netinet/tcp.h>
34 +-# else /* !defined(GLIBCV) && !defined(__UCLIBC__) */
35 +-#include <linux/tcp.h>
36 +-# endif /* defined(GLIBCV) || defined(__UCLIBC__) */
37 +
38 + # if !defined(HASNORPC_H)
39 + #include <rpc/rpc.h>
40 \ No newline at end of file
41
42 diff --git a/sys-process/lsof/lsof-4.87-r99.ebuild b/sys-process/lsof/lsof-4.87-r99.ebuild
43 index 9cda930..dd3753b 100644
44 --- a/sys-process/lsof/lsof-4.87-r99.ebuild
45 +++ b/sys-process/lsof/lsof-4.87-r99.ebuild
46 @@ -31,7 +31,7 @@ src_unpack() {
47 }
48
49 src_prepare() {
50 - epatch "${FILESDIR}"/${PN}-4.85-fix-missing-netinet_tcp_h.patch #for musl
51 + epatch "${FILESDIR}"/${PN}-4.87-remove-glibc-check.patch #for musl
52 epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
53 # convert `test -r header.h` into a compile test
54 sed -i -r \