fix for bug #153525, #123477

Package-Manager: portage-2.1.1-r2

diff --git a/net-analyzer/sguil-sensor/ChangeLog b/net-analyzer/sguil-sensor/ChangeLog
index d39931e30eda7411f3ede4240f7d25072dc6f221..36f4e61abe0a39867448e48bdbc7767b81181958 100644 (file)
--- 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/Manifest b/net-analyzer/sguil-sensor/Manifest
index e2e2c9f5d28233bc86a08f45fd0eef825bdbd05e..57bef52ab2e61c39ae35ef2cc1344b3b0e21462c 100644 (file)
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -1,43 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3e8671de6e58f1d7a97328c12829d80e ChangeLog 1557
-RMD160 01b8d9bcdf2641fffb4046cfc880aa8232ca46f9 ChangeLog 1557
-SHA256 b1237c0c006000519af52040ea29602e8a60353badb1bf21e9e6ac31983383f9 ChangeLog 1557
-MD5 7dea1d8d6ed9dadaa3768e6ba138fe76 files/digest-sguil-sensor-0.5.3-r2 69
-RMD160 eb2ac068cd4da27cf20a85ff600f5eca045c2c4e files/digest-sguil-sensor-0.5.3-r2 69
-SHA256 fd39b03732255598f1873861fe89385e8a60da96782a61f054e3bc4e88b02171 files/digest-sguil-sensor-0.5.3-r2 69
-MD5 21efd06f535dcc5b39027550e66c2b4e files/digest-sguil-sensor-0.6.0_p1 72
-RMD160 7399748d158a56d1ad40d24fca444748fcbd420b files/digest-sguil-sensor-0.6.0_p1 72
-SHA256 3c3027f9b06f492d6d3c85f7ea1338f3cb9a20f98a4432a3764887a0d53c1158 files/digest-sguil-sensor-0.6.0_p1 72
-MD5 6af6111c55df2266d93202e4ac6af862 files/digest-sguil-sensor-0.6.1 70
-RMD160 7f1cd87687f7cdcedc5f7073aa9b2915c7cbe54e files/digest-sguil-sensor-0.6.1 70
-SHA256 13e27dbfc3ab952ec39eebeca55763f8319dd81c0139d65785f8fecc6dce57e6 files/digest-sguil-sensor-0.6.1 70
-MD5 b00be8c2354effc6b8d51da0ca0a02da files/log_packets.confd 553
-RMD160 c158c50811a8ac4956a45d4535b61bd5c41ab118 files/log_packets.confd 553
-SHA256 c0f50a96d4a981d467930bd7a6f4dd4b4cea0512e8b57dc7a653519dfde5c611 files/log_packets.confd 553
-MD5 0982853c1c4d9ed283f9faac1a1f89a5 files/log_packets.initd 2255
-RMD160 d6ab9e053dc1540ff1642a200d16ad76065d64cc files/log_packets.initd 2255
-SHA256 33f7d7decf3b09cd3dc0d0ee2fa592d71009b32b51d857480232e2516b928e9b files/log_packets.initd 2255
+AUX log_packets.confd 424 RMD160 d02d89a4997d0d796b44a1f0ac1df2cf411ee9fd SHA1 6d41979ac80fb78829e8fa70557391ec6ca5e5fd SHA256 d06ca10f5015dbdbcc5df7928352c010290b407bf8565d2c1ee1ecbb1cc8ea54
+MD5 79eb53238b163fe59f09b2b5726a6487 files/log_packets.confd 424
+RMD160 d02d89a4997d0d796b44a1f0ac1df2cf411ee9fd files/log_packets.confd 424
+SHA256 d06ca10f5015dbdbcc5df7928352c010290b407bf8565d2c1ee1ecbb1cc8ea54 files/log_packets.confd 424
+AUX log_packets.initd 2215 RMD160 8a519d36f34080e69af4c57ecce176ea8714e144 SHA1 aa963b109b70e68774d48a947a40fd6de8086624 SHA256 59563a8606d5f1780412eb1c18640fdd597847b2db96677923be2cfdbad3c771
+MD5 b55af0e24f7e6c000bcb4ed2ee00c268 files/log_packets.initd 2215
+RMD160 8a519d36f34080e69af4c57ecce176ea8714e144 files/log_packets.initd 2215
+SHA256 59563a8606d5f1780412eb1c18640fdd597847b2db96677923be2cfdbad3c771 files/log_packets.initd 2215
+AUX sensor_agent.initd 872 RMD160 bd42cb378b0855bf4534aad2d896300dfd584cac SHA1 76e7cda79fe004e3b8503311a2617154a8a57018 SHA256 46b20614d734c60c3a317c5e4fad1a6b2539b3fa394f34d0243d79722e855b88
 MD5 6296476173c3dc63666cf4f8f61d77ca files/sensor_agent.initd 872
 RMD160 bd42cb378b0855bf4534aad2d896300dfd584cac files/sensor_agent.initd 872
 SHA256 46b20614d734c60c3a317c5e4fad1a6b2539b3fa394f34d0243d79722e855b88 files/sensor_agent.initd 872
-MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
-RMD160 4875e4f86bc0fd0f10a781b478c70fd21adb7eaa metadata.xml 223
-SHA256 4d78d21a58ebede4bfdbced61656070166d1d88eacc4becc023287e6de8b5f9b metadata.xml 223
+DIST sguil-sensor-0.5.3.tar.gz 89816
+DIST sguil-sensor-0.6.0p1.tar.gz 105374
+DIST sguil-sensor-0.6.1.tar.gz 103441 RMD160 8a4d5bb0a2b49d523540022fe29586004666af44 SHA1 2f80f531d22b322d02606ef8735acf0fa8c76569 SHA256 b1da0fffeaecd69b9d8eeeb27025fdc3493a2eabfec8ed4153f688f11ee226eb
+EBUILD sguil-sensor-0.5.3-r2.ebuild 2721 RMD160 9d03efd21f77f4e7b73b8236e119d2010b38c6ec SHA1 abb6ee5fa7a7036d360ff20913ebfc670dc7df06 SHA256 28830af9c72e4025f30d37693a668309e65e01f08c9049ec55f62061d1695d64
 MD5 2e2cd8bb5e2d134cfafb10559453d43f sguil-sensor-0.5.3-r2.ebuild 2721
 RMD160 9d03efd21f77f4e7b73b8236e119d2010b38c6ec sguil-sensor-0.5.3-r2.ebuild 2721
 SHA256 28830af9c72e4025f30d37693a668309e65e01f08c9049ec55f62061d1695d64 sguil-sensor-0.5.3-r2.ebuild 2721
+EBUILD sguil-sensor-0.6.0_p1.ebuild 2748 RMD160 e75ab66d02837d2616196abba0a458159410fad5 SHA1 86d407cc4cc9b5cb13ad964c289619bd42d5b3db SHA256 766fb18cd0ac313189032f392924d7aa67577e1a97f9b7230a104091237ab565
 MD5 d89ca1a68f0568d033d51ba2921547e4 sguil-sensor-0.6.0_p1.ebuild 2748
 RMD160 e75ab66d02837d2616196abba0a458159410fad5 sguil-sensor-0.6.0_p1.ebuild 2748
 SHA256 766fb18cd0ac313189032f392924d7aa67577e1a97f9b7230a104091237ab565 sguil-sensor-0.6.0_p1.ebuild 2748
