- Update snort to 2.3.3

- Fix /var => ${VARBASE}
- Changes Include:
> * Issues with suppressing sfPortscan Open Ports have been fixed.
>
> * Added a new mini-preprocessor to catch the X-Link2State
>   vulnerability.  This preprocessor can be configured to drop the
>   offending connection when in Inline-mode. Please read snort.conf or
>   the snort manual for more details.  This preprocessor is enabled by
>   default in snort.conf.

3 files changed, 96 insertions, 96 deletions

diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 4fe113da173..1d4659cf23e 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/04/27 18:36:25 adrianp Exp $
 #
 
-DISTNAME=		snort-2.3.2
+DISTNAME=		snort-2.3.3
 CATEGORIES=		net security
 MASTER_SITES=		http://www.snort.org/dl/current/ \
 			ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
@@ -27,7 +27,7 @@ PKG_GROUPS=		${SNORT_GROUP}
 PKG_USERS=		${SNORT_USER}:${SNORT_GROUP}::Snort\\ user
 FILES_SUBST+=		SNORT_USER="${SNORT_USER}" SNORT_GROUP="${SNORT_GROUP}"
 
-OWN_DIRS_PERMS=		/var/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
+OWN_DIRS_PERMS=		${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
 CONF_FILES=		${EGDIR}/snort.conf.default \
 			${PKG_SYSCONFDIR}/snort.conf
 CONF_FILES+=		${EGDIR}/threshold.conf \
diff --git a/net/snort/PLIST b/net/snort/PLIST
index 571e583a350..7741718dd9b 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2005/03/25 18:28:28 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.20 2005/04/27 18:36:25 adrianp Exp $
 bin/snort
 man/man8/snort.8
 share/doc/snort/AUTHORS
@@ -2223,15 +2223,103 @@ share/doc/snort/signatures/3054.txt
 share/doc/snort/signatures/3055.txt
 share/doc/snort/signatures/3056.txt
 share/doc/snort/signatures/3057.txt
+share/doc/snort/signatures/3058.txt
+share/doc/snort/signatures/3059.txt
 share/doc/snort/signatures/306.txt
+share/doc/snort/signatures/3060.txt
+share/doc/snort/signatures/3061.txt
+share/doc/snort/signatures/3062.txt
+share/doc/snort/signatures/3063.txt
+share/doc/snort/signatures/3064.txt
+share/doc/snort/signatures/3065.txt
+share/doc/snort/signatures/3066.txt
+share/doc/snort/signatures/3067.txt
+share/doc/snort/signatures/3068.txt
+share/doc/snort/signatures/3069.txt
 share/doc/snort/signatures/307.txt
+share/doc/snort/signatures/3070.txt
+share/doc/snort/signatures/3071.txt
+share/doc/snort/signatures/3072.txt
+share/doc/snort/signatures/3073.txt
+share/doc/snort/signatures/3074.txt
+share/doc/snort/signatures/3075.txt
+share/doc/snort/signatures/3076.txt
+share/doc/snort/signatures/3077.txt
+share/doc/snort/signatures/3078.txt
+share/doc/snort/signatures/3079.txt
 share/doc/snort/signatures/308.txt
+share/doc/snort/signatures/3080.txt
+share/doc/snort/signatures/3081.txt
+share/doc/snort/signatures/3082.txt
+share/doc/snort/signatures/3083.txt
+share/doc/snort/signatures/3084.txt
+share/doc/snort/signatures/3085.txt
+share/doc/snort/signatures/3086.txt
+share/doc/snort/signatures/3087.txt
+share/doc/snort/signatures/3088.txt
 share/doc/snort/signatures/309.txt
+share/doc/snort/signatures/3090.txt
+share/doc/snort/signatures/3091.txt
+share/doc/snort/signatures/3092.txt
+share/doc/snort/signatures/3093.txt
+share/doc/snort/signatures/3094.txt
+share/doc/snort/signatures/3095.txt
+share/doc/snort/signatures/3096.txt
+share/doc/snort/signatures/3097.txt
+share/doc/snort/signatures/3098.txt
+share/doc/snort/signatures/3099.txt
 share/doc/snort/signatures/310.txt
+share/doc/snort/signatures/3100.txt
+share/doc/snort/signatures/3101.txt
+share/doc/snort/signatures/3102.txt
+share/doc/snort/signatures/3103.txt
+share/doc/snort/signatures/3104.txt
+share/doc/snort/signatures/3105.txt
+share/doc/snort/signatures/3106.txt
+share/doc/snort/signatures/3107.txt
+share/doc/snort/signatures/3108.txt
+share/doc/snort/signatures/3109.txt
 share/doc/snort/signatures/311.txt
+share/doc/snort/signatures/3110.txt
+share/doc/snort/signatures/3111.txt
+share/doc/snort/signatures/3112.txt
+share/doc/snort/signatures/3113.txt
+share/doc/snort/signatures/3114.txt
+share/doc/snort/signatures/3115.txt
+share/doc/snort/signatures/3116.txt
+share/doc/snort/signatures/3117.txt
+share/doc/snort/signatures/3118.txt
+share/doc/snort/signatures/3119.txt
 share/doc/snort/signatures/312.txt
+share/doc/snort/signatures/3120.txt
+share/doc/snort/signatures/3121.txt
+share/doc/snort/signatures/3122.txt
+share/doc/snort/signatures/3123.txt
+share/doc/snort/signatures/3124.txt
+share/doc/snort/signatures/3125.txt
+share/doc/snort/signatures/3126.txt
+share/doc/snort/signatures/3127.txt
+share/doc/snort/signatures/3128.txt
+share/doc/snort/signatures/3129.txt
 share/doc/snort/signatures/313.txt
+share/doc/snort/signatures/3130.txt
+share/doc/snort/signatures/3131.txt
+share/doc/snort/signatures/3132.txt
+share/doc/snort/signatures/3133.txt
+share/doc/snort/signatures/3134.txt
+share/doc/snort/signatures/3135.txt
+share/doc/snort/signatures/3136.txt
+share/doc/snort/signatures/3137.txt
+share/doc/snort/signatures/3138.txt
+share/doc/snort/signatures/3139.txt
 share/doc/snort/signatures/314.txt
+share/doc/snort/signatures/3140.txt
+share/doc/snort/signatures/3141.txt
+share/doc/snort/signatures/3142.txt
+share/doc/snort/signatures/3143.txt
+share/doc/snort/signatures/3144.txt
+share/doc/snort/signatures/3145.txt
+share/doc/snort/signatures/3146.txt
 share/doc/snort/signatures/315.txt
 share/doc/snort/signatures/316.txt
 share/doc/snort/signatures/317.txt
@@ -2819,94 +2907,6 @@ share/doc/snort/signatures/996.txt
 share/doc/snort/signatures/997.txt
 share/doc/snort/signatures/998.txt
 share/doc/snort/signatures/999.txt
-share/doc/snort/signatures/3146.txt
-share/doc/snort/signatures/3145.txt
-share/doc/snort/signatures/3144.txt
-share/doc/snort/signatures/3143.txt
-share/doc/snort/signatures/3142.txt
-share/doc/snort/signatures/3141.txt
-share/doc/snort/signatures/3140.txt
-share/doc/snort/signatures/3139.txt
-share/doc/snort/signatures/3138.txt
-share/doc/snort/signatures/3137.txt
-share/doc/snort/signatures/3136.txt
-share/doc/snort/signatures/3135.txt
-share/doc/snort/signatures/3134.txt
-share/doc/snort/signatures/3133.txt
-share/doc/snort/signatures/3132.txt
-share/doc/snort/signatures/3131.txt
-share/doc/snort/signatures/3130.txt
-share/doc/snort/signatures/3129.txt
-share/doc/snort/signatures/3128.txt
-share/doc/snort/signatures/3127.txt
-share/doc/snort/signatures/3126.txt
-share/doc/snort/signatures/3125.txt
-share/doc/snort/signatures/3124.txt
-share/doc/snort/signatures/3123.txt
-share/doc/snort/signatures/3122.txt
-share/doc/snort/signatures/3121.txt
-share/doc/snort/signatures/3120.txt
-share/doc/snort/signatures/3119.txt
-share/doc/snort/signatures/3118.txt
-share/doc/snort/signatures/3117.txt
-share/doc/snort/signatures/3116.txt
-share/doc/snort/signatures/3115.txt
-share/doc/snort/signatures/3114.txt
-share/doc/snort/signatures/3113.txt
-share/doc/snort/signatures/3112.txt
-share/doc/snort/signatures/3111.txt
-share/doc/snort/signatures/3110.txt
-share/doc/snort/signatures/3109.txt
-share/doc/snort/signatures/3108.txt
-share/doc/snort/signatures/3107.txt
-share/doc/snort/signatures/3106.txt
-share/doc/snort/signatures/3105.txt
-share/doc/snort/signatures/3104.txt
-share/doc/snort/signatures/3103.txt
-share/doc/snort/signatures/3102.txt
-share/doc/snort/signatures/3101.txt
-share/doc/snort/signatures/3100.txt
-share/doc/snort/signatures/3099.txt
-share/doc/snort/signatures/3098.txt
-share/doc/snort/signatures/3097.txt
-share/doc/snort/signatures/3096.txt
-share/doc/snort/signatures/3095.txt
-share/doc/snort/signatures/3094.txt
-share/doc/snort/signatures/3093.txt
-share/doc/snort/signatures/3092.txt
-share/doc/snort/signatures/3091.txt
-share/doc/snort/signatures/3090.txt
-share/doc/snort/signatures/3088.txt
-share/doc/snort/signatures/3087.txt
-share/doc/snort/signatures/3086.txt
-share/doc/snort/signatures/3085.txt
-share/doc/snort/signatures/3084.txt
-share/doc/snort/signatures/3083.txt
-share/doc/snort/signatures/3082.txt
-share/doc/snort/signatures/3081.txt
-share/doc/snort/signatures/3080.txt
-share/doc/snort/signatures/3079.txt
-share/doc/snort/signatures/3078.txt
-share/doc/snort/signatures/3077.txt
-share/doc/snort/signatures/3076.txt
-share/doc/snort/signatures/3075.txt
-share/doc/snort/signatures/3074.txt
-share/doc/snort/signatures/3073.txt
-share/doc/snort/signatures/3072.txt
-share/doc/snort/signatures/3071.txt
-share/doc/snort/signatures/3070.txt
-share/doc/snort/signatures/3069.txt
-share/doc/snort/signatures/3068.txt
-share/doc/snort/signatures/3067.txt
-share/doc/snort/signatures/3066.txt
-share/doc/snort/signatures/3065.txt
-share/doc/snort/signatures/3064.txt
-share/doc/snort/signatures/3063.txt
-share/doc/snort/signatures/3062.txt
-share/doc/snort/signatures/3061.txt
-share/doc/snort/signatures/3060.txt
-share/doc/snort/signatures/3059.txt
-share/doc/snort/signatures/3058.txt
 share/doc/snort/signatures/snort-sid-template.txt
 share/doc/snort/snort_manual.pdf
 share/doc/snort/snort_manual.tex
diff --git a/net/snort/distinfo b/net/snort/distinfo
index 3afdc8d41a2..eebd7ffe40d 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2005/03/25 18:28:28 adrianp Exp $
+$NetBSD: distinfo,v 1.27 2005/04/27 18:36:25 adrianp Exp $
 
-SHA1 (snort-2.3.2.tar.gz) = 0171d47eb398e5fffa15f36e4d4787ad55808342
-RMD160 (snort-2.3.2.tar.gz) = 7928a74fed6fe404f355617b5ec77c72cd821c42
-Size (snort-2.3.2.tar.gz) = 2620487 bytes
+SHA1 (snort-2.3.3.tar.gz) = 6d05c995f0eef5adde9d63157436c0088747d435
+RMD160 (snort-2.3.3.tar.gz) = 6bb635df1c62d293d8dd4b2fec55cfa486916908
+Size (snort-2.3.3.tar.gz) = 2631270 bytes
 SHA1 (patch-aa) = 08bbfc795c7db4d06f1a1a887369df2c6b1a0a79
 SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
 SHA1 (patch-ac) = 6cdf26fcaeb8dad9cd9562b77377bd56b49c9f38