4 files changed, 48 insertions, 36 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index 27ca8e4ee4c0..e3b0ef2e9630 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.7.0.1
-PORTREVISION=	1
+PORTVERSION=	2.8.0.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/current/
 
@@ -16,8 +15,7 @@ COMMENT=	Lightweight network intrusion detection system
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
-CONFLICTS?=	snort-1.* snort-2.0.* snort-2.1.* snort-2.2.* snort-2.3.* \
-		snort-2.4.*
+CONFLICTS?=	snort-1.* snort-2.[0-7].*
 
 OPTIONS=	DYNAMIC "Enable dynamic plugin support" on \
 		FLEXRESP "Flexible response to events" off \
@@ -34,8 +32,8 @@ CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CONFIG_DIR?=	${PREFIX}/etc/snort
-CONFIG_FILES=	classification.config gen-msg.map generators reference.config \
-		sid sid-msg.map snort.conf threshold.conf unicode.map
+CONFIG_FILES=	classification.config gen-msg.map reference.config \
+		sid-msg.map snort.conf threshold.conf unicode.map
 RULES_DIR=	${PREFIX}/etc/snort/rules
 LOGS_DIR=	/var/log/snort
 
diff --git a/security/snort/distinfo b/security/snort/distinfo
index f0d0e3a84b5b..36bcf3bfc564 100644
--- a/security/snort/distinfo
+++ b/security/snort/distinfo
@@ -1,3 +1,3 @@
-MD5 (snort-2.7.0.1.tar.gz) = 06d3fa0b326dcdca59a19811f32b013a
-SHA256 (snort-2.7.0.1.tar.gz) = c9337c2acb34e34904e3fff8a2c31e1a3a92aa7776a9263454fd4dc5503721fa
-SIZE (snort-2.7.0.1.tar.gz) = 3905846
+MD5 (snort-2.8.0.2.tar.gz) = c4aeac8aa198a5e4d4bc67b5b2d9bdcb
+SHA256 (snort-2.8.0.2.tar.gz) = b1a6bec4893d8708f2572cca62d84654655d91824987a4f58b6d7b39947b95f7
+SIZE (snort-2.8.0.2.tar.gz) = 4340169
diff --git a/security/snort/files/patch-snort.conf b/security/snort/files/patch-snort.conf
index 1ca95740e001..2747badf2a8b 100644
--- a/security/snort/files/patch-snort.conf
+++ b/security/snort/files/patch-snort.conf
@@ -1,11 +1,13 @@
 --- etc/snort.conf.orig	Thu Aug  5 11:55:37 2004
 +++ etc/snort.conf	Wed Aug 11 15:52:47 2004
-@@ -106,7 +106,7 @@
+@@ -106,8 +106,8 @@
  # Path to your rules files (this can be a relative path)
  # Note for Windows users:  You are advised to make this an absolute path,
  # such as:  c:\snort\rules
 -var RULE_PATH ../rules
 +var RULE_PATH ./rules
+-var PREPROC_RULE_PATH ../preproc_rules
++var PREPROC_RULE_PATH ./preproc_rules
  
  # Configure the snort decoder
  # ============================
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index a54288ad41d9..af84cf325b76 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -6,15 +6,9 @@ etc/snort/classification.config-sample
 @unexec if cmp  -s %D/etc/snort/gen-msg.map-sample %D/etc/snort/gen-msg.map; then rm -f %D/etc/snort/gen-msg.map; fi
 etc/snort/gen-msg.map-sample
 @exec if [ ! -f %D/etc/snort/gen-msg.map ] ; then cp -p %D/%F %B/gen-msg.map; fi
-@unexec if cmp  -s %D/etc/snort/generators-sample %D/etc/snort/generators; then rm -f %D/etc/snort/generators; fi
-etc/snort/generators-sample
-@exec if [ ! -f %D/etc/snort/generators ] ; then cp -p %D/%F %B/generators; fi
 @unexec if cmp  -s %D/etc/snort/reference.config-sample %D/etc/snort/reference.config; then rm -f %D/etc/snort/reference.config; fi
 etc/snort/reference.config-sample
 @exec if [ ! -f %D/etc/snort/reference.config ] ; then cp -p %D/%F %B/reference.config; fi
-@unexec if cmp -s %D/etc/snort/sid-sample %D/etc/snort/sid; then rm -f %D/etc/snort/sid; fi
-etc/snort/sid-sample
-@exec if [ ! -f %D/etc/snort/sid ] ; then cp -p %D/%F %B/sid; fi
 @unexec if cmp  -s %D/etc/snort/sid-msg.map-sample %D/etc/snort/sid-msg.map; then rm -f %D/etc/snort/sid-msg.map; fi
 etc/snort/sid-msg.map-sample
 @exec if [ ! -f %D/etc/snort/sid-msg.map ] ; then cp -p %D/%F %B/sid-msg.map; fi
