diff --git a/security/suricata/Makefile b/security/suricata/Makefile index 660fc29b8328..92e6efcdd785 100644 --- a/security/suricata/Makefile +++ b/security/suricata/Makefile @@ -1,139 +1,126 @@ PORTNAME= suricata -DISTVERSION= 6.0.13 -PORTREVISION= 3 +DISTVERSION= 7.0.0 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ MAINTAINER= franco@opnsense.org COMMENT= High Performance Network IDS, IPS and Security Monitoring engine WWW= https://suricata.io LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} LIB_DEPENDS= libjansson.so:devel/jansson \ liblz4.so:archivers/liblz4 \ libnet.so:net/libnet \ - libpcre.so:devel/pcre \ + libpcre2-8.so:devel/pcre2 \ libyaml.so:textproc/libyaml USES= autoreconf cpe gmake iconv:translit libtool localbase pathfix \ pkgconfig shebangfix SHEBANG_FILES= python/suricata/sc/suricatasc.py CPE_VENDOR= openinfosecfoundation USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gccmarch-native \ --enable-bundled-htp \ --enable-gccprotect MAKE_ENV= RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}" INSTALL_TARGET= install-strip TEST_TARGET= check CONFLICTS_INSTALL= libhtp SUB_FILES= pkg-message -OPTIONS_DEFINE= GEOIP IPFW NETMAP NSS PORTS_PCAP PRELUDE PYTHON REDIS \ - TESTS +OPTIONS_DEFINE= GEOIP IPFW NETMAP NSS PORTS_PCAP PYTHON REDIS TESTS OPTIONS_DEFINE_amd64= HYPERSCAN OPTIONS_DEFAULT= IPFW NETMAP PYTHON OPTIONS_RADIO= SCRIPTS OPTIONS_RADIO_SCRIPTS= LUA LUAJIT 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 LUAJIT_DESC= LuaJIT scripting support LUA_DESC= LUA scripting support 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 TESTS_DESC= Unit tests in suricata binary GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb GEOIP_CONFIGURE_ON= --enable-geoip HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan IPFW_CONFIGURE_ON= --enable-ipfw LUAJIT_USES= luajit LUAJIT_CONFIGURE_ON= --enable-luajit LUA_USES= lua:51 LUA_CONFIGURE_ON= --enable-lua -NETMAP_CONFIGURE_ENABLE= netmap # netmap-v14 +NETMAP_CONFIGURE_ENABLE= netmap NSS_LIB_DEPENDS= libnspr4.so:devel/nspr \ libnss3.so:security/nss NSS_CONFIGURE_OFF= --disable-nspr \ --disable-nss 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 PYTHON_CONFIGURE_ENABLE= python REDIS_LIB_DEPENDS= libevent_pthreads.so:devel/libevent \ libhiredis.so:databases/hiredis REDIS_CONFIGURE_ON= --enable-hiredis TESTS_CONFIGURE_ENABLE= unittests pre-patch: @${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4 post-patch: # Disable vendor checksums @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${WRKSRC}/rust/vendor/*/.cargo-checksum.json post-patch-PYTHON-on: @${REINPLACE_CMD} -e "/AC_PATH_PROGS.*HAVE_PYTHON/ s/python[^,]*,/${PYTHON_VERSION},/g" \ ${WRKSRC}/configure.ac post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/log/suricata .for f in classification.config reference.config @${MV} ${STAGEDIR}${DATADIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor .for f in suricata.yaml threshold.config ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor post-install-PYTHON-on: (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d /usr/local/lib/suricata/python -f lib/suricata/python) .for f in disable.conf drop.conf enable.conf modify.conf threshold.in update.yaml ${INSTALL_DATA} ${WRKSRC}/suricata-update/suricata/update/configs/${f} \ ${STAGEDIR}${PREFIX}/lib/suricata/python/suricata/update/configs .endfor .include diff --git a/security/suricata/distinfo b/security/suricata/distinfo index e5e8e5bc46e5..5f09fca589d9 100644 --- a/security/suricata/distinfo +++ b/security/suricata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686896524 -SHA256 (suricata-6.0.13.tar.gz) = e09f2f800d0e0cd2f97f21c505950ccc3dbb9ce5cfe808df9567b6d849a31055 -SIZE (suricata-6.0.13.tar.gz) = 27411308 +TIMESTAMP = 1689683356 +SHA256 (suricata-7.0.0.tar.gz) = 7bcd1313118366451465dc3f8385a3f6aadd084ffe44dd257dda8105863bb769 +SIZE (suricata-7.0.0.tar.gz) = 23426302 diff --git a/security/suricata/files/patch-configure.ac b/security/suricata/files/patch-configure.ac deleted file mode 100644 index b1eece593d90..000000000000 --- a/security/suricata/files/patch-configure.ac +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 diff --git a/security/suricata/pkg-plist b/security/suricata/pkg-plist index 4a9c881fcc8f..2edbf8f69623 100644 --- a/security/suricata/pkg-plist +++ b/security/suricata/pkg-plist @@ -1,166 +1,168 @@ bin/suricata %%PYTHON%%bin/suricata-update %%PYTHON%%bin/suricatactl %%PYTHON%%bin/suricatasc include/htp/bstr.h include/htp/bstr_builder.h include/htp/htp.h include/htp/htp_base64.h include/htp/htp_config.h include/htp/htp_connection_parser.h include/htp/htp_core.h include/htp/htp_decompressors.h include/htp/htp_hooks.h include/htp/htp_list.h include/htp/htp_multipart.h include/htp/htp_table.h include/htp/htp_transaction.h include/htp/htp_urlencoded.h include/htp/htp_utf8_decoder.h include/htp/htp_version.h include/htp/lzma/7zTypes.h include/htp/lzma/LzmaDec.h -include/suricata-plugin.h lib/libhtp.a lib/libhtp.so lib/libhtp.so.2 lib/libhtp.so.2.0.0 %%PYTHON%%lib/suricata/python/suricata/__init__.py %%PYTHON%%lib/suricata/python/suricata/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/config/__init__.py %%PYTHON%%lib/suricata/python/suricata/config/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/config/__pycache__/defaults%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/config/defaults.py %%PYTHON%%lib/suricata/python/suricata/ctl/__init__.py %%PYTHON%%lib/suricata/python/suricata/ctl/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/ctl/__pycache__/filestore%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/ctl/__pycache__/loghandler%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/ctl/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/ctl/__pycache__/test_filestore%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/ctl/filestore.py %%PYTHON%%lib/suricata/python/suricata/ctl/loghandler.py %%PYTHON%%lib/suricata/python/suricata/ctl/main.py %%PYTHON%%lib/suricata/python/suricata/ctl/test_filestore.py %%PYTHON%%lib/suricata/python/suricata/sc/__init__.py %%PYTHON%%lib/suricata/python/suricata/sc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/sc/__pycache__/specs%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/sc/__pycache__/suricatasc%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/sc/specs.py %%PYTHON%%lib/suricata/python/suricata/sc/suricatasc.py %%PYTHON%%lib/suricata/python/suricata/update/__init__.py %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/engine%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/extract%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/loghandler%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/maps%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/matchers%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/net%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/notes%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/osinfo%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/parsers%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/rule%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/sources%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/util%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/__pycache__/version%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__init__.py %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/addsource%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/checkversions%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/disablesource%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/enablesource%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/listsources%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/removesource%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/__pycache__/updatesources%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/commands/addsource.py %%PYTHON%%lib/suricata/python/suricata/update/commands/checkversions.py %%PYTHON%%lib/suricata/python/suricata/update/commands/disablesource.py %%PYTHON%%lib/suricata/python/suricata/update/commands/enablesource.py %%PYTHON%%lib/suricata/python/suricata/update/commands/listsources.py %%PYTHON%%lib/suricata/python/suricata/update/commands/removesource.py %%PYTHON%%lib/suricata/python/suricata/update/commands/updatesources.py %%PYTHON%%lib/suricata/python/suricata/update/compat/__init__.py %%PYTHON%%lib/suricata/python/suricata/update/compat/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/compat/__pycache__/ordereddict%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/compat/argparse/__init__.py %%PYTHON%%lib/suricata/python/suricata/update/compat/argparse/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/compat/argparse/__pycache__/argparse%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/compat/argparse/argparse.py %%PYTHON%%lib/suricata/python/suricata/update/compat/ordereddict.py %%PYTHON%%lib/suricata/python/suricata/update/config.py %%PYTHON%%lib/suricata/python/suricata/update/configs/__init__.py %%PYTHON%%lib/suricata/python/suricata/update/configs/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/configs/disable.conf %%PYTHON%%lib/suricata/python/suricata/update/configs/drop.conf %%PYTHON%%lib/suricata/python/suricata/update/configs/enable.conf %%PYTHON%%lib/suricata/python/suricata/update/configs/modify.conf %%PYTHON%%lib/suricata/python/suricata/update/configs/threshold.in %%PYTHON%%lib/suricata/python/suricata/update/configs/update.yaml %%PYTHON%%lib/suricata/python/suricata/update/data/__init__.py %%PYTHON%%lib/suricata/python/suricata/update/data/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/data/__pycache__/index%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/data/__pycache__/update%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%lib/suricata/python/suricata/update/data/index.py %%PYTHON%%lib/suricata/python/suricata/update/data/update.py %%PYTHON%%lib/suricata/python/suricata/update/engine.py %%PYTHON%%lib/suricata/python/suricata/update/exceptions.py %%PYTHON%%lib/suricata/python/suricata/update/extract.py %%PYTHON%%lib/suricata/python/suricata/update/loghandler.py %%PYTHON%%lib/suricata/python/suricata/update/main.py %%PYTHON%%lib/suricata/python/suricata/update/maps.py %%PYTHON%%lib/suricata/python/suricata/update/matchers.py %%PYTHON%%lib/suricata/python/suricata/update/net.py %%PYTHON%%lib/suricata/python/suricata/update/notes.py %%PYTHON%%lib/suricata/python/suricata/update/osinfo.py %%PYTHON%%lib/suricata/python/suricata/update/parsers.py %%PYTHON%%lib/suricata/python/suricata/update/rule.py %%PYTHON%%lib/suricata/python/suricata/update/sources.py %%PYTHON%%lib/suricata/python/suricata/update/util.py %%PYTHON%%lib/suricata/python/suricata/update/version.py %%PYTHON%%lib/suricata/python/suricatasc/__init__.py %%PYTHON%%lib/suricata/python/suricatasc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc libdata/pkgconfig/htp.pc man/man1/suricata.1.gz %%PYTHON%%man/man1/suricatactl-filestore.1.gz %%PYTHON%%man/man1/suricatactl.1.gz %%PYTHON%%man/man1/suricatasc.1.gz %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/Basic_Setup.txt %%DOCSDIR%%/GITGUIDE %%DOCSDIR%%/INSTALL %%DOCSDIR%%/NEWS %%DOCSDIR%%/README %%DOCSDIR%%/Setting_up_IPSinline_for_Linux.txt %%DOCSDIR%%/TODO %%DOCSDIR%%/Third_Party_Installation_Guides.txt %%DATADIR%%/rules/app-layer-events.rules %%DATADIR%%/rules/decoder-events.rules %%DATADIR%%/rules/dhcp-events.rules %%DATADIR%%/rules/dnp3-events.rules %%DATADIR%%/rules/dns-events.rules %%DATADIR%%/rules/files.rules +%%DATADIR%%/rules/ftp-events.rules %%DATADIR%%/rules/http-events.rules %%DATADIR%%/rules/http2-events.rules %%DATADIR%%/rules/ipsec-events.rules %%DATADIR%%/rules/kerberos-events.rules %%DATADIR%%/rules/modbus-events.rules %%DATADIR%%/rules/mqtt-events.rules %%DATADIR%%/rules/nfs-events.rules %%DATADIR%%/rules/ntp-events.rules +%%DATADIR%%/rules/quic-events.rules +%%DATADIR%%/rules/rfb-events.rules %%DATADIR%%/rules/smb-events.rules %%DATADIR%%/rules/smtp-events.rules %%DATADIR%%/rules/ssh-events.rules %%DATADIR%%/rules/stream-events.rules %%DATADIR%%/rules/tls-events.rules @sample %%ETCDIR%%/classification.config.sample @sample %%ETCDIR%%/reference.config.sample @sample %%ETCDIR%%/suricata.yaml.sample @sample %%ETCDIR%%/threshold.config.sample @dir %%DATADIR%% @dir %%DOCSDIR%% @dir %%ETCDIR%% @dir include/htp @dir(root,wheel,0700) /var/log/suricata @postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/%%ETCDIR%%`` to remove configuration files."; fi