[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/files/, net-analyzer/tcpdump/

[Jeroen Roovers]

commit:     f061abdd02c8cf63129bb71d677114892386e5eb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 19:39:33 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 19:39:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f061abdd

net-analyzer/tcpdump: Remove automatically added include directories

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Bug: https://bugs.gentoo.org/692772
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../tcpdump/files/tcpdump-4.9.2-includedir.patch   | 65 ++++++++++++++++++++++
 ...tcpdump-9999.ebuild => tcpdump-4.9.2-r1.ebuild} | 27 +++++----
 net-analyzer/tcpdump/tcpdump-9999.ebuild           |  4 +-
 3 files changed, 82 insertions(+), 14 deletions(-)

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 00000000000..0f74fa9a8a3
--- /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-9999.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
similarity index 80%
copy from net-analyzer/tcpdump/tcpdump-9999.ebuild
copy to net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
index 5386a5f79ce..7e89e1714aa 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit flag-o-matic toolchain-funcs user
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 HOMEPAGE="
 	http://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	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"
-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 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
 
 RDEPEND="
 	drop-root? ( sys-libs/libcap-ng )
@@ -39,6 +35,9 @@ DEPEND="
 		dev-lang/perl
 	)
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-includedir.patch
+)
 
 pkg_setup() {
 	if use drop-root || use suid; then
@@ -50,6 +49,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	mv aclocal.m4 acinclude.m4 || die
+
+	eautoreconf
+
 	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
 
 	# bug 630394

diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 5386a5f79ce..c4fe962e812 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"