This updates Snort to 2.9.8.2. Tested with DAQ 2.0.6 (sent earlier) on amd64.
Other minor changes in the port: - Shortened a line in the pkg/README so that portcheck won't complain. - Replaced "/var" with ${LOCALSTATEDIR} in pkg/snort.rc. - Regenerated patches. ok?
Index: Makefile =================================================================== RCS file: /cvs/ports/net/snort/Makefile,v retrieving revision 1.93 diff -u -p -r1.93 Makefile --- Makefile 16 Mar 2016 21:19:39 -0000 1.93 +++ Makefile 30 Apr 2016 00:35:50 -0000 @@ -2,7 +2,7 @@ COMMENT = highly flexible sniffer/NIDS -VERSION = 2.9.7.3 +VERSION = 2.9.8.2 DISTNAME = snort-${VERSION} CATEGORIES = net security Index: distinfo =================================================================== RCS file: /cvs/ports/net/snort/distinfo,v retrieving revision 1.33 diff -u -p -r1.33 distinfo --- distinfo 29 May 2015 03:28:18 -0000 1.33 +++ distinfo 30 Apr 2016 00:35:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (snort-2.9.7.3.tar.gz) = jMNhO4iPxUlHor7sdzx22aIDaPJlmzHUWp8LEeZswik= -SIZE (snort-2.9.7.3.tar.gz) = 6300073 +SHA256 (snort-2.9.8.2.tar.gz) = QHUBLTUN+kegIAt6kgMj8Vy3w3B5DypHNnwDq6QAkzM= +SIZE (snort-2.9.8.2.tar.gz) = 6311793 Index: patches/patch-etc_snort_conf =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v retrieving revision 1.14 diff -u -p -r1.14 patch-etc_snort_conf --- patches/patch-etc_snort_conf 29 May 2015 03:28:18 -0000 1.14 +++ patches/patch-etc_snort_conf 30 Apr 2016 00:35:50 -0000 @@ -2,8 +2,8 @@ $OpenBSD: patch-etc_snort_conf,v 1.14 20 reputation preprocessor disabled, still experimental ---- etc/snort.conf.orig Thu Apr 23 20:29:00 2015 -+++ etc/snort.conf Sun May 24 22:10:12 2015 +--- etc/snort.conf.orig Fri Mar 18 15:11:55 2016 ++++ etc/snort.conf Fri Apr 29 11:02:26 2016 @@ -101,17 +101,17 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1 # Path to your rules files (this can be a relative path) # Note for Windows users: You are advised to make this an absolute path, @@ -48,7 +48,7 @@ reputation preprocessor disabled, still # config daq_mode: <mode> # config daq_var: <var> # -@@ -503,12 +508,12 @@ preprocessor dnp3: ports { 20000 } \ +@@ -504,12 +509,12 @@ preprocessor dnp3: ports { 20000 } \ check_crc # Reputation preprocessor. For more information see README.reputation @@ -67,7 +67,7 @@ reputation preprocessor disabled, still ################################################### # Step #6: Configure output plugins -@@ -542,8 +547,10 @@ include reference.config +@@ -543,8 +548,10 @@ include reference.config ################################################### # site specific rules @@ -79,7 +79,7 @@ reputation preprocessor disabled, still include $RULE_PATH/app-detect.rules include $RULE_PATH/attack-responses.rules include $RULE_PATH/backdoor.rules -@@ -568,6 +575,7 @@ include $RULE_PATH/file-executable.rules +@@ -569,6 +576,7 @@ include $RULE_PATH/file-executable.rules include $RULE_PATH/file-flash.rules include $RULE_PATH/file-identify.rules include $RULE_PATH/file-image.rules @@ -87,7 +87,7 @@ reputation preprocessor disabled, still include $RULE_PATH/file-multimedia.rules include $RULE_PATH/file-office.rules include $RULE_PATH/file-other.rules -@@ -579,6 +587,7 @@ include $RULE_PATH/icmp.rules +@@ -580,6 +588,7 @@ include $RULE_PATH/icmp.rules include $RULE_PATH/imap.rules include $RULE_PATH/indicator-compromise.rules include $RULE_PATH/indicator-obfuscation.rules @@ -95,7 +95,7 @@ reputation preprocessor disabled, still include $RULE_PATH/indicator-shellcode.rules include $RULE_PATH/info.rules include $RULE_PATH/malware-backdoor.rules -@@ -592,6 +601,7 @@ include $RULE_PATH/netbios.rules +@@ -593,6 +602,7 @@ include $RULE_PATH/netbios.rules include $RULE_PATH/nntp.rules include $RULE_PATH/oracle.rules include $RULE_PATH/os-linux.rules @@ -103,7 +103,7 @@ reputation preprocessor disabled, still include $RULE_PATH/os-other.rules include $RULE_PATH/os-solaris.rules include $RULE_PATH/os-windows.rules -@@ -605,12 +615,20 @@ include $RULE_PATH/policy-social.rules +@@ -606,12 +616,20 @@ include $RULE_PATH/policy-social.rules include $RULE_PATH/policy-spam.rules include $RULE_PATH/pop2.rules include $RULE_PATH/pop3.rules @@ -124,7 +124,7 @@ reputation preprocessor disabled, still include $RULE_PATH/protocol-voip.rules include $RULE_PATH/pua-adware.rules include $RULE_PATH/pua-other.rules -@@ -627,6 +645,7 @@ include $RULE_PATH/server-mssql.rules +@@ -628,6 +646,7 @@ include $RULE_PATH/server-mssql.rules include $RULE_PATH/server-mysql.rules include $RULE_PATH/server-oracle.rules include $RULE_PATH/server-other.rules @@ -132,7 +132,7 @@ reputation preprocessor disabled, still include $RULE_PATH/server-webapp.rules include $RULE_PATH/shellcode.rules include $RULE_PATH/smtp.rules -@@ -649,6 +668,9 @@ include $RULE_PATH/web-misc.rules +@@ -650,6 +669,9 @@ include $RULE_PATH/web-misc.rules include $RULE_PATH/web-php.rules include $RULE_PATH/x11.rules @@ -142,7 +142,7 @@ reputation preprocessor disabled, still ################################################### # Step #8: Customize your preprocessor and decoder alerts # For more information, see README.decoder_preproc_rules -@@ -666,9 +688,11 @@ include $RULE_PATH/x11.rules +@@ -667,9 +689,11 @@ include $RULE_PATH/x11.rules # dynamic library rules # include $SO_RULE_PATH/bad-traffic.rules Index: patches/patch-src_decode_h =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v retrieving revision 1.8 diff -u -p -r1.8 patch-src_decode_h --- patches/patch-src_decode_h 29 May 2015 03:28:18 -0000 1.8 +++ patches/patch-src_decode_h 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_decode_h,v 1.8 2015/05/29 03:28:18 lteo Exp $ ---- src/decode.h.orig Fri Nov 21 21:48:54 2014 -+++ src/decode.h Wed Apr 22 17:36:46 2015 -@@ -817,9 +817,9 @@ typedef struct _SLLHdr { +--- src/decode.h.orig Fri Mar 18 09:54:31 2016 ++++ src/decode.h Fri Apr 29 11:02:26 2016 +@@ -831,9 +831,9 @@ typedef struct _SLLHdr { * Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28 * Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48 * Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64 Index: patches/patch-src_dynamic-plugins_sf_engine_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-plugins_sf_engine_Makefile_in --- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-plugins/sf_engine/Makefile.in.orig Thu Apr 23 20:28:26 2015 -+++ src/dynamic-plugins/sf_engine/Makefile.in Sun May 24 17:20:04 2015 -@@ -389,7 +389,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-plugins/sf_engine/Makefile.in.orig Fri Mar 18 15:11:29 2016 ++++ src/dynamic-plugins/sf_engine/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -376,7 +376,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicengine_LTLIBRARIES = libsf_engine.la dynamicenginedir = $(libdir)/snort_dynamicengine Index: patches/patch-src_dynamic-preprocessors_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v retrieving revision 1.15 diff -u -p -r1.15 patch-src_dynamic-preprocessors_Makefile_in --- patches/patch-src_dynamic-preprocessors_Makefile_in 29 May 2015 03:28:18 -0000 1.15 +++ patches/patch-src_dynamic-preprocessors_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.15 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/Makefile.in Sun May 24 17:20:05 2015 -@@ -1496,19 +1496,8 @@ clean-local: +--- src/dynamic-preprocessors/Makefile.in.orig Fri Mar 18 15:11:29 2016 ++++ src/dynamic-preprocessors/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -1528,19 +1528,8 @@ clean-local: rm -rf include build install-data-local: Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v retrieving revision 1.11 diff -u -p -r1.11 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in --- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 29 May 2015 03:28:18 -0000 1.11 +++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.11 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Sun May 24 17:20:06 2015 -@@ -348,7 +348,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Fri Mar 18 15:11:29 2016 ++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -335,7 +335,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_dce2_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dce2_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -591,7 +591,7 @@ distdir: $(DISTFILES) +@@ -581,7 +581,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_dnp3_Makefile_in --- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/dnp3/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/dnp3/Makefile.in Sun May 24 17:20:07 2015 -@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/dnp3/Makefile.in.orig Fri Mar 18 15:11:29 2016 ++++ src/dynamic-preprocessors/dnp3/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_dnp3_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_dnp3_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dnp3_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -557,7 +557,7 @@ distdir: $(DISTFILES) +@@ -545,7 +545,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_dns_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in,v retrieving revision 1.13 diff -u -p -r1.13 patch-src_dynamic-preprocessors_dns_Makefile_in --- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 29 May 2015 03:28:18 -0000 1.13 +++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.13 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/dns/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/dns/Makefile.in Sun May 24 17:20:08 2015 -@@ -343,7 +343,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/dns/Makefile.in.orig Fri Mar 18 15:11:29 2016 ++++ src/dynamic-preprocessors/dns/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -330,7 +330,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_dns_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_dns_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dns_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -539,7 +539,7 @@ distdir: $(DISTFILES) +@@ -527,7 +527,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v retrieving revision 1.14 diff -u -p -r1.14 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in --- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 29 May 2015 03:28:18 -0000 1.14 +++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.14 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Sun May 24 17:20:10 2015 -@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -338,7 +338,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_ftptelnet_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_ftptelnet_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ftptelnet_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -605,7 +605,7 @@ distdir: $(DISTFILES) +@@ -593,7 +593,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_gtp_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_gtp_Makefile_in --- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/gtp/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/gtp/Makefile.in Sun May 24 17:20:10 2015 -@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/gtp/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/gtp/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_gtp_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_gtp_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_gtp_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -547,7 +547,7 @@ distdir: $(DISTFILES) +@@ -535,7 +535,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_imap_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_imap_Makefile_in --- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/imap/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/imap/Makefile.in Sun May 24 17:20:11 2015 -@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/imap/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/imap/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -336,7 +336,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_imap_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_imap_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_imap_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -591,7 +591,7 @@ distdir: $(DISTFILES) +@@ -579,7 +579,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_modbus_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_modbus_Makefile_in --- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/modbus/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/modbus/Makefile.in Sun May 24 17:20:13 2015 -@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/modbus/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/modbus/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_modbus_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_modbus_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_modbus_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -547,7 +547,7 @@ distdir: $(DISTFILES) +@@ -535,7 +535,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_pop_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_pop_Makefile_in --- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/pop/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/pop/Makefile.in Sun May 24 17:20:15 2015 -@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/pop/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/pop/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -336,7 +336,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_pop_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_pop_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_pop_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -591,7 +591,7 @@ distdir: $(DISTFILES) +@@ -579,7 +579,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_reputation_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_reputation_Makefile_in --- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/reputation/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/reputation/Makefile.in Sun May 24 17:20:16 2015 -@@ -361,7 +361,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/reputation/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/reputation/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -348,7 +348,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_reputation_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_reputation_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_reputation_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -621,7 +621,7 @@ distdir: $(DISTFILES) +@@ -609,7 +609,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_sdf_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in,v retrieving revision 1.10 diff -u -p -r1.10 patch-src_dynamic-preprocessors_sdf_Makefile_in --- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 29 May 2015 03:28:18 -0000 1.10 +++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.10 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/sdf/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/sdf/Makefile.in Sun May 24 17:20:17 2015 -@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/sdf/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/sdf/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_sdf_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_sdf_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_sdf_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -548,7 +548,7 @@ distdir: $(DISTFILES) +@@ -536,7 +536,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_sip_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_dynamic-preprocessors_sip_Makefile_in --- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 29 May 2015 03:28:18 -0000 1.9 +++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.9 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/sip/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/sip/Makefile.in Sun May 24 17:20:18 2015 -@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/sip/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/sip/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_sip_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_sip_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_sip_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -558,7 +558,7 @@ distdir: $(DISTFILES) +@@ -546,7 +546,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_smtp_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in,v retrieving revision 1.13 diff -u -p -r1.13 patch-src_dynamic-preprocessors_smtp_Makefile_in --- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 29 May 2015 03:28:18 -0000 1.13 +++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.13 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/smtp/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/smtp/Makefile.in Sun May 24 17:20:19 2015 -@@ -350,7 +350,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/smtp/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/smtp/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_smtp_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_smtp_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_smtp_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -600,7 +600,7 @@ distdir: $(DISTFILES) +@@ -588,7 +588,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_ssh_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in,v retrieving revision 1.12 diff -u -p -r1.12 patch-src_dynamic-preprocessors_ssh_Makefile_in --- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 29 May 2015 03:28:18 -0000 1.12 +++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.12 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/ssh/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/ssh/Makefile.in Sun May 24 17:20:21 2015 -@@ -343,7 +343,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/ssh/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/ssh/Makefile.in Fri Apr 29 11:02:26 2016 +@@ -330,7 +330,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_ssh_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_ssh_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ssh_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -539,7 +539,7 @@ distdir: $(DISTFILES) +@@ -527,7 +527,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_dynamic-preprocessors_ssl_Makefile_in =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in,v retrieving revision 1.11 diff -u -p -r1.11 patch-src_dynamic-preprocessors_ssl_Makefile_in --- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 29 May 2015 03:28:18 -0000 1.11 +++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.11 2015/05/29 03:28:18 lteo Exp $ ---- src/dynamic-preprocessors/ssl/Makefile.in.orig Thu Apr 23 20:28:27 2015 -+++ src/dynamic-preprocessors/ssl/Makefile.in Sun May 24 17:20:22 2015 -@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@ +--- src/dynamic-preprocessors/ssl/Makefile.in.orig Fri Mar 18 15:11:30 2016 ++++ src/dynamic-preprocessors/ssl/Makefile.in Fri Apr 29 11:02:27 2016 +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor dynamicpreprocessor_LTLIBRARIES = libsf_ssl_preproc.la @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor @SO_WITH_STATIC_LIB_TRUE@libsf_ssl_preproc_la_LIBADD = ../libsf_dynamic_preproc.la @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ssl_preproc_la_SOURCES = \ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \ -@@ -557,7 +557,7 @@ distdir: $(DISTFILES) +@@ -545,7 +545,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am Index: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c =================================================================== RCS file: /cvs/ports/net/snort/patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_preprocessors_Stream6_snort_stream_tcp_c --- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 29 May 2015 03:28:18 -0000 1.2 +++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 30 Apr 2016 00:35:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_preprocessors_Stream6_snort_stream_tcp_c,v 1.2 2015/05/29 03:28:18 lteo Exp $ ---- src/preprocessors/Stream6/snort_stream_tcp.c.orig Wed Apr 22 22:47:10 2015 -+++ src/preprocessors/Stream6/snort_stream_tcp.c Sun May 24 17:20:26 2015 -@@ -8183,7 +8183,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet +--- src/preprocessors/Stream6/snort_stream_tcp.c.orig Fri Mar 18 09:54:33 2016 ++++ src/preprocessors/Stream6/snort_stream_tcp.c Fri Apr 29 11:02:27 2016 +@@ -8320,7 +8320,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet char src_addr[17]; char dst_addr[17]; memset((char *)timestamp, 0, TIMEBUF_SIZE); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/snort/pkg/PLIST,v retrieving revision 1.28 diff -u -p -r1.28 PLIST --- pkg/PLIST 24 Jan 2015 03:52:53 -0000 1.28 +++ pkg/PLIST 30 Apr 2016 00:35:50 -0000 @@ -105,6 +105,7 @@ share/doc/snort/README.ppm share/doc/snort/README.reload share/doc/snort/README.reputation share/doc/snort/README.sensitive_data +share/doc/snort/README.session share/doc/snort/README.sfportscan share/doc/snort/README.sip share/doc/snort/README.ssh Index: pkg/README =================================================================== RCS file: /cvs/ports/net/snort/pkg/README,v retrieving revision 1.3 diff -u -p -r1.3 README --- pkg/README 4 Mar 2013 04:23:18 -0000 1.3 +++ pkg/README 30 Apr 2016 00:35:50 -0000 @@ -29,7 +29,7 @@ to the correct directory: * Official Snort rules (replace <oinkcode> with yours): ftp -o snortrules-snapshot-${V}.tar.gz \ - https://www.snort.org/reg-rules/snortrules-snapshot-${V}.tar.gz/<oinkcode> + https://www.snort.org/reg-rules/snortrules-snapshot-${V}.tar.gz/<oinkcode> tar -C /etc/snort -xzf snortrules-snapshot-${V}.tar.gz rules preproc_rules Note that registered users without a paid subscription are only Index: pkg/snort.rc =================================================================== RCS file: /cvs/ports/net/snort/pkg/snort.rc,v retrieving revision 1.1 diff -u -p -r1.1 snort.rc --- pkg/snort.rc 11 Oct 2012 02:40:48 -0000 1.1 +++ pkg/snort.rc 30 Apr 2016 00:35:50 -0000 @@ -3,7 +3,7 @@ # $OpenBSD: snort.rc,v 1.1 2012/10/11 02:40:48 lteo Exp $ daemon="${TRUEPREFIX}/bin/snort -D" -daemon_flags="-c ${SYSCONFDIR}/snort/snort.conf -u _snort -g _snort -t /var/snort -l /var/snort/log" +daemon_flags="-c ${SYSCONFDIR}/snort/snort.conf -u _snort -g _snort -t ${LOCALSTATEDIR}/snort -l ${LOCALSTATEDIR}/snort/log" . /etc/rc.d/rc.subr