+EBUILD sguil-sensor-0.6.1.ebuild 2745 RMD160 6620587d81024bea26c94234fda6e2d8dd7d0dbb SHA1 b43460e1a0b7c13330ae8ce09bfeb54052518dca SHA256 8def5d6b4f8c08ade5403161526b357cc43555c0497178b4ba5c31307119a0ec
 MD5 80839c1f3dfbc5cecacc7330e65a1034 sguil-sensor-0.6.1.ebuild 2745
 RMD160 6620587d81024bea26c94234fda6e2d8dd7d0dbb sguil-sensor-0.6.1.ebuild 2745
 SHA256 8def5d6b4f8c08ade5403161526b357cc43555c0497178b4ba5c31307119a0ec sguil-sensor-0.6.1.ebuild 2745
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEJb2II1lqEGTUzyQRAvfoAKCWAZaMVm3Maexoc6QCJR8r/HLZWwCgoaSm
-9W/gT2YKSDKqt6SrELyf/PM=
-=uW/V
------END PGP SIGNATURE-----
+MISC ChangeLog 1684 RMD160 ae0ed981a734fcce59e9c62b29659f0173399d15 SHA1 6d9045aa3ca918a37d6214ca52991953b78906e6 SHA256 eee10eac11d566fc2f05d617f85d1ebe15bcba5c40d455cc1cb79b24b72db587
+MD5 939b325823849954c662f76a07a37eda ChangeLog 1684
+RMD160 ae0ed981a734fcce59e9c62b29659f0173399d15 ChangeLog 1684
+SHA256 eee10eac11d566fc2f05d617f85d1ebe15bcba5c40d455cc1cb79b24b72db587 ChangeLog 1684
+MISC metadata.xml 223 RMD160 4875e4f86bc0fd0f10a781b478c70fd21adb7eaa SHA1 fcb6d281952f130ccaf46c52a595f8ef3f25b15f SHA256 4d78d21a58ebede4bfdbced61656070166d1d88eacc4becc023287e6de8b5f9b
+MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
+RMD160 4875e4f86bc0fd0f10a781b478c70fd21adb7eaa metadata.xml 223
+SHA256 4d78d21a58ebede4bfdbced61656070166d1d88eacc4becc023287e6de8b5f9b metadata.xml 223
+MD5 7dea1d8d6ed9dadaa3768e6ba138fe76 files/digest-sguil-sensor-0.5.3-r2 69
+RMD160 eb2ac068cd4da27cf20a85ff600f5eca045c2c4e files/digest-sguil-sensor-0.5.3-r2 69
+SHA256 fd39b03732255598f1873861fe89385e8a60da96782a61f054e3bc4e88b02171 files/digest-sguil-sensor-0.5.3-r2 69
+MD5 21efd06f535dcc5b39027550e66c2b4e files/digest-sguil-sensor-0.6.0_p1 72
+RMD160 7399748d158a56d1ad40d24fca444748fcbd420b files/digest-sguil-sensor-0.6.0_p1 72
+SHA256 3c3027f9b06f492d6d3c85f7ea1338f3cb9a20f98a4432a3764887a0d53c1158 files/digest-sguil-sensor-0.6.0_p1 72
+MD5 acd5f0ae97fbc69bb296723f4730f09d files/digest-sguil-sensor-0.6.1 256
+RMD160 f46b5a24814135f70ceff7e4789cb4bd0dfc059d files/digest-sguil-sensor-0.6.1 256
+SHA256 e6dc957352bf5b2a8d84619b153cd5b6fea5422a58cb083fd5a020a75a501139 files/digest-sguil-sensor-0.6.1 256

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 6fb6ec9a57178e62dc6a9cadca0c8a7c410dd44b..3dad6ae3c2cc3317e0121a2644f356a8a4e0135b 100644 (file)
--- 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 591454bd6b2ffa303703c7620caeda274128aa17..819ae109ec71e661ba7c073aeb12bc5617e0c102 100644 (file)
--- 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 5bab23c1d295862592f1367e28d65b8dc51942b7..624f014dfcbbaada1a87655157ef25cbd976af43 100644 (file)
--- 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 $?
 }