On Wed, Jul 14, 2021 at 10:22:12AM +0100, Stuart Henderson wrote:
Hello Stuart,
first I'd like to apologize for the late reply.
> LuaJIT only supports a limited number of archs, restricting what snort
> can be run on. (Notably LuaJIT 2.0 doesn't support aarch64). This diff,
> prompted by a mail from Soner Tari, adds a no_luajit flavour disabling
> use of LuaJIT, and uses it by default unless on one of the archs where
> LuaJIT is supported.
>
> It would also be possible to get rid of the flavour and just include or
> disable appid depending on the arch, but with rspamd I found it helpful
> to be able to build without luajit on amd64 for testing, so I took the
> same approach.
>
> @comment approach is similar to MODPY_COMMENT used in many Python ports
> to include/exclude files based on a Makefile without the need to manage
> separate PFRAG files.
Thanks for your patch.
Attached is a straight forward update of snort to 2.9.18.1 with your
additional patch.
The flavored and unflavored versions work for me on amd64.
Unfortunately I don't have other archs to test.
Regards,
Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.110
diff -u -p -u -p -r1.110 Makefile
--- Makefile 11 Jul 2021 02:11:34 -0000 1.110
+++ Makefile 18 Sep 2021 21:34:47 -0000
@@ -2,9 +2,9 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.18
-RULESV = 29180
-SUBST_VARS = RULESV
+DISTNAME = snort-2.9.18.1
+RULESV = 29181
+SUBST_VARS = RULESV APPID_COMMENT
CATEGORIES = net security
@@ -15,8 +15,17 @@ MAINTAINER = Markus Lude <markus.lude@g
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB += c c++abi crypto daq dnet luajit-5.1 lzma m nghttp2
-WANTLIB += pcap pcre pthread z
+WANTLIB += c crypto daq dnet lzma m nghttp2 pcap pcre pthread z
+
+FLAVORS = no_luajit
+.if ${MACHINE_ARCH} == arm || \
+ ${MACHINE_ARCH} == amd64 || \
+ ${MACHINE_ARCH} == i386 || \
+ ${MACHINE_ARCH} == powerpc
+FLAVOR ?=
+.else
+FLAVOR = no_luajit
+.endif
MASTER_SITES = https://www.snort.org/downloads/snort/
@@ -29,10 +38,18 @@ LIBTOOL_FLAGS = --tag=disable-static
LIB_DEPENDS = archivers/xz \
devel/pcre \
- lang/luajit \
net/daq \
net/libdnet \
www/nghttp2
+
+.if ${FLAVOR:Mno_luajit}
+CONFIGURE_ARGS += --disable-open-appid
+APPID_COMMENT = "@comment "
+.else
+LIB_DEPENDS += lang/luajit
+WANTLIB += c++abi luajit-5.1
+APPID_COMMENT =
+.endif
CONFIGS = classification.config gen-msg.map
reference.config \
snort.conf threshold.conf unicode.map
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 distinfo
--- distinfo 11 Jul 2021 02:11:34 -0000 1.46
+++ distinfo 18 Sep 2021 21:34:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.18.tar.gz) = 0DCGQvaeDTb3DblwPldmr84vRP8Ft9LJzI46yDI7LHc=
-SIZE (snort-2.9.18.tar.gz) = 6909928
+SHA256 (snort-2.9.18.1.tar.gz) = 2orw8bLk8kfZcMajwOg/ttzVyE+qIa6knzBvJp6OKKo=
+SIZE (snort-2.9.18.1.tar.gz) = 7001847
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.16
diff -u -p -u -p -r1.16 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 11 Jul 2021
02:11:34 -0000 1.16
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -376,7 +376,7 @@ top_srcdir = @top_srcdir@
+@@ -388,7 +388,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
-@@ -517,7 +517,7 @@ massage_ipv6_headers = \
+@@ -529,7 +529,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.24
diff -u -p -u -p -r1.24 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 11 Jul 2021 02:11:34
-0000 1.24
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 18 Sep 2021 21:34:47
-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
-@@ -1639,19 +1639,8 @@ clean-local:
+@@ -1655,19 +1655,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.7
diff -u -p -u -p -r1.7 patch-src_dynamic-preprocessors_appid_Makefile_in
--- patches/patch-src_dynamic-preprocessors_appid_Makefile_in 11 Jul 2021
02:11:34 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_appid_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -575,8 +575,8 @@ APPID_SOURCES = $(APPID_SRC_DIR)/commonAppMatcher.c \
+@@ -586,8 +586,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.20
diff -u -p -u -p -r1.20 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 11 Jul 2021
02:11:34 -0000 1.20
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@
+@@ -372,7 +372,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)
-@@ -595,7 +595,7 @@ distdir: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -353,7 +353,7 @@ top_srcdir = @top_srcdir@
+@@ -365,7 +365,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)
-@@ -578,7 +578,7 @@ distdir: $(DISTFILES)
+@@ -592,7 +592,7 @@ distdir-am: $(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.22
diff -u -p -u -p -r1.22 patch-src_dynamic-preprocessors_dns_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 11 Jul 2021
02:11:34 -0000 1.22
+++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
+@@ -349,7 +349,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 \
-@@ -532,7 +532,7 @@ distdir: $(DISTFILES)
+@@ -546,7 +546,7 @@ distdir-am: $(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.23
diff -u -p -u -p -r1.23 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 11 Jul
2021 02:11:34 -0000 1.23
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 18 Sep
2021 21:34:47 -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
-@@ -356,7 +356,7 @@ top_srcdir = @top_srcdir@
+@@ -368,7 +368,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 \
-@@ -593,7 +593,7 @@ distdir: $(DISTFILES)
+@@ -607,7 +607,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -340,7 +340,7 @@ top_srcdir = @top_srcdir@
+@@ -352,7 +352,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 \
-@@ -537,7 +537,7 @@ distdir: $(DISTFILES)
+@@ -551,7 +551,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_imap_Makefile_in
--- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -346,7 +346,7 @@ top_srcdir = @top_srcdir@
+@@ -358,7 +358,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 \
-@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
+@@ -594,7 +594,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -341,7 +341,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_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 \
-@@ -538,7 +538,7 @@ distdir: $(DISTFILES)
+@@ -552,7 +552,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_pop_Makefile_in
--- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@
+@@ -357,7 +357,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 \
-@@ -578,7 +578,7 @@ distdir: $(DISTFILES)
+@@ -592,7 +592,7 @@ distdir-am: $(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.17
diff -u -p -u -p -r1.17 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 11 Jul
2021 02:11:34 -0000 1.17
+++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 18 Sep
2021 21:34:47 -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
-@@ -348,7 +348,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_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 \
-@@ -610,7 +610,7 @@ distdir: $(DISTFILES)
+@@ -624,7 +624,7 @@ distdir-am: $(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.3
diff -u -p -u -p -r1.3 patch-src_dynamic-preprocessors_s7commplus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in 11 Jul
2021 02:11:34 -0000 1.3
+++ patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in 18 Sep
2021 21:34:47 -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
-@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
+@@ -344,7 +344,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 \
-@@ -532,7 +532,7 @@ distdir: $(DISTFILES)
+@@ -546,7 +546,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
+@@ -343,7 +343,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 \
-@@ -537,7 +537,7 @@ distdir: $(DISTFILES)
+@@ -551,7 +551,7 @@ distdir-am: $(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.18
diff -u -p -u -p -r1.18 patch-src_dynamic-preprocessors_sip_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 11 Jul 2021
02:11:34 -0000 1.18
+++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
+@@ -363,7 +363,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)
-@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
+@@ -587,7 +587,7 @@ distdir-am: $(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.22
diff -u -p -u -p -r1.22 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 11 Jul 2021
02:11:34 -0000 1.22
+++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -347,7 +347,7 @@ top_srcdir = @top_srcdir@
+@@ -359,7 +359,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 \
-@@ -586,7 +586,7 @@ distdir: $(DISTFILES)
+@@ -600,7 +600,7 @@ distdir-am: $(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.21
diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 11 Jul 2021
02:11:34 -0000 1.21
+++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
+@@ -349,7 +349,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 \
-@@ -532,7 +532,7 @@ distdir: $(DISTFILES)
+@@ -546,7 +546,7 @@ distdir-am: $(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.20
diff -u -p -u -p -r1.20 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 11 Jul 2021
02:11:34 -0000 1.20
+++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 18 Sep 2021
21:34:47 -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
-@@ -339,7 +339,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_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 \
-@@ -550,7 +550,7 @@ distdir: $(DISTFILES)
+@@ -564,7 +564,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 PLIST
--- pkg/PLIST 16 Feb 2021 03:02:38 -0000 1.34
+++ pkg/PLIST 18 Sep 2021 21:34:47 -0000
@@ -3,19 +3,19 @@
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/snort
-bin/appid_detector_builder.sh
+${APPID_COMMENT}bin/appid_detector_builder.sh
@bin bin/snort
@bin bin/u2boat
-@bin bin/u2openappid
+${APPID_COMMENT}@bin bin/u2openappid
@bin bin/u2spewfoo
-@bin bin/u2streamer
+${APPID_COMMENT}@bin bin/u2streamer
lib/pkgconfig/snort.pc
lib/snort_dynamicengine/
@comment lib/snort_dynamicengine/libsf_engine.la
@so lib/snort_dynamicengine/libsf_engine.so
lib/snort_dynamicpreprocessor/
-lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
-@so lib/snort_dynamicpreprocessor/libsf_appid_preproc.so
+${APPID_COMMENT}lib/snort_dynamicpreprocessor/libsf_appid_preproc.la
+${APPID_COMMENT}@so lib/snort_dynamicpreprocessor/libsf_appid_preproc.so
@comment lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
@so lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so
@comment lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
