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.

(Portage version: 2.2_rc28/cvs/Linux i686)

4 files changed, 102 insertions, 4 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/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
+}