Attachment #237997 for bug #267688




PORTNAME=	suricata
DISTVERSION=	7.0.0-beta1
PORTREVISION=	2
CATEGORIES=	security
MASTER_SITES=	https://www.openinfosecfoundation.org/download/


LIB_DEPENDS=	libjansson.so:devel/jansson \
		liblz4.so:archivers/liblz4 \
		libnet.so:net/libnet \
		libpcre2-8.so:devel/pcre2 \
		libyaml.so:textproc/libyaml

USES=		autoreconf cpe gmake iconv:translit libtool localbase pathfix \


SUB_FILES=	pkg-message

OPTIONS_DEFINE=		GEOIP IPFW NETMAP NSS PORTS_PCAP PYTHON REDIS TESTS
			TESTS
OPTIONS_DEFINE_amd64=	HYPERSCAN
OPTIONS_DEFAULT=	IPFW NETMAP PYTHON



OPTIONS_SUB=	yes

PRELUDE_BROKEN=	Compilation broken, see https://redmine.openinfosecfoundation.org/issues/4065

GEOIP_DESC=		GeoIP support
HYPERSCAN_DESC=		Hyperscan support
IPFW_DESC=		IPFW and IP Divert support for inline IDP

NETMAP_DESC=		Netmap support for inline IDP
NSS_DESC=		File checksums and SSL/TLS fingerprinting
PORTS_PCAP_DESC=	Use libpcap from ports
PRELUDE_DESC=		Prelude support for NIDS alerts
PYTHON_DESC=		Python-based update and control utilities
REDIS_DESC=		Redis output support
SCRIPTS_DESC=		Scripting


PORTS_PCAP_LIB_DEPENDS=	libpcap.so.1:net/libpcap

PRELUDE_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt \
				libgnutls.so:security/gnutls \
				libgpg-error.so:security/libgpg-error \
				libltdl.so:devel/libltdl \
				libprelude.so:security/libprelude
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
PRELUDE_CONFIGURE_ENABLE=	prelude

PYTHON_BUILD_DEPENDS=		${PYTHON_RUN_DEPENDS}
PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
PYTHON_USES=			python

Lines 1-3 Link Here

(-)b/security/suricata/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1664344381	1	TIMESTAMP = 1667981813
2	SHA256 (suricata-6.0.8.tar.gz) = 253ce3cc0df967ad9371d6ea8d4eed91ec593df3ed04e08229c7cf85780c91a3	2	SHA256 (suricata-7.0.0-beta1.tar.gz) = 64c95b29eb869e7c5bdac62d74f4cd1d5701ca857e091d59a4938de83300ad0f
3	SIZE (suricata-6.0.8.tar.gz) = 32697425	3	SIZE (suricata-7.0.0-beta1.tar.gz) = 28918750




--- configure.ac.orig	2021-03-01 16:13:22 UTC
+++ configure.ac
@@ -706,8 +706,6 @@
                 # unittests when jit is enabled.
                 pcre_jit_available="no, pcre 8.39/8.40 jit disabled for powerpc64"
             fi
-            # hack: use libatomic
-            LIBS="${LIBS} -latomic"
         ;;
         *)
             # bug 1693, libpcre 8.35 is broken and debian jessie is still using that
@@ -1186,8 +1184,10 @@
             AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),[enable_prelude=$enableval],[enable_prelude=no])
     # Prelude doesn't work with -Werror
     STORECFLAGS="${CFLAGS}"
