Old.

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 15 insertions, 246 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 760ea252e414..52f4f2b3c955 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.194 2014/09/17 08:48:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.195 2014/09/17 10:13:35 jer Exp $
+
+  17 Sep 2014; Jeroen Roovers <jer@gentoo.org> -tcpdump-4.3.0.ebuild,
+  -files/tcpdump-4.3.0-ssl-detect.patch, metadata.xml:
+  Old.
 
   17 Sep 2014; Agostino Sarubbo <ago@gentoo.org> tcpdump-4.5.1-r1.ebuild:
   Stable for ppc64, wrt bug #511502
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 982d05f98ca8..5ee6cffd4f9c 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,29 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tcpdump-4.3.0-ssl-detect.patch 3568 SHA256 970b709a1599e9496e77dd4cbf7e87ed80502d6c046e7c1599ff6a7683d1b597 SHA512 df93da14652f1907a29a68768e01b3f8784d04d269ab7f54592e7d8740fccc7d944166d75f4112343a71fca0a63b2693adce768190869cf11f0cbf16c81ff535 WHIRLPOOL 0dbe296397aa9e69f73c88f3755cc292314bb35b3ee7724c1486ca34dd76a76f1935673a28a1476885d3c372833049ad38a9693d63c69679e24c07bcef1c734d
-DIST tcpdump-4.3.0.tar.gz 887619 SHA256 efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286 SHA512 56a33f8aeae551fdc499be31d834207b253de27dce7bdde02e2de5ed0edc4bbe86d8e120c9d2a2303b21d5c32773a4f2984e6af4f0d6f945edb3691a6446cb3c WHIRLPOOL b7d06938816aad8313d61bc30d15efa321ae2ab4663e9355ae2c50b7645bd3cb694de85e04314b5e320459312ee6150a2d3c8c93ee7ffc47ca2ece29bebd8270
 DIST tcpdump-4.5.1.tar.gz 1024455 SHA256 14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96 SHA512 c4d739e68a4d54f184c9b3e21fed95f327e4070dc0f3ddb35890b93b809de424c0a9a313353fb97e49aaf5425ba8d13e30c3e93610716dcc83466aa836c701d6 WHIRLPOOL 28611acfcf41d44df1000eca4b3ec6b7cd1dd39d41997f14672000cdceb9b23876fbca2b3fc0a3d28e2e355c1169cb36011496253949863d2735106a7c3e56a4
 DIST tcpdump-4.6.2.tar.gz 1105356 SHA256 524ee4d8e83a6c663f6879004216a9a5bcb1c68b11920d653eb87b79d008e0b8 SHA512 6e1799a97378c4844460d6b0c0766e9c7d36da0678d103f9571f536ccbc6d46f05b7caf4dc21277966ca687836152d21c227546c7d1cb382b045ed8f055228fc WHIRLPOOL d540fcccb0fac8f7c472bafe800c4c451455bcc2df8208d2e21d99c5e6d58de32dda89b59a2d63ee44ea63fa2fe607100f03f113d0ce40e6aa9b1db762a79ba3
-EBUILD tcpdump-4.3.0.ebuild 2349 SHA256 5153e7ea5c6737b747f652fac29b79476475130716fa2a499186cd7c29c23ea3 SHA512 5aaf1305e75eca7c43c29d93e031db1212c80c671ffcd026ca2d52aac85b94d034d78fbad3c1ee089a4fc56fb1275b5d0be5153e89c049ca9dce6caf5cc5faf1 WHIRLPOOL 338a3538d761be7180acfe8ba9fc58f099f73541724e6e947c4766c9d11646193be694583112788de18ee584037756b18240b6ba4d3aa617384e061720a0b20b
 EBUILD tcpdump-4.5.1-r1.ebuild 2786 SHA256 159e54230ba9473b22d134a03c1717fa2ada89dcc49952d53cc1bac8f2210edf SHA512 7253d089fda1e3dcf6776b26754c60af7058b31ffdd45543bc2bad747f72a6a62ab156caed4c50081460968e94d615ced77737bfb764c2232e84d0162bdcc89b WHIRLPOOL c741276bd14fb6721c1a9cad513c20a029421debeecebba72634bd5f08692778fad71bb31bb50975cc797b10fc6e17a1c4f57091280289abbb61b0006fc47c8b
 EBUILD tcpdump-4.6.2.ebuild 2277 SHA256 acfff1606acf15741d26c617314f8af68dd9033542f690e53b321409f2c90294 SHA512 ebc0b10fff96111ea7f0564993b9cb44be83c63b9ab18e8173354ffb7777672f150a5f5d4dfc9a15a29f4679bed7e418fb4c032e8b63c982238d3a26ccb64304 WHIRLPOOL 231a8eb8db916d055ba05d84ef758310ec95a3ccd246037beee6d690e76ea6e1c2f758eb8c79268ff0279638f7f6041899fbf814ea104a5b9f9a8b258c79b6f8
