From 66d216a02b3e5e9a10d2c65110e0c93cbb75998c Mon Sep 17 00:00:00 2001 From: Alper Ak Date: Wed, 9 Jul 2025 20:30:42 +0300 Subject: [PATCH] snort3: Upgrade 3.7.1.0 -> 3.9.1.0 to allow CMake 4+ compatibility - Drop 0001-Fix-build-with-gcc-15.patch because fixed in the newer version. Changelog: https://github.com/snort3/snort3/blob/3.9.1.0/ChangeLog.md Fix: | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | Compatibility with CMake < 3.5 has been removed from CMake. | | Update the VERSION argument value. Or, use the ... syntax | to tell CMake that the project requires at least but has been updated | to work with policies introduced by or earlier. | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | | | -- Configuring incomplete, errors occurred! Signed-off-by: Alper Ak Signed-off-by: Khem Raj --- .../snort3/0001-Fix-build-with-gcc-15.patch | 79 ------------------- .../{snort3_3.7.1.0.bb => snort3_3.9.1.0.bb} | 6 +- 2 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch rename meta-networking/recipes-connectivity/snort/{snort3_3.7.1.0.bb => snort3_3.9.1.0.bb} (87%) diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch deleted file mode 100644 index f9cade5256..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 2bfb46b11d35f2fc5f3926376651cc936c6eab13 Mon Sep 17 00:00:00 2001 -From: Nguyen Dat Tho -Date: Mon, 31 Mar 2025 15:59:51 +0900 -Subject: [PATCH] Fix build with gcc-15 - -Signed-off-by: Nguyen Dat Tho - -Upstream-Status: Submitted ---- - tools/snort2lua/config_states/config_ignore_ports.cc | 1 + - tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc | 1 + - tools/snort2lua/preprocessor_states/pps_frag3_engine.cc | 1 + - tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc | 1 + - tools/snort2lua/rule_states/rule_gid_sid.cc | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/tools/snort2lua/config_states/config_ignore_ports.cc b/tools/snort2lua/config_states/config_ignore_ports.cc -index 4ddfebb5d..ec180a558 100644 ---- a/tools/snort2lua/config_states/config_ignore_ports.cc -+++ b/tools/snort2lua/config_states/config_ignore_ports.cc -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "conversion_state.h" - #include "helpers/converter.h" -diff --git a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc -index 2a41decb8..79e98dd2b 100644 ---- a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc -+++ b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - namespace preprocessors - { -diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc -index d5c1fcf4d..c0309cc6f 100644 ---- a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc -+++ b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc -@@ -19,6 +19,7 @@ - - #include - #include -+#include - - #include "conversion_state.h" - #include "helpers/converter.h" -diff --git a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc -index 1e97a58ad..3df35340e 100644 ---- a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc -+++ b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "conversion_state.h" - #include "helpers/s2l_util.h" -diff --git a/tools/snort2lua/rule_states/rule_gid_sid.cc b/tools/snort2lua/rule_states/rule_gid_sid.cc -index 7f2b84ae4..d3215b655 100644 ---- a/tools/snort2lua/rule_states/rule_gid_sid.cc -+++ b/tools/snort2lua/rule_states/rule_gid_sid.cc -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - #include "conversion_state.h" - #include "helpers/converter.h" --- -2.34.1 - diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb similarity index 87% rename from meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb rename to meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb index e9169a050f..598b1f4dfb 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb @@ -9,11 +9,9 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ file://0001-cmake-Check-for-HP-libunwind.patch \ - file://0001-cmake-Pass-noline-flag-to-flex.patch \ - file://0001-Fix-build-with-gcc-15.patch" - -SRCREV = "6a11279883a8584e06ad9ab2df162c639961cd61" + file://0001-cmake-Pass-noline-flag-to-flex.patch" +SRCREV = "6730d53f99f3714654804d07203f33e6b1b8a107" PACKAGES =+ "${PN}-scripts"