Hello,
attached is a stright forward update for snort 2.9.18.
Tested on amd64.
Regards,
Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.109
diff -u -p -u -p -r1.109 Makefile
--- Makefile 7 Apr 2021 02:00:52 -0000 1.109
+++ Makefile 6 Jul 2021 18:45:44 -0000
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.17.1
-RULESV = 29171
+DISTNAME = snort-2.9.18
+RULESV = 29180
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 distinfo
--- distinfo 7 Apr 2021 02:00:52 -0000 1.45
+++ distinfo 6 Jul 2021 18:45:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.17.1.tar.gz) = MD09XcWv/s/qrTozHTFj+QHUjZYP3WWYy1XG0Vke7YI=
-SIZE (snort-2.9.17.1.tar.gz) = 6980147
+SHA256 (snort-2.9.18.tar.gz) = 0DCGQvaeDTb3DblwPldmr84vRP8Ft9LJzI46yDI7LHc=
+SIZE (snort-2.9.18.tar.gz) = 6909928
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.15
diff -u -p -u -p -r1.15 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 7 Apr 2021
02:00:52 -0000 1.15
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -389,7 +389,7 @@ top_srcdir = @top_srcdir@
+@@ -376,7 +376,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
-@@ -530,7 +530,7 @@ massage_ipv6_headers = \
+@@ -517,7 +517,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.23
diff -u -p -u -p -r1.23 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 7 Apr 2021 02:00:52
-0000 1.23
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 6 Jul 2021 18:45:44
-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
-@@ -1648,19 +1648,8 @@ clean-local:
+@@ -1639,19 +1639,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.6
diff -u -p -u -p -r1.6 patch-src_dynamic-preprocessors_appid_Makefile_in
--- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 7 Apr 2021
02:00:52 -0000 1.6
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -587,8 +587,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+@@ -575,8 +575,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.19
diff -u -p -u -p -r1.19 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 7 Apr 2021
02:00:52 -0000 1.19
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -373,7 +373,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_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)
-@@ -607,7 +607,7 @@ distdir: $(DISTFILES)
+@@ -595,7 +595,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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -366,7 +366,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_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)
-@@ -590,7 +590,7 @@ distdir: $(DISTFILES)
+@@ -578,7 +578,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.21
diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_dns_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 7 Apr 2021
02:00:52 -0000 1.21
+++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -350,7 +350,7 @@ top_srcdir = @top_srcdir@
+@@ -337,7 +337,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 \
-@@ -544,7 +544,7 @@ distdir: $(DISTFILES)
+@@ -532,7 +532,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.22
diff -u -p -u -p -r1.22 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 7 Apr
2021 02:00:52 -0000 1.22
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 6 Jul
2021 18:45:44 -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
-@@ -369,7 +369,7 @@ top_srcdir = @top_srcdir@
+@@ -356,7 +356,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 \
-@@ -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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -353,7 +353,7 @@ top_srcdir = @top_srcdir@
+@@ -340,7 +340,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 \
-@@ -549,7 +549,7 @@ distdir: $(DISTFILES)
+@@ -537,7 +537,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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_imap_Makefile_in
--- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -359,7 +359,7 @@ top_srcdir = @top_srcdir@
+@@ -346,7 +346,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 \
-@@ -592,7 +592,7 @@ distdir: $(DISTFILES)
+@@ -580,7 +580,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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -354,7 +354,7 @@ top_srcdir = @top_srcdir@
+@@ -341,7 +341,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 \
-@@ -550,7 +550,7 @@ distdir: $(DISTFILES)
+@@ -538,7 +538,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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_pop_Makefile_in
--- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
+@@ -345,7 +345,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 \
-@@ -590,7 +590,7 @@ distdir: $(DISTFILES)
+@@ -578,7 +578,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.16
diff -u -p -u -p -r1.16 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 7 Apr
2021 02:00:52 -0000 1.16
+++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 6 Jul
2021 18:45:44 -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
-@@ -361,7 +361,7 @@ top_srcdir = @top_srcdir@
+@@ -348,7 +348,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 \
-@@ -622,7 +622,7 @@ distdir: $(DISTFILES)
+@@ -610,7 +610,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_dynamic-preprocessors_s7commplus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in 7 Apr
2021 02:00:52 -0000 1.2
+++ patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in 6 Jul
2021 18:45:44 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/s7commplus/Makefile.in
--- src/dynamic-preprocessors/s7commplus/Makefile.in.orig
+++ src/dynamic-preprocessors/s7commplus/Makefile.in
-@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@
+@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
dynamicpreprocessor_LTLIBRARIES = libsf_s7commplus_preproc.la
@@ -12,7 +12,7 @@ Index: src/dynamic-preprocessors/s7commp
@SO_WITH_STATIC_LIB_TRUE@libsf_s7commplus_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_s7commplus_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -544,7 +544,7 @@ distdir: $(DISTFILES)
+@@ -532,7 +532,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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@
+@@ -331,7 +331,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 \
-@@ -549,7 +549,7 @@ distdir: $(DISTFILES)
+@@ -537,7 +537,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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_sip_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 7 Apr 2021
02:00:52 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -364,7 +364,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_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)
-@@ -585,7 +585,7 @@ distdir: $(DISTFILES)
+@@ -573,7 +573,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.21
diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 7 Apr 2021
02:00:52 -0000 1.21
+++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@
+@@ -347,7 +347,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 \
-@@ -598,7 +598,7 @@ distdir: $(DISTFILES)
+@@ -586,7 +586,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.20
diff -u -p -u -p -r1.20 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 7 Apr 2021
02:00:52 -0000 1.20
+++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -350,7 +350,7 @@ top_srcdir = @top_srcdir@
+@@ -337,7 +337,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 \
-@@ -544,7 +544,7 @@ distdir: $(DISTFILES)
+@@ -532,7 +532,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.19
diff -u -p -u -p -r1.19 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 7 Apr 2021
02:00:52 -0000 1.19
+++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 6 Jul 2021
18:45:44 -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
-@@ -352,7 +352,7 @@ top_srcdir = @top_srcdir@
+@@ -339,7 +339,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 \
-@@ -562,7 +562,7 @@ distdir: $(DISTFILES)
+@@ -550,7 +550,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.12
diff -u -p -u -p -r1.12 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 7 Apr 2021
02:00:52 -0000 1.12
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 6 Jul 2021
18:45:44 -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
-@@ -8905,7 +8905,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+@@ -8919,7 +8919,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_util_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_util_c,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-src_util_c
--- patches/patch-src_util_c 2 Jun 2019 02:07:44 -0000 1.10
+++ patches/patch-src_util_c 6 Jul 2021 18:45:44 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_util_c,v 1.10 2019/0
Index: src/util.c
--- src/util.c.orig
+++ src/util.c
-@@ -226,12 +226,13 @@ int DisplayBanner(void)
+@@ -227,12 +227,13 @@ int DisplayBanner(void)
* Returns: void function
*
****************************************************************************/
@@ -18,7 +18,7 @@ Index: src/util.c
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
-@@ -241,7 +242,9 @@ void ts_print(register const struct timeval *tvp, char
+@@ -242,7 +243,9 @@ void ts_print(register const struct timeval *tvp, char
/* manual page (for linux) says tz is never used, so.. */
memset((char *) &tz, 0, sizeof(tz));
gettimeofday(&tv, &tz);
