- Update to 2.8.6

- name for one patch has changed from patch-snort.conf to patch-etc__snort.conf
  (easier to build diffs with 'make makepatch')
- snort.conf was replaced with the version shiped in the rules tarball
  (Maybe users shoud be pointed to the Changelog)

PR:		ports/146155
Submitted by:	olli hauer <ohauer_AT_gmx dot de>

4 files changed, 28 insertions, 24 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index aa46882f5234..805160d52d63 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.8.5.3
-PORTREVISION=	2
+PORTVERSION=	2.8.6
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/ \
 		http://dl.snort.org/snort-current/
@@ -128,7 +127,7 @@ CONFIGURE_ARGS+=	--enable-perfprofiling
 
 .if defined(WITH_SNORTSAM)
 PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
-PATCHFILES+=snortsam-2.8.5.3.diff.gz:snortsam
+PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
 .endif
 
 post-patch:
diff --git a/security/snort/files/patch-etc__snort.conf b/security/snort/files/patch-etc__snort.conf
new file mode 100644
index 000000000000..66a94a5dc7aa
--- /dev/null
+++ b/security/snort/files/patch-etc__snort.conf
@@ -0,0 +1,15 @@
+--- ./etc/snort.conf.orig	2010-03-19 20:41:00.000000000 +0100
++++ ./etc/snort.conf	2010-04-27 22:26:53.000000000 +0200
+@@ -57,9 +57,9 @@
+ # 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 SO_RULE_PATH ../so_rules
+-var PREPROC_RULE_PATH ../preproc_rules
++var RULE_PATH ./rules
++var SO_RULE_PATH ./so_rules
++var PREPROC_RULE_PATH ./preproc_rules
+ 
+ ###################################################
+ # Step #2: Configure the decoder.  For more information, see README.decode
diff --git a/security/snort/files/patch-snort.conf b/security/snort/files/patch-snort.conf
deleted file mode 100644
index 2747badf2a8b..000000000000
--- a/security/snort/files/patch-snort.conf
+++ /dev/null
@@ -1,13 +0,0 @@
---- etc/snort.conf.orig	Thu Aug  5 11:55:37 2004
-+++ etc/snort.conf	Wed Aug 11 15:52:47 2004
-@@ -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 0e6cfcc9e089..4d62e0c97cef 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -25,9 +25,13 @@ etc/snort/unicode.map-sample
 @dirrmtry etc/snort
 %%DYNAMIC%%src/snort_dynamicsrc/bitop.h
 %%DYNAMIC%%src/snort_dynamicsrc/debug.h
+%%DYNAMIC%%src/snort_dynamicsrc/event.h
+%%DYNAMIC%%src/snort_dynamicsrc/obfuscation.h
 %%DYNAMIC%%src/snort_dynamicsrc/pcap_pkthdr32.h
+%%DYNAMIC%%src/snort_dynamicsrc/plugin_enum.h
 %%DYNAMIC%%src/snort_dynamicsrc/preprocids.h
 %%DYNAMIC%%src/snort_dynamicsrc/profiler.h
+%%DYNAMIC%%src/snort_dynamicsrc/rule_option_types.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfPolicyUserData.c
 %%DYNAMIC%%src/snort_dynamicsrc/sfPolicyUserData.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_common.h
@@ -45,8 +49,10 @@ etc/snort/unicode.map-sample
 %%DYNAMIC%%src/snort_dynamicsrc/sfhashfcn.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.c
 %%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.h
+%%DYNAMIC%%src/snort_dynamicsrc/signature.h
 %%DYNAMIC%%src/snort_dynamicsrc/str_search.h
 %%DYNAMIC%%src/snort_dynamicsrc/stream_api.h
+%%DYNAMIC%%src/snort_dynamicsrc/treenodes.h
 %%DYNAMIC%%@dirrmtry src/snort_dynamicsrc
 %%DYNAMIC%%@dirrmtry src
 %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.so
@@ -54,15 +60,7 @@ 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
@@ -79,6 +77,10 @@ etc/snort/unicode.map-sample
 %%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_sdf_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.so.0
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.a
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so
@@ -144,6 +146,7 @@ etc/snort/unicode.map-sample
 %%PORTDOCS%%%%DOCSDIR%%/README.pcap_readmode
 %%PORTDOCS%%%%DOCSDIR%%/README.ppm
 %%PORTDOCS%%%%DOCSDIR%%/README.reload
+%%PORTDOCS%%%%DOCSDIR%%/README.sensitive_data
 %%PORTDOCS%%%%DOCSDIR%%/README.sfportscan
 %%PORTDOCS%%%%DOCSDIR%%/README.ssh
 %%PORTDOCS%%%%DOCSDIR%%/README.ssl