reinit the tree, so we can have metadata

4 files changed, 210 insertions, 0 deletions

diff --git a/net-analyzer/tptest/Manifest b/net-analyzer/tptest/Manifest
new file mode 100644
index 000000000000..d4008d97d0b5
--- /dev/null
+++ b/net-analyzer/tptest/Manifest
@@ -0,0 +1,6 @@
+AUX tptest-3.1.7-getstatsfromlinevuln.patch 5727 SHA256 1315296c0d79aa486ec4db1f0c43c95c676d76cecc4884f761307dca27c2ac2d SHA512 3d0135d382adbbb58fc359d021313b4eef319d96c46cfdee06def06273dce259d0027a4dd043ccb08c5382dc543c6ec5ba05b536e685f41b946c8048711dc883 WHIRLPOOL b4f7918e4b0791bbe058add0c236f2f73991915702ec580f4d9c73d8fe44e697844592dca7de16af17dd4934a47668951c7282ff37ce5ecce700b9eb832cbb94
+DIST tptest-3.1.7.tar.gz 313801 SHA256 db39257b3ee6408a575e16804975df1e68f52270537cc3e7505897b777f7994d SHA512 c78fdbc561adbe109be9fc45a2dbd5c452235525ac4d5f24e39fd8824825fd02c35853411c3f4ae1870f98b576df37f3f1f1266de7c40edcb8f35c69b9063c59 WHIRLPOOL f19631cc2e9d8ed3272cfb81da3c003e26ef6d80b35de57eb793157b2acadf65eb85179afa3138ec83722b9b5b70b0b4f800381ef43d3d56072018be3838ac15
+EBUILD tptest-3.1.7-r2.ebuild 899 SHA256 e398e59f7aec2a4c3f8f316d728acb8643ad090b690966edafc6627df3c1810b SHA512 7462d7a2570d3ad9445188659980ea1985cc69b97725fc91c3dcce6c2add46a748693a82a7595bca00c04f6f96094b248a9baf2f604cfa7680e49996cf28f62f WHIRLPOOL f402e38f63a8b7dbbce4ce95433a3e6adadb578b08415c2b9494fc2f3540efbeac53f8ccb45e6f768502dd1797811bf41c3da9a1d5d70242ac4b0aafa72da48a
+MISC ChangeLog 2484 SHA256 2fafdb40bdebb2aca0a430d3556ea1f80bb4c091fbc4725b4fc4a52d04c7f953 SHA512 d020873a954627e8f44c6c7f614481e03ce1c7cfea1f8b3b2142e4881a193b2834ab00976e2240c3d665fd7ba43ab6be4f767988cdf01c6622b2a3bdd81d5b2d WHIRLPOOL ccf1eea4bce2fcda29f39c9f05600ddc8dc553ccbb8e6bfac8e3d2591e684cba075d00b005c3df0ec1cb8e063a2372e90e2149fb1f66bb8fba23239dc64bf4e7
+MISC ChangeLog-2015 2375 SHA256 3672b8b1313c9e1f04b72ef1dbec3263d56b72b39b43cfb3687dce5d0eb51e4c SHA512 2f183c96823d3894f0657b0560d9619bae9c45c7689c2e6b4ce1ec7eb506015f0dec9a8e6579568c18dacd34b86290c1850ee7c52aa0afe2330e3443715e9ff6 WHIRLPOOL f7d6051dc7467604ecf900e627fc464082f1e0facbb8fda48f6b299f4027d9b04978f32c04c26ec20527164dd194b2a488c92fe40c97928b5754ee4657b9e304
+MISC metadata.xml 356 SHA256 41ebc785ff8e46fbf986d9c7823212765ace64be94474e6ded5468b3a6bd934b SHA512 df040b3a61401e1ca7ff513904875c135b48d03dbbe8ee4bd83f2faa8e8ba448bed670a44b6ff04b24cace44d8308ca64c29dfb32b2f0dac602e3d6d62234956 WHIRLPOOL efb8402d8f394e2f72965f4985115a13b469a308a6e5cb1b074d0e25554480b39fb45fccef746f83a0c6ddca71b7e6fad42e7a4637c776fbb4230fba4c67b472
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..4b7fd209f9e4
--- /dev/null
+++ b/net-analyzer/tptest/files/tptest-3.1.7-getstatsfromlinevuln.patch
@@ -0,0 +1,150 @@
+--- a/engine/tpcommon.c
++++ b/engine/tpcommon.c
+@@ -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;
+-
+ }
+ 
+ 
+--- a/engine/tpcommon.h
++++ b/engine/tpcommon.h
+@@ -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/metadata.xml b/net-analyzer/tptest/metadata.xml
new file mode 100644
index 000000000000..43601ae2ee47
--- /dev/null
+++ b/net-analyzer/tptest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tptest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
new file mode 100644
index 000000000000..d580934eae8f
--- /dev/null
+++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs eutils
+
+MY_PV="${PV/./_}"
+
+DESCRIPTION="Internet bandwidth tester"
+HOMEPAGE="http://tptest.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ppc sparc x86"
+
+src_prepare() {
+	sed -i apps/unix/{client,server}/Makefile \
+		-e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \
+		|| die
+	epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch"
+	cp -f os-dep/unix/* .
+	cp -f engine/* .
+}
+
+src_compile() {
+	emake -C apps/unix/client \
+		CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS}" \
+		|| die
+	emake -C apps/unix/server \
+		CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS}" \
+		|| die
+}
+
+src_install() {
+	dobin apps/unix/client/tptestclient
+	dosbin apps/unix/server/tptestserver
+
+	insinto /etc
+	doins apps/unix/server/tptest.conf
+}