Corrected init scripts as per bug #90415

(Portage version: 2.0.51.20-r5)

6 files changed, 27 insertions, 20 deletions

diff --git a/net-analyzer/neti/ChangeLog b/net-analyzer/neti/ChangeLog
index 3f732755f8d3..57f7bc85adbf 100644
--- a/net-analyzer/neti/ChangeLog
+++ b/net-analyzer/neti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/neti
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.7 2005/01/29 19:26:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.8 2005/04/29 22:47:24 dragonheart Exp $
+
+*neti-1.01-r1 (29 Apr 2005)
+
+  29 Apr 2005; Daniel Black <dragonheart@gentoo.org> files/neti-init,
+  -neti-1.01.ebuild, +neti-1.01-r1.ebuild:
+  Corrected init scripts as per bug #90415. Thanks to Marco Morales
+  <soulN0SPAMse@gmail.com>
 
   30 Jan 2005; Daniel Black <dragonheart@gentoo.org> neti-1.01.ebuild:
   Change to virtual/libpcap dependancy
diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest
index 60785af324d9..c87038c1866f 100644
--- a/net-analyzer/neti/Manifest
+++ b/net-analyzer/neti/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b13ac9785b89b3056a3beb6076dd77b9 ChangeLog 943
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 2babe3d6e57bc0447b3b47953fe9996d neti-1.01.ebuild 1336
+MD5 42ac1b1e9af5f9c58d965139b90ce49d neti-1.01.ebuild 1478
+MD5 42ac1b1e9af5f9c58d965139b90ce49d neti-1.01-r1.ebuild 1478
+MD5 1ffb655ed548f7a6a93d45df215c2611 files/neti-init 500
 MD5 68d7769784d731fd49d9283179d49dc6 files/digest-neti-1.01 61
-MD5 5001057dcb956df8106836a6bddccd45 files/neti-init 542
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB++NOmdTrptrqvGERArqqAJ0UGIJOD3xOMbVT3EPiS4cd6mJCAwCcC0UI
-MMQVCGDi6NViuNA76XnOh2o=
-=qcXu
------END PGP SIGNATURE-----
+MD5 68d7769784d731fd49d9283179d49dc6 files/digest-neti-1.01-r1 61
diff --git a/net-analyzer/neti/files/digest-neti-1.01 b/net-analyzer/neti/files/digest-neti-1.01-r1
index b816ccff245f..b816ccff245f 100644
--- a/net-analyzer/neti/files/digest-neti-1.01
+++ b/net-analyzer/neti/files/digest-neti-1.01-r1
diff --git a/net-analyzer/neti/files/neti-init b/net-analyzer/neti/files/neti-init
index 55a5bf095058..b41b348845e7 100644
--- a/net-analyzer/neti/files/neti-init
+++ b/net-analyzer/neti/files/neti-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/files/neti-init,v 1.2 2004/07/14 23:05:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/files/neti-init,v 1.3 2005/04/29 22:47:24 dragonheart Exp $
 
 depend() {
     need net
@@ -9,8 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting netiathome"
-	start-stop-daemon --start --quiet --exec \
-		/usr/bin/tethereal -iany -l -p -tad -V -R"udp||tcp||icmp||igmp" | neti
+	start-stop-daemon --start --background --quiet --exec /usr/sbin/NETIStart
 	eend $?
 }
 
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
index b9fc2b9c6f11..e1dc22300ef8 100644
--- a/net-analyzer/neti/metadata.xml
+++ b/net-analyzer/neti/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
+<maintainer>
+  <email>netmon@gentoo.org</email>
+    <name>Netmon herd</name>
+</maintainer>
 <maintainer>
   <email>dragonheart@gentoo.org</email>
     <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
 </maintainer>
 <longdescription></longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/neti/neti-1.01.ebuild b/net-analyzer/neti/neti-1.01-r1.ebuild
index b2fbf6110b93..a0362e0d017f 100644
--- a/net-analyzer/neti/neti-1.01.ebuild
+++ b/net-analyzer/neti/neti-1.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/neti-1.01.ebuild,v 1.7 2005/01/29 19:26:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/neti-1.01-r1.ebuild,v 1.1 2005/04/29 22:47:24 dragonheart Exp $
 
 DESCRIPTION="NETI@Home research project from GATech"
 HOMEPAGE="http://www.neti.gatech.edu"
@@ -23,6 +23,13 @@ DEPEND="java? ( >=virtual/jdk-1.2 )
 	sys-devel/automake
 	sys-devel/gcc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# start-stop-daemon asks for this
+	sed -i -e "1i\#\!/bin/sh" NETIStart || die "sed NETIStart failed"
+}
+
 src_compile() {
 	econf \
 		`use_with zlib` \