Version bump, bug #261201, thank DrChandra the Gentoo Person for report. Fixes statical linking with libpcap and make sure we don't use bundled libopts, bug #252940, thank Diego E. 'Flameeyes' Pettenò for report.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

5 files changed, 107 insertions, 16 deletions

diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index 8b83ca860baf..3341fc2a1d11 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/tcpreplay
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.30 2008/08/17 19:47:40 gentoofan23 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.31 2009/04/05 19:14:22 pva Exp $
+
+*tcpreplay-3.4.1 (05 Apr 2009)
+
+  05 Apr 2009; Peter Volkov <pva@gentoo.org>
+  +files/tcpreplay-3.4.1-errx-exit.patch, metadata.xml,
+  +tcpreplay-3.4.1.ebuild:
+  Version bump, bug #261201, thank DrChandra the Gentoo Person for report.
+  Fixes statical linking with libpcap and make sure we don't use bundled
+  libopts, bug #252940, thank Diego E. 'Flameeyes' Pettenò for report.
 
   17 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org>
   tcpreplay-3.3.2.ebuild:
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index d15051a3c6e0..0b2822e7f6d2 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tcpreplay-3.4.1-errx-exit.patch 949 RMD160 8df657a0236a899138335a282d8d507966750f71 SHA1 81cb334400ba76d8ed116b62fdca3bb21ebf1756 SHA256 b5afbbdcaad5a86ca814b5c5ce363ddfe667c45f478a9e019dcf8a119c3523d6
 DIST tcpreplay-2.3.5.tar.gz 682045 RMD160 f94e35bbe96e95416bbc320cb853fe889f2b630d SHA1 161eb4ac7985d3026f068eda93314f988eff05c7 SHA256 8582d169b8c56b7eb1bea2cf58ccc5e686d327a7039cca5a7b8279d26bc71fdc
 DIST tcpreplay-3.2.3.tar.gz 776918 RMD160 2b6c3cdd4758ba54086e84753f2a921fce1061fa SHA1 bafca8248bcbdc9fbbda1ddfa5410ab024723d0d SHA256 5e4a5dabf98cc75cfd3e719018de4a111d81f55eb582ab1c865a26930977db74
 DIST tcpreplay-3.3.2.tar.gz 855896 RMD160 a42d75f54d2203f91f413ab7191554eb761fd06f SHA1 270912f9f58abed741c65e8ea16fdf421603ea11 SHA256 b20dbc127668a3c02bf12c86fb511ad23f5483f4c5e3b8ab3f4df4af449c3076
+DIST tcpreplay-3.4.1.tar.gz 872412 RMD160 454bb5bce242311161964f487b5b9b5dfd1298bb SHA1 f5984c6bea651bf52fe1d5ba1224e74727e9e859 SHA256 29ac0dfbea60f69f30b1f77a65bdb79e7023eabe82eaac73d32fef022460b1db
 EBUILD tcpreplay-2.3.5.ebuild 1167 RMD160 ad08de2562978e0146fe2b4b9c2e6e9d122d293c SHA1 5368bcf03943756ddefbe201b2e25a0a0a697853 SHA256 2fc8cc645ed42663720048e65fab749af6e28f151c25ee78350b525a993672fa
 EBUILD tcpreplay-3.2.3.ebuild 1202 RMD160 2483c5b1aa21e05bcc45a88e660e41fcfedd882b SHA1 cb82eb94092f481773bf0ed489a765292047b7c5 SHA256 6f1346954b5ef430fa60cbf163a51dcdbc36488e7a5cc0634f58404eaa03bb8d
 EBUILD tcpreplay-3.3.2.ebuild 1210 RMD160 f3824609b1cf580b59509974b347c691cdd0071d SHA1 cda4e5433e4b971c0b0eb9646d3b963d77f0b5ce SHA256 2010bdc450c5f95ed3ca5d72c763261da440a8b23d99507f9e6c73526c51feef
