Version bump (bug #393085).

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

5 files changed, 117 insertions, 97 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 39802859ae5e..76348560efbd 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.146 2011/11/10 13:22:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.147 2011/12/16 17:35:10 jer Exp $
+
+*tcpdump-4.2.0 (16 Dec 2011)
+
+  16 Dec 2011; Jeroen Roovers <jer@gentoo.org>
+  -tcpdump-4.0.1_pre20090709.ebuild, +tcpdump-4.2.0.ebuild,
+  +files/tcpdump-4.2.0-ppi.h:
+  Version bump (bug #393085).
 
   10 Nov 2011; Naohiro Aota <naota@gentoo.org> tcpdump-4.1.1.ebuild:
   Add fall-back dependency sys-freebsd/freebsd-ubin. It should work with
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index b2864db2b5b4..064b333d3fdd 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 AUX tcpdump-4.0.0-ipv6-build.patch 288 RMD160 8e14d69d20dc2e431c6d10fc9ae694ab8976ebfb SHA1 a2e791b9612a7be04f882488e9d77e1f5c812a7e SHA256 c61cf785e854b44bfc015e4de6223051912547b0564bf61dbbfa97d1ddc4a63a
 AUX tcpdump-4.0.0-libsmi-autodep.patch 653 RMD160 5ac1093c524f83b4aaf21271d302e3acde2d8220 SHA1 e5cd061e6e5a918fa648b39aa0110f8ed043d8f1 SHA256 bdbd422f50b93f0c4232ae9cea0f4497976ab15559079575ec5ef1bca9dca72d
+AUX tcpdump-4.2.0-ppi.h 145 RMD160 18e03dde1a48dbbb4a8c114ce9a11660307af92e SHA1 658e84fd8cadbbe434d6b1f772384064095b32f4 SHA256 3cc039bf75aa4b9d3a2432d37c8f751c4e6d8c478361267ad37239871ff6c665
 DIST tcpdump-3.9.8.tar.gz 938054 RMD160 76b17d131f4d89342c2bcdc27c40d23d29ecb1f1 SHA1 98be9acb1e9154656838fcb89c4a36417cf56042 SHA256 2309c8eb1dc87436a410f4a8d041b0453ade5753c35ce7a2c5bc9a0263a8d299
-DIST tcpdump-4.0.1-20090709.tar.gz 1553485 RMD160 5f56cad6a6e25ac3d320a58912b513bbae29f635 SHA1 b6ed8d5e9a57863c87bb77eabc2d8f319645f1b1 SHA256 e662e3c101fc105831b5e15d708cb95be6e80399c050a4e28a9b474436c7d8ae
 DIST tcpdump-4.1.1.tar.gz 1587392 RMD160 97ac07582f26c4126b09de1dcca6851ad02352d1 SHA1 8f356cbc781192ecb527623d68db90e06aa9d4b9 SHA256 e6cd4bbd61ec7adbb61ba8352c4b4734f67b8caaa845d88cb826bc0b9f1e7f0a
+DIST tcpdump-4.2.0.tar.gz 833172 RMD160 8981438e5a6a7b3bf5475e886625f015400e72c5 SHA1 bd1a5559cc11a78db5a7fcea24e7b8b7cc0b9559 SHA256 8979aba28fa3e67ca7f97de8482b38482eef1d70c739dc1f9c33eba60c027639
 EBUILD tcpdump-3.9.8-r1.ebuild 2235 RMD160 b1a1a5589297b50d9a0ed6319f8726c06fda651d SHA1 4a725909b6c2a884ec5c9390f98d3e63f98c7e97 SHA256 f75d0415b2c7a4175d66dca2da4b9442791cd68e391a5edeb54c5082bbe42785
 EBUILD tcpdump-3.9.8.ebuild 1908 RMD160 e1842d7bdfa207f74f2c164fcda84283780b3b42 SHA1 64b8be1fc9b2e1786836ebe42c343bdc7041fc3e SHA256 b5f1450e23d5cff9d9d3c57caf1dbaf8861e8867f97954c78a54d43f6bc78b56
-EBUILD tcpdump-4.0.1_pre20090709.ebuild 2377 RMD160 b23ee67a27df295da1855ba9b93d35b5880d25b4 SHA1 c54533a920c5a0a3f313d98da28bbb2fbf01e8fd SHA256 1155b3d9f6b18d027bc92a19a208f92e5dcfbe377a7a63fb74aaf20c7923646b
 EBUILD tcpdump-4.1.1.ebuild 2231 RMD160 10002a9266e14faa1b13e9e573c94bb4cb4bb8f9 SHA1 2f57d70db22d425fdd600de41be00dc58f29402d SHA256 4bdfda05171c88db3b74bcd845e0d769b61f75d50c266dd8014347127a4cda54
-MISC ChangeLog 20108 RMD160 cbced22e3bd138b36eca30c94f51a394e92a3d78 SHA1 ede4fd09cf47c5408b743cbe70f3ff70c08f73fc SHA256 209049c4c15dad3ca1374adc3d1f7a14a7f2daf9c8863b5a0f15dc5500408282
+EBUILD tcpdump-4.2.0.ebuild 2296 RMD160 fc059b36037b9b59cb3e37a3ee4c878848371e52 SHA1 8bb9a58798081683672c01bac523ba84120aabeb SHA256 caf92eaa2ba01d8f66c81464e1d05024ec873661b0302ec1d913812e11e9ca57
+MISC ChangeLog 20304 RMD160 18406335fde62a92215ccad4ce235eb004102f96 SHA1 c83b312fcdafd00b7f7fe00e3614736d31583df9 SHA256 69b9703fb1d05a7dc555cd75ce12e91a02a6742556662862054f32a5403ca542
 MISC metadata.xml 465 RMD160 f9751964faf36897dbf01df6258c8af50791b1e5 SHA1 e4ed0caa1ba72d0827449bee5ce0e792940f3bfe SHA256 e8f218a9ee2e142e9b19c54bdc0e2b336cdccabaed8347a30956b663e6b9f51c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk670B4ACgkQGpDnPLSHuMD66gCdH5bl/tZqBddUSv8qHvFe1djC
-ItwAoIh3nqkBUwckiZ6j4hZkkcTiiozi
-=+5+l
+iEYEARECAAYFAk7rgVQACgkQVWmRsqeSphOOqACfbjQ6N7cE57nHy2xd0Vg9XKds
+UqIAnRj6yTDL815UCPBKMik+uPeIOYsL
+=p9CZ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.2.0-ppi.h b/net-analyzer/tcpdump/files/tcpdump-4.2.0-ppi.h
new file mode 100644
index 000000000000..733eb950f0de
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.2.0-ppi.h
@@ -0,0 +1,9 @@
+typedef struct ppi_header {
+	uint8_t		ppi_ver;
+	uint8_t		ppi_flags;
+	uint16_t	ppi_len;
+	uint32_t	ppi_dlt;
+} ppi_header_t;
+
+#define	PPI_HDRLEN	8
+
diff --git a/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild b/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild
deleted file mode 100644
index 93b18ae46487..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.0.1_pre20090709.ebuild,v 1.2 2010/01/01 17:46:33 fauli Exp $
-
-EAPI="2"
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="http://www.tcpdump.org/"
-MY_P=${PN}-${PV/_pre/-}
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-#	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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="+chroot smi ssl ipv6 -samba test"
-
-RDEPEND="net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-DEPEND="${RDEPEND}
-	test? ( app-arch/sharutils
-		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
-		ewarn "(Giving you 10 secs to think about it)"
-		ewarn
-		ebeep 5
-		epause 5
-	fi
-	enewgroup tcpdump
-	enewuser tcpdump -1 -1 -1 tcpdump
-}
-
-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
-
-	# Fix wrt bug #48747
-	if [[ $(gcc-major-version) -gt 3 ]] || \
-		[[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 4 ]]
-	then
-		filter-flags -funit-at-a-time
-		append-flags -fno-unit-at-a-time
-	fi
-
-	econf --with-user=tcpdump \
-		$(use_with ssl crypto) \
-		$(use_with smi) \
-		$(use_enable ipv6) \
-		$(use_enable samba smb) \
-		$(use_with chroot chroot /var/lib/tcpdump)
-}
-
-src_compile() {
-	make CCOPT="$CFLAGS" || die "make failed"
-}
-
-src_test() {
-	sed '/^\(bgp_vpn_attrset\|ikev2four\|espudp1\|eapon1\)/d;' -i tests/TESTLIST
-	make check || die "tests failed"
-}
-
-src_install() {
-	dosbin tcpdump || die
-	doman tcpdump.1 || die
-	dodoc *.awk || die
-	dodoc CHANGES CREDITS README || die
-
-	keepdir /var/lib/tcpdump
-	fperms 700 /var/lib/tcpdump
-	fowners tcpdump:tcpdump /var/lib/tcpdump
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
new file mode 100644
index 000000000000..15191edd00dc
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild,v 1.1 2011/12/16 17:35:10 jer Exp $
+
+EAPI="4"
+inherit flag-o-matic toolchain-funcs eutils
+
+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 ~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() {
+	# http://sourceforge.net/tracker/?func=detail&aid=3444149&group_id=53066&atid=469573
+	# bug #393085
+	cp "${FILESDIR}"/${P}-ppi.h "${S}/ppi.h" || die
+}
+
+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) \
+		$(use_with smi) \
+		$(use_enable ipv6) \
+		$(use_enable samba smb) \
+		$(use_with chroot chroot /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."
+}