commit: 516ec63aca5466fc1d9d1a444f51128dc17a0852
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 9 13:38:41 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 13:39:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516ec63a
net-analyzer/tcpdump: Prevent more -L/usr/lib injections
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch | 19 +++++++++++++++++++
net-analyzer/tcpdump/tcpdump-9999.ebuild | 8 ++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
new file mode 100644
index 00000000000..852ea6b6c13
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -371,7 +371,7 @@
+
+ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
+ if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
+- LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
++ LIBS="-l$ipv6lib $LIBS"
+ echo "You have $ipv6lib library, using it"
+ else
+ if test "$ipv6trylibc" = "yes"; then
+@@ -891,7 +891,6 @@
+ # at the front of the header and library search path.
+ #
+ CFLAGS="-I$withval/include $CFLAGS"
+- LIBS="-L$withval/lib $LIBS"
+ fi
+ ],[
+ #
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild
b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 52faf660b30..a4285888f60 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -36,10 +36,14 @@ DEPEND="
${RDEPEND}
drop-root? ( virtual/pkgconfig )
test? (
- || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+ >=net-libs/libpcap-1.9.1
dev-lang/perl
+ || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-libdir.patch
+)
pkg_setup() {
if use drop-root || use suid; then
