reinit the tree, so we can have metadata

5 files changed, 208 insertions, 0 deletions

diff --git a/net-analyzer/nttcp/Manifest b/net-analyzer/nttcp/Manifest
new file mode 100644
index 000000000000..3b48497d6fa7
--- /dev/null
+++ b/net-analyzer/nttcp/Manifest
@@ -0,0 +1,7 @@
+AUX nttcp-1.47-format-security.patch 3620 SHA256 bfe9e2dee548d6b33dcfa681f210fc61a5f580ad5b8973cb097a7e40814d587b SHA512 7976fb58cbc6f15d93f0e4485cf9477bf03b3794dcebe9b0905c12250279d23ff3f34a6dee30e961d38cbeb85e4a97daaecdffe89adc7136ccabecf31bb794ea WHIRLPOOL c5191d57463a2dd99c46b245b34766a6a82261f25f75434b9dcea56498eb76fd1be7fce368c6c186b43c04cdcddda23f1a8ba594c4391385c111060ba06a413d
+DIST nttcp-1.47.tar.gz 25693 SHA256 a0e0ac34d250ba874f9ce75da60717cde8da4ebbef56879bbc8b8ed2743b81ae SHA512 eb0a5aa0633555a6e4c3834e99666cd0e00d41da5d82fdfd2644a9f59727236f1b24fbe810272cf9cfb96d76361b028bcf57025008570dbd6b0d761df5cce625 WHIRLPOOL 4565335b23ad89e609d04a8c2c8eef914bbe85da2696da5a1fa352a02feaa13faca71f9058e34ab621fcf3b3653a334cfad67a22b81ca325c0caed789b7931fc
+EBUILD nttcp-1.47-r1.ebuild 577 SHA256 555eea5a9bb864253644a695683c29b7f2af541d9d646076ae5feeb6b3323f11 SHA512 1047838a6a4889deacc9203d2c98d5d62c6654700f70d4402c0c07751c4786092b2f8756305441d50c2dac61f5779ad54621c9f430c39c9d0d0073e7e5a585a8 WHIRLPOOL 7e873bd92a95f28bf6c65d5fdc04ef1d85999d20bbc014ec0e2ef3012b2ad3e75989db7c35477ed7e03f4cb6fb5c1d65c0bfc19f30d0f1d6616384fdf2f3615e
+EBUILD nttcp-1.47-r3.ebuild 577 SHA256 7598d8b9df6cafb8b5b433174c9990a47b637d529cd578cb6bfeb8dc43af92ac SHA512 58e74de3d225a95a6523014d32dd631fdc795c19e6d32238305fb8d4d6f9556f12de1c22df3dc7bd5cbe8d3f5cbd1867a34fd46e88fc2b535151106cf03d6469 WHIRLPOOL 8e4bc2baab35d2d23373caf92481e842f534f79bdfd95d345ec833ebedfed45812d7f13c1f60af0ba854bc2aa74ca3c160ebc657a5cd65b9bd2498288d1f440d
+MISC ChangeLog 2524 SHA256 dcbf22dee188d46c715e42cc145f91edd454265d601ba9544b90f2f30b490a78 SHA512 b16502af05f311b338cc2e1afbc587957507b1c53aca4ff1baae3a7283372d0b96d83ec93349754eace079a107c53179f787143a83fd0a52e73dc48c03b3803e WHIRLPOOL 9a0628167606f548ce16d5ebad8a44ff905dd39d22742a7728dd9f17efad141b082205d671d6839744f109fa5c35cea1f0915c4d8b797619e1a22e9910b0a36d
+MISC ChangeLog-2015 2893 SHA256 e173f055deb0489fb161867e212156c2be29ec0252b319ba246fe0eca70a216e SHA512 f9d32be2afd0fb09569754c07cebec796f207399fa1cb979842c8d752b2112e2cd556aa1175c3298eb90e0798c3fe182a95f4a979957ec28d9933d7cd3e1c164 WHIRLPOOL 84afd61a178fc8082275b0e6302d9db91a94a0af6f159856879e6b1810a1b7cc8d3563cc708b8c0eb71dc269aa67874247f216a55fc07008e4cba4be7e2764e8
+MISC metadata.xml 347 SHA256 9f6da253ce01045e5cde3003ad08b101f00011ca383b66edb638044694c2f439 SHA512 72d427b0c64a4225fe272ef7873f3549ae88bfa261e1aeaf06c2dfa72284d61d2f48f9028b6466a4715b1e4759b6ade4d6958463a170530fbacccb9a1695025e WHIRLPOOL 6f91d31a848e85c2bd29aec663b305764c3aecfb015729d0f87bdb96b1b1f59483f6e5afbe720da19ded26a2058a0d7d7189cf6935e892c8298795c0bc88e8b5
diff --git a/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch b/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch
new file mode 100644
index 000000000000..514b5fa6e33b
--- /dev/null
+++ b/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch
@@ -0,0 +1,132 @@
+--- a/nttcp.c
++++ b/nttcp.c
+@@ -372,7 +372,7 @@
+ #define Message(x)	fMessage(stdout, x)
+ 
+ void Exit(char *s, int ret) {
+-    syslog(LOG_DEBUG, s);
++    syslog(LOG_DEBUG, "%s\n", s);
+     fMessage(stderr,s);
+     exit(ret);
+ }
+@@ -694,7 +694,7 @@
+     register int cnt;
+     if (opt.udp) {
+ 	struct sockaddr_in from;
+-	int len= sizeof(from);
++	socklen_t len= sizeof(from);
+ 	 cnt= recvfrom(fd, buf, count, 0, (struct sockaddr *)&from, &len);
+ 	 SysCalls++;
+     }
+@@ -1150,8 +1150,8 @@
+ int main(int argc, char *argv[]) {
+ 
+     struct sockaddr_in PeerAddr;
+-    int  PeerAddrLeng;
+-    char *DataPortFormat= "dataport: %d\n";
++    socklen_t  PeerAddrLeng;
++    const char DataPortFormat[]= "dataport: %d\n";
+     int DataPort;
+     struct sockaddr_in sinlh;	/* for control socket on local host */
+     int  fd;	     		/* data socket to transport the data */
+@@ -1184,7 +1184,8 @@
+     } 
+     if (opt.inetd) {
+     	/* we simulate inetd behaviour */
+-	int nsrv, srv, fromleng;
++	int nsrv, srv;
++	socklen_t fromleng;
+ 	struct sockaddr_in sinsrv;
+ 	struct sockaddr_in frominet;
+ 	if (opt.Verbose) {
+@@ -1285,7 +1286,7 @@
+ 	    Exit(MsgBuf, 2);
+ 	}
+ 	if (OptionLine[sizeof(OptionLine)-1] != '\0') {
+-	    sprintf(MsgBuf, "%s: optionline longer than %d\n",
++	    sprintf(MsgBuf, "%s: optionline longer than %zd\n",
+ 	      myname, sizeof(OptionLine)-1);
+ 	    Exit(MsgBuf, 3);
+ 	}
+@@ -1308,7 +1309,7 @@
+     	Peer[PeerCount].fin= stdin;
+     	Peer[PeerCount].fout= stdout;
+ 	syslog(LOG_DEBUG,
+-	  "call from %.50 (=%.30s): done remote initial processing\n",
++	  "call from %.50s (=%.30s): done remote initial processing\n",
+ 	  Peer[PeerCount].HostName, Peer[PeerCount].IPName);
+ 	PeerCount++;
+     }
+@@ -1617,7 +1618,7 @@
+ 	sinlh.sin_family = AF_INET;
+ #if defined(MULTICAST)
+ 	if (opt.MulticastChannel) {
+-	    int ml, p, join_group;
++	    int p, join_group;
+ 	    struct ip_mreq mreq;
+ 	    sinlh.sin_port = htons(opt.MulticastPort);
+ 	    if (bind(fd, (struct sockaddr *)&sinlh, sizeof(sinlh)) < 0) {
+@@ -1640,7 +1641,6 @@
+ 		sprintf(MsgBuf, DataPortFormat, DEFAULT_PORT);
+ 
+ 	    /* tell it our clients */
+-	    ml= strlen(MsgBuf);
+ 	    for (p=0; p<PeerCount; p++) {
+ 	    	fputs(MsgBuf, Peer[p].fout);
+ 		fflush(Peer[p].fout);
+@@ -1683,7 +1683,7 @@
+ 	}
+ 	else { /* == TCP */
+ 	    struct sockaddr_in frominet;
+-	    int fromleng;
++	    socklen_t fromleng;
+ 	    fromleng = sizeof(frominet);
+ 	    memset(&frominet, 0, fromleng);
+ 	    AlarmMsg= "accept timed out\n";
+@@ -1694,7 +1694,7 @@
+ 	    SetItVal(0);
+ 	    if (opt.Verbose) {
+ 		struct sockaddr_in peer;
+-		int peerlen = sizeof(peer);
++		socklen_t peerlen = sizeof(peer);
+ 		if (getpeername(fd, (struct sockaddr *)&peer, &peerlen) < 0)
+ 		    exitError("getpeername", 19);
+ 		sprintf(MsgBuf,
+@@ -1732,7 +1732,7 @@
+ 
+     /* print window sizes */
+     if (opt.Verbose) {
+-	int optlen;
++	socklen_t optlen;
+ 	int WinSize;
+ 
+ 	optlen= sizeof(WinSize);
+@@ -1899,8 +1899,8 @@
+ 	 * rcr		real call reate in Calls/s	(float)
+ 	 * ccr		cpu call rate in Calls/s	(float)
+ 	 */
+-	char *iFormat= "%*.*ld";
+-	char *fFormat= "%*.*f";
++	const char iFormat[]= "%*.*ld";
++	const char fFormat[]= "%*.*f";
+ 	char *fs;
+ 	LenStr *TitleLine, *StatLine;
+ 
+@@ -2002,7 +2002,7 @@
+ 		fs+= 2;
+ 	    }
+ 	    else if (*fs == 'l') {
+-		sprintf(MsgBuf, iFormat, fw, fp, opt.BufLen);
++		sprintf(MsgBuf, iFormat, fw, fp, (long int)opt.BufLen);
+ 		TitleStr= "BufLen";
+ 		fs++;
+ 	    }
+@@ -2017,7 +2017,7 @@
+ 		fs++;
+ 	    }
+ 	    else if (*fs == 'c') {
+-		sprintf(MsgBuf, iFormat, fw, fp, SysCalls);
++		sprintf(MsgBuf, iFormat, fw, fp, (long int)SysCalls);
+ 		TitleStr= "Calls";
+ 		fs++;
+ 	    }
diff --git a/net-analyzer/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml
new file mode 100644
index 000000000000..c9c02c73ae91
--- /dev/null
+++ b/net-analyzer/nttcp/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+<longdescription>tool to test TCP and UDP throughput</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
new file mode 100644
index 000000000000..5d6f49f09066
--- /dev/null
+++ b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tool to test TCP and UDP throughput"
+HOMEPAGE="http://www.leo.org/~elmar/nttcp/"
+SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_compile() {
+	emake \
+		ARCH= \
+		CC="$(tc-getCC)" \
+		LFLAGS="${LDFLAGS}" \
+		OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
new file mode 100644
index 000000000000..f502164771a3
--- /dev/null
+++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="tool to test TCP and UDP throughput"
+HOMEPAGE="http://www.leo.org/~elmar/nttcp/"
+SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_compile() {
+	emake \
+		ARCH= \
+		CC="$(tc-getCC)" \
+		LFLAGS="${LDFLAGS}" \
+		OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}