-MISC ChangeLog 26292 SHA256 0eeb8d558469b35fca6125a369e50e8ff219067bb41cee759d32935af4d68e16 SHA512 4370858eba74b647a621ae85f49e8a48a2663f30f854c3b949caa998c77e15f77ad25f8c74719800736687a4da6d722163d9d608a3d3df124ed4cac684171f36 WHIRLPOOL 5b0cdc61b94e22fbdf3f79edb0cd15ab3fda2efb9d43a0bc5829c5c2b139ba7ceafedba44c22b2e2dab739f8e7567c02aef6347b9cf28f0b40a17d825b5df4ad
-MISC metadata.xml 453 SHA256 5202cfcdb64b8b465398164cbf3c87a295f1a71a1e2d828b51edecce588426a9 SHA512 43eaf679b8dd9ed91683c98971a90be396cc6fb594530cd1496d262fdf47f984914d2ebe3cd4034ca3f1ed50153930db8b84e55257161c703afdf0dad7a5048c WHIRLPOOL 26af4c4c4e672bcda1ee56bd0d54667a58a927b3c0192b01d09e8c6f681edc691cfba5ea78b3faf2eefa46d6b9bcbace6eff4dccb874d7d6d40adbf00948bf99
+MISC ChangeLog 26425 SHA256 00ca4a433cbabb4d5ab570c894a45288b048bff3fb75930d526a7ef6eb713b68 SHA512 1532682da3e482dd950f805682e6401fa43652fc383b18fb118478f43d0fed73215f06449fa530a91ee722de1b955f508ad9f2989aa3cff847b357d987bdfde6 WHIRLPOOL 555ee2d4fd1b7d50906cd38b408cd56d3537698eecbacb373f36344a7496e3cf605455e35e4c5a96b18ac3925e55d09a1675f497cafcbc284e58601e7ea7e354
+MISC metadata.xml 365 SHA256 bb85383017d0fe03c9837832a8a4b747170fee670eb579bdfd2d9245762ff08c SHA512 6725efad0a73f396087805026ea7c9dac2768537dddc479fe7e0cfe5a23e63097dfed512b2a88534e3a7bc6a90e5f1151a09fe4d09c0eadaaf7c057d697189de WHIRLPOOL 7f49d044d82bd75952d3bf257b8890528a9ccef0bd330e845fd06c1c50e1caf950f2062f78e3a2b09c140ad18d2534be6e03c8866c7d98846eab1aa10e1a8e29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUGUr4AAoJELp701BxlEWfTj8P/jPb+tJX6NVW5hTgFJzHUBHc
-Iq1JhH1pk5ZS4WJmebplS1SBbznUrQmzGz5xkJAxoQw930cu3R5svOatbw0rG6fl
-EY1AF1NsvYpggbolpqc9aSmAslLIkBbQ4iIU5dv4Ld42IpEAcHxwhpEqTxl7Nsqw
-0IZKIhj26cVRdwjMpySlos5Pzq5AdYObDGg8FRvg6ycOGVKLZ5Shm38N9GfPc8fN
-s8B5Oo9mDBv/W23EbQ2XkvTYJC6D9t9tSmHjWh1KNWIVXKCMV9oysy+b4Pg4hhfM
-/6B1EQqYoUtv8p8702BkcEsBWkCAj7SDQg2s1TPMOLCtrlwcJFn56DwfD//SFHJu
-BRAAJKVg0Y+YnLv1ivA+oVNdtiaGCbk6tBHa9vsTzPodaKfGnnHvQA0MYet5geJb
-eLIrwJ/uE+VaJaIJActU/qnOo5bT84sxjViNPtJKQIF2MTUs5RPyqC5axGFqhUjO
-QF2z5QSo74mClRERSZb28WVrcrUcJGckgp4m8czmLP7Q7I0V3R6tda1KfonC0iuO
-hb2A6p/dVKSAkJ10yDzdqFDc3eoeg+qnLspOq+RVWrdsZ4W6QmyvNW+G9N2l9pO0
-X58y1y4p398UgP81bqCdnZzT/Pw5ht1h+VPVOPy81NqWa2VA2fo06rPcYGBiqrTA
-7IwyG1aTq3jj7PdC7N3x
-=x531
+iEYEAREIAAYFAlQZXtEACgkQVWmRsqeSphOa2ACff2elSwQqs3lATbsADqGxmzP8
+LYoAn1hLl7Yg6EJ5yPKvMWtnna5xD7MP
+=TQH2
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.3.0-ssl-detect.patch b/net-analyzer/tcpdump/files/tcpdump-4.3.0-ssl-detect.patch
deleted file mode 100644
index a4854372971a..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.3.0-ssl-detect.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-fix from upstream to drop ugly filesystem checks that fail horribly when cross-compiling
-
-From c4b7e5f2b287ee3d1de8f706b809a8e217720c4e Mon Sep 17 00:00:00 2001
-From: Marc Abramowitz <marc@marc-abramowitz.com>
-Date: Sat, 13 Oct 2012 11:21:45 -0700
-Subject: [PATCH] Simplify the detection of OpenSSL libcrypto by using
- standard autoconf macros rather than a local copy of
- AC_LBL_SSLEAY.
-
-AC_LBL_SSLEAY is old and has not kept pace with some more recent
-developments in packaging like Debian and Ubuntu's multiarch support.
-The autoconf macros have been updated to handle multiarch so using them
-means that tcpdump gains the ability to be built with libcrypto on these
-new multiarch distros and to work successfully with Travis CI, which
-uses Ubuntu 12, which is one such multiarch distro (see GH-32).
-
-Fixes GH-33
----
- configure    | 11201 ++++++++++++++++++---------------------------------------
- configure.in |    73 +-
- 2 files changed, 3443 insertions(+), 7831 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 8864238..14a60e1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -994,13 +994,13 @@ AC_LBL_UNALIGNED_ACCESS
- 
- AC_VAR_H_ERRNO
- 
--# Check for SSLeay
--AC_MSG_CHECKING(whether to use SSLeay libcrypto)
-+# Check for OpenSSL libcrypto
-+AC_MSG_CHECKING(whether to use OpenSSL libcrypto)
- # Specify location for both includes and libraries.
--want_libcrypto=youmama
-+want_libcrypto=ifavailable
- AC_ARG_WITH(crypto,
--    AS_HELP_STRING([--with-crypto@<:@=PATH@:>@],
--		   [use SSLeay libcrypto (located in directory PATH, if supplied).  @<:@default=yes, if available@:>@]),
-+    AS_HELP_STRING([--with-crypto],
-+		   [use OpenSSL libcrypto @<:@default=yes, if available@:>@]),
- [
- 	if test $withval = no
- 	then
-@@ -1010,10 +1010,6 @@ AC_ARG_WITH(crypto,
- 	then
- 		want_libcrypto=yes
- 		AC_MSG_RESULT(yes)
--	else
--		want_libcrypto=yes
--		AC_MSG_RESULT(yes)
--		crypto_dir=$withval
- 	fi
- ],[
- 	#
-@@ -1023,63 +1019,8 @@ AC_ARG_WITH(crypto,
- 	AC_MSG_RESULT([yes, if available])
- ])
- if test "$want_libcrypto" != "no"; then
--	ac_cv_ssleay_path=no
--	incdir=no
--	if test "x$crypto_dir" = x; then
--		#
--		# Location not specified; check the default locations.
--		#
--		AC_MSG_CHECKING(where SSLeay is located)
--		dirs="/usr /usr/local /usr/local/ssl /usr/pkg"
--		if test "x${host_alias}" != x; then
--			dirs="/usr/${host_alias} $dirs"
--		fi
--		for dir in $dirs; do
--			AC_LBL_SSLEAY($dir)
--
--			if test "$ac_cv_ssleay_path" != "no" -a "$incdir" != "no"; then
--				break;
--			else
--				ac_cv_ssleay_path=no
--				incdir=no
--			fi
--		done
--		if test "$ac_cv_ssleay_path" != no; then
--			AC_MSG_RESULT($ac_cv_ssleay_path)
--		fi
--	else
--		AC_MSG_CHECKING(for SSLeay in $crypto_dir)
--		AC_LBL_SSLEAY($crypto_dir)
--		if test "$ac_cv_ssleay_path" != no; then
--			AC_MSG_RESULT(found)
--		fi
--	fi
--	if test "$ac_cv_ssleay_path" != no; then
--		V_INCLS="$V_INCLS $incdir"
--		if test "$dir" != "/usr"; then
--			LDFLAGS="-L$dir/lib $LDFLAGS"
--		fi
--		if test -f $ac_cv_ssleay_path/lib/libRSAglue.a; then
--			LIBS="$LIBS -lRSAglue"
--		fi
--		if test -f $ac_cv_ssleay_path/lib/librsaref.a; then
--			LIBS="$LIBS -lrsaref"
--		fi
--		AC_CHECK_LIB(crypto, DES_cbc_encrypt)
--
--		savedcppflags="$CPPFLAGS"
--		CPPFLAGS="$CPPFLAGS $V_INCLS"
--		AC_CHECK_HEADERS(openssl/evp.h)
--		CPPFLAGS="$savedcppflags"
--	else
--		#
--		# Not found.  Did the user explicitly ask for it?
--		#
--		AC_MSG_RESULT(not found)
--		if test "$want_libcrypto" = yes; then
--			AC_MSG_ERROR(SSLeay not found)
--		fi
--	fi
-+	AC_CHECK_LIB(crypto, DES_cbc_encrypt)
-+	AC_CHECK_HEADERS(openssl/evp.h)
- fi
- 
- dnl
--- 
-1.8.0
-
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index dc1f7d30e801..785877034dc5 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<use>
-		<flag name='smi'>Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
-		<flag name='chroot'>Chroot into /var/lib/tcpdump when dropping privileges</flag>
-		<flag name='drop-root'>Drop privileges to tcpdump:tcpdump when run as root</flag>
-	</use>
+<herd>netmon</herd>
+<use>
+	<flag name='smi'>Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
+	<flag name='drop-root'>Drop privileges to tcpdump:tcpdump when run as root</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild
deleted file mode 100644
index 2ddf0b12e78b..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild,v 1.11 2014/08/03 15:48:12 tgall Exp $
-
-EAPI="4"
-
-AUTOTOOLS_AUTO_DEPEND="no" # Only cross-compiling
-inherit flag-o-matic user autotools eutils toolchain-funcs
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-		http://www.jp.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 ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="+chroot smi ssl ipv6 -samba suid test"
-
-RDEPEND="
-	net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? ( >=dev-libs/openssl-0.9.6m )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
-		dev-lang/perl
-	)
-"
-
-pkg_setup() {
-	if use samba ; then
-		ewarn
-		ewarn "CAUTION !!! CAUTION !!! CAUTION"
-		ewarn
-		ewarn "You're about to compile tcpdump with samba printing support"
-		ewarn "Upstream tags it as 'possibly-buggy SMB printer'"
-		ewarn "So think twice whether this is fine with you"
-		ewarn
-		ewarn "CAUTION !!! CAUTION !!! CAUTION"
-		ewarn
-	fi
-	enewgroup tcpdump
-	enewuser tcpdump -1 -1 -1 tcpdump
-}
-
-src_prepare() {
-	if tc-is-cross-compiler ; then
-		epatch "${FILESDIR}"/${P}-ssl-detect.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O2
-
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	econf \
-		--with-user=tcpdump \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
-		$(use_with smi) \
-		$(use_enable ipv6) \
-		$(use_enable samba smb) \
-		$(use_with chroot chroot "${EPREFIX}/var/lib/tcpdump")
-}
-
-src_test() {
-	sed '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST
-	emake check
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README
-
-	if use chroot; then
-		keepdir /var/lib/tcpdump
-		fperms 700 /var/lib/tcpdump
-		fowners tcpdump:tcpdump /var/lib/tcpdump
-	fi
-	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}