Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 85 insertions, 115 deletions

diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index ac8adca35f86..c73de8bbfb4c 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tcpreplay
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.57 2014/10/30 09:54:08 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.58 2015/03/31 05:21:19 jer Exp $
+
+*tcpreplay-4.1.0 (31 Mar 2015)
+
+  31 Mar 2015; Jeroen Roovers <jer@gentoo.org> -tcpreplay-3.4.4-r1.ebuild,
+  +tcpreplay-4.1.0.ebuild, -files/tcpreplay-3.4.4-crash.patch:
+  Version bump.
 
   30 Oct 2014; Agostino Sarubbo <ago@gentoo.org> tcpreplay-4.0.4.ebuild:
   Stable for x86, wrt bug #509058
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index ada05ff8199e..dc4bac27de60 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,29 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tcpreplay-3.4.4-crash.patch 913 SHA256 0d1fe6a9477d819bcdb89b0a61ded708ff2e1b564c5f2cad8806099287a9b795 SHA512 624fdaeab1de104231a639c47ae8d292382b2426ecd1d6a36544f0619e55a6f001c34b727d7323590d730f1f9de1941ee21edc0c5b00f6c683a0ec78ae169459 WHIRLPOOL 5798f7c745ab3a644fea78a9b3e0e1aaf0cb9867371416806d7c8bafac420a0a33b4005c45c9eb768e455a826b4b3aa921317d064b58c6ce96a5b8090afd3de6
-DIST tcpreplay-3.4.4.tar.gz 947179 SHA256 7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f SHA512 b129f14689d73905fa3238090de397bf845d6764e73411738a82bdf39c3d4605ad9a64e55dfca88035716704015a1cfc8b4fe097e019e30f84379f4126700cc8 WHIRLPOOL dcf25b15e7ae65980a5fa18ce2ab98c8494443c52263ce37878d6adce8f451a5404c6b7b5d2db75877528faec2331ca67e01d1b2f6faeb40f8b0b4a010f33094
 DIST tcpreplay-4.0.4.tar.gz 2070706 SHA256 a9e6493fe33e9d17185e5cdd49d46ad5560832fdd86eeea6dcc04ec63df10256 SHA512 a9e87817079a73d677dd9c51a7eb850ae833c627f08914e45b71736a4536c307d92fe1451bf10e8babe3a8f8283f4f99987c1f37f93be110b12fd326337a0ecf WHIRLPOOL 602989ac43c1bb7f91583b4a4edff16962cca6821ab84be3d96bab7700e123d475ae79b0e5c36c99cd5984db4f0a48d86d2a9bf3e63619d42ba24fb230945b23
 DIST tcpreplay-4.0.5.tar.gz 2059744 SHA256 63798c8adc9e5be79467e23593838ce0e617b25938cfce3116feda2630344d80 SHA512 bf0e8e64d9431bbf8379d2578edf0a53e6803dfc06d973c388aa885bcc4f029499dad02aed0ee17b78b5eef178b450b6c0b851b9a52a1ac27dc0e1cb2b83a88d WHIRLPOOL dcb446268956fc5f89d211e0aafa1323a2984c614b0637c7cdefdeaa617e594893397476bb358d1dc58cebc7d185fd4914cb88db97b23286606a7ae133a1ec50
