Version bump, fix test logic.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 128 insertions, 6 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index bcb4d2bef100..5f11c78ad74f 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.173 2013/07/27 17:11:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.174 2013/11/28 04:57:43 radhermit Exp $
+
+*tcpdump-4.5.1 (28 Nov 2013)
+
+  28 Nov 2013; Tim Harder <radhermit@gentoo.org> +tcpdump-4.5.1.ebuild:
+  Version bump, fix test logic.
 
   27 Jul 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove duplicate description.
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index d3698765cc67..1d80d3980667 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -4,15 +4,21 @@ 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.4.0.tar.gz 915381 SHA256 12274bed2cb89098dadf00a022b4d40853c5108369f3b3117aedf21ec61530bd SHA512 cf31eb2f878e7e448533172241d57071e105b40265b943ebad8d25867384658016676a528f399fb38b0a2ec09d4986d99e4862fd8a09d9a491eeca75ae69d754 WHIRLPOOL f875510dd8c4f409341790281cc2f2f0be2a6e4642e7a00bd7d62ebd4a263f12e7e5f80a17a219c1fa85edf884ccd870dda259d7f90284d9b356edcb0c137d9b
+DIST tcpdump-4.5.1.tar.gz 1024455 SHA256 14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96 SHA512 c4d739e68a4d54f184c9b3e21fed95f327e4070dc0f3ddb35890b93b809de424c0a9a313353fb97e49aaf5425ba8d13e30c3e93610716dcc83466aa836c701d6 WHIRLPOOL 28611acfcf41d44df1000eca4b3ec6b7cd1dd39d41997f14672000cdceb9b23876fbca2b3fc0a3d28e2e355c1169cb36011496253949863d2735106a7c3e56a4
 EBUILD tcpdump-4.3.0.ebuild 2345 SHA256 c210a21ad6a56c17add0eca2027cdf8cc4c2c58ffb8cb560d79a8e4fe030dacb SHA512 d1ee29b0ccfd7f9014d42499b87e74e7c81841674f64f70d7887a4955605623a8b4897fc0bb721192d718a72d794402bd2b8a080dfa37cd2439a458d8c47a35b WHIRLPOOL c8b276ab9612f74381cd1c5194727d53d691218e51fa998d76e531a9e89ae7f87d3d49b9c048440038c4734a3cdccd0c6d2b7a71de22c7825bd33ead761e5492
 EBUILD tcpdump-4.4.0-r1.ebuild 2762 SHA256 c2a6249674c3960db6f988967849c1c1d7013e176c64edaf82a988f20bc3081f SHA512 6bbd025e1197a0692fa3130b22adcce370ac72f756154b803172d2410eb56ede6836736a2ee4bcfd90ed4f429dd53ecb2fd36de84327d060ed42fc348222a030 WHIRLPOOL 0db0e329387702067c687f6cb496ebe8c4bc1697b4e5f7292c3d0edf26afe4fd4a0fbfab8aac4f91ff4e169a8172afb4d547269663db6b916b7d09229a5d7ece
 EBUILD tcpdump-4.4.0.ebuild 2209 SHA256 a2d7e1fc4bcb4a7ed958816949943f975fcf4c8c63f39981331a8d03ea9df8d5 SHA512 fb0a66f91132d6ebbe4fe0f73f349b36d3dccc28aa5f0acae822bea4dba282d7b173fc3a7807cc0eff95ed6e50b3d14f926c9cea224a3939c474bcb76db1502d WHIRLPOOL 85616181baaa9758fce8adc12a20663f466bb14ee2bcd85e93f9d0ecad7a97842d85dcfcb5a9a4790c73667ccb3c38b7cf69ca96f62c7bd031368dd8f9157d55
