Update snort to 1.8.4 (update was provided by Mipam <mipam@ibb.net> in a

private mail -- thanks!)

Changes are:
	* Fixed stream4 offset initialization
	* Double Open of snort log file
	* Lots of new rules
	* Fatal error on problems other than -> and <>
	* Fixed stream4 several low memory conditions
	* Error checking in stream4/frag2 argument parsing
	* snortdb schema updates to 1.05
	* --with-pcap-includes should now look at specified pcap
	* packet statistics now should be more accurate with regards to
	  lost packets werwerwerwerwer
	* double PID file write
	* S4 alignment problems on Sparc fixed
	* new snmptrap code
	* documentation updates
	* Stability fixes in frag2

5 files changed, 36 insertions, 27 deletions

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 14f042443b9..d0a87f23e6c 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/12/05 16:03:57 agc Exp $
+# $NetBSD: Makefile,v 1.16 2002/04/02 21:34:08 rh Exp $
 #
 
-DISTNAME=	snort-1.8.3
+DISTNAME=	snort-1.8.4
 CATEGORIES=	net security
 MASTER_SITES=	http://www.snort.org/releases/				\
 		ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
diff --git a/net/snort/PLIST b/net/snort/PLIST
index 02101aeb105..7559b9330fe 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/29 01:05:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/04/02 21:34:08 rh Exp $
 bin/snort
 man/man8/snort.8
 share/doc/snort/AUTHORS
@@ -6,8 +6,8 @@ share/doc/snort/BUGS
 share/doc/snort/COPYING
 share/doc/snort/CREDITS
 share/doc/snort/ChangeLog
-share/doc/snort/INSTALL
 share/doc/snort/FAQ
+share/doc/snort/INSTALL
 share/doc/snort/LICENSE
 share/doc/snort/NEWS
 share/doc/snort/README
diff --git a/net/snort/distinfo b/net/snort/distinfo
index bb45d03eb02..60bb8125be0 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2002/03/13 08:28:23 jmc Exp $
+$NetBSD: distinfo,v 1.10 2002/04/02 21:34:08 rh Exp $
 
-SHA1 (snort-1.8.3.tar.gz) = c1cc80b5495efeceb6fb07f2dfa6aa813ddf2051
-Size (snort-1.8.3.tar.gz) = 1706939 bytes
-SHA1 (patch-aa) = 289c515c2eaf62dcba44bea668dc60a0abd57d51
-SHA1 (patch-ab) = 6518ad8c2b5202ec3567f31cabf23253353b837a
+SHA1 (snort-1.8.4.tar.gz) = 5130d0372c8a7b7608f8092d83a432de7b357777
+Size (snort-1.8.4.tar.gz) = 1766532 bytes
+SHA1 (patch-aa) = e3153843b43f32f9db934b8adb57ce80498c78dd
+SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa
index 221ef383237..14ca1905bfa 100644
--- a/net/snort/patches/patch-aa
+++ b/net/snort/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2001/11/28 13:44:52 kleink Exp $
+$NetBSD: patch-aa,v 1.6 2002/04/02 21:34:09 rh Exp $
 
---- snort.c.orig	Fri Nov  2 07:18:29 2001
-+++ snort.c	Wed Nov 28 14:04:21 2001
+--- snort.c.orig	Sun Mar 24 23:32:03 2002
++++ snort.c	Sun Mar 24 23:36:09 2002
 @@ -43,6 +43,9 @@
  
  /*  I N C L U D E S  **********************************************************/
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.5 2001/11/28 13:44:52 kleink Exp $
  
  
  /*  G L O B A L S  ************************************************************/
-@@ -1413,6 +1416,19 @@
+@@ -1487,6 +1490,19 @@
  
              break;
  
@@ -23,10 +23,10 @@ $NetBSD: patch-aa,v 1.5 2001/11/28 13:44:52 kleink Exp $
 +        case DLT_PPP_ETHER:          /* PPP over Ethernet */
 +
 +#    else
-+	/* no DLT_PPP_* on <1.5 */
++       /* no DLT_PPP_* on <1.5 */
 +#    endif /* >= NetBSD 1.5 */
 +#  else
-+	/* no __NetBSD_Version__ on <1.4 */
++       /* no __NetBSD_Version__ on <1.4 */
 +#  endif /* __NetBSD_Version__ */
 +#endif /* NetBSD */
          case DLT_PPP:                /* point-to-point protocol */
diff --git a/net/snort/patches/patch-ab b/net/snort/patches/patch-ab
index 9f29d17abc6..907f9f0f455 100644
--- a/net/snort/patches/patch-ab
+++ b/net/snort/patches/patch-ab
@@ -1,13 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2002/03/13 08:28:24 jmc Exp $
+$NetBSD: patch-ab,v 1.2 2002/04/02 21:34:09 rh Exp $
 
---- config.sub.orig	Wed Mar 13 08:25:47 2002
-+++ config.sub	Wed Mar 13 08:25:59 2002
-@@ -177,7 +177,7 @@
- 	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
- 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
- 	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
-+	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | macppc-*)
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
+--- config.sub.orig	Sun Mar 24 23:37:23 2002
++++ config.sub	Sun Mar 24 23:46:03 2002
+@@ -235,7 +235,7 @@
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| m32r | m68000 | m68k | m88k | mcore \
+-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
++	| mips16 | mips64 | mips64el | mips64orion | mips64orionel | macppc \
+ 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+ 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+ 	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+@@ -296,7 +296,7 @@
+ 	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+ 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
++	| mips64orionel-* | macppc-* | mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+ 	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \