From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D21BD138351 for ; Thu, 9 Jan 2020 13:39:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E81C3E0885; Thu, 9 Jan 2020 13:39:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92968E089D for ; Thu, 9 Jan 2020 13:39:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E662534DEE6 for ; Thu, 9 Jan 2020 13:39:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BFD897 for ; Thu, 9 Jan 2020 13:39:09 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1578577144.516ec63aca5466fc1d9d1a444f51128dc17a0852.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/files/, net-analyzer/tcpdump/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch net-analyzer/tcpdump/tcpdump-9999.ebuild X-VCS-Directories: net-analyzer/tcpdump/files/ net-analyzer/tcpdump/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 516ec63aca5466fc1d9d1a444f51128dc17a0852 X-VCS-Branch: master Date: Thu, 9 Jan 2020 13:39:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b8ba751-ddae-4681-9b15-6c3696ea320c X-Archives-Hash: 99d9c5058de208fa16537d5f372fd3a7 commit: 516ec63aca5466fc1d9d1a444f51128dc17a0852 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jan 9 13:38:41 2020 +0000 Commit: Jeroen Roovers gentoo 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 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