gentoo resync : 02.09.2020

3 files changed, 106 insertions, 11 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index f230333963ad..e85d77d7bfe2 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,6 +1,8 @@
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
+DIST tcpdump-4.10.0rc1.tar.gz 1823212 BLAKE2B aa274e548163eacb09a98edbaa1127dbb06b6fe2f6eb23ffa968a577081d9d9323c339a885a198ee08d7dced04302cf50301ca575fbe95e082a6ed89e115de05 SHA512 b226ca569eeda7cee45fc7a1e42766f404d55ebca8133da544ecd75f975701532346f0cfdbefd4fc708fca12a8d094790c99a7276bd9b563885ef036a3912493
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
+EBUILD tcpdump-4.10.0_rc1.ebuild 1973 BLAKE2B 215c44f36012423adf3800f2d5e7f4b76284400929b34dfe231fece3be30bd4eabaf1982875994c2524e00a6024f5956d97e816cbc5c7916df3d1c1b067f834a SHA512 f75fee2637d034cc1a75f96fe9514f9f780a2ddcab0630b2682a2614ba5a0c7b3ef5b3828fdfadb4fc88bccae9502566b673bd448e54f048349ef445a515e855
 EBUILD tcpdump-4.9.3-r1.ebuild 1879 BLAKE2B 65e3958ba8cad7dc7b7d2b77d6010e8f839c89fdb0d2fae5c15b338dab2d1b6f2758b86bfa94e72589a7578b3f3a7f299ba298a15414ee4847f014f9047915c9 SHA512 caada4ddb50725f408d1559b8d53c1ac8c996a5eee4ca41d645731f378c35ff7b1d74e75e7c728bb546c5c678d984015f702e5ba350048540f77cfc3fab56e1f
 EBUILD tcpdump-4.9.3.ebuild 1938 BLAKE2B 3fbeee3f62778f3347d509c2daa7a70ece06f40e3a8d37b85f3a67f53a6c3ed1eaa09bc52b48239db0c51739ad2f94239f9ebe11ed9c1e4bc2dbde8b8eff94b9 SHA512 f627bd6a18482bbc70724491eb69acfbba095d5193bfee673da5f275ce8b40383450776aa1e22444595116df42bc5b6d23a2ffd16a5b94cbc3144253f64e104a
-EBUILD tcpdump-9999.ebuild 2195 BLAKE2B ca86179ed2e7c1011ad249593cb2dbef59d2c509c217d630b5915a199798460ca89fb636471588b84761806d1bc8c2415c76a1fa67a91416973e99258e046415 SHA512 cb1ecf623008bff818de460ea6c83cceb6a41e336dfa9d3ef6e9d05699574e18fb892c1d3eb85f2b176362cc24ec3cadda495b552959944ce4295cdd598f254b
+EBUILD tcpdump-9999.ebuild 1956 BLAKE2B 39c4b6d5b776f94a97000c3837736e54db87e089a92682be2f2f7d60c799d358a342b53cf3acce029405afbec899ec6bb2308e34e52b3fd2a749783d24f8806b SHA512 eff621effc30d7baba25d54fae2a55a4dd1221f42d1d8262a8b47f87bef8c2c5b291b17810c87a6209a2f035a5c85e49ce02aa0d12f07ea1e5aaf2483a68383b
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild b/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild
new file mode 100644
index 000000000000..2034a5392dd1
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.10.0_rc1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+LICENSE="BSD"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
+"
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap
+	drop-root? ( sys-libs/libcap-ng )
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+BDEPEND="
+	drop-root? ( virtual/pkgconfig )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=net-libs/libpcap-1.9.1
+		dev-lang/perl
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-libdir.patch
+)
+S=${WORKDIR}/${PN}-${P/_}
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	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") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index b0c0a0baa597..1df4d6f13e01 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -5,27 +5,21 @@ EAPI=7
 inherit autotools git-r3 user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 HOMEPAGE="
 	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/tcpdump
 "
-
 LICENSE="BSD"
+EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+
 SLOT="0"
 IUSE="+drop-root libressl smi ssl samba suid test"
 RESTRICT="!test? ( test )"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
+KEYWORDS=""
 
 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= )