-MISC ChangeLog 4729 RMD160 e4d3b69bd7017179a2dee64eb6f5532218414836 SHA1 eff1d3c5b241c1b1dda09825ed16906ff682df86 SHA256 54ad005ebb562a2547056186093e12733c2ee693b7e5be990765972d9c8c4674
-MISC metadata.xml 375 RMD160 445605231a2777f6ab2df48790c7a12c73faccb8 SHA1 2dd9b8775af26f0cc4df702c315d5ac52506979d SHA256 7c3bc72523a0614f71df82866f47ac21a50cabc0ef9bde2b09c94e19ce8a806f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiohAgACgkQF6yMcaBxwHk+HwCeIAjRVregVjncHMRnhzI80wdR
-4NoAnimI4MmEHTmjGwvB4APz4NC4GExN
-=0fYt
------END PGP SIGNATURE-----
+EBUILD tcpreplay-3.4.1.ebuild 1585 RMD160 a8c958297ba1faa54d1ccf121dec32ff31c5115f SHA1 2a22f8233dc862b443b0886b453ec999ad6170a7 SHA256 3ea02111bfafcc9b8f90f90750d976a652ef77b59da99d0a13f7e9e13d49b06e
+MISC ChangeLog 5102 RMD160 9780eb0e1f6b0150d6a85718dd89a4e17b4c3177 SHA1 4f41be4f14c613f367a0fe8e12d2e2a04f0a6b49 SHA256 60728f37ec1b858449d65e2a8656d25bd4692b7385ae648a811c3d10633afe0c
+MISC metadata.xml 835 RMD160 f49a99ce7708fa2eae5909d38c6c195c8ff147ec SHA1 8dfb5042c39c0ebb163b15446afac2ef9a70754c SHA256 26bad01dbf458cd04f341e34abf64a5b635f5ed06a83e90f870381e917786e8a
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-3.4.1-errx-exit.patch b/net-analyzer/tcpreplay/files/tcpreplay-3.4.1-errx-exit.patch
new file mode 100644
index 000000000000..1a66eb6ec04d
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-3.4.1-errx-exit.patch
@@ -0,0 +1,23 @@
+ * QA Notice: Package has poor programming practices which may compile
+ *            fine but exhibit random runtime failures.
+ * xX.c:101: warning: implicit declaration of function 'exit'
+ * tcpdump.c:93: warning: implicit declaration of function 'exit'
+ * signal_handler.c:91: warning: implicit declaration of function 'exit'
+ * sleep.c:65: warning: implicit declaration of function 'exit'
+ * signal_handler.c:91: warning: implicit declaration of function 'exit'
+ * sleep.c:65: warning: implicit declaration of function 'exit'
+ * sleep.c:65: warning: implicit declaration of function 'exit'
+
+=== modified file 'src/common/err.h'
+--- src/common/err.h	2009-04-03 11:02:19 +0000
++++ src/common/err.h	2009-04-03 11:06:00 +0000
+@@ -50,6 +50,8 @@
+ extern int debug;
+ #endif
+ 
++#include <stdlib.h>
++
+ /*
+  * We define five functions for reporting errors, warnings and debug messages:
+  * err()   - Fatal error.  Pass exit code followed by static string
+
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index 89e48ba35be6..d75dc70fa8d7 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -2,6 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>replay saved tcpdump or snoop files at arbitrary speeds</longdescription>
-<use><flag name='pcapnav'>Enable if you want the jump to byte offset feature via <pkg>net-libs/libpcapnav</pkg></flag></use>
+<longdescription>
+  Tcpreplay is a suite of utilities for UNIX systems for editing and replaying
+  network traffic which was previously captured by tools like tcpdump and
+  ethereal/wireshark. The goal of tcpreplay is to provide the means for
+  providing reliable and repeatible means for testing a variety of network
+  devices such as switches, router, firewalls, network intrusion detection and
+  prevention systems (IDS and IPS).
+</longdescription>
+<use>
+  <flag name='pcapnav'>Enable if you want the jump to byte offset feature via <pkg>net-libs/libpcapnav</pkg></flag>
+  <flag name='tcpdump'>Use <pkg>net-analyzer/tcpdump</pkg> for packet decoding feature </flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.4.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.4.1.ebuild
new file mode 100644
index 000000000000..8c6fa9d9f971
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-3.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.1.ebuild,v 1.1 2009/04/05 19:14:22 pva Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
+HOMEPAGE="http://tcpreplay.synfin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.9.7
+	dev-libs/libdnet	
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	echo "We don't use bundled libopts" > libopts/options.h
+	epatch "${FILESDIR}/tcpreplay-3.4.1-errx-exit.patch"
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf --enable-shared \
+		--disable-local-libopts \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_enable debug)
+}
+
+src_test() {
+	if hasq userpriv "${FEATURES}"; then
+		ewarn "Some tested disabled due to FEATURES=userpriv"
+		ewarn "For a full test as root - make -C ${S}/test"
+		make -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		make test || {
+			ewarn "Note, that some tests require eth0 iface to be UP." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "emake install failed"
+	dodoc README docs/{CHANGELOG,CREDIT,HACKING,TODO} || die
+}