-EBUILD tcpreplay-3.4.4-r1.ebuild 1614 SHA256 d99864b4e26977d50596f73d8c655ff1e94f8991dd4eae6f3fa8f4bbc950fa4c SHA512 bc531447055647b272819ba862dbeea03bfb66113e63aa44559319fe7bbeb284f3777d296b6d9ca94ec2be83386e3e428e58c4c897f616213757bd3ad5556ccb WHIRLPOOL 06a44887b5b488f9b2759b2b9a0347ac46134542d87a631721f316dd2550d53b2e0a998fbc44cec00425d1adf4c4d4a9cad0b5da51739ca30504c7130d49de63
+DIST tcpreplay-4.1.0.tar.gz 2118212 SHA256 ad285b08d7a61ed88799713c4c5d657a7a503eee832304d3a767f67efe5d1a20 SHA512 bfd7a0679dccd86aba7ca5d102665e6feba72bffb1596915985bc50261f9ac10ce56b870e1aa64a33efa79e3bee89b8c66e2c26328fb15d3722a5bc957ea77a2 WHIRLPOOL e6a07495cb07a09f707b3784d15a266c04a7b3d369b7d8eb9d7d5683838accdcc539255ff05f99c2fc8036d045e66f3a250a0c7f1896024c65065a6c6d282b7a
 EBUILD tcpreplay-4.0.4.ebuild 2028 SHA256 f7ed69d3bc655a6510a91f8784416584691b7621609e113a6c31d0583ec1f18a SHA512 d81e465926e8d5a2b29a669ed8a42c26e440f44fba72b8cbc8d4b9ce3e399680cdb0ee677789151e4971e2ecb49183b15fbffbc568033c779e17c93e31c8114f WHIRLPOOL 2eb22aa16d28805b846ce63d6389db673740bfb1a906aa432090bc9f0772c5fbcac5903defc32b312e30a84207c810d8b50becdb02ef1ff2831a824aec8a6ea4
 EBUILD tcpreplay-4.0.5.ebuild 2030 SHA256 42fc65722ed4b2357cba7d145a5cafcea8a9f3a03d2f7822e460815aea083140 SHA512 202927e599bf7145cb84b127f364a75cd1609d87d0eee5f6d72afbcb9f6e8706fe7cb1b8b62dcc013e4fdfa91a25c3592779d78d265fa091a57e8fad2e745ca2 WHIRLPOOL 170a0d95b4db30b99c04caacdec47055f881ae7f1ff79367fc375ebbd01a191cfb54a2b55f5009417fa5076d9470cd965c16b9c782605fa9c3658729a433e9f4
-MISC ChangeLog 9310 SHA256 cdbcb63e69ff9c23790acebc39d96f11d1b91033798fda030424377a27fb7982 SHA512 7a78bea0557bb3dbf74eaabb2d909d4be4a76fffc498a099429507340bb0994cd9ecc433b3235818146a3b51ace493293722bb736e6e178f6b1c5f41e6681e6a WHIRLPOOL 6e0ba0e926858e42e313707213acd76d9938c507f370a86783d2669d08a4b5f88f1887c4516ff188b14451dcd25ca6f3ed9dfa0fdfa28e12297a5d78afeb559e
+EBUILD tcpreplay-4.1.0.ebuild 2031 SHA256 9a6a31845618c5f5fd3e6341f93ee2310faaa457011bad9f567876517e0352f3 SHA512 0fc0af669b7f07f3baa6c9d1d17cc0d644ed1cfeab276d68b308da4dd81998deda68c8709eee0a18133734d9eb800468abaa473795330860d979506f0c85f931 WHIRLPOOL fbc5c8c9bce3c8707f6062784564c881ea6e3bbb197bac421fd62b1adcb2667d85127e1f557938ef0c558d5a8a7b34dd9eaba27a8aec009523dfc6f9a0248076
+MISC ChangeLog 9497 SHA256 8e0d3fbdb620606f3053eacc549197c42539aa8369ef7ba5d5815726e1ee4316 SHA512 fe30058b3fe9dd66b25eb9dc82d832d1d1e4e3a953fba38a5891381c34ec2e224a5b7352f91a06cb93b7ba730bc047da299bc598f5bd8256ed2f8d34c2feebb6 WHIRLPOOL 654d0795400a904dc2095aca5022a097abc29ff4284e80f0a0b834f373c7bbba7252fa5e6a4d959a76025a75843157f7f226883fd0b09d553a44e658e17daf0d
 MISC metadata.xml 835 SHA256 26bad01dbf458cd04f341e34abf64a5b635f5ed06a83e90f870381e917786e8a SHA512 ef0c8a22ac7d6ff7d3bb9c056ab8de2f46136f69e43839c68732e60d2ebd063b09a40f46cdd9165f9cfcfdab0476dbcc7284b6ed40b1c66afbf4d947e8ce848e WHIRLPOOL 991dcb884ad1ace09ab4c785744c2cfa3b2f4d9965f34a429b5ea62f03a9b15a8c8c3a7825cb7c36a73ab28198ab7959b24ad104534f238a40bd1f0b4f0e0d9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUUgrBAAoJELp701BxlEWfy6YP/0Pl8nSVmE9CDwDTeiwzcIft
