Change to init script to accept CONF

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index bb3c07780078b4108c721d50bb40419cadb76725..0cc928103eed9287a7ea8fae26bc3a6b544e676a 100644 (file)
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.86 2005/10/19 09:19:49 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.87 2005/11/26 13:57:06 strerror Exp $
+
+  26 Nov 2005; Benjamin Smee <strerror@gentoo.org> files/snort.rc6:
+  Change to init script to accept CONF
 
 *snort-2.4.3 (19 Oct 2005)
 

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 74fed14fa7c1cead00d19db0fb473fdaa1d3ba67..1dc65a0cbac50229dda678fde474fe422521d7c7 100644 (file)
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -3,11 +3,11 @@ MD5 4a7bd3135da2aeeeede46de0677bd157 snort-2.4.1-r1.ebuild 4322
 MD5 cdb1487b04506276a6b465ba18e11fcc snort-2.4.1.ebuild 4080
 MD5 fb1657b65226b6ff73c2d0f89081eb04 snort-2.4.3.ebuild 4319
 MD5 54a7ae3abfcd21c637f064420083251f snort-2.3.3-r1.ebuild 4041
-MD5 8514cc2e6b65c1a52b5f6ccd844817fc ChangeLog 16346
+MD5 8fc1de7c01c36711397c057d02f69d02 ChangeLog 16454
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
 MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1-r1 271
-MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
+MD5 9c325479975ea9fcb4f62c01407e8194 files/snort.rc6 712
 MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
 MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
 MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1 271

diff --git a/net-analyzer/snort/files/snort.rc6 b/net-analyzer/snort/files/snort.rc6
index 078b2519459ec84b446b6fcf83e668b0cd1e498d..ef70d44e5bcdd698463e7765e44b4ffc1196be11 100644 (file)
--- a/net-analyzer/snort/files/snort.rc6
+++ b/net-analyzer/snort/files/snort.rc6
@@ -1,15 +1,15 @@
 #!/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/snort/files/snort.rc6,v 1.5 2004/07/14 23:12:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.rc6,v 1.6 2005/11/26 13:57:06 strerror Exp $
 
 depend() {
        need net
 }
 
 checkconfig() {
-       if [ ! -e /etc/snort/snort.conf ] ; then
-               eerror "You need an /etc/snort/snort.conf to run snort"
+       if [ ! -e $CONF ] ; then
+               eerror "You need a configuration file to run snort"
                eerror "There is an example config in /etc/snort/snort.conf.distrib"
                return 1
        fi
@@ -26,6 +26,5 @@ start() {
 stop() {
        ebegin "Stopping snort"
        start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-       #kill  -9 `cat $PIDFILE`  2>&1
        eend $?
 }