UPDATE: net/snort 2.9.11.1

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: net/snort 2.9.11.1

Lawrence Teo-7
This updates Snort to 2.9.11.1.

Release notes + changelog:
https://www.snort.org/downloads/snort/release_notes_2.9.11.1.txt
https://www.snort.org/downloads/snort/changelog_2.9.11.1.txt

In addition, the diff also syncs pkg/README with reality, adds
daemon_timeout=120 to the rc script (since Snort can take a long time
to start with the current rules), and updates/regenerates patches.

ok?



Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile 23 Jan 2017 11:22:58 -0000 1.97
+++ Makefile 11 Jan 2018 02:14:22 -0000
@@ -2,13 +2,12 @@
 
 COMMENT = highly flexible sniffer/NIDS
 
-VERSION = 2.9.9.0
+VERSION = 2.9.11.1
 DISTNAME = snort-${VERSION}
-REVISION = 0
 
 CATEGORIES = net security
 
-HOMEPAGE = http://www.snort.org/
+HOMEPAGE = https://www.snort.org/
 
 MAINTAINER = Markus Lude <[hidden email]>
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo 5 Jan 2017 03:08:04 -0000 1.36
+++ distinfo 11 Jan 2018 02:15:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.9.0.tar.gz) = cbFHEl6WOQoS89VXlu1Qc993IGvTVj2E0+Wh8Z59elY=
-SIZE (snort-2.9.9.0.tar.gz) = 6364482
+SHA256 (snort-2.9.11.1.tar.gz) = n2s66sWhCfVVBL03BWSsQxyxdzUHkp3EYWJomPM/Rs0=
+SIZE (snort-2.9.11.1.tar.gz) = 6442755
Index: patches/patch-src_decode_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_decode_h
--- patches/patch-src_decode_h 5 Jan 2017 03:08:04 -0000 1.10
+++ patches/patch-src_decode_h 11 Jan 2018 02:28:39 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_decode_h,v 1.10 2017/01/05 03:08:04 lteo Exp $
---- src/decode.h.orig Tue Jun  7 03:47:47 2016
-+++ src/decode.h Sun Dec  4 00:36:43 2016
-@@ -834,9 +834,9 @@ typedef struct _SLLHdr {
+Index: src/decode.h
+--- src/decode.h.orig
++++ src/decode.h
+@@ -835,9 +835,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.10
diff -u -p -r1.10 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 2 May 2016 02:29:58 -0000 1.10
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.10 2016/05/02 02:29:58 lteo Exp $
---- 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@
+Index: src/dynamic-plugins/sf_engine/Makefile.in
+--- src/dynamic-plugins/sf_engine/Makefile.in.orig
++++ src/dynamic-plugins/sf_engine/Makefile.in
+@@ -388,7 +388,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.16
diff -u -p -r1.16 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 2 May 2016 02:29:58 -0000 1.16
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.16 2016/05/02 02:29:58 lteo Exp $
---- 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:
+Index: src/dynamic-preprocessors/Makefile.in
+--- src/dynamic-preprocessors/Makefile.in.orig
++++ src/dynamic-preprocessors/Makefile.in
+@@ -1635,19 +1635,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.13
diff -u -p -r1.13 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 5 Jan 2017 03:08:04 -0000 1.13
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,16 +1,17 @@
 $OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.13 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Tue Nov 29 01:12:24 2016
-+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/dcerpc2/Makefile.in
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig
++++ src/dynamic-preprocessors/dcerpc2/Makefile.in
+@@ -372,7 +372,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_dce2_preproc.la
 -libsf_dce2_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
 +libsf_dce2_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
- @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 \
-@@ -566,7 +566,7 @@ distdir: $(DISTFILES)
+ @SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD =  \
+ @SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
+ @SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
+@@ -605,7 +605,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 5 Jan 2017 03:08:04 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,16 +1,17 @@
 $OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.11 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/dnp3/Makefile.in.orig Tue Nov 29 01:12:24 2016
-+++ src/dynamic-preprocessors/dnp3/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/dnp3/Makefile.in
+--- src/dynamic-preprocessors/dnp3/Makefile.in.orig
++++ src/dynamic-preprocessors/dnp3/Makefile.in
+@@ -365,7 +365,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_dnp3_preproc.la
 -libsf_dnp3_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
 +libsf_dnp3_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
- @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 \
-@@ -546,7 +546,7 @@ distdir: $(DISTFILES)
+ @SO_WITH_STATIC_LIB_TRUE@libsf_dnp3_preproc_la_LIBADD =  \
+ @SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
+ @SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
+@@ -588,7 +588,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.15
diff -u -p -r1.15 patch-src_dynamic-preprocessors_dns_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 5 Jan 2017 03:08:04 -0000 1.15
+++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.15 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/dns/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/dns/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/dns/Makefile.in
+--- src/dynamic-preprocessors/dns/Makefile.in.orig
++++ src/dynamic-preprocessors/dns/Makefile.in
+@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_dns_preproc.la
@@ -10,7 +11,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 \
-@@ -531,7 +531,7 @@ distdir: $(DISTFILES)
+@@ -542,7 +542,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.16
diff -u -p -r1.16 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 5 Jan 2017 03:08:04 -0000 1.16
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,16 +1,17 @@
 $OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.16 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -355,7 +355,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/ftptelnet/Makefile.in
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in
+@@ -368,7 +368,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_ftptelnet_preproc.la
 -libsf_ftptelnet_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
 +libsf_ftptelnet_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
- @SO_WITH_STATIC_LIB_TRUE@libsf_ftptelnet_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
+ @SO_WITH_STATIC_LIB_TRUE@libsf_ftptelnet_preproc_la_LIBADD = ../libsf_dynamic_preproc.la ../libsf_dynamic_utils.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ftptelnet_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -587,7 +587,7 @@ distdir: $(DISTFILES)
+@@ -603,7 +603,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 5 Jan 2017 03:08:04 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.11 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/gtp/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/gtp/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -340,7 +340,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/gtp/Makefile.in
+--- src/dynamic-preprocessors/gtp/Makefile.in.orig
++++ src/dynamic-preprocessors/gtp/Makefile.in
+@@ -352,7 +352,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_gtp_preproc.la
@@ -10,7 +11,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 \
-@@ -536,7 +536,7 @@ distdir: $(DISTFILES)
+@@ -547,7 +547,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_imap_Makefile_in
--- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 5 Jan 2017 03:08:04 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.11 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/imap/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/imap/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -346,7 +346,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/imap/Makefile.in
+--- src/dynamic-preprocessors/imap/Makefile.in.orig
++++ src/dynamic-preprocessors/imap/Makefile.in
+@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_imap_preproc.la
@@ -10,7 +11,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 \
-@@ -579,7 +579,7 @@ distdir: $(DISTFILES)
+@@ -590,7 +590,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 5 Jan 2017 03:08:04 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.11 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/modbus/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/modbus/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -341,7 +341,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/modbus/Makefile.in
+--- src/dynamic-preprocessors/modbus/Makefile.in.orig
++++ src/dynamic-preprocessors/modbus/Makefile.in
+@@ -353,7 +353,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_modbus_preproc.la
@@ -10,7 +11,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 \
-@@ -537,7 +537,7 @@ distdir: $(DISTFILES)
+@@ -548,7 +548,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_pop_Makefile_in
--- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 5 Jan 2017 03:08:04 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.11 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/pop/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/pop/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/pop/Makefile.in
+--- src/dynamic-preprocessors/pop/Makefile.in.orig
++++ src/dynamic-preprocessors/pop/Makefile.in
+@@ -357,7 +357,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_pop_preproc.la
@@ -10,7 +11,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 \
-@@ -577,7 +577,7 @@ distdir: $(DISTFILES)
+@@ -588,7 +588,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.10
diff -u -p -r1.10 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 2 May 2016 02:29:58 -0000 1.10
+++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.10 2016/05/02 02:29:58 lteo Exp $
---- 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@
+Index: src/dynamic-preprocessors/reputation/Makefile.in
+--- src/dynamic-preprocessors/reputation/Makefile.in.orig
++++ src/dynamic-preprocessors/reputation/Makefile.in
+@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_reputation_preproc.la
@@ -10,7 +11,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 \
-@@ -609,7 +609,7 @@ distdir: $(DISTFILES)
+@@ -620,7 +620,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 2 May 2016 02:29:58 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.11 2016/05/02 02:29:58 lteo Exp $
---- 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@
+Index: src/dynamic-preprocessors/sdf/Makefile.in
+--- src/dynamic-preprocessors/sdf/Makefile.in.orig
++++ src/dynamic-preprocessors/sdf/Makefile.in
+@@ -343,7 +343,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_sdf_preproc.la
@@ -10,7 +11,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 \
-@@ -536,7 +536,7 @@ distdir: $(DISTFILES)
+@@ -547,7 +547,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.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_sip_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 5 Jan 2017 03:08:04 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,16 +1,17 @@
 $OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.11 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/sip/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/sip/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/sip/Makefile.in
+--- src/dynamic-preprocessors/sip/Makefile.in.orig
++++ src/dynamic-preprocessors/sip/Makefile.in
+@@ -363,7 +363,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_sip_preproc.la
 -libsf_sip_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
 +libsf_sip_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
- @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 \
-@@ -543,7 +543,7 @@ distdir: $(DISTFILES)
+ @SO_WITH_STATIC_LIB_TRUE@libsf_sip_preproc_la_LIBADD =  \
+ @SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
+ @SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
+@@ -583,7 +583,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.15
diff -u -p -r1.15 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 5 Jan 2017 03:08:04 -0000 1.15
+++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 11 Jan 2018 02:28:36 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.15 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/smtp/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/smtp/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -347,7 +347,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/smtp/Makefile.in
+--- src/dynamic-preprocessors/smtp/Makefile.in.orig
++++ src/dynamic-preprocessors/smtp/Makefile.in
+@@ -359,7 +359,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_smtp_preproc.la
@@ -10,7 +11,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 \
-@@ -585,7 +585,7 @@ distdir: $(DISTFILES)
+@@ -596,7 +596,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.14
diff -u -p -r1.14 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 5 Jan 2017 03:08:04 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 11 Jan 2018 02:28:37 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.14 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/ssh/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/ssh/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/ssh/Makefile.in
+--- src/dynamic-preprocessors/ssh/Makefile.in.orig
++++ src/dynamic-preprocessors/ssh/Makefile.in
+@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_ssh_preproc.la
@@ -10,7 +11,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 \
-@@ -531,7 +531,7 @@ distdir: $(DISTFILES)
+@@ -542,7 +542,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.13
diff -u -p -r1.13 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 5 Jan 2017 03:08:04 -0000 1.13
+++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 11 Jan 2018 02:28:37 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.13 2017/01/05 03:08:04 lteo Exp $
---- src/dynamic-preprocessors/ssl/Makefile.in.orig Tue Nov 29 01:12:25 2016
-+++ src/dynamic-preprocessors/ssl/Makefile.in Sun Dec  4 00:36:43 2016
-@@ -339,7 +339,7 @@ top_srcdir = @top_srcdir@
+Index: src/dynamic-preprocessors/ssl/Makefile.in
+--- src/dynamic-preprocessors/ssl/Makefile.in.orig
++++ src/dynamic-preprocessors/ssl/Makefile.in
+@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
  dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
  dynamicpreprocessor_LTLIBRARIES = libsf_ssl_preproc.la
@@ -10,7 +11,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 \
-@@ -549,7 +549,7 @@ distdir: $(DISTFILES)
+@@ -560,7 +560,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.4
diff -u -p -r1.4 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 5 Jan 2017 03:08:04 -0000 1.4
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 11 Jan 2018 02:28:37 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_preprocessors_Stream6_snort_stream_tcp_c,v 1.4 2017/01/05 03:08:04 lteo Exp $
---- src/preprocessors/Stream6/snort_stream_tcp.c.orig Thu Aug 18 03:55:59 2016
-+++ src/preprocessors/Stream6/snort_stream_tcp.c Sun Dec  4 00:36:43 2016
-@@ -8398,7 +8398,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+Index: src/preprocessors/Stream6/snort_stream_tcp.c
+--- src/preprocessors/Stream6/snort_stream_tcp.c.orig
++++ src/preprocessors/Stream6/snort_stream_tcp.c
+@@ -8504,7 +8504,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
                          char src_addr[17];
                          char dst_addr[17];
                          memset((char *)timestamp, 0, TIMEBUF_SIZE);
Index: patches/patch-src_preprocessors_spp_sfportscan_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_preprocessors_spp_sfportscan_c
--- patches/patch-src_preprocessors_spp_sfportscan_c 29 May 2015 03:28:18 -0000 1.11
+++ patches/patch-src_preprocessors_spp_sfportscan_c 11 Jan 2018 02:28:37 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.11 2015/05/29 03:28:18 lteo Exp $
---- src/preprocessors/spp_sfportscan.c.orig Wed Apr 22 22:47:10 2015
-+++ src/preprocessors/spp_sfportscan.c Sun May 24 17:20:27 2015
-@@ -274,7 +274,7 @@ static int LogPortscanAlert(Packet *p, const char *msg
+Index: src/preprocessors/spp_sfportscan.c
+--- src/preprocessors/spp_sfportscan.c.orig
++++ src/preprocessors/spp_sfportscan.c
+@@ -280,7 +280,7 @@ static int LogPortscanAlert(Packet *p, const char *msg
          return 0;
      }
 
Index: pkg/README
===================================================================
RCS file: /cvs/ports/net/snort/pkg/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- pkg/README 2 May 2016 02:29:58 -0000 1.4
+++ pkg/README 11 Jan 2018 02:33:05 -0000
@@ -12,7 +12,7 @@ ${SYSCONFDIR}/snort/snort.conf.
 The two most common sources of Snort rules are the official Snort rules
 and the Emerging Threats rules.  To download the official Snort rules,
 you will first need to sign up for an "oinkcode" at
-https://www.snort.org/signup since they are distributed under a
+https://www.snort.org/users/sign_up since they are distributed under a
 commercial license.  Emerging Threats rules can be downloaded without
 signing up.
 
@@ -29,15 +29,12 @@ 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/rules/snortrules-snapshot-${V}.tar.gz?oinkcode=<oinkcode>
     tar -C /etc/snort -xzf snortrules-snapshot-${V}.tar.gz rules preproc_rules
 
-  Note that registered users without a paid subscription are only
-  allowed to download the official Snort ruleset once every 15 minutes.
-
 * Emerging Threats rules:
 
-    ftp http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz
+    ftp https://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz
     tar -C /etc/snort -xzf emerging.rules.tar.gz
 
   If you use Emerging Threats rules, you will need to uncomment its
Index: pkg/snort.rc
===================================================================
RCS file: /cvs/ports/net/snort/pkg/snort.rc,v
retrieving revision 1.2
diff -u -p -r1.2 snort.rc
--- pkg/snort.rc 2 May 2016 02:29:58 -0000 1.2
+++ pkg/snort.rc 11 Jan 2018 02:33:19 -0000
@@ -4,6 +4,7 @@
 
 daemon="${TRUEPREFIX}/bin/snort -D"
 daemon_flags="-c ${SYSCONFDIR}/snort/snort.conf -u _snort -g _snort -t ${LOCALSTATEDIR}/snort -l ${LOCALSTATEDIR}/snort/log"
+daemon_timeout=120
 
 . /etc/rc.d/rc.subr