tcpdump: upgraded package to upstream
Upgraded net-analyzer/tcpdump to version 4.9.3 on amd64
Changes vs. upstream:
* KEYWORDS="*"
* s/EPREFIX/ESYSROOT/ for the libcrypto configure parameter to make
cross compilation work properly.
BUG=chromium:740333
TEST=Builds
Change-Id: I6f74b38d43e00085b0cfd7b87013f4ac832c8ef4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/1899955
Tested-by: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mattias Nissler <mnissler@chromium.org>
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r1 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r1
deleted file mode 100644
index 6cf1402..0000000
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=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:= ) ) drop-root? ( virtual/pkgconfig ) test? ( || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/baselayout
-DESCRIPTION=A Tool for network monitoring and data acquisition
-EAPI=6
-HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
-IUSE=+drop-root libressl smi ssl samba suid test
-KEYWORDS=*
-LICENSE=BSD
-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:= ) ) sys-apps/baselayout
-SLOT=0
-SRC_URI=http://www.tcpdump.org/release/tcpdump-4.9.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0 user 9090dfc2ada1aeb498eed56b8ad04ce6
-_md5_=83d864c4df838d6d9bb95913876f24ee
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r2 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r2
deleted file mode 100644
index 6cf1402..0000000
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=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:= ) ) drop-root? ( virtual/pkgconfig ) test? ( || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/baselayout
-DESCRIPTION=A Tool for network monitoring and data acquisition
-EAPI=6
-HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
-IUSE=+drop-root libressl smi ssl samba suid test
-KEYWORDS=*
-LICENSE=BSD
-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:= ) ) sys-apps/baselayout
-SLOT=0
-SRC_URI=http://www.tcpdump.org/release/tcpdump-4.9.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0 user 9090dfc2ada1aeb498eed56b8ad04ce6
-_md5_=83d864c4df838d6d9bb95913876f24ee
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
new file mode 100644
index 0000000..b174f2c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst setup test
+DEPEND=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:= ) ) drop-root? ( virtual/pkgconfig ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) ) sys-apps/baselayout
+DESCRIPTION=A Tool for network monitoring and data acquisition
+EAPI=7
+HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
+IUSE=+drop-root libressl smi ssl samba suid test
+KEYWORDS=*
+LICENSE=BSD
+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:= ) ) sys-apps/baselayout
+SLOT=0
+SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0 user 9090dfc2ada1aeb498eed56b8ad04ce6
+_md5_=ff6d3e6bab7067cc80b7a57fa12c6bfc
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index f079afe..96c3fad 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1 +1 @@
-DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
+DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
deleted file mode 100644
index 0f74fa9..0000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 2d5b8e1..926985b 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -10,6 +10,7 @@
<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
</use>
<upstream>
+ <remote-id type="cpe">cpe:/a:tcpdump:tcpdump</remote-id>
<remote-id type="github">the-tcpdump-group/tcpdump</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r2.ebuild
deleted file mode 120000
index d865b7a..0000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-tcpdump-4.9.2-r1.ebuild
\ No newline at end of file
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
similarity index 79%
rename from net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
rename to net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
index 85d980a..7715a08 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs user
+EAPI=7
+inherit flag-o-matic toolchain-funcs user
DESCRIPTION="A Tool for network monitoring and data acquisition"
HOMEPAGE="
- http://www.tcpdump.org/
+ https://www.tcpdump.org/
https://github.com/the-tcpdump-group/tcpdump
"
SRC_URI="
- http://www.tcpdump.org/release/${P}.tar.gz
+ https://www.tcpdump.org/release/${P}.tar.gz
"
LICENSE="BSD"
@@ -31,13 +31,11 @@
${RDEPEND}
drop-root? ( virtual/pkgconfig )
test? (
- || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+ >=net-libs/libpcap-1.9.1
dev-lang/perl
+ || ( app-arch/sharutils sys-freebsd/freebsd-ubin )
)
"
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.2-includedir.patch
-)
pkg_setup() {
if use drop-root || use suid; then
@@ -46,19 +44,6 @@
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
@@ -69,7 +54,7 @@
$(use_enable samba smb) \
$(use_with drop-root chroot '') \
$(use_with smi) \
- $(use_with ssl crypto "${EPREFIX}/usr") \
+ $(use_with ssl crypto "${ESYSROOT}/usr") \
$(usex drop-root "--with-user=tcpdump" "")
}
