Pullup ticket 1212 - requested by Adrian Portelli

security update for snort

Revisions pulled up:
- pkgsrc/net/snort/distinfo		1.33, 1.34
- pkgsrc/net/snort/patches/patch-aa	1.13
- pkgsrc/net/snort/Makefile.common	1.32

   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Thu Feb 16 20:45:52 UTC 2006

   Modified Files:
           pkgsrc/net/snort: distinfo
           pkgsrc/net/snort/patches: patch-aa

   Log Message:
   Fix errno.
---
   Module Name:    pkgsrc
   Committed By:   adrianp
   Date:           Thu Mar  9 09:37:44 UTC 2006

   Modified Files:
           pkgsrc/net/snort: Makefile.common distinfo

   Log Message:
   Update to 2.4.4
   This includes the fix for:
           http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0839
   > +2006-02-20 Steven Sturges <ssturges@sourcefire.com>
   > +    * src/preprocessors/spp_frag3.c:
   > +    * configure.in:
   > +      Fix ip options handling.  Thanks to Vyacheslav Burdjanadze for
   > +      finding the issue.
   > +
   > +2006-01-09 Steven Sturges <ssturges@sourcefire.com>
   > +    * src/sfutil/mwm.c:
   > +      Fixed bug with multiple recurring patterns in Wu-Manbher
   > +      implementation.
   > +      Thanks to Evan Stawnyczy for pointing it out an Marc Norton for
   > +      the fix.
   > +    * src/parser/IpAddrSet.c:
   > +      Fixed problem with parsing conf file and rules when DNS is not
   > +      working.
   > +      Thanks Martin Olsson for mentioning this and testing the fix.
   > +    * src/preprocessors/spp_perfmonitor.c:
   > +    * src/preprocessors/perf-base.c:
   > +      Handle wrapping on 64-bit platforms
   > +
   > +2005-11-17 Andrew Mullican <amullican@sourcefire.com>
   > +    * src/sfutil/sfxhash.c:
   > +    * src/preprocessors/portscan.c:
   > +      Add tracker without using bogus data, to avoid internal buffer
   > +      overrun.
   > +      Thanks Sandro Poppi for the find.
   > +
   > +2005-11-11 Steven Sturges <ssturges@sourcefire.com>
   > +    * src/snort.c:
   > +      Allow value of 0 to be used with -G flag
   > +    * src/preprocessors/spp_bo.c:
   > +      Code Cleanup
   > +    * src/preprocessors/spp_frag3.c:
   > +      Fix memory leak and mishandling of IP Options.  Thanks Yin
   > +      Zhaohui for the find.

3 files changed, 19 insertions, 11 deletions

diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 23c12b38a6c..60b36429b8e 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.29 2005/12/05 23:55:15 rillig Exp $
+# $NetBSD: Makefile.common,v 1.29.2.1 2006/03/11 03:35:57 snj Exp $
 #
 
-DISTNAME=		snort-2.4.3
+DISTNAME=		snort-2.4.4
 CATEGORIES=		net security
 MASTER_SITES=		http://www.snort.org/dl/current/ \
 			ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
@@ -55,7 +55,7 @@ SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	etc/snort.conf src/snort.c
 SUBST_SED.paths=	-e "s|@PREFIX@|${PREFIX}|g" \
 			-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.cgi=	"Fixing paths."
+SUBST_MESSAGE.cgi=	Fixing paths.
 
 post-install:
 	@${CP} ${WRKSRC}/etc/snort.conf ${WRKSRC}/etc/snort.conf.default
diff --git a/net/snort/distinfo b/net/snort/distinfo
index 59a61b8e225..14d8e843b84 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2005/10/18 15:15:04 adrianp Exp $
+$NetBSD: distinfo,v 1.32.2.1 2006/03/11 03:35:58 snj Exp $
 
-SHA1 (snort-2.4.3.tar.gz) = 5b38b558b73252c048f23dba2499bcd902ebdd9e
-RMD160 (snort-2.4.3.tar.gz) = 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2
-Size (snort-2.4.3.tar.gz) = 2733590 bytes
-SHA1 (patch-aa) = f8cd982f2fbc5ed828bf021a489097408f1c9d43
+SHA1 (snort-2.4.4.tar.gz) = 80783bfae2854c8cb9d604747251ba584522a053
+RMD160 (snort-2.4.4.tar.gz) = 5c0ff9aafdb083438cb10e82bdcdba43f806f86e
+Size (snort-2.4.4.tar.gz) = 2825187 bytes
+SHA1 (patch-aa) = 0ab8a524a1e78545cb2f6875cc1da7d0e848b3cd
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
 SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38
 SHA1 (patch-ae) = 4a669e664ccbce2b9e689fe3d281c46f6549b72c
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa
index c087fb4abf8..6d21fe21a13 100644
--- a/net/snort/patches/patch-aa
+++ b/net/snort/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.12 2005/08/13 19:56:47 adrianp Exp $
+$NetBSD: patch-aa,v 1.12.4.1 2006/03/11 03:35:58 snj Exp $
 
 --- src/snort.c.orig	Wed Dec  3 16:22:22 2003
 +++ src/snort.c	Sat Jan 31 21:25:32 2004
-@@ -1391,6 +1391,18 @@
+@@ -105,7 +105,6 @@ extern OutputFuncNode *LogList;
+ long start_time;    /* tracks how many seconds snort actually ran */
+ #endif
+ 
+-extern int errno;
+ /*extern char *malloc_options;*/
+ 
+ /* exported variables *********************************************************/
+@@ -1771,6 +1770,18 @@ int SetPktProcessor()
  
              break;
  
@@ -21,7 +29,7 @@ $NetBSD: patch-aa,v 1.12 2005/08/13 19:56:47 adrianp Exp $
          case DLT_PPP:                /* point-to-point protocol */
              if(!pv.readmode_flag)
              {
-@@ -1780,7 +1792,7 @@
+@@ -2164,7 +2175,7 @@ static char *ConfigFileSearch()
  {
      struct stat st;
      int i;