network/snort: Updated for version 2.9.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 19 insertions, 11 deletions

diff --git a/network/snort/README b/network/snort/README
index 249f906b22..cf0b57c75c 100644
--- a/network/snort/README
+++ b/network/snort/README
@@ -11,3 +11,5 @@ sessions/packets when deployed in-line.
 Snort has three primary functional modes.  It can be used as a packet sniffer 
 like tcpdump(1), a packet logger (useful for network traffic debugging, etc), 
 or as a full blown network intrusion detection and prevention system.
+
+This requires libdnet and daq.
diff --git a/network/snort/README.SLACKWARE b/network/snort/README.SLACKWARE
index 86115083da..3a171835a7 100644
--- a/network/snort/README.SLACKWARE
+++ b/network/snort/README.SLACKWARE
@@ -1,7 +1,6 @@
 README.SLACKWARE
 ================
 
-
 Documentation
 -------------
 
diff --git a/network/snort/doinst.sh b/network/snort/doinst.sh
index ee9ebe7752..6dc7804cb7 100644
--- a/network/snort/doinst.sh
+++ b/network/snort/doinst.sh
@@ -28,6 +28,6 @@ config etc/snort/threshold.conf.new
 config etc/snort/attribute_table.dtd.new
 config etc/snort/classification.config.new
 config etc/snort/gen-msg.map.new
-config etc/snort/sid-msg.map.new
+#config etc/snort/sid-msg.map.new
 config etc/snort/unicode.map.new
 
diff --git a/network/snort/rc.snort b/network/snort/rc.snort
index d91941e822..9aaf410fcf 100644
--- a/network/snort/rc.snort
+++ b/network/snort/rc.snort
@@ -16,7 +16,7 @@ CONF=/etc/snort/snort.conf
 # Start snort:
 snort_start() {
   CMDLINE="/usr/bin/snort -d -D -i $IFACE"
-  echo -n "Starting Snort daemon:  $CMDLINE"
+  echo "Starting Snort daemon:  $CMDLINE"
   $CMDLINE --pid-path /var/run --create-pidfile -l $LOGDIR -c $CONF
   echo
 }
diff --git a/network/snort/snort.SlackBuild b/network/snort/snort.SlackBuild
index 2eaeea0d5d..b65057130b 100644
--- a/network/snort/snort.SlackBuild
+++ b/network/snort/snort.SlackBuild
@@ -25,10 +25,10 @@
 # Modified by the SlackBuilds.org project
 
 # Maintained as of version 2.8.6.1 by Niels Horn <niels.horn@gmail.com>
-# revision date: 2010/09/18
+# revision date: 2010/10/09
 
 PRGNAM=snort
-VERSION=${VERSION:-2.8.6.1}
+VERSION=${VERSION:-2.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,6 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-pthread \
   --enable-linux-smp-stats \
+  --enable-zlib \
   --with-mysql-libraries=/usr/lib${LIBDIRSUFFIX}/mysql \
   --with-mysql-includes=/usr/include/mysql \
   --build=$ARCH-slackware-linux
@@ -108,14 +109,20 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $(readlink $i).gz $i.gz ; rm
 # Set up a sane config directory - snort won't do this on its own
 mkdir -p $PKG/etc/$PRGNAM
 # Fix paths for libraries in snort.conf, also 64-bits and rules paths...
+#  also set "unified2" as standard output, without special options
 sed -e "s|usr/local/lib|usr/lib${LIBDIRSUFFIX}|g" \
-    -e "s|PATH ../|PATH |g" etc/snort.conf > $PKG/etc/snort/snort.conf.new
+    -e "s|PATH ../|PATH |g" \
+    -e "/^# output unified2*/aoutput unified2: filename snort.log, limit 128" \
+    etc/snort.conf > $PKG/etc/snort/snort.conf.new
 cat etc/threshold.conf > $PKG/etc/snort/threshold.conf.new
 cat etc/reference.config > $PKG/etc/snort/reference.config.new
 cat etc/classification.config > $PKG/etc/snort/classification.config.new
 cat etc/attribute_table.dtd > $PKG/etc/snort/attribute_table.dtd.new
 cat etc/gen-msg.map > $PKG/etc/snort/gen-msg.map.new
-cat etc/sid-msg.map > $PKG/etc/snort/sid-msg.map.new
+# sid-msg.map is not included in the source tarball, but it is in the
+#  snort-rules package. We'll just skip it for now, it might come back in
+#  the next release...
+#cat etc/sid-msg.map > $PKG/etc/snort/sid-msg.map.new
 cat etc/unicode.map > $PKG/etc/snort/unicode.map.new
 
 # Create default, empty directory for rules
diff --git a/network/snort/snort.info b/network/snort/snort.info
index 9b46a29865..0c57d75eb5 100644
--- a/network/snort/snort.info
+++ b/network/snort/snort.info
@@ -1,10 +1,10 @@
 PRGNAM="snort"
-VERSION="2.8.6.1"
+VERSION="2.9.0"
 HOMEPAGE="http://www.snort.org/"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/snort-2.8.6.1.tar.gz"
-MD5SUM="b1119396a32e9df0d80404e4b6c49166"
+DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/snort-2.9.0.tar.gz"
+MD5SUM="f0b5681aebc2c9ce695df16158130e7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"