-mKjWiAVlBdDHv5FcbV1OgJ+K5/iCPcOn/fi+nysnfd3OAf3SPDyu5asJMpqnzpDN
-PhkcO49HzekiogR8GOELYULEBpld4hJLSb22e1RQasH0z70D5ViSg9QKiW62vEUQ
-HPZyHE/tvCRt0oDOqYReLJyZivXaiCS7EQFzlxh71/XEV5mNVc6nOrZ2XXtLuLI3
-IEq4QPJG8PfQNuBKmpgV/rH/kirg9TGD+0DoS4QYiYH3yYAytmdLYtL15nXelnit
-Iaa36m6ti4poLz+h68foZO4HwpEWnEFqyxxoxsti97aO7YSksoT6PrdF9kvhfK97
-Y+PAwbdV6yCSW85P2QspLtsBQuC+ZcOk03KhegB6uyE0h0FViQW3L0Jxk95Jmo6k
-CrJ84t1ykfJd0Ai21cwNmpwcLZ7hrvCvTFe/c3ypZ91QByBZ87gIfUVSXfNYrTt4
-62IKF+oQgp+9BoK0H/NF8TzkbbLHAIGpvRLpl4wtFuPEs7zOf3jhRdQUNa2Dj970
-uJCbv0Q5AxtidJ3D45b27kCnn/gv6SU08ZP0P4xFWh/Y2FVoyw2TdBUCoxHxE8gm
-0PP973PymZd0xfQe++nNu//DlBGrYeZEPG5ia+Cpj6BKZaz/aR6Czlvz9c8+dW/Z
-oOLFejxZygb9Qwh+0wlm
-=wwdG
+iEYEAREIAAYFAlUaLtAACgkQVWmRsqeSphMVkgCcD8WVpz8PaImdPSrLhqvrJPte
+MY8AniSBsggv47QLSvqkIoWsq7Z6Lro8
+=hrqS
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-crash.patch b/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-crash.patch
deleted file mode 100644
index 0d98a57f850b..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-crash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/common/cidr.c
-+++ b/src/common/cidr.c
-@@ -85,11 +85,12 @@
- destroy_cidr(tcpr_cidr_t * cidr)
- {
- 
--    if (cidr != NULL)
-+    if (cidr != NULL) {
-         if (cidr->next != NULL)
-             destroy_cidr(cidr->next);
- 
--    safe_free(cidr);
-+        safe_free(cidr);
-+    }
-     return;
- 
- }
-@@ -667,7 +668,7 @@
- cidr2iplist(tcpr_cidr_t * cidr, char delim)
- {
-     char *list = NULL;
--    char ipaddr[16];
-+    char ipaddr[16], tempbuff[20];
-     u_int32_t size, addr, first, last, numips;
-     struct in_addr in;
- 
-@@ -694,7 +695,8 @@
-     /* loop through all but the last one */
-     for (addr = first; addr < last; addr++) {
-         in.s_addr = htonl(addr);
--        snprintf(ipaddr, 17, "%s%c", inet_ntoa(in), delim);
-+        snprintf(tempbuff, 17, "%s%c", inet_ntoa(in), delim);
-+        memcpy(ipaddr, tempbuff, 16);
-         dbgx(2, "%s", ipaddr);
-         strlcat(list, ipaddr, size);
-     }
-
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild
deleted file mode 100644
index 5389b8ee347c..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild,v 1.6 2014/01/31 13:25:49 jer 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.16
-	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}"/${P}-crash.patch
-}
-
-src_configure() {
-	# By default it uses static linking. Avoid that, bug 252940
-	econf \
-		--enable-shared \
-		--enable-dynamic-link \
-		--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 [[ ! ${EUID} -eq 0 ]]; then
-		ewarn "Some tests were disabled due to FEATURES=userpriv"
-		ewarn "To run all tests issue the following command as root:"
-		ewarn " # 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
-	dodoc README docs/{CHANGELOG,CREDIT,HACKING,TODO} || die
-}
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild
new file mode 100644
index 000000000000..2731c6364b02
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-4.1.0.ebuild,v 1.1 2015/03/31 05:21:19 jer Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="a suite of utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.16.2[libopts]
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
+src_prepare() {
+	sed -i \
+		-e 's|-O3||g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		--disable-local-libopts \
+		--enable-dynamic-link \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note, that some tests require eth0 iface to be UP." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}