Hello,

attached is an update to snort-2.9.12.

Tested on amd64.

Please test, comment and eventually commit.

Regards
Markus

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.100
diff -u -p -u -p -r1.100 Makefile
--- Makefile    4 Sep 2018 12:46:18 -0000       1.100
+++ Makefile    10 Feb 2019 19:24:33 -0000
@@ -2,8 +2,8 @@
 
 COMMENT =              highly flexible sniffer/NIDS
 
-VERSION =              2.9.11.1
-DISTNAME =             snort-${VERSION}
+VERSION =              2.9.12.0
+DISTNAME =             snort-${VERSION:S/.0$//g}
 
 CATEGORIES =           net security
 
@@ -25,6 +25,7 @@ CONFIGURE_ARGS +=     --disable-static-daq \
 
 LIB_DEPENDS =          archivers/xz \
                        devel/pcre \
+                       lang/luajit \
                        net/daq \
                        net/libdnet \
                        www/nghttp2
@@ -39,7 +40,6 @@ DOCS =                        AUTHORS CREDITS README README.*
 
 V =                    ${VERSION:S/.//g}
 SUBST_VARS +=          V
-REVISION =             0
 
 pre-configure:
        @${SUBST_CMD} ${WRKSRC}/etc/snort.conf
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo    28 Jan 2018 03:09:12 -0000      1.37
+++ distinfo    10 Feb 2019 19:24:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.11.1.tar.gz) = n2s66sWhCfVVBL03BWSsQxyxdzUHkp3EYWJomPM/Rs0=
-SIZE (snort-2.9.11.1.tar.gz) = 6442755
+SHA256 (snort-2.9.12.tar.gz) = ewLhGYfGy09tedcnmcqa0rS9Wcwdlrt9bJFUn5kNmdA=
+SIZE (snort-2.9.12.tar.gz) = 6456877
Index: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
===================================================================
RCS file: patches/patch-src_dynamic-preprocessors_appid_Makefile_in
diff -N patches/patch-src_dynamic-preprocessors_appid_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in   10 Feb 2019 
19:24:33 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/dynamic-preprocessors/appid/Makefile.in
+--- src/dynamic-preprocessors/appid/Makefile.in.orig
++++ src/dynamic-preprocessors/appid/Makefile.in
+@@ -583,7 +583,7 @@ 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
+-libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
++libsf_appid_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version 
@XCCFLAGS@
+ @SO_WITH_STATIC_LIB_FALSE@libsf_appid_preproc_la_LIBADD = $(LUA_LIBS)
+ @SO_WITH_STATIC_LIB_TRUE@libsf_appid_preproc_la_LIBADD = 
../libsf_dynamic_preproc.la ../libsf_dynamic_utils.la $(LUA_LIBS)
+ @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_appid_preproc_la_SOURCES = \
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.5
diff -u -p -u -p -r1.5 patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c  28 Jan 2018 
03:09:12 -0000      1.5
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c  10 Feb 2019 
19:24:33 -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
-@@ -8504,7 +8504,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+@@ -8530,7 +8530,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.31
diff -u -p -u -p -r1.31 PLIST
--- pkg/PLIST   4 Sep 2018 12:46:18 -0000       1.31
+++ pkg/PLIST   10 Feb 2019 19:24:33 -0000
@@ -2,15 +2,21 @@
 @pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
 @newgroup _snort:557
 @newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
+bin/appid_detector_builder.sh
 @bin bin/snort
 @bin bin/u2boat
+@bin bin/u2openappid
 @bin bin/u2spewfoo
+@bin bin/u2streamer
 lib/pkgconfig/snort.pc
 lib/snort_dynamicengine/
 lib/snort_dynamicengine/libsf_engine.a
 @comment lib/snort_dynamicengine/libsf_engine.la
 lib/snort_dynamicengine/libsf_engine.so
 lib/snort_dynamicpreprocessor/
+lib/snort_dynamicpreprocessor/libsf_appid_preproc.a
+lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
+lib/snort_dynamicpreprocessor/libsf_appid_preproc.so
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
 @comment lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so

Reply via email to