fix for bug #488522 thanks to pchrist

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

3 files changed, 135 insertions, 10 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 5d7e17b1acbe..9a9b1818d579 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.176 2013/11/28 05:07:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.177 2013/12/06 04:43:27 zerochaos Exp $
+
+*tcpdump-4.5.1-r1 (06 Dec 2013)
+
+  06 Dec 2013; Rick Farina <zerochaos@gentoo.org> +tcpdump-4.5.1-r1.ebuild:
+  fix for bug #488522 thanks to pchrist
 
   28 Nov 2013; Tim Harder <radhermit@gentoo.org> tcpdump-4.4.0-r1.ebuild:
   Fix test logic (bug #482374).
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index ce804427880d..ddde486f0f24 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
@@ -8,17 +8,24 @@ DIST tcpdump-4.5.1.tar.gz 1024455 SHA256 14ab39657128f3a650aed4cf455f76c75906010
 EBUILD tcpdump-4.3.0.ebuild 2345 SHA256 c210a21ad6a56c17add0eca2027cdf8cc4c2c58ffb8cb560d79a8e4fe030dacb SHA512 d1ee29b0ccfd7f9014d42499b87e74e7c81841674f64f70d7887a4955605623a8b4897fc0bb721192d718a72d794402bd2b8a080dfa37cd2439a458d8c47a35b WHIRLPOOL c8b276ab9612f74381cd1c5194727d53d691218e51fa998d76e531a9e89ae7f87d3d49b9c048440038c4734a3cdccd0c6d2b7a71de22c7825bd33ead761e5492
 EBUILD tcpdump-4.4.0-r1.ebuild 2760 SHA256 9f7feedb1ab7091f181ae2e2a1430e5d45251e8a8468fd6f75410b09427efa9d SHA512 dbb8be0d5381055ce0f71381168e327bdfead85e4fdac32e8c9c5841998a3fde8ec10c59cf5174a67768ac6865eff7ecd0c3fe1967e914b164db24fdba5538a5 WHIRLPOOL 373e1c225086185436960bc7b28938b7fd91816a9827ed7d7186af7b832b6a96ca6ea085d7087d28433b5deeff6b91ff47a385e8f8e2105136ce4fff6454905e
 EBUILD tcpdump-4.4.0.ebuild 2209 SHA256 a2d7e1fc4bcb4a7ed958816949943f975fcf4c8c63f39981331a8d03ea9df8d5 SHA512 fb0a66f91132d6ebbe4fe0f73f349b36d3dccc28aa5f0acae822bea4dba282d7b173fc3a7807cc0eff95ed6e50b3d14f926c9cea224a3939c474bcb76db1502d WHIRLPOOL 85616181baaa9758fce8adc12a20663f466bb14ee2bcd85e93f9d0ecad7a97842d85dcfcb5a9a4790c73667ccb3c38b7cf69ca96f62c7bd031368dd8f9157d55
+EBUILD tcpdump-4.5.1-r1.ebuild 2894 SHA256 ef57a6299cb97b372269af0aa4e9e69230aeab6f69e1e955c69085a45b828613 SHA512 f9067e8b1f2f5eb65ad7d4fb8eafd82690484b08eb391f0bd17d422998e55afad65368069ec084ef99747505c452e9d0a0a8020f8b82a3bb8aab003601cde021 WHIRLPOOL f7e1915c9da5a853f331c14018bc0a84e5a23259f382201494b2e0507ffe6fd3f6d1f0943befea76487ba945690f3f363db87e1a08fd757fdb6fd30df166a442
 EBUILD tcpdump-4.5.1.ebuild 2775 SHA256 9fa612a3dd0c0cf0ed8605e363efead5ddcb70c30a75c7819f4fcd6e52b7499c SHA512 903be04cbe220bfc0f6d4c9375f827698478032303608f64b97a8db7ff977937ccd42ae3af76c1d865e65d3ac775c40a237aeaa921a36ea082047223ac98b01b WHIRLPOOL e8ac90b502dc5a318853efe14583ee8d3bf923df7baa220ff7005aa242ca1f7dc9a46eda24dc9b5e30444bd1fb0ef3a854d4306220c04a7ff7c03e0ee8670431
-MISC ChangeLog 24252 SHA256 705352cc4459a506a281a58ce3dc00d44192f73cf7c23aa002bd091a017306c0 SHA512 17f0afd77435102332cb6f175c58252bf2813ab59071af10f57fa9c2d80454945ae6568a1d9d66e3bf30f2115e05490a2b7d551202a9c79d1b670e8aedfea8c0 WHIRLPOOL 67ef4d0632e479cdb448a390fb65902d8e343ef2fc41a96dd5c5374b01b5d9b9c09229b11a85556c505ae9b51419faa08a127bbd8bdc6fc4e95e06747abe289b
+MISC ChangeLog 24402 SHA256 fb19c557c3454ef8661e62d7171b9c4bbeab350bb9f10599856f453d3b5f8de2 SHA512 c22e1659d1ea4c110bab1f4e8e65c7f1444daf3f77605235d427b683d32e4539bda1dce089914893f164ae047f76f2a66bcbd88ff116c13eee1a456303411c94 WHIRLPOOL 31dd887ad14ee8c85ef94800a929049ddf351f454db0e8b9a12b08605de9482edc611471eb111ea9b72424c97c0ed8a65152c1a848e128bfe4433d0e0f3338a8
 MISC metadata.xml 453 SHA256 5202cfcdb64b8b465398164cbf3c87a295f1a71a1e2d828b51edecce588426a9 SHA512 43eaf679b8dd9ed91683c98971a90be396cc6fb594530cd1496d262fdf47f984914d2ebe3cd4034ca3f1ed50153930db8b84e55257161c703afdf0dad7a5048c WHIRLPOOL 26af4c4c4e672bcda1ee56bd0d54667a58a927b3c0192b01d09e8c6f681edc691cfba5ea78b3faf2eefa46d6b9bcbace6eff4dccb874d7d6d40adbf00948bf99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSls+tAAoJEEqz6FtPBkyjS/gH/07iCXx+lOKFzw5MtlrRw6/F
-Zgs+PGtUuoQitZNJxa3DcAcelUdmxaz3tR8A8ccxyla8yQbpLTJmjZR8vman7fXn
-PxrOQ/7Mz3JSb3T61MuHiHXIOJ1NtbE4dOXq6E2v91v284j5z7D6vOCAvgzBq4b6
-eYjtwRGBRK/k4jG/MoaI/v5py6BiWDHSOJG4qzz7zCWsu/Tn1miEeWIHapjvhDDq
-dBrKmn+5rGjT7f71tuG+Iubj2Om8wLxBMcZ7TjOs0kPQw/oTpg8NEdKos+Dk6/h9
-Kv8FBhnleRnIcdD6lmaqWX0eIWOF8nTH7so5PegBwk3zX3M3CLyubk7XpLT+tXY=
-=67js
+iQIcBAEBCgAGBQJSoVZJAAoJEKXdFCfdEflKHDsP/AkECzd8lLW2U6VJh0WhrjnS
+sf8OBOU9RL9Al8cr7hXKVA88+cy0pJk7q+qrap12ZXliM0pKRpj5YmA18KR35Zb9
+Ie6es2Oi8OgFaY7UQVZzlGBI8VKsNSyqsv2dRFQ6yiT/aD50SW0DbkSSO90AElMQ
+6yRzpjxld7Xkuam0WjszXV8cnMvFvqfhGaq9VcsvTUcbnuCi8ZClN2qQ1p1W6r9P
+ypCn31bjGOlWcbneLl72iOJMNTy+FI2QhZ7ub5G3On1gxAgwGJzDDmXz+iggAqn2
+MtonB0ffaq61NDr8jfI04rVX171mkCQl3raMaIYtW4eXY/FwNCLwxQ2FscFVRQ+8
+lUeML+FHOBJCQ3aDRFUhYbN14cR2C6cODAxEC2rd1xWlLZQH4VLmgHOWOWSy0dZ2
+Q8IIjoDMwPdGVK+VkwbikVQrErh4IjWhJD8GKntSn6eHRoNTJy7eE1tFo0fAxXep
+tPrSwQ2xKGH1LKB5mt8w8Kt/pdYPqiMjuM0B6yEOMU1rER/gHjkCJf2W+q3jXGTh
+Y05ujw5yjvWJIsl1RUZlc5cQLOzGHtlb+STwPFgVesLrTHANQeIFBd78iijtLwLb
+5dxR6lReUeTNO7lr5AGrweSeM9EQzlRFo9I0209nGFPC/RhDhBWunKIVKfvZVwye
+P/cQqhwxnoKMDX9gZjQ+
+=uhQm
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..d55c57db1bf0
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild
@@ -0,0 +1,113 @@
+# 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-r1.ebuild,v 1.1 2013/12/06 04:43:27 zerochaos 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
+	sed -i configure.in -e \
+		's|-z \"$with_user\" ;|-z \"$with_user\" \&\& test \"$with_user\" != \"no\" ;|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") \
+		$(use_with drop-root 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."
+}