-MISC ChangeLog 23867 SHA256 c3648034928cf491c97c65ac491c3bcffaf8f2f6f181e0d70fce2ec209a3b0cf SHA512 d980ee759c015c8ff9bc87d6b5fc6d546045b773b286601c0fac95a6f52adf03ecb0b3b78fcd78aca581fde3a8d5054ebde7735cd8995062fd72e79cba00df75 WHIRLPOOL b128d44fdf1c8fd9817cb490a34c47f5da77132d7852c93e6db54b4d4acaa9a105ea4ee683c523e2603b1b1b85dd99a95e6793e98f667970f4b2214c05ca9a29
+EBUILD tcpdump-4.5.1.ebuild 2760 SHA256 66d3c9d85a92a09b1ed69b8d8c935e57ebf2e5d3773f950f5036358f9e4fc94f SHA512 6512c545777b99017f94be31a8783d18596bb3f1d838eb9c780982cba3625087c9a22b44baac4fa9dc2242b11633486655a7e4b599035579e31a2b850f893418 WHIRLPOOL 88b905793299f5f52e64a660cf775cba4e605e3406ce7fded8c6a23a1d5fdbdb09a8ef6ad7c83e552efb59d4998c491c48d9c4acf53156ca072f416cbb63c75f
+MISC ChangeLog 24008 SHA256 61a9c6a3137699c467de68d1a2d613556cfe61a24cd85b5840cde94d6fff9e99 SHA512 69a14d5cedb4b8f0ab883ea673a6f93ca15bb91e57aed8e41feed477a0924deec48b9be94cf985e2799573f55f912a5f05951baaa9b202e6d6ea0c4163502938 WHIRLPOOL cff4b16a136f79cafa60fc39cfc2c589f7e337416d498df4c60f390c35288dc1e10a5b770139a2d1dd9090aefa586a3d33291aa0f205317a198649fdadf3186b
 MISC metadata.xml 453 SHA256 5202cfcdb64b8b465398164cbf3c87a295f1a71a1e2d828b51edecce588426a9 SHA512 43eaf679b8dd9ed91683c98971a90be396cc6fb594530cd1496d262fdf47f984914d2ebe3cd4034ca3f1ed50153930db8b84e55257161c703afdf0dad7a5048c WHIRLPOOL 26af4c4c4e672bcda1ee56bd0d54667a58a927b3c0192b01d09e8c6f681edc691cfba5ea78b3faf2eefa46d6b9bcbace6eff4dccb874d7d6d40adbf00948bf99
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHz/ygACgkQVWmRsqeSphP6kgCfT5GOQxpPbk+19jG6iSm8R3tR
-M0UAn3Razy7FUB4hl+RSvoRiBiLpr+wY
-=s3PP
+iQEcBAEBCAAGBQJSls1IAAoJEEqz6FtPBkyjHdYIAKry9WXAiSFkDkVTxnHBJ3tl
+Vhl/Fa6OhsKCNQtTR2VlfWaDtMxexrNQeWul7LutNjCamvfbr9/DcBO7WDaf1BBh
+KOfqhpX0DwvzejB5YBMG6gAApl4dLk1nj7WArZPDF6wDCSN156j5h280Xbc5046a
+j9nW/OA54aVV8sLj3LG0UHa+pZN992rWeW/jr1lyi49Uq0BrT5DBrV/As04PmGTV
+hOelToy3dUonSskC+hJTHCd0YMxpH1HcG1ZFzu5s+waIy2wdIBdiN6YiOjmksXIH
+iOslysOSVulgwCGgc0reUJebPf4FyPeidazNHzcbDK/RvwBPxJBTMrYZz1GFhEw=
+=Hmmh
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/tcpdump-4.5.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.5.1.ebuild
new file mode 100644
index 000000000000..6377c565589e
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.5.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.5.1.ebuild,v 1.1 2013/11/28 04:57:43 radhermit Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTO_DEPEND="no" # Only cross-compiling
+inherit autotools eutils flag-o-matic toolchain-funcs user
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+drop-root smi ssl ipv6 -samba suid test"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? ( >=dev-libs/openssl-0.9.6m )
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	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 with:"
+		ewarn "WARNING: The SMB printer may have exploitable buffer overflows!!!"
+		ewarn "So think twice whether this is fine with you"
+		ewarn
+		ewarn "CAUTION !!! CAUTION !!! CAUTION"
+		ewarn
+	fi
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_prepare() {
+	sed -i aclocal.m4 -e 's|\"-O2\"|\"\"|g' || die
+	eautoconf
+}
+src_configure() {
+	# tcpdump needs some optimization. see bug #108391
+	# but do not replace -Os
+	filter-flags -O[0-9]
+	has -O? ${CFLAGS} || append-cflags -O2
+
+	filter-flags -finline-functions
+
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/usr") \
+		--with-user=tcpdump
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		sed -i '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST
+		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."
+}