Update to 2.6.1.5

Snort v2.6.1.5 includes:
* A new http_post rule keyword used to search for content in normalized
  HTTP posts
* A fix for a potential memory leak when generating HTTP Inspection events

Snort v2.6.1.4 includes detection functionality for a BSD IPv6 fragmentation
overflow, and addresses a number of potential security-related issues in
Snort as reported by customers, uncovered by internal investigations, and
through third-party code audits.

4 files changed, 22 insertions, 22 deletions

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 23184948e02..9d04718591d 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/02/19 19:40:35 adrianp Exp $
+# $NetBSD: Makefile,v 1.30 2007/05/18 22:20:09 adrianp Exp $
 #
 
-DISTNAME=		snort-2.6.1.3
+DISTNAME=		snort-2.6.1.5
 CATEGORIES=		net security
 MASTER_SITES=		http://www.snort.org/dl/current/
 
diff --git a/net/snort/distinfo b/net/snort/distinfo
index 79d26a29d5c..9c9d5bdba0d 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.38 2007/02/20 17:29:36 joerg Exp $
+$NetBSD: distinfo,v 1.39 2007/05/18 22:20:10 adrianp Exp $
 
-SHA1 (snort-2.6.1.3.tar.gz) = cb944d74ab6c254f88d356d45e4492ba560dfc3c
-RMD160 (snort-2.6.1.3.tar.gz) = 0c390bd7cdbe705ba43ce8c8894bfec53c3179f6
-Size (snort-2.6.1.3.tar.gz) = 3700149 bytes
-SHA1 (patch-aa) = 0ab8a524a1e78545cb2f6875cc1da7d0e848b3cd
+SHA1 (snort-2.6.1.5.tar.gz) = 14e65990f70dab4e740e0b8116c671364d3ca8c4
+RMD160 (snort-2.6.1.5.tar.gz) = 2a21bf1dfef13e4e73c575d43f57eb57ec6b0120
+Size (snort-2.6.1.5.tar.gz) = 3725149 bytes
+SHA1 (patch-aa) = e5562b4f6e268afea81c19ba5d685d8cdfdc3405
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
 SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38
 SHA1 (patch-ad) = d4bf1dee02af1f1730263a78a868bbdae5d8846d
 SHA1 (patch-ae) = 4a669e664ccbce2b9e689fe3d281c46f6549b72c
-SHA1 (patch-af) = 0480c59f59a616148002732dae8364425f892069
+SHA1 (patch-af) = ce5129f0337514c9a2a9a482e2f1ed9a405112ec
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa
index 64e6ed264a0..e4d7136db1b 100644
--- a/net/snort/patches/patch-aa
+++ b/net/snort/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2006/02/16 20:45:52 joerg Exp $
+$NetBSD: patch-aa,v 1.14 2007/05/18 22:20:10 adrianp Exp $
 
---- src/snort.c.orig	Wed Dec  3 16:22:22 2003
-+++ src/snort.c	Sat Jan 31 21:25:32 2004
-@@ -105,7 +105,6 @@ extern OutputFuncNode *LogList;
+--- src/snort.c.orig	2007-03-15 18:58:28.000000000 +0000
++++ src/snort.c
+@@ -148,7 +148,6 @@ extern OutputFuncNode *LogList;
  long start_time;    /* tracks how many seconds snort actually ran */
  #endif
  
@@ -10,31 +10,31 @@ $NetBSD: patch-aa,v 1.13 2006/02/16 20:45:52 joerg Exp $
  /*extern char *malloc_options;*/
  
  /* exported variables *********************************************************/
-@@ -1771,6 +1770,18 @@ int SetPktProcessor()
+@@ -2590,6 +2589,18 @@ int SetPktProcessor()
  
              break;
  
 +#if defined(__NetBSD__)
 +#  if defined(__NetBSD_Version__)
 +#    if (__NetBSD_Version__ >= 105000000)
-+        case DLT_PPP_ETHER:          /* PPP over Ethernet */
++	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 */
              if(!pv.readmode_flag)
              {
-@@ -2164,7 +2175,7 @@ static char *ConfigFileSearch()
+@@ -3116,7 +3127,7 @@ static char *ConfigFileSearch()
  {
      struct stat st;
      int i;
 -    char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
-+    char *conf_files[]={ "@PKG_SYSCONFDIR@/snort.conf", "./snort.conf", NULL};
++    char *conf_files[]={"@PKG_SYSCONFDIR@/snort.conf", "./snort.conf", NULL};
      char *fname = NULL;
-     char *home_dir = NULL;
      char *rval = NULL;
+ 
diff --git a/net/snort/patches/patch-af b/net/snort/patches/patch-af
index 6baea442782..011e76b4a0f 100644
--- a/net/snort/patches/patch-af
+++ b/net/snort/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2007/02/20 17:29:36 joerg Exp $
+$NetBSD: patch-af,v 1.4 2007/05/18 22:20:10 adrianp Exp $
 
---- src/dynamic-plugins/sf_dynamic_plugins.c.orig	2007-02-20 16:54:06.000000000 +0000
+--- src/dynamic-plugins/sf_dynamic_plugins.c.orig	2007-03-14 16:58:10.000000000 +0000
 +++ src/dynamic-plugins/sf_dynamic_plugins.c
 @@ -210,8 +210,7 @@ void LoadAllLibs(char *path, LoadLibrary
          dirEntry = readdir(directory);
@@ -10,5 +10,5 @@ $NetBSD: patch-af,v 1.3 2007/02/20 17:29:36 joerg Exp $
 -                !fnmatch(EXT, dirEntry->d_name, FNM_PATHNAME | FNM_PERIOD))
 +            if (!fnmatch(EXT, dirEntry->d_name, FNM_PATHNAME | FNM_PERIOD))
              {
-                 snprintf(path_buf, PATH_MAX, "%s%s%s", path, "/", dirEntry->d_name);
+                 SnortSnprintf(path_buf, PATH_MAX, "%s%s%s", path, "/", dirEntry->d_name);
                  loadFunc(path_buf, 1);