Fix buffer overflow (bug #336605) in stable version.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

4 files changed, 105 insertions, 2 deletions

diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index 7b7c59b51ea2..c8ef0dc5fecf 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tcpreplay
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.40 2010/10/29 06:03:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.41 2010/10/29 13:41:07 pva Exp $
+
+*tcpreplay-3.4.4-r1 (29 Oct 2010)
+
+  29 Oct 2010; Peter Volkov <pva@gentoo.org> +tcpreplay-3.4.4-r1.ebuild,
+  +files/tcpreplay-3.4.4-crash.patch:
+  Fix buffer overflow (bug #336605) in stable version.
 
 *tcpreplay-3.4.5_beta2 (29 Oct 2010)
 
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 6bc67d641c2c..8606883d17c8 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,8 +1,10 @@
+AUX tcpreplay-3.4.4-crash.patch 999 RMD160 ea9cc29a1479d600493e57ec79ae9ad3244b6be8 SHA1 310bb774108bab593435120ccf96dfc4080804e1 SHA256 1880eccd2616836df6e255757f0683d9c3a9d127848514741f3825f53e560af8
 DIST tcpreplay-3.4.3.tar.gz 950100 RMD160 fc3430bd5a638d3f7bc9504032948598b4efede5 SHA1 441365eefdad608d41ccce92cc995ebb8559f35c SHA256 f604ac0cdfe5a33c2eff06a999ff904fa30fc5ac858047d18ac7a43aa0d61dd4
 DIST tcpreplay-3.4.4.tar.gz 947179 RMD160 672812755ff39b284044b08cba32c574ab2b7e70 SHA1 9e4cca81cfbfb919f8759e1a27ce1b3b963ff3b8 SHA256 7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f
 DIST tcpreplay-3.4.5beta2.tar.gz 1886620 RMD160 d1840f1d1c1e85a708af6b9b395c52cc96456652 SHA1 340f3593683e7b026aaef8f20e1a7fcc2ddb6046 SHA256 072a5ef9997e817a78b272d4a2af70386456998de66da1fd510283b2128900f6
 EBUILD tcpreplay-3.4.3.ebuild 1531 RMD160 eaaecde3de14979485db78177b919c1573495757 SHA1 3fd50386bcd6131d77680486b9ca3c8c90216b42 SHA256 07c7f2bd625cc7f47f13d0154daa03fce352c64a6d02a183cb55a07126183082
+EBUILD tcpreplay-3.4.4-r1.ebuild 1586 RMD160 ec3a002867d371037409aef9968ae883848f099f SHA1 ac4fd384811a466af0e2818614048f825a12543e SHA256 f4c89b24a649016a0c1e11b070800432858e0e81fb07bc18c94bea2c971ca354
 EBUILD tcpreplay-3.4.4.ebuild 1530 RMD160 f611e6d8c6f4688b60715eea40d161af6088b020 SHA1 09b9e362e3881ff43d7d2c241793b2ef83f3c81d SHA256 fd78c328c37076ecb1b564370d5fe6608a90d6d1ab3d37cec47db40055dfe444
 EBUILD tcpreplay-3.4.5_beta2.ebuild 1583 RMD160 cc2afe25959036368cfc99ec78063dc5a7e06962 SHA1 d27708f63d6e574ead154de5e17bce1e019eee3c SHA256 e7b39580891ce007225c45c17be26e03c3924ec76c5d34247f692bf67c44b7d3
-MISC ChangeLog 6533 RMD160 08155a770c3057027d9da532449d3d204ae8e01f SHA1 b9cfe3d23ba8cc87f0a893ecd769dd847565d741 SHA256 7be41ef15541116742f9bef0e3f3658e35537afa8b0aacc252d029583da5e694
+MISC ChangeLog 6735 RMD160 5f166a87fab3f5aaba3fd6b51dc91e487bb15db3 SHA1 04c66c81a7d116dc3809200cb0097a79cf614bf2 SHA256 a8a0b88af909da3ca2e800fad84c0330bc6cc3b9b7d9ecd2d543fca1cfcffa96
 MISC metadata.xml 835 RMD160 f49a99ce7708fa2eae5909d38c6c195c8ff147ec SHA1 8dfb5042c39c0ebb163b15446afac2ef9a70754c SHA256 26bad01dbf458cd04f341e34abf64a5b635f5ed06a83e90f870381e917786e8a
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-crash.patch b/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-crash.patch
new file mode 100644
index 000000000000..09875054fab7
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-3.4.4-crash.patch
@@ -0,0 +1,38 @@
+=== modified file 'src/common/cidr.c'
+--- src/common/cidr.c	2010-10-29 13:00:54 +0000
++++ src/common/cidr.c	2010-10-29 13:09:01 +0000
+@@ -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
new file mode 100644
index 000000000000..56545bc5f5be
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-3.4.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 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.1 2010/10/29 13:41:07 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.8
+	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 \
+		--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
+}