Old.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

6 files changed, 7 insertions, 249 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index d72500ef68cd..537faa70c26b 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netperf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.56 2012/08/05 18:05:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.57 2012/08/05 22:52:18 jer Exp $
+
+  05 Aug 2012; Jeroen Roovers <jer@gentoo.org>
+  -files/netperf-2.4.0-gcc41.patch, -netperf-2.4.4-r1.ebuild,
+  -netperf-2.4.5-r2.ebuild, -files/netperf-2.4.5-netserver.patch,
+  -files/netperf-CVE-2007-1444.patch:
+  Old.
 
   05 Aug 2012; Raúl Porcel <armin76@gentoo.org> netperf-2.5.0-r1.ebuild:
   alpha/ia64/sparc stable wrt #419221
diff --git a/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch b/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch
deleted file mode 100644
index 72da7e4cbcc2..000000000000
--- a/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4	2005-05-11 19:57:20.000000000 +0300
-+++ aclocal.m4	2006-03-19 19:42:03.000000000 +0200
-@@ -906,7 +906,7 @@
-          # "void *" as the second argument to getpeername
-          curl_cv_socklen_t_equiv=
-          for arg2 in "struct sockaddr" void; do
--            for t in int size_t unsigned long "unsigned long" socklen_t; do
-+            for t in  socklen_t int size_t unsigned long "unsigned long"; do
-                AC_TRY_COMPILE([
-                   #ifdef HAVE_SYS_TYPES_H
-                   #include <sys/types.h>
diff --git a/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch b/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch
deleted file mode 100644
index 362e4aeb2107..000000000000
--- a/net-analyzer/netperf/files/netperf-2.4.5-netserver.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# Set DEBUG_LOG_FILE location
-# Fix compiler warnings (bug #337422):
-	netserver.c: In function ‘process_requests’:
-	netserver.c:287: warning: array subscript is above array bounds
-	inlined from ‘process_requests’ at netserver.c:268:
-	/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
-	inlined from ‘process_requests’ at netserver.c:284:
-	/usr/include/bits/stdio2.h:65: warning: call to __builtin___snprintf_chk will always overflow destination buffer
-
---- a/src/netserver.c
-+++ b/src/netserver.c
-@@ -142,7 +142,7 @@
- 
- #ifndef DEBUG_LOG_FILE
- #ifndef WIN32
--#define DEBUG_LOG_FILE "/tmp/netperf.debug"
-+#define DEBUG_LOG_FILE "/var/log/netperf.debug"
- #else
- #define DEBUG_LOG_FILE "c:\\temp\\netperf.debug"
- #endif  /* WIN32 */
-@@ -266,7 +266,7 @@
- 	      (!strstr(local_machine,delims[i])) &&
- 	      (!strstr(local_version,delims[i]))) {
- 	    snprintf((char *)netperf_response.content.test_specific_data,
--		     sizeof(netperf_response) - 7,
-+		     MAXSPECDATA,
- 		     "%c%s%c%s%c%s%c%s",
- 		     delims[i][0],
- 		     local_sysname,
-@@ -282,15 +282,15 @@
- 	if (i == 4) {
- 	  /* none of the delimiters were unique, use the last one */
- 	  snprintf((char *)netperf_response.content.test_specific_data,
--		   sizeof(netperf_response) - 7,
-+		   MAXSPECDATA,
- 		   "%c%s%c%s%c%s%c%s",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique",
--		   delims[i][0],
-+		   delims[3][0],
- 		   "NoDelimUnique");
- 	}
- 	send_response_n(0);
diff --git a/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch b/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch
deleted file mode 100644
index ca8a33dee40f..000000000000
--- a/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur netperf-2.4.4.orig/src/netlib.c netperf-2.4.4.patched/src/netlib.c
---- netperf-2.4.4.orig/src/netlib.c	2007-10-18 01:16:02.000000000 +0400
-+++ netperf-2.4.4.patched/src/netlib.c	2008-01-30 22:03:01.000000000 +0300
-@@ -244,6 +244,7 @@
- union   netperf_response_struct netperf_response;
- 
- FILE    *where;
-+int	fd = -1;
- 
- char    libfmt = '?';
-         
-diff -Naur netperf-2.4.4.orig/src/netlib.h netperf-2.4.4.patched/src/netlib.h
---- netperf-2.4.4.orig/src/netlib.h	2007-10-18 01:17:37.000000000 +0400
-+++ netperf-2.4.4.patched/src/netlib.h	2008-01-30 21:46:34.000000000 +0300
-@@ -445,6 +445,7 @@
- extern  SOCKET  server_sock;
- extern  int     times_up;
- extern  FILE    *where;
-+extern int      fd;
- extern  int     loops_per_msec;
- extern  float   lib_local_per_cpu_util[];
-   
-diff -Naur netperf-2.4.4.orig/src/netserver.c netperf-2.4.4.patched/src/netserver.c
---- netperf-2.4.4.orig/src/netserver.c	2007-10-18 01:09:12.000000000 +0400
-+++ netperf-2.4.4.patched/src/netserver.c	2008-01-30 21:57:56.000000000 +0300
-@@ -153,6 +153,9 @@
- char    listen_port[10];
- extern	char	*optarg;
- extern	int	optind, opterr;
-+#if !defined(WIN_32)
-+char debuglog[] = "/tmp/netperf.debugXXXXXX";
-+#endif
- 
- #ifndef WIN32
- #define SERVER_ARGS "dL:n:p:v:V46"
-@@ -225,6 +228,10 @@
-       if (!debug) 
-       {
- 	fclose(where);
-+#if !defined(WIN32)
-+	unlink(debuglog);
-+	close(fd);
-+#endif
- #if !defined(WIN32) && !defined(MPE) && !defined(__VMS)
- 	/* For Unix: reopen the debug write file descriptor to "/dev/null" */
- 	/* and redirect stdout to it.					   */
-@@ -918,8 +925,11 @@
-   strcpy(FileName, DEBUG_LOG_FILE);
-     
- #ifndef WIN32
--  snprintf(&FileName[strlen(FileName)], sizeof(FileName) - strlen(FileName), "_%d", getpid());
--  if ((where = fopen(FileName, "w")) == NULL) {
-+  if((fd = mkstemp(debuglog)) == -1 || (where = fdopen(fd, "w+")) == NULL){
-+    if(fd != -1){
-+      unlink(debuglog);
-+      close(fd);
-+    }
-     perror("netserver: debug file");
-     exit(1);
-   }
-@@ -947,10 +957,6 @@
-     }
-   }
- #endif
-- 
--#ifndef WIN32 
--  chmod(DEBUG_LOG_FILE,0644);
--#endif
-   
- #if WIN32
-   if (child) {
diff --git a/net-analyzer/netperf/netperf-2.4.4-r1.ebuild b/net-analyzer/netperf/netperf-2.4.4-r1.ebuild
deleted file mode 100644
index ebbc55b8e856..000000000000
--- a/net-analyzer/netperf/netperf-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.4-r1.ebuild,v 1.1 2011/12/31 20:14:06 idl0r Exp $
-
-inherit eutils flag-o-matic autotools
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-#SRC_URI="ftp://ftp.netperf.org/netperf/experimental/${MY_P}.tar.gz"
-SRC_URI="ftp://ftp.netperf.org/netperf/${MY_P}.tar.gz
-		mirror://gentoo/netperf-2.4.4-svn_trunk_20071205.patch.bz2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i 's:^\(#define DEBUG_LOG_FILE "\)/tmp/netperf.debug:\1/var/log/netperf.debug:' src/netserver.c
-	epatch "${WORKDIR}"/${P}-svn_trunk_20071205.patch
-	epatch "${FILESDIR}"/${PN}-2.4.0-gcc41.patch
-	epatch "${FILESDIR}"/${PN}-CVE-2007-1444.patch
-	epatch "${FILESDIR}"/${PN}-fix-scripts.patch
-
-	# Fixing paths in scripts
-	sed -i -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
-			doc/examples/sctp_stream_script \
-			doc/examples/tcp_range_script \
-			doc/examples/tcp_rr_script \
-			doc/examples/tcp_stream_script \
-			doc/examples/udp_rr_script \
-			doc/examples/udp_stream_script
-
-	eautoconf
-}
-
-src_install () {
-	einstall || die
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv "${D}"/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd "${FILESDIR}"/${PN}-2.2-init netperf
-	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog NEWS README Release_Notes
-	dodir /usr/share/doc/${PF}/examples
-	#Scripts no longer get installed by einstall
-	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples
-}
diff --git a/net-analyzer/netperf/netperf-2.4.5-r2.ebuild b/net-analyzer/netperf/netperf-2.4.5-r2.ebuild
deleted file mode 100644
index a0878b323450..000000000000
--- a/net-analyzer/netperf/netperf-2.4.5-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.5-r2.ebuild,v 1.1 2011/12/31 20:14:06 idl0r Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-SRC_URI="ftp://ftp.netperf.org/netperf/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-fix-scripts.patch \
-		"${FILESDIR}"/${P}-netserver.patch
-
-	# Fixing paths in scripts
-	sed -i -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
-			doc/examples/sctp_stream_script \
-			doc/examples/tcp_range_script \
-			doc/examples/tcp_rr_script \
-			doc/examples/tcp_stream_script \
-			doc/examples/udp_rr_script \
-			doc/examples/udp_stream_script
-}
-
-src_install () {
-	einstall || die
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv "${D}"/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd "${FILESDIR}"/${PN}-2.2-init netperf
-	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog NEWS README Release_Notes
-	dodir /usr/share/doc/${PF}/examples
-	#Scripts no longer get installed by einstall
-	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples
-}