Update snort to 1.9.0. Changes:

Lots of new rules, extended analyzing of packages etc.

Fixes PR 18637 by Adrian Portelli <adrianp@stindustries.net>

7 files changed, 122 insertions, 79 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 28c9ae4e26e..8012eeb7e38 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.235 2002/10/13 04:32:16 dmcmahill Exp $
+$NetBSD: CHANGES,v 1.236 2002/10/13 04:42:46 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2002:
 
@@ -3187,3 +3187,4 @@ Changes to the packages collection and infrastructure in 2002:
 	Updated bidwatcher to 1.3.5nb2 [tron 2002-10-12]
 	Updated qt3 to 3.0.5nb1 [wiz 2002-10-12]
 	Added p5-Parallel-Pvm-1.3.0 [dmcmahill 2002-10-13]
+	Updated snort to 1.9.0 [hubertf 2002-10-13]
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index d2864754224..bb220bba1f6 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2002/10/10 12:28:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/10/13 04:42:12 hubertf Exp $
 #
 
-DISTNAME?=	snort-1.8.7
+DISTNAME?=	snort-1.9.0
 CATEGORIES?=	net security
 MASTER_SITES?=	http://www.snort.org/releases/				\
 		ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
@@ -21,21 +21,21 @@ CONFIGURE_ARGS+=--with-libpcap-libraries=${BUILDLINK_PREFIX.libpcap}/lib
 
 post-install:
 	${INSTALL_DATA_DIR} -m 700 -o ${ROOT_USER} -g ${ROOT_GROUP} /var/log/snort
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snort
-	cd ${WRKSRC} ; \
-	for i in snort.conf *.config *.rules ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/snort ; \
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/snort
+	cd ${WRKSRC}/etc ; \
+	for i in `ls | grep -v Makefile` ; do \
+		${INSTALL_DATA} $$i ${PREFIX}/etc/snort ; \
 	done
 	:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
-	cd ${WRKSRC} ; \
-	for f in [A-LN-Z]* ; do \
-		${INSTALL_DATA} $$f ${PREFIX}/share/doc/snort ; \
+	cd ${WRKSRC}/doc ; \
+	for i in `ls | grep -v Makefile` ; do \
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/snort ; \
 	done
 	:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snort/MIBS
-	cd ${WRKSRC}/MIBS ; \
-	for m in SnortCommonMIB.txt SnortIDAlertMIB.txt ; do \
-		${INSTALL_DATA} $$m ${PREFIX}/share/snort/MIBS ; \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/snort/rules
+	cd ${WRKSRC}/rules ; \
+	for i in `ls | grep -v Makefile` ; do \
+		${INSTALL_DATA} $$i ${PREFIX}/share/snort/rules ; \
 	done
 	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
diff --git a/net/snort/PLIST b/net/snort/PLIST
index 7559b9330fe..5fe2b5bfbd5 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,66 +1,81 @@
-@comment $NetBSD: PLIST,v 1.5 2002/04/02 21:34:08 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/10/13 04:42:12 hubertf Exp $
 bin/snort
+etc/snort/SnortCommonMIB.txt
+etc/snort/SnortIDAlertMIB.txt
+etc/snort/classification.config
+etc/snort/gen-msg.map
+etc/snort/reference.config
+etc/snort/sid
+etc/snort/sid-msg.map
+etc/snort/snort.conf
 man/man8/snort.8
 share/doc/snort/AUTHORS
 share/doc/snort/BUGS
-share/doc/snort/COPYING
 share/doc/snort/CREDITS
-share/doc/snort/ChangeLog
 share/doc/snort/FAQ
 share/doc/snort/INSTALL
-share/doc/snort/LICENSE
 share/doc/snort/NEWS
 share/doc/snort/README
-share/doc/snort/README-SNMP
 share/doc/snort/README.FLEXRESP
 share/doc/snort/README.PLUGINS
