Re: UPDATE: net/snort 2.9.16
On Thu, May 21, 2020 at 11:06:19AM +0100, Stuart Henderson wrote:
> On 2020/05/18 23:52, Lawrence Teo wrote:
> > lib/pkgconfig/snort.pc
> > lib/snort_dynamicengine/
> > -lib/snort_dynamicengine/libsf_engine.a
> > +@static-lib lib/snort_dynamicengine/libsf_engine.a
> > @comment lib/snort_dynamicengine/libsf_engine.la
> > -lib/snort_dynamicengine/libsf_engine.so
> > +@so lib/snort_dynamicengine/libsf_engine.so
>
> Just noticed this in the diff - are these static libraries doing anything
> useful? These look like they should just be dlopen() modules which could
> be dropped with LIBTOOL_FLAGS=--tag=disable-static.
Thank you for the note. Here's a new diff that drops those static
libraries with the LIBTOOL_FLAGS you suggested. As far as I can tell
from my tests, those static libraries are not needed.
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Dec 2019 03:19:10 - 1.106
+++ Makefile21 May 2020 20:55:49 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.15
-RULESV = 29150
+DISTNAME = snort-2.9.16
+RULESV = 29160
SUBST_VARS = RULESV
CATEGORIES = net security
@@ -24,6 +24,8 @@ SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-static-daq \
--enable-non-ether-decoders
+
+LIBTOOL_FLAGS =--tag=disable-static
LIB_DEPENDS = archivers/xz \
devel/pcre \
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo1 Dec 2019 03:19:10 - 1.42
+++ distinfo17 May 2020 01:14:58 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.15.tar.gz) = v7Q3dGRG73KgPFAdsTzW2l7dK0H1XIDEN7ooi+bafbo=
-SIZE (snort-2.9.15.tar.gz) = 6704763
+SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
+SIZE (snort-2.9.16.tar.gz) = 6948498
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_decode_h
--- patches/patch-src_decode_h 28 Jan 2018 03:09:12 - 1.11
+++ patches/patch-src_decode_h 17 May 2020 01:15:23 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.11 2018
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
+@@ -837,9 +837,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.20
diff -u -p -r1.20 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 1 Dec 2019 03:19:10
- 1.20
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 17 May 2020 01:15:25
-
@@ -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
-@@ -1647,19 +1647,8 @@ clean-local:
+@@ -1649,19 +1649,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.17
diff -u -p -r1.17 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 1 Dec 2019
03:19:10 - 1.17
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 17 May 2020
01:15:27 -
@@ -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)
-@@ -608,7 +608,7 @@ distdir-am: $(DISTFILES)
+@@ -609,7 +609,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.15
diff -u -p -r1.15 patch-src_dynamic-preprocessors_dnp3_Makefile_in
---
Re: UPDATE: net/snort 2.9.16
On 2020/05/18 23:52, Lawrence Teo wrote: > lib/pkgconfig/snort.pc > lib/snort_dynamicengine/ > -lib/snort_dynamicengine/libsf_engine.a > +@static-lib lib/snort_dynamicengine/libsf_engine.a > @comment lib/snort_dynamicengine/libsf_engine.la > -lib/snort_dynamicengine/libsf_engine.so > +@so lib/snort_dynamicengine/libsf_engine.so Just noticed this in the diff - are these static libraries doing anything useful? These look like they should just be dlopen() modules which could be dropped with LIBTOOL_FLAGS=--tag=disable-static.
UPDATE: net/snort 2.9.16
This updates Snort to 2.9.16.
https://blog.snort.org/2020/04/snort-29160-has-been-released.html
Upstream has a daq 2.0.7 release too, where the only change is the
addition of a daq.vcxproj file for 64-bit Windows. But their distfile
still ships with the configure script generated for daq-2.0.6, causing
the build to fail. I think they did not generate a new configure from
the 2.0.7 configure.ac.
However, for our purposes there is no functional change between
daq-2.0.6 and daq-2.0.7, so I did not spend too much time trying to make
it work since snort-2.9.16 builds and runs just fine with daq-2.0.6.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Dec 2019 03:19:10 - 1.106
+++ Makefile19 May 2020 02:20:57 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.15
-RULESV = 29150
+DISTNAME = snort-2.9.16
+RULESV = 29160
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo1 Dec 2019 03:19:10 - 1.42
+++ distinfo17 May 2020 01:14:58 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.15.tar.gz) = v7Q3dGRG73KgPFAdsTzW2l7dK0H1XIDEN7ooi+bafbo=
-SIZE (snort-2.9.15.tar.gz) = 6704763
+SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
+SIZE (snort-2.9.16.tar.gz) = 6948498
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_decode_h
--- patches/patch-src_decode_h 28 Jan 2018 03:09:12 - 1.11
+++ patches/patch-src_decode_h 17 May 2020 01:15:23 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.11 2018
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
+@@ -837,9 +837,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.20
diff -u -p -r1.20 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 1 Dec 2019 03:19:10
- 1.20
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 17 May 2020 01:15:25
-
@@ -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
-@@ -1647,19 +1647,8 @@ clean-local:
+@@ -1649,19 +1649,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.17
diff -u -p -r1.17 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 1 Dec 2019
03:19:10 - 1.17
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 17 May 2020
01:15:27 -
@@ -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)
-@@ -608,7 +608,7 @@ distdir-am: $(DISTFILES)
+@@ -609,7 +609,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.15
diff -u -p -r1.15 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in1 Dec 2019
03:19:10 - 1.15
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in17 May 2020
01:15:29 -
@@ -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)
-@@ -591,7 +591,7 @@ distdir-am: $(DISTFILES)
+@@ -592,7 +592,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
