fix for bug #153525, #123477

(Portage version: 2.1.1-r2)

4 files changed, 12 insertions, 11 deletions

diff --git a/net-analyzer/sguil-sensor/ChangeLog b/net-analyzer/sguil-sensor/ChangeLog
index d39931e30eda..36f4e61abe0a 100644
--- a/net-analyzer/sguil-sensor/ChangeLog
+++ b/net-analyzer/sguil-sensor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sguil-sensor
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/ChangeLog,v 1.9 2006/03/01 14:12:17 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/ChangeLog,v 1.10 2006/12/02 23:26:29 cedk Exp $
+
+  02 Dec 2006; Cedric Krier <cedk@gentoo.org> files/log_packets.confd,
+  files/log_packets.initd:
+  fix for bug #153525, #123477
 
 *sguil-sensor-0.6.1 (01 Mar 2006)
 
diff --git a/net-analyzer/sguil-sensor/files/digest-sguil-sensor-0.6.1 b/net-analyzer/sguil-sensor/files/digest-sguil-sensor-0.6.1
index 6fb6ec9a5717..3dad6ae3c2cc 100644
--- a/net-analyzer/sguil-sensor/files/digest-sguil-sensor-0.6.1
+++ b/net-analyzer/sguil-sensor/files/digest-sguil-sensor-0.6.1
@@ -1 +1,3 @@
 MD5 62be71b0aa41ccacb7872839dc4bf5ad sguil-sensor-0.6.1.tar.gz 103441
+RMD160 8a4d5bb0a2b49d523540022fe29586004666af44 sguil-sensor-0.6.1.tar.gz 103441
+SHA256 b1da0fffeaecd69b9d8eeeb27025fdc3493a2eabfec8ed4153f688f11ee226eb sguil-sensor-0.6.1.tar.gz 103441
diff --git a/net-analyzer/sguil-sensor/files/log_packets.confd b/net-analyzer/sguil-sensor/files/log_packets.confd
index 591454bd6b2f..819ae109ec71 100644
--- a/net-analyzer/sguil-sensor/files/log_packets.confd
+++ b/net-analyzer/sguil-sensor/files/log_packets.confd
@@ -4,17 +4,13 @@
 IFACE=eth1
 
 # Make sure this matches your IFACE
-PIDFILE=/var/run/log_packets_$IFACE.pid
+PIDFILE=/var/run/sguil/log_packets_$IFACE.pid
 
 # You probably don't want to change this, but in case you do
 LOGDIR="/var/lib/sguil"
 
-# Probably not this either
-CONF=/etc/snort/snort.conf
-
 # Percentage of disk to try and maintain
 MAX_DISK_USE=95
 
 # This pulls in the options above
-#SNORT_OPTS="-D -m 122 -u sguil -g sguil -A none -i $IFACE -l $LOGDIR -c $CONF"
 OPTIONS="-m 122 -u sguil -g sguil"
diff --git a/net-analyzer/sguil-sensor/files/log_packets.initd b/net-analyzer/sguil-sensor/files/log_packets.initd
index 5bab23c1d295..624f014dfcbb 100644
--- a/net-analyzer/sguil-sensor/files/log_packets.initd
+++ b/net-analyzer/sguil-sensor/files/log_packets.initd
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/files/log_packets.initd,v 1.3 2005/10/10 00:53:56 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/files/log_packets.initd,v 1.4 2006/12/02 23:26:29 cedk Exp $
 
 opts="start stop cleandisk"
 
+LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs"
 
 start() {
 	ebegin "Starting Log_packest"
@@ -15,8 +16,6 @@ start() {
 		return 1
 	fi
 
-	LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs"
-
 	if [ ! -d ${LOG_DIR} ]
 	then
 		mkdir -p ${LOG_DIR}
@@ -31,7 +30,7 @@ start() {
 		chmod 770 "${LOG_DIR}/${today}"
 		chown root:sguil "${LOG_DIR}/${today}"
 	fi
-	start-stop-daemon --start --quiet -b -m --pidfile /var/run/sguil/logpackets.pid \
+	start-stop-daemon --start --quiet -b -m --pidfile "${PIDFILE}" \
 		--exec /usr/bin/snort \
 		-- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${IFACE}" "${FILTER}"
 	real_cleandisk
@@ -40,7 +39,7 @@ start() {
 
 stop() {
 	ebegin "Stopping Sensor Agent"
-	start-stop-daemon --stop --quiet --pidfile /var/run/sguil/logpackets.pid
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
 	eend $?
 }