diff --git a/package/snort3/0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch b/package/snort3/0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch deleted file mode 100644 index 4f24ee72d4..0000000000 --- a/package/snort3/0001-Pull-request-3925-build-fix-cstdint-related-clearlinux-errors.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 154cf0312b3652bdfdf241e6883d7c6de9b85e01 Mon Sep 17 00:00:00 2001 -From: "Maya Dagon (mdagon)" -Date: Mon, 24 Jul 2023 08:06:50 +0000 -Subject: [PATCH] Pull request #3925: build: fix cstdint related clearlinux - errors - -Merge in SNORT/snort3 from ~MDAGON/snort3:clearlinux to master - -Squashed commit of the following: - -commit 7ef2bc13851ffa2bf7908964242859a8c05ddd96 -Author: maya dagon -Date: Thu Jul 20 14:34:01 2023 -0400 - - build: fix cstdint related clearlinux errors - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/snort3/snort3/commit/154cf0312b3652bdfdf241e6883d7c6de9b85e01 ---- - src/js_norm/js_identifier_ctx.h | 1 + - src/packet_io/sfdaq_config.h | 1 + - src/service_inspectors/wizard/magic.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/utils/js_identifier_ctx.h b/src/utils/js_identifier_ctx.h -index b8d5121a2c..6ef1ce2b23 100644 ---- a/src/utils/js_identifier_ctx.h -+++ b/src/utils/js_identifier_ctx.h -@@ -20,6 +20,7 @@ - #ifndef JS_IDENTIFIER_CTX - #define JS_IDENTIFIER_CTX - -+#include - #include - #include - #include -diff --git a/src/packet_io/sfdaq_config.h b/src/packet_io/sfdaq_config.h -index 990c45785b..f4c1042bc3 100644 ---- a/src/packet_io/sfdaq_config.h -+++ b/src/packet_io/sfdaq_config.h -@@ -21,6 +21,7 @@ - #ifndef SFDAQ_CONFIG_H - #define SFDAQ_CONFIG_H - -+#include - #include - #include - -diff --git a/src/service_inspectors/wizard/magic.h b/src/service_inspectors/wizard/magic.h -index fa24d0b5a4..b9477eb95c 100644 ---- a/src/service_inspectors/wizard/magic.h -+++ b/src/service_inspectors/wizard/magic.h -@@ -21,6 +21,7 @@ - #define MAGIC_H - - #include -+#include - #include - #include - diff --git a/package/snort3/Config.in b/package/snort3/Config.in index 7171603aa3..8dae65381e 100644 --- a/package/snort3/Config.in +++ b/package/snort3/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_SNORT3 select BR2_PACKAGE_LIBDNET select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LUAJIT - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_PACKAGE_LIBTIRPC_RPCDB if BR2_PACKAGE_LIBTIRPC select BR2_PACKAGE_OPENSSL diff --git a/package/snort3/snort3.hash b/package/snort3/snort3.hash index 7746547d18..599818ee24 100644 --- a/package/snort3/snort3.hash +++ b/package/snort3/snort3.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d787d954f21d4cd6a048e10b8c53c78cb6287ec448108fc573b951639c8947b3 snort3-3.1.40.0.tar.gz +sha256 9465d19b0925088266504e8962e97e55359bafd6a19f66b4169dcd21ef1d8ec5 snort3-3.11.1.0.tar.gz # Hash for license files: sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING diff --git a/package/snort3/snort3.mk b/package/snort3/snort3.mk index a76b831838..273aa56709 100644 --- a/package/snort3/snort3.mk +++ b/package/snort3/snort3.mk @@ -4,13 +4,13 @@ # ################################################################################ -SNORT3_VERSION = 3.1.40.0 +SNORT3_VERSION = 3.11.1.0 SNORT3_SITE = $(call github,snort3,snort3,$(SNORT3_VERSION)) SNORT3_LICENSE = GPL-2.0 SNORT3_LICENSE_FILES = COPYING LICENSE SNORT3_DEPENDENCIES = \ - host-pkgconf daq3 flex hwloc libdnet libpcap luajit openssl pcre zlib + host-pkgconf daq3 flex hwloc libdnet libpcap luajit openssl pcre2 zlib SNORT3_CONF_OPTS = \ -DENABLE_GDB=OFF \