gentoo resync : 28.04.2021

4 files changed, 56 insertions, 24 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 9a3b306fc7da..6a2eee6c0a9d 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,9 @@
 AUX tcpdump-4.9.3-CVE-2020-8037.patch 1732 BLAKE2B f9ebe8862e6316443bec5b3103882eca6298104e64a7e121c81129367a984c6580e1be480e7aa263dfdf664d04547ea6cead7e16866978dffa33c2dba7c13dcb SHA512 f53b5557ad2c68c28bbd6121b637ade43937ce4956fa9c2c8b187e8c62726c018509eb728f7f7479d078c9018f091f64114944b2d6106e6214662899f880445a
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801
-EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 9de2877989906aa1d870f6d450040da8e6586ee5ecd77c66ff11dfb7848f9538b3739c5c458e4d1bbf8fb811f646909b4b9bc2956c1656c11fc64010355510d8 SHA512 b131e963b567a24763c85b5696e3b633aef1be2ea22d03c3a76c4867bd72aab9bf42d2eba9c2ec2c0d1c151aff016199fcd4085d78f14db0b7b25240793ea684
-EBUILD tcpdump-4.99.0.ebuild 1864 BLAKE2B 88937ff7ca63caea3a9c84a2ca5e97bd11623de064cf385b28ee33a4200fef8fcfdb8283a33ed4978155d79f3df3c0d6ba0d074289650ea7cf226f9684c36fd0 SHA512 82989ef5c40bb17a4d1efc4df929921044dfc3abfd0fad74934a26fc7608765f0559f055f1d51f1e86ed3a2c8218087c822ed39eac7241117adbec90dc7d5b50
-EBUILD tcpdump-9999.ebuild 1710 BLAKE2B cce77f9bcef21eeb2f6360b2b7d0cca85e4f3f5568c39cb8b3ac2c69fcc8aff2942715d70958d847e7425be2da49a353260287488273a1ebf51c5b0d8238ceb2 SHA512 73a88872fcc171ba0aa074e96742aa937a5b988b3f0c7196b2dec02d566e60201c6b050548175fdc2f30cd0e829dc28e82e21f8ea07c58fda7815814c651708b
+DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79
+DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803
+EBUILD tcpdump-4.9.3-r4.ebuild 1760 BLAKE2B dda41e8b026d7121c30c6a53280d4908bdeefa9e1d3c8e22fc444a8bf509d0a25efeb012781e06e8ce409091687bfb081b4aa232902d36b5c9780f325f53659f SHA512 037a2342cc37920be4d0a8d7aff9172c47ee5ac1f312f3cd1fa8d3aeb1ae0440f9f0445170f2199983a763bd3afaffa3949de278f40c2e864f6957ac7ed892da
+EBUILD tcpdump-4.99.0.ebuild 2360 BLAKE2B a2d53ec444175556138dc435ced542adf27828a1bb793b67ea0cb09d1d243e15d22e2be80914c3d8921462ea771127a07ca06a64f9f2dc1939be9e820b985173 SHA512 ebb033cbac5869c26efd8cd860148bc70240e1e90c00deddd80052342766b71f578ae48c0f971c8667140bbe8a79c298abc50e4535e0a1ff66f11a76eda1437d
+EBUILD tcpdump-9999.ebuild 2204 BLAKE2B 07c96334989ad029da284b913dfb24175d66a3a22bfca1a891b0a5da8788e2a8be89ede5b9ca403f8dc8331ece340884607ccef783fae48aa0832c7c8adae78f SHA512 cdc6c55c3afde64296d96524869c86dcb170520a7962a1da63c2a8c65f1453d54682d71b9917ab450544f3a51f23da5f795bb7fa9da393f7ce3fe7c84c37a13d
 MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index 217b3f570c80..d0a366b2b4b6 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 2edd75502e32..d06df7164dbd 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -7,18 +7,31 @@ inherit autotools
 
 DESCRIPTION="A tool for network monitoring and data acquisition"
 HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz"
-S="${WORKDIR}/${PN}-${P/_}"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	# Note: drop -upstream on bump, this is just because we switched to the official
+	# distfiles for verify-sig
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
+
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl +smi +ssl +samba suid test"
+REQUIRED_USE="test? ( samba )"
+
 # Assorted failures: bug #768498
 RESTRICT="test"
-REQUIRED_USE="test? ( samba )"
 
-BDEPEND="drop-root? ( virtual/pkgconfig )"
 RDEPEND="
 	net-libs/libpcap
 	drop-root? (
@@ -43,6 +56,11 @@ DEPEND="
 		dev-lang/perl
 	)
 "
+BDEPEND="drop-root? ( virtual/pkgconfig )"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 17c0eed4bfee..3e4c338aca2d 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -3,22 +3,33 @@
 
 EAPI=7
 
-inherit autotools git-r3
+inherit autotools
 
 DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="+drop-root libressl +smi +ssl +samba suid test"
-
-RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( samba )"
 
+# Assorted failures: bug #768498
+RESTRICT="test"
+
 RDEPEND="
 	net-libs/libpcap
 	drop-root? (
@@ -36,9 +47,6 @@ RDEPEND="
 		acct-user/pcap
 	)
 "
-BDEPEND="
-	drop-root? ( virtual/pkgconfig )
-"
 DEPEND="
 	${RDEPEND}
 	test? (
@@ -46,13 +54,18 @@ DEPEND="
 		dev-lang/perl
 	)
 "
+BDEPEND="drop-root? ( virtual/pkgconfig )"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -67,7 +80,7 @@ src_configure() {
 }
 
 src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
 		emake check
 	else
 		ewarn "If you want to run the test suite, make sure you either"
@@ -81,7 +94,7 @@ src_install() {
 	dodoc *.awk
 	dodoc CHANGES CREDITS README.md
 
-	if use suid; then
+	if use suid ; then
 		fowners root:pcap /usr/sbin/tcpdump
 		fperms 4110 /usr/sbin/tcpdump
 	fi