-    CFLAGS="${CFLAGS} -Wno-error=unused-result"
-
+    AX_CHECK_COMPILE_FLAG([-Wno-error=unused-result], 
+        [CFLAGS="${CFLAGS} -Wno-error=unused-result"],
+        [])
+       
     AS_IF([test "x$enable_prelude" = "xyes"], [
         AM_PATH_LIBPRELUDE(0.9.9, , AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?), no)
         if test "x${LIBPRELUDE_CFLAGS}" != "x"; then

Lines 20-26 include/htp/htp_utf8_decoder.h Link Here

(-)b/security/suricata/pkg-plist (-1 / +1 lines)
20	include/htp/htp_version.h	20	include/htp/htp_version.h
21	include/htp/lzma/7zTypes.h	21	include/htp/lzma/7zTypes.h
22	include/htp/lzma/LzmaDec.h	22	include/htp/lzma/LzmaDec.h
23	include/suricata-plugin.h
24	lib/libhtp.a	23	lib/libhtp.a
25	lib/libhtp.so	24	lib/libhtp.so
26	lib/libhtp.so.2	25	lib/libhtp.so.2
Lines 151-156 man/man1/suricata.1.gz Link Here
151	%%DATADIR%%/rules/mqtt-events.rules	150	%%DATADIR%%/rules/mqtt-events.rules
152	%%DATADIR%%/rules/nfs-events.rules	151	%%DATADIR%%/rules/nfs-events.rules
153	%%DATADIR%%/rules/ntp-events.rules	152	%%DATADIR%%/rules/ntp-events.rules
		153	%%DATADIR%%/rules/quic-events.rules
154	%%DATADIR%%/rules/smb-events.rules	154	%%DATADIR%%/rules/smb-events.rules
155	%%DATADIR%%/rules/smtp-events.rules	155	%%DATADIR%%/rules/smtp-events.rules
156	%%DATADIR%%/rules/ssh-events.rules	156	%%DATADIR%%/rules/ssh-events.rules

Return to bug 267688

Lines 1-6 Link Here

(-)b/security/suricata/Makefile (-16 / +3 lines)
1	PORTNAME= suricata	1	PORTNAME= suricata
2	DISTVERSION= 6.0.8	2	DISTVERSION= 7.0.0-beta1
3	PORTREVISION= 2
4	CATEGORIES= security	3	CATEGORIES= security
5	MASTER_SITES= https://www.openinfosecfoundation.org/download/	4	MASTER_SITES= https://www.openinfosecfoundation.org/download/
6		5
Lines 15-21 BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} Link Here
15	LIB_DEPENDS= libjansson.so:devel/jansson \	14	LIB_DEPENDS= libjansson.so:devel/jansson \
16	liblz4.so:archivers/liblz4 \	15	liblz4.so:archivers/liblz4 \
17	libnet.so:net/libnet \	16	libnet.so:net/libnet \
18	libpcre.so:devel/pcre \	17	libpcre2-8.so:devel/pcre2 \
19	libyaml.so:textproc/libyaml	18	libyaml.so:textproc/libyaml
20		19
21	USES= autoreconf cpe gmake iconv:translit libtool localbase pathfix \	20	USES= autoreconf cpe gmake iconv:translit libtool localbase pathfix \
Lines 40-47 CONFLICTS_INSTALL= libhtp Link Here
40		39
41	SUB_FILES= pkg-message	40	SUB_FILES= pkg-message
42		41
43	OPTIONS_DEFINE= GEOIP IPFW NETMAP NSS PORTS_PCAP PRELUDE PYTHON REDIS \	42	OPTIONS_DEFINE= GEOIP IPFW NETMAP NSS PORTS_PCAP PYTHON REDIS TESTS
44	TESTS
45	OPTIONS_DEFINE_amd64= HYPERSCAN	43	OPTIONS_DEFINE_amd64= HYPERSCAN
46	OPTIONS_DEFAULT= IPFW NETMAP PYTHON	44	OPTIONS_DEFAULT= IPFW NETMAP PYTHON
47		45
Lines 50-57 OPTIONS_RADIO_SCRIPTS= LUA LUAJIT Link Here
50		48
51	OPTIONS_SUB= yes	49	OPTIONS_SUB= yes
52		50
53	PRELUDE_BROKEN= Compilation broken, see https://redmine.openinfosecfoundation.org/issues/4065
54
55	GEOIP_DESC= GeoIP support	51	GEOIP_DESC= GeoIP support
56	HYPERSCAN_DESC= Hyperscan support	52	HYPERSCAN_DESC= Hyperscan support
57	IPFW_DESC= IPFW and IP Divert support for inline IDP	53	IPFW_DESC= IPFW and IP Divert support for inline IDP
Lines 60-66 LUA_DESC= LUA scripting support Link Here
60	NETMAP_DESC= Netmap support for inline IDP	56	NETMAP_DESC= Netmap support for inline IDP
61	NSS_DESC= File checksums and SSL/TLS fingerprinting	57	NSS_DESC= File checksums and SSL/TLS fingerprinting
62	PORTS_PCAP_DESC= Use libpcap from ports	58	PORTS_PCAP_DESC= Use libpcap from ports
63	PRELUDE_DESC= Prelude support for NIDS alerts
64	PYTHON_DESC= Python-based update and control utilities	59	PYTHON_DESC= Python-based update and control utilities
65	REDIS_DESC= Redis output support	60	REDIS_DESC= Redis output support
66	SCRIPTS_DESC= Scripting	61	SCRIPTS_DESC= Scripting
Lines 88-101 NSS_CONFIGURE_OFF= --disable-nspr \ Link Here
88		83
89	PORTS_PCAP_LIB_DEPENDS= libpcap.so.1:net/libpcap	84	PORTS_PCAP_LIB_DEPENDS= libpcap.so.1:net/libpcap
90		85
91	PRELUDE_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
92	libgnutls.so:security/gnutls \
93	libgpg-error.so:security/libgpg-error \
94	libltdl.so:devel/libltdl \
95	libprelude.so:security/libprelude
96	PRELUDE_CONFIGURE_ON= --with-libprelude-prefix=${LOCALBASE}
97	PRELUDE_CONFIGURE_ENABLE= prelude
98
99	PYTHON_BUILD_DEPENDS= ${PYTHON_RUN_DEPENDS}	86	PYTHON_BUILD_DEPENDS= ${PYTHON_RUN_DEPENDS}
100	PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}	87	PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
101	PYTHON_USES= python	88	PYTHON_USES= python

Removed Link Here

(-)a/security/suricata/files/patch-configure.ac (-24 lines)
1	--- configure.ac.orig 2021-03-01 16:13:22 UTC
2	+++ configure.ac
3	@@ -706,8 +706,6 @@
4	# unittests when jit is enabled.
5	pcre_jit_available="no, pcre 8.39/8.40 jit disabled for powerpc64"
6	fi
7	- # hack: use libatomic
8	- LIBS="${LIBS} -latomic"
9	;;
10	*)
11	# bug 1693, libpcre 8.35 is broken and debian jessie is still using that
12	@@ -1186,8 +1184,10 @@
13	AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),[enable_prelude=$enableval],[enable_prelude=no])
14	# Prelude doesn't work with -Werror
15	STORECFLAGS="${CFLAGS}"
16	- CFLAGS="${CFLAGS} -Wno-error=unused-result"
17	-
18	+ AX_CHECK_COMPILE_FLAG([-Wno-error=unused-result],
19	+ [CFLAGS="${CFLAGS} -Wno-error=unused-result"],
20	+ [])
21	+
22	AS_IF([test "x$enable_prelude" = "xyes"], [
23	AM_PATH_LIBPRELUDE(0.9.9, , AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?), no)
24	if test "x${LIBPRELUDE_CFLAGS}" != "x"; then