snort update

[Brian <bmc_(_at_)_snort_(_dot_)_org>]

Can someone apply the attached diff to update the snort port to 2.1.1?

Also, the following files need to get axed, as they have been merged in
already.

    net/snort/patches/patch-src_preprocessors_spp_frag2_c
    net/snort/patches/patch-src_preprocessors_spp_http_decode_c
    net/snort/patches/patch-src_preprocessors_spp_stream4_c

Thanks.

Brian

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile	2004/01/02 04:56:24	1.30
+++ Makefile	2004/02/28 02:46:52
@@ -2,8 +2,8 @@
 
 COMMENT=	"highly flexible sniffer/NIDS"
 
-DISTNAME=	snort-2.0.0
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	snort-2.1.1
+PKGNAME=	${DISTNAME}
 CATEGORIES=	net security
 MASTER_SITES=	${HOMEPAGE}/dl/
 
@@ -20,6 +20,8 @@
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
 
+LIB_DEPENDS=     pcre::devel/pcre
+
 FLAVORS=	postgresql mysql smbalert flexresp
 FLAVOR?=	
 
@@ -48,6 +50,8 @@
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snort
 	${INSTALL_DATA} ${WRKSRC}/etc/snort.conf ${PREFIX}/share/examples/snort
+	${INSTALL_DATA} ${WRKSRC}/etc/threshold.conf ${PREFIX}/share/examples/snort
+	${INSTALL_DATA} ${WRKSRC}/etc/unicode.map ${PREFIX}/share/examples/snort
 	${INSTALL_DATA} ${WRKSRC}/etc/sid-msg.map ${PREFIX}/share/examples/snort
 	${INSTALL_DATA} ${WRKSRC}/etc/classification.config \
 		 ${PREFIX}/share/examples/snort
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	2003/04/16 13:01:42	1.6
+++ distinfo	2004/02/28 02:46:52
@@ -1,3 +1,3 @@
-MD5 (snort-2.0.0.tar.gz) = b7d374655c4390c07b2e38a2d381c2bd
-RMD160 (snort-2.0.0.tar.gz) = d0e7a70615cec6440ccff0e7297758e08621819a
-SHA1 (snort-2.0.0.tar.gz) = 1fdb5656b7a84439da0cd9118f5a977098f0652b
+MD5 (snort-2.1.1.tar.gz) = f53ce230616c1f6aafedf546a7cc0f0f
+RMD160 (snort-2.1.1.tar.gz) = 196c7686596ef4de2acdc1e0e67b84c84ca8f203
+SHA1 (snort-2.1.1.tar.gz) = 498dc3f3e6b2d37deaf833cb98e269eb41f8aeef
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/net/snort/pkg/DESCR,v
retrieving revision 1.6
diff -u -r1.6 DESCR
--- pkg/DESCR	2003/12/15 23:03:09	1.6
+++ pkg/DESCR	2004/02/28 02:46:53
@@ -1,16 +1,14 @@
 Snort is a fairly intelligent sniffer/NIDS, with a very strong rule set.
 
-Snort can perform protocol analysis, content searching/matching and can be 
-used to detect a variety of attacks and probes, such as buffer overflows, 
-stealth port scans, CGI attacks, SMB probes, OS fingerprinting attempts,
-and much more. 
+Snort can perform protocol analysis, content searching/matching and can be used
+to detect a variety of attacks and probes, such as buffer overflows, stealth
+port scans, CGI attacks, SMB probes, OS fingerprinting attempts, and much more. 
 
-Snort uses a flexible rules language to describe traffic that it should 
-collect or pass, as well as a detection engine that utilizes a modular 
-plugin architecture.  Snort has a real-time alerting capability as well, 
-incorporating alerting mechanisms for syslog, a user specified file, a 
-UNIX socket, or WinPopup messages to Windows clients using Samba's 
-smbclient. 
+Snort uses a flexible rules language to describe traffic that it should collect
+or pass, as well as a detection engine that utilizes a modular plugin
+architecture.  Snort has a real-time alerting capability as well, incorporating
+alerting mechanisms for syslog, a user specified file, a UNIX socket, or
+WinPopup messages to Windows clients using Samba's smbclient. 
 
 Available flavors:
 	postgresql - enable postgresql database logging support
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- pkg/PLIST	2003/03/03 22:05:41	1.11
+++ pkg/PLIST	2004/02/28 02:46:53
@@ -43,6 +43,8 @@
 share/examples/snort/sql.rules
 share/examples/snort/telnet.rules
 share/examples/snort/tftp.rules
+share/examples/snort/threshold.conf
+share/examples/snort/unicode.map
 share/examples/snort/virus.rules
 share/examples/snort/web-attacks.rules
 share/examples/snort/web-cgi.rules