Hello,
attached is an update to snort 2.9.15.
Tested on amd64.
Please test, comment and eventually commit.
Regards
Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 Makefile
--- Makefile 29 Aug 2019 02:47:15 -0000 1.105
+++ Makefile 23 Nov 2019 08:56:21 -0000
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.14.1
-RULESV = 29141
+DISTNAME = snort-2.9.15
+RULESV = 29150
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 distinfo
--- distinfo 29 Aug 2019 02:47:15 -0000 1.41
+++ distinfo 23 Nov 2019 08:56:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.14.1.tar.gz) = JHKYnaOqzgANHqWTHs5o+OXMDFEeJy1lGCETokgegi0=
-SIZE (snort-2.9.14.1.tar.gz) = 6531749
+SHA256 (snort-2.9.15.tar.gz) = v7Q3dGRG73KgPFAdsTzW2l7dK0H1XIDEN7ooi+bafbo=
+SIZE (snort-2.9.15.tar.gz) = 6704763
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.13
diff -u -p -u -p -r1.13 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 29 Aug 2019
02:47:15 -0000 1.13
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -5,7 +5,7 @@ Disable libsf_sorules in the examples di
Index: src/dynamic-plugins/sf_engine/Makefile.in
--- src/dynamic-plugins/sf_engine/Makefile.in.orig
+++ src/dynamic-plugins/sf_engine/Makefile.in
-@@ -376,7 +376,7 @@ top_srcdir = @top_srcdir@
+@@ -388,7 +388,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicengine_LTLIBRARIES = libsf_engine.la
dynamicenginedir = $(libdir)/snort_dynamicengine
@@ -14,7 +14,7 @@ Index: src/dynamic-plugins/sf_engine/Mak
@BUILD_OPENSSL_MD5_TRUE@OPENSSL_MD5 = \
@BUILD_OPENSSL_MD5_TRUE@ md5.c md5.h
-@@ -517,7 +517,7 @@ massage_ipv6_headers = \
+@@ -529,7 +529,7 @@ massage_ipv6_headers = \
$(sed_ipv6_headers); \
fi
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.19
diff -u -p -u -p -r1.19 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 29 Aug 2019 02:47:15
-0000 1.19
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 23 Nov 2019 08:56:21
-0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/Makefile.in
--- src/dynamic-preprocessors/Makefile.in.orig
+++ src/dynamic-preprocessors/Makefile.in
-@@ -1631,19 +1631,8 @@ clean-local:
+@@ -1647,19 +1647,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_appid_Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_dynamic-preprocessors_appid_Makefile_in
--- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 29 Aug 2019
02:47:15 -0000 1.4
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -6,7 +6,7 @@ libunwind symbols.
Index: src/dynamic-preprocessors/appid/Makefile.in
--- src/dynamic-preprocessors/appid/Makefile.in.orig
+++ src/dynamic-preprocessors/appid/Makefile.in
-@@ -575,8 +575,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+@@ -586,8 +586,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
$(APPID_SRC_DIR)/util/sfutil.c $(APPID_SRC_DIR)/util/sfutil.h
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_appid_preproc.la
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.16
diff -u -p -u -p -r1.16 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 29 Aug 2019
02:47:15 -0000 1.16
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/dcerpc2/Makefile.in
--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig
+++ src/dynamic-preprocessors/dcerpc2/Makefile.in
-@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@
+@@ -372,7 +372,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_dce2_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dcerpc2
@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)
-@@ -594,7 +594,7 @@ distdir: $(DISTFILES)
+@@ -608,7 +608,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/dnp3/Makefile.in
--- src/dynamic-preprocessors/dnp3/Makefile.in.orig
+++ src/dynamic-preprocessors/dnp3/Makefile.in
-@@ -353,7 +353,7 @@ top_srcdir = @top_srcdir@
+@@ -365,7 +365,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_dnp3_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dnp3/Ma
@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)
-@@ -577,7 +577,7 @@ distdir: $(DISTFILES)
+@@ -591,7 +591,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_dns_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 29 Aug 2019
02:47:15 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/dns/Makefile.in
--- src/dynamic-preprocessors/dns/Makefile.in.orig
+++ src/dynamic-preprocessors/dns/Makefile.in
-@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
+@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_dns_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dns/Mak
@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)
+@@ -545,7 +545,7 @@ distdir-am: $(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.19
diff -u -p -u -p -r1.19 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 29 Aug
2019 02:47:15 -0000 1.19
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 23 Nov
2019 08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/ftptelnet/Makefile.in
--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig
+++ src/dynamic-preprocessors/ftptelnet/Makefile.in
-@@ -356,7 +356,7 @@ top_srcdir = @top_srcdir@
+@@ -368,7 +368,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_ftptelnet_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/ftpteln
@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 \
-@@ -592,7 +592,7 @@ distdir: $(DISTFILES)
+@@ -606,7 +606,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/gtp/Makefile.in
--- src/dynamic-preprocessors/gtp/Makefile.in.orig
+++ src/dynamic-preprocessors/gtp/Makefile.in
-@@ -340,7 +340,7 @@ top_srcdir = @top_srcdir@
+@@ -352,7 +352,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_gtp_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/gtp/Mak
@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)
+@@ -550,7 +550,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_imap_Makefile_in
--- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/imap/Makefile.in
--- src/dynamic-preprocessors/imap/Makefile.in.orig
+++ src/dynamic-preprocessors/imap/Makefile.in
-@@ -346,7 +346,7 @@ top_srcdir = @top_srcdir@
+@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_imap_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/imap/Ma
@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)
+@@ -593,7 +593,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/modbus/Makefile.in
--- src/dynamic-preprocessors/modbus/Makefile.in.orig
+++ src/dynamic-preprocessors/modbus/Makefile.in
-@@ -341,7 +341,7 @@ top_srcdir = @top_srcdir@
+@@ -353,7 +353,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_modbus_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/modbus/
@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)
+@@ -551,7 +551,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_pop_Makefile_in
--- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/pop/Makefile.in
--- src/dynamic-preprocessors/pop/Makefile.in.orig
+++ src/dynamic-preprocessors/pop/Makefile.in
-@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@
+@@ -357,7 +357,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_pop_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/pop/Mak
@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)
+@@ -591,7 +591,7 @@ distdir-am: $(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.13
diff -u -p -u -p -r1.13 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 29 Aug
2019 02:47:15 -0000 1.13
+++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 23 Nov
2019 08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/reputation/Makefile.in
--- src/dynamic-preprocessors/reputation/Makefile.in.orig
+++ src/dynamic-preprocessors/reputation/Makefile.in
-@@ -348,7 +348,7 @@ top_srcdir = @top_srcdir@
+@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_reputation_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/reputat
@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)
+@@ -623,7 +623,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/sdf/Makefile.in
--- src/dynamic-preprocessors/sdf/Makefile.in.orig
+++ src/dynamic-preprocessors/sdf/Makefile.in
-@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
+@@ -343,7 +343,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_sdf_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/sdf/Mak
@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)
+@@ -550,7 +550,7 @@ distdir-am: $(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.14
diff -u -p -u -p -r1.14 patch-src_dynamic-preprocessors_sip_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 29 Aug 2019
02:47:15 -0000 1.14
+++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/sip/Makefile.in
--- src/dynamic-preprocessors/sip/Makefile.in.orig
+++ src/dynamic-preprocessors/sip/Makefile.in
-@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
+@@ -363,7 +363,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_sip_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/sip/Mak
@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)
-@@ -572,7 +572,7 @@ distdir: $(DISTFILES)
+@@ -586,7 +586,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 29 Aug 2019
02:47:15 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/smtp/Makefile.in
--- src/dynamic-preprocessors/smtp/Makefile.in.orig
+++ src/dynamic-preprocessors/smtp/Makefile.in
-@@ -347,7 +347,7 @@ top_srcdir = @top_srcdir@
+@@ -359,7 +359,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_smtp_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/smtp/Ma
@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)
+@@ -599,7 +599,7 @@ distdir-am: $(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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 29 Aug 2019
02:47:15 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/ssh/Makefile.in
--- src/dynamic-preprocessors/ssh/Makefile.in.orig
+++ src/dynamic-preprocessors/ssh/Makefile.in
-@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
+@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_ssh_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/ssh/Mak
@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)
+@@ -545,7 +545,7 @@ distdir-am: $(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.16
diff -u -p -u -p -r1.16 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 29 Aug 2019
02:47:15 -0000 1.16
+++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/ssl/Makefile.in
--- src/dynamic-preprocessors/ssl/Makefile.in.orig
+++ src/dynamic-preprocessors/ssl/Makefile.in
-@@ -339,7 +339,7 @@ top_srcdir = @top_srcdir@
+@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_ssl_preproc.la
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/ssl/Mak
@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)
+@@ -563,7 +563,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_log_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_log_c
--- patches/patch-src_log_c 24 Jan 2015 03:52:53 -0000 1.7
+++ patches/patch-src_log_c 23 Nov 2019 08:56:21 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_log_c,v 1.7 2015/01/24 03:52:53 lteo Exp $
---- src/log.c.orig Sat Feb 22 03:45:22 2014
-+++ src/log.c Sat Oct 25 16:32:17 2014
-@@ -457,7 +457,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
+Index: src/log.c
+--- src/log.c.orig
++++ src/log.c
+@@ -473,7 +473,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type););
memset((char *) timestamp, 0, TIMEBUF_SIZE);
@@ -10,7 +11,7 @@ $OpenBSD: patch-src_log_c,v 1.7 2015/01/
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -1955,7 +1955,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
+@@ -1971,7 +1971,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
memset((char *) timestamp, 0, TIMEBUF_SIZE);
@@ -19,7 +20,7 @@ $OpenBSD: patch-src_log_c,v 1.7 2015/01/
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -2129,7 +2129,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
+@@ -2145,7 +2145,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
memset((char *) timestamp, 0, TIMEBUF_SIZE);
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.8
diff -u -p -u -p -r1.8 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 24 Jul 2019
02:15:57 -0000 1.8
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 23 Nov 2019
08:56:21 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_preprocessors_Stream
Index: src/preprocessors/Stream6/snort_stream_tcp.c
--- src/preprocessors/Stream6/snort_stream_tcp.c.orig
+++ src/preprocessors/Stream6/snort_stream_tcp.c
-@@ -8575,7 +8575,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+@@ -8607,7 +8607,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
char src_addr[17];
char dst_addr[17];
memset((char *)timestamp, 0, TIMEBUF_SIZE);
