ports/146155: [patch] port security/snort update to 2.8.6

Thu Apr 29 18:00:13 UTC 2010

>Number:         146155
>Category:       ports
>Synopsis:       [patch] port security/snort update to 2.8.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 29 18:00:12 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer <ohauer at gmx.de>
>Release:        
>Organization:
>Environment:
FreeBSD 7.3-RELEASE i386


>Description:
Update snort to version 2.8.6.

Note:
- 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)

Tested with the following options on FreeBSD-7.3 i386

    WITH_DYNAMIC=true
    WITHOUT_FLEXRESP=true
    WITH_FLEXRESP2=true
    WITHOUT_MYSQL=true
    WITHOUT_ODBC=true
    WITH_POSTGRESQL=true
    WITHOUT_PRELUDE=true
    WITH_PERPROFILE=true
    WITH_SNORTSAM=true


>How-To-Repeat:
>Fix:

--- patch_security_snort-2.8.6.txt begins here ---
Index: distinfo
===================================================================
--- distinfo
+++ distinfo
@@ -1,6 +1,6 @@
-MD5 (snort-2.8.5.3.tar.gz) = ef02aaad54746603f2cb3236fe962128
-SHA256 (snort-2.8.5.3.tar.gz) = a7d9eb16427514d00926e9892c4a92b6ff1fd0f79555d8f8dce91dfa14112e6a
-SIZE (snort-2.8.5.3.tar.gz) = 4730637
-MD5 (snortsam-2.8.5.diff.gz) = 5adbf37ed30b7e7b06dcb763310654c7
-SHA256 (snortsam-2.8.5.diff.gz) = f23fd04749b4ec3028a35c8db8c2ce0d14beac9c95b52f232229e13930b341f0
-SIZE (snortsam-2.8.5.diff.gz) = 29150
+MD5 (snort-2.8.6.tar.gz) = b1c2d3ddb1c0a859a47c5a31d19e60ad
+SHA256 (snort-2.8.6.tar.gz) = 6064d7bb78d6438b455ff349b93d52f40d3977f1fecb1d7958c87881b0030358
+SIZE (snort-2.8.6.tar.gz) = 4960740
+MD5 (snortsam-2.8.6.diff.gz) = 35fe432a8061dc3155f3530ff54f4ebf
+SHA256 (snortsam-2.8.6.diff.gz) = 24253b7f1dac99edc4527ac9a4da1c30d340c0eeaf6f754495e4078bf1b88955
+SIZE (snortsam-2.8.6.diff.gz) = 28755
Index: files/patch-etc__snort.conf
===================================================================
--- files/patch-etc__snort.conf
+++ 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
Index: files/patch-snort.conf
===================================================================
--- files/patch-snort.conf
+++ files/patch-snort.conf
@@ -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
- # ============================
Index: pkg-plist
===================================================================
--- pkg-plist
+++ pkg-plist
@@ -25,9 +25,13 @@
 @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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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
Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	snort
-PORTVERSION=	2.8.5.3
-PORTREVISION=	1
+PORTVERSION=	2.8.6
+#PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/ \
 		http://dl.snort.org/snort-current/
@@ -128,7 +128,7 @@
 
 .if defined(WITH_SNORTSAM)
 PATCH_SITES+=http://www.snortsam.net/files/snort-plugin/:snortsam
-PATCHFILES+=snortsam-2.8.5.diff.gz:snortsam
+PATCHFILES+=snortsam-2.8.6.diff.gz:snortsam
 .endif
 
 post-patch:
--- patch_security_snort-2.8.6.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

