Upgrade snort to 1.8.1. Changes:

    * SNMP alerts
    * IDMEF XML output (the Silicon Defense plugin is integrated into
      the main codebase now)
    * Limited regex support in the rules language
    * New packet counters for stream4 and frag2
    * New normalization mode for http_decode

3 files changed, 50 insertions, 37 deletions

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 598a5487d3b..62296a41de3 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2001/08/03 06:35:11 itojun Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/22 18:07:50 hubertf Exp $
 #
 
-DISTNAME=	snort-1.8p1
+DISTNAME=	snort-1.8.1-RELEASE
+PKGNAME=	${DISTNAME:C/-RELEASE//}
 CATEGORIES=	net security
 MASTER_SITES=	http://www.snort.org/Files/				\
 		ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
 		http://www.centus.com/snort/				\
 		http://snort.whitehats.com/				\
 		http://snort.safenetworks.com/				\
-		ftp://gd.tuwien.ac.at/infosys/security/snort/
+		ftp://gd.tuwien.ac.at/infosys/security/snort/		\
+		http://snort.sourcefire.com/releases/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.snort.org/
@@ -25,25 +27,27 @@ ROOTGROUP=	root
 
 ROOTGROUP?=	wheel
 
-WRKSRC=		${WRKDIR}/snort
+#WRKSRC=		${WRKDIR}/snort
 
 post-install:
 	${INSTALL_DATA_DIR} -m 700 -o root -g ${ROOTGROUP} /var/log/snort
 	${INSTALL_DATA_DIR} ${PREFIX}/share/snort
-.for f in backdoor.rules ddos.rules dns.rules dos.rules exploit.rules \
-	finger.rules ftp.rules icmp-info.rules icmp.rules info.rules \
-	local.rules misc.rules netbios.rules policy.rules rpc.rules \
-	rservices.rules scan.rules shellcode.rules smtp.rules sql.rules \
-	telnet.rules virus.rules web-cgi.rules web-coldfusion.rules \
-	web-frontpage.rules web-iis.rules web-misc.rules x11.rules
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/snort
-.endfor
+	cd ${WRKSRC} ; \
+	for i in snort.conf *.config *.rules ; do \
+		${INSTALL_DATA} $$i ${PREFIX}/share/snort ; \
+	done
+	:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
-.for f in BUGS CREDITS README README.FLEXRESP README.PLUGINS \
- README.Spade README.Spade.Usage README.csv README.database README.tcpstream \
- README.xml NEWS RULES.SAMPLE USAGE
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/snort
-.endfor
+	cd ${WRKSRC} ; \
+	for f in [A-LN-Z]* ; do \
+		${INSTALL_DATA} $$f ${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 ; \
+	done
 	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/snort/distinfo b/net/snort/distinfo
index 728d240e8ea..dc583e5a54b 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/08/22 10:31:07 wiz Exp $
+$NetBSD: distinfo,v 1.5 2001/08/22 18:07:50 hubertf Exp $
 
-SHA1 (snort-1.8p1.tar.gz) = ae9ef94381ff7b163a75277ea710964e797dd769
-Size (snort-1.8p1.tar.gz) = 1024604 bytes
+SHA1 (snort-1.8.1-RELEASE.tar.gz) = 0a167b87b51a62bc9bbf06ef84e2941574327af9
+Size (snort-1.8.1-RELEASE.tar.gz) = 1026894 bytes
 SHA1 (patch-aa) = 99f6d436940ab8ddc80f123ac2438380983e8953
diff --git a/net/snort/pkg/PLIST b/net/snort/pkg/PLIST
index 9a4635fa7c4..cca9c0508a9 100644
--- a/net/snort/pkg/PLIST
+++ b/net/snort/pkg/PLIST
@@ -1,14 +1,36 @@
-@comment $NetBSD: PLIST,v 1.6 2001/08/03 06:35:12 itojun Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/08/22 18:07:50 hubertf Exp $
 bin/snort
 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/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.database
+share/doc/snort/README.tcpstream
+share/doc/snort/README.xml
+share/doc/snort/RULES.SAMPLE
+share/doc/snort/SnortUsersManual.pdf
+share/doc/snort/USAGE
+share/snort/MIBS/SnortCommonMIB.txt
+share/snort/MIBS/SnortIDAlertMIB.txt
 share/snort/backdoor.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-info.rules
 share/snort/icmp.rules
 share/snort/info.rules
 share/snort/local.rules
@@ -20,30 +42,17 @@ 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/virus.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
 @dirrm share/snort
-share/doc/snort/BUGS
-share/doc/snort/CREDITS
-share/doc/snort/README
-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.csv
-share/doc/snort/README.database
-share/doc/snort/README.tcpstream
-share/doc/snort/README.xml
-share/doc/snort/NEWS
-share/doc/snort/RULES.SAMPLE
-share/doc/snort/USAGE
 @dirrm share/doc/snort
 @exec install -d -m 700 -o root -g wheel /var/log/snort
 @unexec rmdir /var/log/snort 2>/dev/null || true