Security bump wrt bug 261191

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 187 insertions, 12 deletions

diff --git a/net-analyzer/tptest/ChangeLog b/net-analyzer/tptest/ChangeLog
index d70ab4a3105f..e383e183d4b3 100644
--- a/net-analyzer/tptest/ChangeLog
+++ b/net-analyzer/tptest/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/tptest
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/ChangeLog,v 1.12 2010/09/20 18:32:35 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/ChangeLog,v 1.13 2013/10/04 20:51:42 creffett Exp $
+
+*tptest-3.1.7-r2 (04 Oct 2013)
+
+  04 Oct 2013; Chris Reffett <creffett@gentoo.org>
+  +files/tptest-3.1.7-getstatsfromlinevuln.patch, +tptest-3.1.7-r2.ebuild,
+  -tptest-3.1.7-r1.ebuild:
+  Security bump wrt bug 261191
 
 *tptest-3.1.7-r1 (20 Sep 2010)
 
diff --git a/net-analyzer/tptest/Manifest b/net-analyzer/tptest/Manifest
index 21ca537d8e15..f710ea0513f5 100644
--- a/net-analyzer/tptest/Manifest
+++ b/net-analyzer/tptest/Manifest
@@ -1,5 +1,18 @@
-DIST tptest-3.1.7.tar.gz 313801 RMD160 a36341a66d00aae0c0c32ff283be9f487c033322 SHA1 4f326e0049541544abf33265e55eb7e4cd8e6f83 SHA256 db39257b3ee6408a575e16804975df1e68f52270537cc3e7505897b777f7994d
-EBUILD tptest-3.1.7-r1.ebuild 1007 RMD160 a2e76bd450b9e20a84fc9046653d5d9d9e57100f SHA1 7456ffe3699645648c8d7dcd77a3e4018a4489e5 SHA256 5cb37b7b6f251d1f532e82418129280dec7b68f2ebb5212604e3e07f597e9c11
-EBUILD tptest-3.1.7.ebuild 1095 RMD160 513b561c6f85ef46fc6bbc6897c1e651b0d2a78a SHA1 8f1dd5d5e85d6833391116358d3110d52ce799fd SHA256 dcad380fa4cdaa09f8a47276922fb06a0742ab7a19a0d479d7cac6879f885aee
-MISC ChangeLog 1451 RMD160 f243a4909f9002ad0debc112ba598d70c051c6d6 SHA1 5cda6c5c439c37348b0466dc8cf24aa4ebe1ecea SHA256 4fecb0d927c13384ca7780d1f418ff1e795a079291e6c9b94c4ef398170549bd
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tptest-3.1.7-getstatsfromlinevuln.patch 6077 SHA256 2f67174fe58f5d9227d44a7f16f783eb3b07902076e5a653012eeb2bcb59cfd4 SHA512 532f0f2e343665f6f1dd5ae84c4aea1ea367c2e24cad0bcf10b9632240d9bc152190ed185941751918151ddb5fc3dfac277872ff3c4c0e90d71ec5e0b9909907 WHIRLPOOL 5b8b8e8b3c6a306a7d99340e70308ae40cfad7e3a4b7f33dc239ff12fdd65443ff8cfab11a038c656ec16b10dc0fd4c06b78576f179772e6becf9f443e037252
+DIST tptest-3.1.7.tar.gz 313801 SHA256 db39257b3ee6408a575e16804975df1e68f52270537cc3e7505897b777f7994d SHA512 c78fdbc561adbe109be9fc45a2dbd5c452235525ac4d5f24e39fd8824825fd02c35853411c3f4ae1870f98b576df37f3f1f1266de7c40edcb8f35c69b9063c59 WHIRLPOOL f19631cc2e9d8ed3272cfb81da3c003e26ef6d80b35de57eb793157b2acadf65eb85179afa3138ec83722b9b5b70b0b4f800381ef43d3d56072018be3838ac15
+EBUILD tptest-3.1.7-r2.ebuild 1099 SHA256 26517fd74d128f4069a88bb3d03654945f0830f1c673c7849f0a7912da346f17 SHA512 d46e3659bf11dde18e2736d2e13f9cabf1f4325a3aedfa60786bbf04ff0c8db49499345151b6e40a58c1f393de22afb41670ea52c70f0f7f677fad6372bedd1f WHIRLPOOL e47eda10cba5e5d4b87da7b943989b271e9982ef58e3237ce3cb7ca6845b78651abdc1f51534f00e50f83165a3519d937a079db04dc191b17aaf86005d64ed7e
+EBUILD tptest-3.1.7.ebuild 1095 SHA256 dcad380fa4cdaa09f8a47276922fb06a0742ab7a19a0d479d7cac6879f885aee SHA512 779dbb1a623519a34e8bca5b81a1c1e0721aebf636eee250a3c611e5a26cc92562ded7a58a7e33f9858feac415495a2f807075f3fd0d7f5076ec94395b111e48 WHIRLPOOL b17fe7a2af379ce415493fad7a4409c566eb48aef7ef6a01e7fbd6fb0a7ec63afd215214c07604750fe875b7de5d69f4fea11d97c531beb26ae5f87866bd01d6
+MISC ChangeLog 1673 SHA256 01b1e4d8620589a1e9381a28394793290861afb81629439412b9b74e9a44a75c SHA512 7b8c538df0b6e25916d77bfaa2e240bdb61a47355b985fb7054792260ea0f2fb1e0e02fb60f167745aa05422a06a9b8634a3997af7975cf9f362ebd8a506721e WHIRLPOOL 67f018d5d5ad8db7267f0774d2729ef470aa4fc1768da1511d24290f24dc1c872dcc3238c75350ec2e100f5db1b3a74ec904d442efffc135ae136a9c5788b9e2
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iKYEAREIAGYFAlJPKmFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RSJwCfbvZvowe7iwR/nreiHbRdhjkP
+ZtkAn3riXv9kyWMUzmdM1WFhZQKh1M44
+=tm1k
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch
new file mode 100644
index 000000000000..ad0cf08c18a9
--- /dev/null
+++ b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch
@@ -0,0 +1,152 @@
+diff -Nurp tptest-3.1.7/engine/tpcommon.c tptest-3.1.7.new/engine/tpcommon.c
+--- tptest-3.1.7/engine/tpcommon.c	2004-03-22 15:49:12.000000000 -0500
++++ tptest-3.1.7.new/engine/tpcommon.c	2009-06-11 16:48:25.000000000 -0400
+@@ -37,6 +37,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <stdlib.h>
++#include <stddef.h>
+ 
+ #ifdef UNIX
+ #include <sys/time.h>
+@@ -194,68 +196,76 @@ done:
+ 
+ 
+ // Fill a tpStats structure with the contents from a STATS line
+-int GetStatsFromLine(char *line, TPStats *s)
++int GetStatsFromLine(const char *line, TPStats *s)
+ {
+ 	char valBuf[30];
++	char * stats_ptr = NULL;
+ 
+ 	if (strncmp(line, "STATS ", 6) != 0)
+ 		return -1;
+-	memset(valBuf, 0, 30);
++	memset(valBuf, 0, sizeof(valBuf));
++	stats_ptr = ((char *)line)+6;
+ 
+-	if (CopyTagField(valBuf, 29, line+6, "majorv"))
+-		s->MajorVersion = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "minorv"))
+-		s->MinorVersion = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "pktssent"))
+-		s->PktsSent = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "pktsunsent"))
+-		s->PktsUnSent = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "pktsrcvd"))
+-		s->PktsRecvd = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "bytessent"))
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "majorv"))
++		s->MajorVersion = (USHORT) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "minorv"))
++		s->MinorVersion = (USHORT) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pktssent"))
++		s->PktsSent = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pktsunsent"))
++		s->PktsUnSent = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pktsrcvd"))
++		s->PktsRecvd = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "bytessent"))
+ 		sscanf(valBuf, "%" LONG_LONG_PREFIX "d", &(s->BytesSent));
+-	if (CopyTagField(valBuf, 29, line+6, "bytesrcvd"))
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "bytesrcvd"))
+ 		sscanf(valBuf, "%" LONG_LONG_PREFIX "d", &(s->BytesRecvd));
+-	if (CopyTagField(valBuf, 29, line+6, "maxrtt"))
+-		s->MaxRoundtrip = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "minrtt"))
+-		s->MinRoundtrip = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "oocount"))
+-		s->ooCount = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "txstart_s"))
+-		s->StartSend.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "txstart_us"))
+-		s->StartSend.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "txstop_s"))
+-		s->StopSend.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "txstop_us"))
+-		s->StopSend.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "rxstart_s"))
+-		s->StartRecv.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "rxstart_us"))
+-		s->StartRecv.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "rxstop_s"))
+-		s->StopRecv.tv_sec = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "rxstop_us"))
+-		s->StopRecv.tv_usec = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 29, line+6, "totrtt"))
+-		s->TotalRoundtrip = atoi(valBuf);
+-	if (CopyTagField(valBuf, 29, line+6, "nortt"))
+-		s->nRoundtrips = atoi(valBuf);
+-
+-	if (CopyTagField(valBuf, 101, line + 6, "email"))
+-		strcpy(s->email, valBuf);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "maxrtt"))
++		s->MaxRoundtrip = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "minrtt"))
++		s->MinRoundtrip = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "oocount"))
++		s->ooCount = (UINT32) strtoul(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstart_s"))
++		s->StartSend.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstart_us"))
++		s->StartSend.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstop_s"))
++		s->StopSend.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "txstop_us"))
++		s->StopSend.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstart_s"))
++		s->StartRecv.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstart_us"))
++		s->StartRecv.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstop_s"))
++		s->StopRecv.tv_sec = strtol(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "rxstop_us"))
++		s->StopRecv.tv_usec = strtol(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "totrtt"))
++		s->TotalRoundtrip = (UINT32) strtoul(valBuf,NULL,10);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "nortt"))
++		s->nRoundtrips = (UINT32) strtoul(valBuf,NULL,10);
++
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "email"))
++	{
++		strncpy(s->email, valBuf, sizeof(s->email));
++		s->email[sizeof(s->email)-1] = '\0';
++	}
+ 
+-	if (CopyTagField(valBuf, 101, line + 6, "pwd"))
+-		strcpy(s->pwd, valBuf);
++	if (CopyTagField(valBuf, sizeof(valBuf)-1, stats_ptr, "pwd"))
++	{
++		strncpy(s->pwd, valBuf, sizeof(s->pwd));
++		s->pwd[sizeof(s->pwd)-1] = '\0';
++	}
+ 
++	stats_ptr = NULL;
+ 	return 0;
+-
+ }
+ 
+ 
+diff -Nurp tptest-3.1.7/engine/tpcommon.h tptest-3.1.7.new/engine/tpcommon.h
+--- tptest-3.1.7/engine/tpcommon.h	2002-09-16 10:10:42.000000000 -0400
++++ tptest-3.1.7.new/engine/tpcommon.h	2009-06-11 16:40:10.000000000 -0400
+@@ -43,7 +43,7 @@ int SameTag(char *s1, char *s2);
+ int CopyTagField(char *destp, int destSize, char *srcp, char *pname);
+ int GetSessionFromLine(char *, TPEngine *);
+ char * CreateSessionLine(TPEngine *, char *);
+-int GetStatsFromLine(char *, TPStats *);
++int GetStatsFromLine(const char *, TPStats *);
+ char * CreateLineFromStats(TPStats *, char *);
+ int ReplyCode(char *);
+ void TVAddUSec(struct timeval *, int);
diff --git a/net-analyzer/tptest/tptest-3.1.7-r1.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
index 30f9c1a467b2..239925e8c45a 100644
--- a/net-analyzer/tptest/tptest-3.1.7-r1.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/tptest-3.1.7-r1.ebuild,v 1.1 2010/09/20 18:32:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/tptest-3.1.7-r2.ebuild,v 1.1 2013/10/04 20:51:42 creffett Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 MY_PV="${PV/./_}"
 
@@ -17,11 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
+RDEPEND=""
+DEPEND=""
+
 src_prepare() {
 	sed -i apps/unix/{client,server}/Makefile \
 		-e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \
 		|| die "sed Makefiles"
-
+	epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch"
 	cp -f os-dep/unix/* .
 	cp -f engine/* .
 }