@@ -30,23 +24,23 @@ etc/snort/unicode.map-sample
 @dirrmtry etc/snort/rules
 @dirrmtry etc/snort
 %%DYNAMIC%%src/snort_dynamicsrc/bitop.h
+%%DYNAMIC%%src/snort_dynamicsrc/debug.h
+%%DYNAMIC%%src/snort_dynamicsrc/pcap_pkthdr32.h
+%%DYNAMIC%%src/snort_dynamicsrc/preprocids.h
+%%DYNAMIC%%src/snort_dynamicsrc/profiler.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_common.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_meta.h
-%%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preprocessor.h
-%%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.c
+%%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preprocessor.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_snort_packet.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_snort_plugin_api.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfghash.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfhashfcn.h
-%%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.c
-%%DYNAMIC%%src/snort_dynamicsrc/snort_packet_header.h
+%%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.h
 %%DYNAMIC%%src/snort_dynamicsrc/str_search.h
 %%DYNAMIC%%src/snort_dynamicsrc/stream_api.h
-%%DYNAMIC%%src/snort_dynamicsrc/debug.h
-%%DYNAMIC%%src/snort_dynamicsrc/profiler.h
-%%DYNAMIC%%src/snort_dynamicsrc/preprocids.h
 %%DYNAMIC%%@dirrmtry src/snort_dynamicsrc
 %%DYNAMIC%%@dirrmtry src
 %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.so
@@ -54,26 +48,35 @@ etc/snort/unicode.map-sample
 %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.la
 %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.a
 %%DYNAMIC%%@dirrmtry lib/snort/dynamicengine
+%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.so
+%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.so.0
+%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.la
+%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.a
+%%DYNAMIC%%@dirrmtry lib/snort/dynamicrules
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.so.0
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.so.0
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so.0
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so.0
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssh_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssh_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssh_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssh_preproc.so.0
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssh_preproc.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssh_preproc.a
 %%DYNAMIC%%@dirrmtry lib/snort/dynamicpreprocessor
 %%DYNAMIC%%@dirrmtry lib/snort
 %%EXAMPLESDIR%%/classification.config-sample
@@ -83,10 +86,8 @@ etc/snort/unicode.map-sample
 %%EXAMPLESDIR%%/create_oracle.sql
 %%EXAMPLESDIR%%/create_postgresql
 %%EXAMPLESDIR%%/gen-msg.map-sample
-%%EXAMPLESDIR%%/generators-sample
 %%EXAMPLESDIR%%/reference.config-sample
 %%EXAMPLESDIR%%/sid-msg.map-sample
-%%EXAMPLESDIR%%/sid-sample
 %%EXAMPLESDIR%%/snort.conf-sample
 %%EXAMPLESDIR%%/threshold.conf-sample
 %%EXAMPLESDIR%%/unicode.map-sample
@@ -94,6 +95,9 @@ etc/snort/unicode.map-sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.ARUBA
 %%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP
@@ -109,23 +113,31 @@ etc/snort/unicode.map-sample
 %%PORTDOCS%%%%DOCSDIR%%/README.csv
 %%PORTDOCS%%%%DOCSDIR%%/README.database
 %%PORTDOCS%%%%DOCSDIR%%/README.dcerpc
+%%PORTDOCS%%%%DOCSDIR%%/README.decode
 %%PORTDOCS%%%%DOCSDIR%%/README.dns
 %%PORTDOCS%%%%DOCSDIR%%/README.event_queue
 %%PORTDOCS%%%%DOCSDIR%%/README.flow
-%%PORTDOCS%%%%DOCSDIR%%/README.flowbits
 %%PORTDOCS%%%%DOCSDIR%%/README.flow-portscan
+%%PORTDOCS%%%%DOCSDIR%%/README.flowbits
 %%PORTDOCS%%%%DOCSDIR%%/README.frag3
 %%PORTDOCS%%%%DOCSDIR%%/README.ftptelnet
 %%PORTDOCS%%%%DOCSDIR%%/README.http_inspect
+%%PORTDOCS%%%%DOCSDIR%%/README.ipv6
+%%PORTDOCS%%%%DOCSDIR%%/README.ppm
 %%PORTDOCS%%%%DOCSDIR%%/README.sfportscan
 %%PORTDOCS%%%%DOCSDIR%%/README.ssh
 %%PORTDOCS%%%%DOCSDIR%%/README.stream4
 %%PORTDOCS%%%%DOCSDIR%%/README.stream5
+%%PORTDOCS%%%%DOCSDIR%%/README.tag
 %%PORTDOCS%%%%DOCSDIR%%/README.thresholding
+%%PORTDOCS%%%%DOCSDIR%%/README.variables
 %%PORTDOCS%%%%DOCSDIR%%/README.wireless
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/WISHLIST
 %%PORTDOCS%%%%DOCSDIR%%/faq.pdf
+%%PORTDOCS%%%%DOCSDIR%%/generators
 %%PORTDOCS%%%%DOCSDIR%%/snort_manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/snort_schema_v106.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%