| 1 |
commit: 516ec63aca5466fc1d9d1a444f51128dc17a0852 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 9 13:38:41 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 9 13:39:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516ec63a |
| 7 |
|
| 8 |
net-analyzer/tcpdump: Prevent more -L/usr/lib injections |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch | 19 +++++++++++++++++++ |
| 14 |
net-analyzer/tcpdump/tcpdump-9999.ebuild | 8 ++++++-- |
| 15 |
2 files changed, 25 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..852ea6b6c13 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch |
| 22 |
@@ -0,0 +1,19 @@ |
| 23 |
+--- a/configure.ac |
| 24 |
++++ b/configure.ac |
| 25 |
+@@ -371,7 +371,7 @@ |
| 26 |
+ |
| 27 |
+ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then |
| 28 |
+ if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then |
| 29 |
+- LIBS="-L$ipv6libdir -l$ipv6lib $LIBS" |
| 30 |
++ LIBS="-l$ipv6lib $LIBS" |
| 31 |
+ echo "You have $ipv6lib library, using it" |
| 32 |
+ else |
| 33 |
+ if test "$ipv6trylibc" = "yes"; then |
| 34 |
+@@ -891,7 +891,6 @@ |
| 35 |
+ # at the front of the header and library search path. |
| 36 |
+ # |
| 37 |
+ CFLAGS="-I$withval/include $CFLAGS" |
| 38 |
+- LIBS="-L$withval/lib $LIBS" |
| 39 |
+ fi |
| 40 |
+ ],[ |
| 41 |
+ # |
| 42 |
|
| 43 |
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild |
| 44 |
index 52faf660b30..a4285888f60 100644 |
| 45 |
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild |
| 46 |
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2019 Gentoo Authors |
| 49 |
+# Copyright 1999-2020 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
EAPI=7 |
| 53 |
@@ -36,10 +36,14 @@ DEPEND=" |
| 54 |
${RDEPEND} |
| 55 |
drop-root? ( virtual/pkgconfig ) |
| 56 |
test? ( |
| 57 |
- || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) |
| 58 |
+ >=net-libs/libpcap-1.9.1 |
| 59 |
dev-lang/perl |
| 60 |
+ || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) |
| 61 |
) |
| 62 |
" |
| 63 |
+PATCHES=( |
| 64 |
+ "${FILESDIR}"/${PN}-9999-libdir.patch |
| 65 |
+) |
| 66 |
|
| 67 |
pkg_setup() { |
| 68 |
if use drop-root || use suid; then |
Archives