Hello,
thanks Stuart for your suggestions.
Updated diff attached.
- straight DISTNAME
- use RULESV instead of V
- fix WANTLIB
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 12 Feb 2019 18:57:21 -0000
@@ -2,8 +2,9 @@
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.11.1
-DISTNAME = snort-${VERSION}
+DISTNAME = snort-2.9.12
+RULESV = 29120
+SUBST_VARS = RULESV
CATEGORIES = net security
@@ -14,7 +15,7 @@ MAINTAINER = Markus Lude <markus.lude@g
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c crypto daq dnet lzma m nghttp2 pcap pcre pthread z
+WANTLIB = c crypto daq dnet luajit-5.1 lzma m nghttp2 pcap pcre
pthread z
MASTER_SITES = https://www.snort.org/downloads/snort/
@@ -25,6 +26,7 @@ CONFIGURE_ARGS += --disable-static-daq \
LIB_DEPENDS = archivers/xz \
devel/pcre \
+ lang/luajit \
net/daq \
net/libdnet \
www/nghttp2
@@ -36,10 +38,6 @@ PREPROC = decoder.rules preprocessor.ru
DOCS = AUTHORS CREDITS README README.* *.pdf TODO USAGE \
WISHLIST
-
-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 12 Feb 2019 18:57:21 -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 12 Feb 2019
18:57:21 -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 12 Feb 2019
18:57: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
-@@ -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 12 Feb 2019 18:57:21 -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
Index: pkg/README
===================================================================
RCS file: /cvs/ports/net/snort/pkg/README,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 README
--- pkg/README 4 Sep 2018 12:46:18 -0000 1.6
+++ pkg/README 12 Feb 2019 18:57:21 -0000
@@ -28,9 +28,9 @@ to the correct directory:
* Official Snort rules (replace <oinkcode> with yours):
- ftp -o snortrules-snapshot-${V}.tar.gz \
-
https://www.snort.org/rules/snortrules-snapshot-${V}.tar.gz?oinkcode=<oinkcode>
- tar -C /etc/snort -xzf snortrules-snapshot-${V}.tar.gz rules preproc_rules
+ ftp -o snortrules-snapshot-${RULESV}.tar.gz \
+
https://www.snort.org/rules/snortrules-snapshot-${RULESV}.tar.gz?oinkcode=<oinkcode>
+ tar -C /etc/snort -xzf snortrules-snapshot-${RULESV}.tar.gz rules
preproc_rules
* Emerging Threats rules:
