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 6289D138359 for ; Mon, 24 Aug 2020 07:55:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80852E080E; Mon, 24 Aug 2020 07:55:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5BE0FE080E for ; Mon, 24 Aug 2020 07:55:41 +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 3E7E633BE23 for ; Mon, 24 Aug 2020 07:55:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCD5FEC for ; Mon, 24 Aug 2020 07:55:38 +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: <1598255736.d1c4217456364c563e6ff53b47e642a81721e24c.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild net-analyzer/tcpdump/tcpdump-9999.ebuild X-VCS-Directories: net-analyzer/tcpdump/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d1c4217456364c563e6ff53b47e642a81721e24c X-VCS-Branch: master Date: Mon, 24 Aug 2020 07:55:38 +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: 171e633c-32fb-4737-a226-03d61740fe85 X-Archives-Hash: 3085e1a7a74fbb24285a4f5f5595ba6f commit: d1c4217456364c563e6ff53b47e642a81721e24c Author: Jeroen Roovers gentoo org> AuthorDate: Mon Aug 24 07:54:35 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Aug 24 07:55:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c42174 net-analyzer/tcpdump: Do actually use that patch from January Package-Manager: Portage-3.0.4, Repoman-3.0.1 Closes: https://bugs.gentoo.org/731192 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild | 19 +++++++++++-------- net-analyzer/tcpdump/tcpdump-9999.ebuild | 18 +++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild index 8374b080d4e..e23d799be4b 100644 --- a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs user +inherit autotools user DESCRIPTION="A Tool for network monitoring and data acquisition" HOMEPAGE=" @@ -20,8 +20,8 @@ IUSE="+drop-root libressl smi ssl samba suid test" RESTRICT="!test? ( test )" RDEPEND=" - drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap + drop-root? ( sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) @@ -30,12 +30,14 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - drop-root? ( virtual/pkgconfig ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl ) " +PATCHES=( + "${FILESDIR}"/${PN}-9999-libdir.patch +) pkg_setup() { if use drop-root || use suid; then @@ -44,14 +46,15 @@ pkg_setup() { fi } -src_configure() { - if use drop-root; then - append-cppflags -DHAVE_CAP_NG_H - export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) - fi +src_prepare() { + default + eautoreconf +} +src_configure() { econf \ $(use_enable samba smb) \ + $(use_with drop-root cap-ng) \ $(use_with drop-root chroot '') \ $(use_with smi) \ $(use_with ssl crypto "${ESYSROOT}/usr") \ diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index ac642f4be7b..b0c0a0baa59 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs user +inherit autotools git-r3 user DESCRIPTION="A Tool for network monitoring and data acquisition" EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" @@ -32,9 +32,11 @@ RDEPEND=" libressl? ( dev-libs/libressl:= ) ) " +BDEPEND=" + drop-root? ( virtual/pkgconfig ) +" DEPEND=" ${RDEPEND} - drop-root? ( virtual/pkgconfig ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl @@ -52,22 +54,20 @@ pkg_setup() { } src_prepare() { - default - sed -i -e '/^eapon1/d;' tests/TESTLIST || die # bug 630394 sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die + + default + + eautoreconf } src_configure() { - if use drop-root; then - append-cppflags -DHAVE_CAP_NG_H - export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) - fi - econf \ $(use_enable samba smb) \ + $(use_with drop-root cap-ng) \ $(use_with drop-root chroot '') \ $(use_with smi) \ $(use_with ssl crypto "${ESYSROOT}/usr") \