some initscript changes

5 files changed, 47 insertions, 89 deletions

diff --git a/net-misc/hogwash/files/digest-hogwash-0.1d b/net-misc/hogwash/files/digest-hogwash-0.1d
deleted file mode 100644
index d0ec7a6f685c..000000000000
--- a/net-misc/hogwash/files/digest-hogwash-0.1d
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b81c69f54c2b7fa496601870ec2c61bf hogwash-0.1.d.tgz
-MD5 a7b712b9af2ff909ee8b4dd215ccdfbf rules0727
diff --git a/net-misc/hogwash/files/hogwash b/net-misc/hogwash/files/hogwash
deleted file mode 100644
index 3da290f1ab57..000000000000
--- a/net-misc/hogwash/files/hogwash
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-SERVICE=hogwash
-opts="start stop"
-PIDFILE="/var/run/hogwash.pid"
-EXE=/usr/sbin/hogwash
-
-# Note you need to edit this to fit your needs
-# -e is the external interface if you are not using this on a box with two
-# or more NiCs this first line fits your needs
-OPTS="-e eth0 -c /etc/hogwash/stock.rules"
-
-# I'm using hogwash on a stackless box for stealth packet scrubbing so I
-# use this line
-#OPTS="-e eth0 -i eth1 -c /etc/hogwash/rules0727"
-
-depend() { 
-	need net
-}
-
-start() {
-	ebegin "Starting $SERVICE"
-	$EXE $OPTS 2>&1 >/dev/null & 
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $SERVICE"
-	kill `cat $PIDFILE` 
-	eend $?
-}
diff --git a/net-misc/hogwash/files/hogwash.rc6 b/net-misc/hogwash/files/hogwash.rc6
new file mode 100644
index 000000000000..bd57f912e622
--- /dev/null
+++ b/net-misc/hogwash/files/hogwash.rc6
@@ -0,0 +1,30 @@
+x#!/sbin/runscript
+
+#you can put this in your rc.conf file if you wish
+#HOGWASH_OPTS="-e eth0 -c /etc/hogwash/stock.rules"     # for one network card
+#HOGWASH_OPTS="-e eth0 -i eth1 -c /etc/hogwash/rules.2" # if you have two nics
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "$HOGWASH_OPTS" ] ; then
+		eerror "You need to setup your HOGWASH_OPTS first"
+		eerror "It is needed before you can start hogwash"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting hogwash"
+	start-stop-daemon --start --quiet --exec /usr/sbin/hogwash -- $HOGWASH_OPTS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping hogwash"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/hogwash
+	eend $?
+}
diff --git a/net-misc/hogwash/hogwash-0.1d-r2.ebuild b/net-misc/hogwash/hogwash-0.1d-r2.ebuild
index 7a962475383f..e89d3ad6c99d 100644
--- a/net-misc/hogwash/hogwash-0.1d-r2.ebuild
+++ b/net-misc/hogwash/hogwash-0.1d-r2.ebuild
@@ -1,39 +1,36 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hogwash/hogwash-0.1d-r2.ebuild,v 1.1 2001/09/12 04:07:00 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hogwash/hogwash-0.1d-r2.ebuild,v 1.2 2001/10/18 19:19:33 woodchip Exp $
 
-S=${WORKDIR}/devel
-DESCRIPTION="layer2 packet scrubber. It lives right on top of the network driver and will drop or
-sanitize packets based on signature. The authors installed it on an unpatched RH-6.2 box and entered
-it into the capture the flag competition at defcon 9 and the box came back unscathed. I've included
-the rules file too."
-A="hogwash-0.1.d.tgz rules.2"
-SRC_URI="http://prdownloads.sourceforge.net/hogwash/${PN}-0.1.d.tgz 
-			http://hogwash.sourceforge.net/rules.2"
+DESCRIPTION="An invisible, layer2 network packet scrubber based on snort"
 HOMEPAGE="http://hogwash.sourceforge.net"
-DEPEND=">=net-libs/libpcap-0.6.1
-		 >=net-libs/libnet-1.0.2a"
 
-#RDEPEND=""
+S=${WORKDIR}/devel
+SRC_URI="http://prdownloads.sourceforge.net/hogwash/hogwash-0.1.d.tgz
+	http://hogwash.sourceforge.net/rules.2"
+
+DEPEND="virtual/glibc
+	>=net-libs/libpcap-0.6.1
+	>=net-libs/libnet-1.0.2a"
+
 src_unpack() {
+
 	unpack hogwash-0.1.d.tgz
 }
-src_compile() {
 
-	try ./setup	
+src_compile() {
 
+	./setup || die
 }
 
 src_install () {
 	
 	dosbin hogwash
-	insinto /etc/hogwash
-	doins stock.rules ${DISTDIR}/rules.2
 	dodoc COPYRIGHT README ${FILESDIR}/Documentation.txt
 	dodir /var/log/snort
-	into /etc/init.d
-	doexe ${FILESDIR}/hogwash
-	
-}
+	dodir /var/log/hogwash
 
+	insinto /etc/hogwash ; doins stock.rules ${DISTDIR}/rules.2
+	exeinto /etc/init.d ; newexe ${FILESDIR}/hogwash.rc6 hogwash
+}
diff --git a/net-misc/hogwash/hogwash-0.1d.ebuild b/net-misc/hogwash/hogwash-0.1d.ebuild
deleted file mode 100644
index 63bb4da9db9f..000000000000
--- a/net-misc/hogwash/hogwash-0.1d.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hogwash/hogwash-0.1d.ebuild,v 1.1 2001/08/16 04:15:22 lamer Exp $
-
-S=${WORKDIR}/devel
-DESCRIPTION="layer2 packet scrubber. It lives right on top of the network driver and will drop or
-sanitize packets based on signature. The authors installed it on an unpatched RH-6.2 box and entered
-it into the capture the flag competition at defcon 9 and the box came back unscathed. I've included
-the rules file too."
-A="hogwash-0.1.d.tgz rules0727"
-SRC_URI="http://prdownloads.sourceforge.net/hogwash/${PN}-0.1.d.tgz 
-			http://hogwash.sourceforge.net/rules0727"
-HOMEPAGE="http://hogwash.sourceforge.net"
-DEPEND=">=net-libs/libpcap-0.6.1
-		 >=net-libs/libnet-1.0.2a"
-
-#RDEPEND=""
-src_unpack() {
-	unpack hogwash-0.1.d.tgz
-}
-src_compile() {
-
-	try ./setup	
-
-}
-
-src_install () {
-	
-	dosbin hogwash
-	insinto /etc/hogwash
-	doins stock.rules ${DISTDIR}/rules0727
-	dodoc COPYRIGHT README ${FILESDIR}/Documentation.txt
-	dodir /var/log/snort
-	
-}
-