-share/doc/snort/README.Spade
-share/doc/snort/README.Spade.Usage
+share/doc/snort/README.SNMP
+share/doc/snort/README.csv
 share/doc/snort/README.database
-share/doc/snort/README.tcpstream
 share/doc/snort/README.xml
-share/doc/snort/RULES.SAMPLE
+share/doc/snort/RULES.todo
 share/doc/snort/SnortUsersManual.pdf
+share/doc/snort/TODO
 share/doc/snort/USAGE
-share/snort/MIBS/SnortCommonMIB.txt
-share/snort/MIBS/SnortIDAlertMIB.txt
-share/snort/attack-responses.rules
-share/snort/backdoor.rules
-share/snort/bad-traffic.rules
-share/snort/classification.config
-share/snort/ddos.rules
-share/snort/dns.rules
-share/snort/dos.rules
-share/snort/exploit.rules
-share/snort/finger.rules
-share/snort/ftp.rules
-share/snort/icmp.rules
-share/snort/icmp-info.rules
-share/snort/info.rules
-share/snort/local.rules
-share/snort/misc.rules
-share/snort/netbios.rules
-share/snort/policy.rules
-share/snort/porn.rules
-share/snort/rpc.rules
-share/snort/rservices.rules
-share/snort/scan.rules
-share/snort/shellcode.rules
-share/snort/smtp.rules
-share/snort/snort.conf
-share/snort/sql.rules
-share/snort/telnet.rules
-share/snort/tftp.rules
-share/snort/virus.rules
-share/snort/web-attacks.rules
-share/snort/web-cgi.rules
-share/snort/web-coldfusion.rules
-share/snort/web-frontpage.rules
-share/snort/web-iis.rules
-share/snort/web-misc.rules
-share/snort/x11.rules
-@dirrm share/snort/MIBS
+share/snort/rules/attack-responses.rules
+share/snort/rules/backdoor.rules
+share/snort/rules/bad-traffic.rules
+share/snort/rules/chat.rules
+share/snort/rules/ddos.rules
+share/snort/rules/deleted.rules
+share/snort/rules/dns.rules
+share/snort/rules/dos.rules
+share/snort/rules/experimental.rules
+share/snort/rules/exploit.rules
+share/snort/rules/finger.rules
+share/snort/rules/ftp.rules
+share/snort/rules/icmp-info.rules
+share/snort/rules/icmp.rules
+share/snort/rules/imap.rules
+share/snort/rules/info.rules
+share/snort/rules/local.rules
+share/snort/rules/misc.rules
+share/snort/rules/multimedia.rules
+share/snort/rules/mysql.rules
+share/snort/rules/netbios.rules
+share/snort/rules/nntp.rules
+share/snort/rules/oracle.rules
+share/snort/rules/other-ids.rules
+share/snort/rules/p2p.rules
+share/snort/rules/policy.rules
+share/snort/rules/pop3.rules
+share/snort/rules/porn.rules
+share/snort/rules/rpc.rules
+share/snort/rules/rservices.rules
+share/snort/rules/scan.rules
+share/snort/rules/shellcode.rules
+share/snort/rules/smtp.rules
+share/snort/rules/snmp.rules
+share/snort/rules/sql.rules
+share/snort/rules/telnet.rules
+share/snort/rules/tftp.rules
+share/snort/rules/virus.rules
+share/snort/rules/web-attacks.rules
+share/snort/rules/web-cgi.rules
+share/snort/rules/web-client.rules
+share/snort/rules/web-coldfusion.rules
+share/snort/rules/web-frontpage.rules
+share/snort/rules/web-iis.rules
+share/snort/rules/web-misc.rules
+share/snort/rules/web-php.rules
+share/snort/rules/x11.rules
+@dirrm share/snort/rules
 @dirrm share/snort
 @dirrm share/doc/snort
