gentoo resync : 06.08.2019

4 files changed, 176 insertions, 3 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 52aea4c6a8a5..ef98d053a6df 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,6 @@
+AUX tcpdump-4.9.2-includedir.patch 2027 BLAKE2B b9fc28ec180095f9b6e47e9a1ccd75d479029cfb19d6f1ff53595a25cab4c68d1ca55df0f702dfae86e264e4b7d3f645f3fac1b548bb6d62cec58306ae19e88a SHA512 054af892c4948926d23b6b7a4f93ac00ab8f258181784598a4097dd8f8b641ddeaedf3c9924b940b860929e086810037d3a672fabd03427b4bb41d3020013c27
 DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
+EBUILD tcpdump-4.9.2-r1.ebuild 2196 BLAKE2B 3fa9633aec8cbf4fade7622b445336fb79d90b361299ad18d0704e613e749d05204f44b0e75b489692dc5851dcc1d987719c7f6cc4d1e5f5b9265775c1ffcc88 SHA512 6573400c2c12725e5c791756de76854c38869cbabe35c208c479beda30893f0f029011f407bd56f0ae6dd8a63a5dddf45f57d49b51babf25a966a407e0cdbe6b
 EBUILD tcpdump-4.9.2.ebuild 2074 BLAKE2B 94a22e1acea10408c02fcca114547eba248491b0a99505ee369549c681e23e5a5ffa51f4dd43ba6ae2eaa79d0abc85f1f5c1f9a057a96c70189d47e9d98e0028 SHA512 48bd328212aae63dc3f0361352f93b29edb165cbbe12f7d92cc3588c9240e4584e5257bda6adc52872b271e72dfcd65cbd78d79b1faf86b76088fe4f3244376f
-EBUILD tcpdump-9999.ebuild 2202 BLAKE2B bda2d7229a0da196d4a16b263cea1b3a48197485e48118fa368288c8a1ed5138b0090017321528d22a56b20ab0fae177e9b798e7ef4e8d1c1cf41dc73d23d1e7 SHA512 c6a450a094a69fb62b9b742c1fbd63bd8fb30326bffc484f19e60c6ab7fe6e4ae2f0fd73b6330ddb4b825db3f919cd62b0a18e3f40a673d3250e7ff10a1991dc
+EBUILD tcpdump-9999.ebuild 2199 BLAKE2B 4931c70244b037b100cbabad036f2cb14a675d6bb0cec61697bcb2b996d18ee18e38afe6d04cec9e07b78b222cf5ef1f2cf01205eef137f7df5eb7d931605744 SHA512 57e1a444b5a345b2acc2cc14e64fd2298b6d8b20fcf45a9352ddfb3a6a16220fb078b0e4382031eb1b3ed61b7b33ab30c2790c7f1adb15a68701fd57fbe97f9f
 MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
new file mode 100644
index 000000000000..0f74fa9a8a3f
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
@@ -0,0 +1,65 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -534,40 +534,6 @@
+ 		if test $libpcap = FAIL ; then
+ 		    AC_MSG_ERROR(see the INSTALL doc for more info)
+ 		fi
+-		dnl
+-		dnl Some versions of Red Hat Linux put "pcap.h" in
+-		dnl "/usr/include/pcap"; had the LBL folks done so,
+-		dnl that would have been a good idea, but for
+-		dnl the Red Hat folks to do so just breaks source
+-		dnl compatibility with other systems.
+-		dnl
+-		dnl We work around this by assuming that, as we didn't
+-		dnl find a local libpcap, libpcap is in /usr/lib or
+-		dnl /usr/local/lib and that the corresponding header
+-		dnl file is under one of those directories; if we don't
+-		dnl find it in either of those directories, we check to
+-		dnl see if it's in a "pcap" subdirectory of them and,
+-		dnl if so, add that subdirectory to the "-I" list.
+-		dnl
+-		dnl (We now also put pcap.h in /usr/include/pcap, but we
+-		dnl leave behind a /usr/include/pcap.h that includes it,
+-		dnl so you can still just include <pcap.h>.)
+-		dnl
+-		AC_MSG_CHECKING(for extraneous pcap header directories)
+-		if test \( ! -r /usr/local/include/pcap.h \) -a \
+-			\( ! -r /usr/include/pcap.h \); then
+-		    if test -r /usr/local/include/pcap/pcap.h; then
+-			d="/usr/local/include/pcap"
+-		    elif test -r /usr/include/pcap/pcap.h; then
+-			d="/usr/include/pcap"
+-		    fi
+-		fi
+-		if test -z "$d" ; then
+-		    AC_MSG_RESULT(not found)
+-		else
+-		    $2="-I$d $$2"
+-		    AC_MSG_RESULT(found -- -I$d added)
+-		fi
+ 	    fi
+     else
+ 	    $1=$libpcap
+@@ -1351,11 +1351,4 @@
+ 			  	    -f "$1/$tmplib/libcrypto.dylib" \); then
+ 		ac_cv_ssleay_path="$1"
+ 	fi
+-
+-	#
+-	# Make sure we have the headers as well.
+-	#
+-	if test -d "$1/include/openssl" -a -f "$1/include/openssl/des.h"; then
+-		incdir="-I$1/include"
+-	fi
+ ])
+--- a/configure.in
++++ b/configure.in
+@@ -908,7 +908,6 @@
+ 		# Put the subdirectories of the libcrypto root directory
+ 		# 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-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
new file mode 100644
index 000000000000..7e89e1714aaf
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+	http://www.tcpdump.org/release/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl samba suid test"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		dev-lang/perl
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-includedir.patch
+)
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_prepare() {
+	default
+
+	mv aclocal.m4 acinclude.m4 || die
+
+	eautoreconf
+
+	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
+
+	# bug 630394
+	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
+}
+
+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 chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/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 5386a5f79cea..c4fe962e8128 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"