Added init.d script for running iperf in server mode; fixes bug 69609.

Package-Manager: portage-2.0.51-r14

4 files changed, 54 insertions, 10 deletions

diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index 1dfa225a8a6f..fe7f00158782 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iperf
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.8 2004/09/25 08:16:50 dholm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.9 2005/01/21 23:47:11 ka0ttic Exp $
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/iperf.initd,
+  iperf-1.7.0.ebuild:
+  Added init.d script for running iperf in server mode; fixes bug 69609.
 
   25 Sep 2004; David Holm <dholm@gentoo.org> iperf-1.7.0.ebuild:
   Added to ~ppc.
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index db07d224b7a8..058386a13add 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,4 +1,15 @@
-MD5 24bf59f1633ffbdf84c1b48f0e5516bd ChangeLog 848
-MD5 4cacaa3c46b4755d5d8a0f8c2e0e0a8f iperf-1.7.0.ebuild 706
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44c5634a576aafd997491f64bc94c2bd iperf-1.7.0.ebuild 939
+MD5 4dab5e771f55a7159d3b7b903b8ee19f ChangeLog 1015
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 38cdd3984bb355d4ab62c2eb4cb6a79a files/iperf.initd 506
 MD5 8d7742f71fada23db6fa1398664a3c2e files/digest-iperf-1.7.0 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB8ZSIEZCkKN40op4RAizbAJsGGG2/LSt40Jw+Zrl3s5XrDx7HBwCgxCGm
+ep2HPtkOl/5eBbU1JSipBPs=
+=dHzt
+-----END PGP SIGNATURE-----
diff --git a/net-misc/iperf/files/iperf.initd b/net-misc/iperf/files/iperf.initd
new file mode 100644
index 000000000000..ed6e407bd6b4
--- /dev/null
+++ b/net-misc/iperf/files/iperf.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.1 2005/01/21 23:47:11 ka0ttic Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting iperf server"
+	start-stop-daemon --start --quiet \
+		--exec /usr/bin/iperf -- -s -D >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down iperf server"
+	start-stop-daemon --stop --quiet --exec /usr/bin/iperf
+	eend $?
+}
diff --git a/net-misc/iperf/iperf-1.7.0.ebuild b/net-misc/iperf/iperf-1.7.0.ebuild
index b0ce3341c5b4..6ed3094a7734 100644
--- a/net-misc/iperf/iperf-1.7.0.ebuild
+++ b/net-misc/iperf/iperf-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-1.7.0.ebuild,v 1.6 2004/09/25 08:16:50 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-1.7.0.ebuild,v 1.7 2005/01/21 23:47:11 ka0ttic Exp $
 
 IUSE=""
 DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
@@ -16,17 +16,25 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:@read  INSTALL_DIR;::' Makefile
+	sed -i 's:@read  INSTALL_DIR;::' Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
 	cd cfg
-	econf || die
+	econf || die "econf failed"
 	cd ..
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make INSTALL_DIR=${D}/usr/bin install || die
+	make INSTALL_DIR=${D}/usr/bin install || die "make install failed"
 	dodoc INSTALL README VERSION
+	newinitd ${FILESDIR}/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	echo
+	einfo "To run iperf in server mode, run:"
+	einfo "  /etc/init.d/iperf start"
+	echo
 }