update to netperf-2.2pl4 for bug 19463

6 files changed, 85 insertions, 5 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 9b57d0106a86..1cf05e4f09f4 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/netperf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.5 2004/01/27 22:02:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.6 2004/01/29 01:37:12 agriffis Exp $
+
+*netperf-2.2.4 (28 Jan 2004)
+
+  28 Jan 2004; <agriffis@gentoo.org> netperf-2.2.4.ebuild,
+  files/netperf-2.2-conf, files/netperf-2.2-init:
+  update to netperf-2.2pl4 for bug 19463. Thanks to Jyrki Muukkonen for some
+  good ideas in this ebuild
 
   27 Jan 2004; <agriffis@gentoo.org> netperf-2.2.ebuild:
   stable on alpha and ia64
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 048b6c468311..0c9344563da5 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,11 +1,10 @@
-MD5 efae496b7e7986c6a8dfeaaccb8594f3 ChangeLog 849
+MD5 f606fa47d75ec3b34fff789d54b2ce35 ChangeLog 1094
 MD5 f8cc702960d05fadbca4a4d148bbfc80 netperf-2.2.ebuild 908
-MD5 85866306e1114863590cb19f670d1f74 asdf 2830
-MD5 91224d91da2efa58fe8632aab86f9de7 netperf-2.2.4.ebuild 1180
+MD5 5a011033b46d1cdaed3c803da396c234 netperf-2.2.4.ebuild 1300
 MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
 MD5 a3d32398b2de6ff285e374a73448d17b files/digest-netperf-2.2 68
 MD5 5b39a4d1bbad0a785afc512f8a35e87d files/netperf-2.2alpha.diff 686
-MD5 2ddf8d70be3eab2ad7395c1cb9450867 files/netperf-2.2-conf 119
+MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
 MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
 MD5 53dcd4d9466b21f6b2a16c342f458d12 netperf/netperf-2.2_p4.ebuild 1438
 MD5 99eb3dd5275b5517ece3e4af0b96cb74 netperf/ChangeLog 1224
diff --git a/net-analyzer/netperf/files/digest-netperf-2.2.4 b/net-analyzer/netperf/files/digest-netperf-2.2.4
new file mode 100644
index 000000000000..c04c639e9b47
--- /dev/null
+++ b/net-analyzer/netperf/files/digest-netperf-2.2.4
@@ -0,0 +1 @@
+MD5 0ba938bc65dac4989639a40fdf892952 netperf-2.2pl4.tar.gz 823686
diff --git a/net-analyzer/netperf/files/netperf-2.2-conf b/net-analyzer/netperf/files/netperf-2.2-conf
new file mode 100644
index 000000000000..f61f483a83ea
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.2-conf
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/netperf
+
+# Add your preferred netserver args here
+#NETSERVER_ARGS="-n 4"
diff --git a/net-analyzer/netperf/files/netperf-2.2-init b/net-analyzer/netperf/files/netperf-2.2-init
new file mode 100644
index 000000000000..c6fed548f912
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.2-init
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+#
+# init.d script for net-analyzer/netperf's netserver
+#
+
+depend() {
+    use net
+}
+
+start() {
+    ebegin 'Starting netperf server (netserver)'
+    start-stop-daemon --start --quiet --chuid nobody \
+        --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} >/dev/null
+    eend $?
+}
+
+stop() {
+    ebegin 'Stopping netperf server (netserver)'
+    start-stop-daemon --stop --quiet --exec /usr/sbin/netserver
+    eend $?
+}
diff --git a/net-analyzer/netperf/netperf-2.2.4.ebuild b/net-analyzer/netperf/netperf-2.2.4.ebuild
new file mode 100644
index 000000000000..c4b49eab7247
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.2.4.ebuild,v 1.1 2004/01/29 01:37:13 agriffis Exp $
+
+inherit flag-o-matic
+
+if [[ $PV == *.*.* ]]; then
+	MY_P=${P%.*}pl${PV##*.}	# convert netperf-2.2.4 => netperf-2.2pl4
+	S=${WORKDIR}/${MY_P}
+else
+	MY_P=${P}
+fi
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ia64 ~alpha"
+
+IUSE="ipv6"
+
+DEPEND="virtual/glibc"
+
+src_compile() {
+	append-flags -DDO_UNIX
+	use ipv6 && append-flags -DDO_IPV6
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install () {
+	# binaries
+	dosbin netserver
+	dobin netperf
+
+	# init.d / conf.d
+	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
+	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+
+	# man pages
+	newman netserver.man netserver.1
+	newman netperf.man netperf.1
+
+	# documentation and example scripts
+	dodoc ACKNWLDGMNTS COPYRIGHT README Release_Notes netperf.ps
+	mkdir ${D}/usr/share/doc/${PF}/examples
+	cp *_script ${D}/usr/share/doc/${PF}/examples
+}