ping
On Tue, Feb 09, 2021 at 11:51:25PM +0100, Markus Lude wrote:
> Hello,
>
> attached is an update to snort 2.9.17. The new version includes fixes
> for gcc-10. Tested on amd64.
>
> Please test and eventually commit. Thanks.
>
> Regards,
> Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile
--- Makefile 27 May 2020 02:32:10 -0000 1.107
+++ Makefile 9 Feb 2021 22:46:07 -0000
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.16
-RULESV = 29160
+DISTNAME = snort-2.9.17
+RULESV = 29170
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 distinfo
--- distinfo 27 May 2020 02:32:10 -0000 1.43
+++ distinfo 9 Feb 2021 22:46:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
-SIZE (snort-2.9.16.tar.gz) = 6948498
+SHA256 (snort-2.9.17.tar.gz) = w7I0w5IqCbA2i4R9240fo3G3QfAy9Cqpq1PWe0KNxkg=
+SIZE (snort-2.9.17.tar.gz) = 6983018
Index: patches/patch-src_decode_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-src_decode_h
--- patches/patch-src_decode_h 27 May 2020 02:32:10 -0000 1.12
+++ patches/patch-src_decode_h 9 Feb 2021 22:46:07 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.12 2020
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
+@@ -839,9 +839,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-preprocessors_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 27 May 2020 02:32:10
-0000 1.21
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 9 Feb 2021 22:46:07
-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
-@@ -1649,19 +1649,8 @@ clean-local:
+@@ -1650,19 +1650,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
===================================================================
RCS file: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
diff -N patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in 9 Feb
2021 22:46:07 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/dynamic-preprocessors/s7commplus/Makefile.in
+--- src/dynamic-preprocessors/s7commplus/Makefile.in.orig
++++ src/dynamic-preprocessors/s7commplus/Makefile.in
+@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_s7commplus_preproc.la
+-libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
++libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
+ @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 \
+@@ -546,7 +546,7 @@ distdir-am: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) all-local
++all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_log_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-src_log_c
--- patches/patch-src_log_c 1 Dec 2019 03:19:10 -0000 1.8
+++ patches/patch-src_log_c 9 Feb 2021 22:46:07 -0000
@@ -11,7 +11,7 @@ Index: src/log.c
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -1971,7 +1971,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
+@@ -1975,7 +1975,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
memset((char *) timestamp, 0, TIMEBUF_SIZE);
@@ -20,7 +20,7 @@ Index: src/log.c
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -2145,7 +2145,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
+@@ -2149,7 +2149,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.10
diff -u -p -u -p -r1.10 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 27 May 2020
02:32:10 -0000 1.10
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 9 Feb 2021
22:46:07 -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
-@@ -8881,7 +8881,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+@@ -8901,7 +8901,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.33
diff -u -p -u -p -r1.33 PLIST
--- pkg/PLIST 27 May 2020 02:32:10 -0000 1.33
+++ pkg/PLIST 9 Feb 2021 22:46:07 -0000
@@ -2,6 +2,7 @@
@pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/snort
bin/appid_detector_builder.sh
@bin bin/snort
@bin bin/u2boat
@@ -33,6 +34,8 @@ lib/snort_dynamicpreprocessor/libsf_appi
@so lib/snort_dynamicpreprocessor/libsf_pop_preproc.so
@comment lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la
@so lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so
+@comment lib/snort_dynamicpreprocessor/libsf_s7commplus_preproc.la
+@so lib/snort_dynamicpreprocessor/libsf_s7commplus_preproc.so
@comment lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la
@so lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so
@comment lib/snort_dynamicpreprocessor/libsf_sip_preproc.la
@@ -136,6 +139,3 @@ share/examples/snort/unicode.map
@group _snort
@sample /var/snort/
@sample /var/snort/log/
-@owner
-@group
-@rcscript ${RCDIR}/snort