+@dirrm etc/snort
 @exec install -d -m 700 -o root -g wheel /var/log/snort
 @unexec ${RMDIR} /var/log/snort 2>/dev/null || true
diff --git a/net/snort/distinfo b/net/snort/distinfo
index 853842f6e18..ea636638d3e 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.12 2002/07/15 14:41:26 wiz Exp $
+$NetBSD: distinfo,v 1.13 2002/10/13 04:42:12 hubertf Exp $
 
-SHA1 (snort-1.8.7.tar.gz) = e33d85acfa110c62ab139f5bfe2be1fa623c0ca8
-Size (snort-1.8.7.tar.gz) = 1726082 bytes
-SHA1 (patch-aa) = ed057aa75c405130c6d7d62d7e217f8cba26f49c
+SHA1 (snort-1.9.0.tar.gz) = ad376504dd866dd0bbf79d65c0b547902a3f2739
+Size (snort-1.9.0.tar.gz) = 1866556 bytes
+SHA1 (patch-aa) = ce6d9a13823dd1ca25a0ff250a3e134f71227ca4
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
+SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38
+SHA1 (patch-ad) = 5472fc78db0c0668a1d8ff8f1c66eee6ba7f6a7e
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa
index 0b75061df89..3eaf24c2739 100644
--- a/net/snort/patches/patch-aa
+++ b/net/snort/patches/patch-aa
@@ -1,18 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/07/15 14:41:27 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2002/10/13 04:42:13 hubertf Exp $
 
---- snort.c.orig	Fri Jun 28 16:22:59 2002
-+++ snort.c
-@@ -43,6 +43,9 @@
- 
- /*  I N C L U D E S  **********************************************************/
- #include "snort.h"
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
- 
- 
- /*  G L O B A L S  ************************************************************/
-@@ -1480,6 +1483,19 @@
+--- src/snort.c.orig	Wed Sep 25 21:56:53 2002
++++ src/snort.c
+@@ -1437,6 +1437,19 @@
  
              break;
  
@@ -32,3 +22,12 @@ $NetBSD: patch-aa,v 1.7 2002/07/15 14:41:27 wiz Exp $
          case DLT_PPP:                /* point-to-point protocol */
              if(!pv.readmode_flag)
              {
+@@ -2193,7 +2206,7 @@
+     struct stat st;
+     int found;
+     int i;
+-    char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
++    char *conf_files[]={ PREFIX "/etc/snort.conf", "./snort.conf", NULL};
+     char *fname = NULL;
+     char *home_dir;
+     char *tmp;
diff --git a/net/snort/patches/patch-ac b/net/snort/patches/patch-ac
new file mode 100644
index 00000000000..4bf04b6926c
--- /dev/null
+++ b/net/snort/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/10/13 04:42:13 hubertf Exp $
+
+--- src/plugbase.h.orig	Thu Jun 27 00:40:44 2002
++++ src/plugbase.h
+@@ -46,7 +46,7 @@
+     #undef Free
+ #endif
+ 
+-#if defined(SOLARIS) || defined(FREEBSD) || defined(OPENBSD)
++#if defined(SOLARIS) || defined(FREEBSD) || defined(OPENBSD) || defined(NETBSD)
+     #include <sys/param.h>
+ #endif
+ 
diff --git a/net/snort/patches/patch-ad b/net/snort/patches/patch-ad
new file mode 100644
index 00000000000..3795b8026e1
--- /dev/null
+++ b/net/snort/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/10/13 04:42:13 hubertf Exp $
+
+--- src/Makefile.in.orig	Sun Oct 13 05:25:01 2002
++++ src/Makefile.in
+@@ -59,7 +59,7 @@
+ POST_UNINSTALL = :
+ host_alias = @host_alias@
+ host_triplet = @host@
+-CC = @CC@
++CC = @CC@ -DPREFIX=\"@prefix@\"
+ MAKEINFO = @MAKEINFO@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@