commit: 207fabf6ce392e5e85eef580116afc553739f92b Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Oct 20 09:32:30 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Oct 20 09:32:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207fabf6
net-analyzer/tcpdump: Old Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-analyzer/tcpdump/Manifest | 1 - .../tcpdump/files/tcpdump-4.9.2-includedir.patch | 65 ------------- net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild | 106 --------------------- net-analyzer/tcpdump/tcpdump-4.9.2.ebuild | 99 ------------------- 4 files changed, 271 deletions(-) diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 59c9ed32885..96c3fad37e2 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,2 +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 0f74fa9a8a3..00000000000 --- 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/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild deleted file mode 100644 index 193cb91dd2e..00000000000 --- a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" -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 ~sh ~sparc ~x86 ~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-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild deleted file mode 100644 index 632d82283d9..00000000000 --- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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 - -DESCRIPTION="A Tool for network monitoring and data acquisition" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" -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 ~sh sparc x86 ~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 - ) -" - -pkg_setup() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - -src_prepare() { - default - - 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." -}
