From ffe4c94dca7a56d431b2e4bafec067e8bcf1c3fb Mon Sep 17 00:00:00 2001 From: Nguyen Dat Tho Date: Mon, 31 Mar 2025 18:15:35 +0900 Subject: snort3: upgrade 3.6.1 -> 3.7.1 Changelog: https://github.com/snort3/snort3/blob/master/ChangeLog.md Add 0001-Fix-build-with-gcc-15.patch to fix build with gcc-15 Signed-off-by: Nguyen Dat Tho Signed-off-by: Khem Raj --- .../snort/snort3/0001-Fix-build-with-gcc-15.patch | 79 ++++++++++++++++++++++ .../recipes-connectivity/snort/snort3_3.6.1.0.bb | 39 ----------- .../recipes-connectivity/snort/snort3_3.7.1.0.bb | 40 +++++++++++ 3 files changed, 119 insertions(+), 39 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch delete mode 100644 meta-networking/recipes-connectivity/snort/snort3_3.6.1.0.bb create mode 100644 meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb 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 new file mode 100644 index 0000000000..f9cade5256 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch @@ -0,0 +1,79 @@ +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.6.1.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.6.1.0.bb deleted file mode 100644 index 622ab56ae9..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort3_3.6.1.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "snort3" -DESCRIPTION = "snort3 - a free lightweight network intrusion detection system for UNIX and Windows." -HOMEPAGE = "http://www.snort.org/" -SECTION = "net" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" - -DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" - -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" - -SRCREV = "2f8c230d6605279b19dac8fe59e27f034ee81510" - -S = "${WORKDIR}/git" - -PACKAGES =+ "${PN}-scripts" - -inherit cmake pkgconfig - -do_install:append() { - sed -i "s#${RECIPE_SYSROOT_NATIVE}##g; s#${RECIPE_SYSROOT}##g" ${D}${libdir}/pkgconfig/snort.pc -} - -FILES:${PN} += "${libdir}/snort/daq/*.so" - -FILES:${PN}-scripts = "${bindir}/appid_detector_builder.sh" - -RDEPENDS:${PN}-scripts += "bash" - -# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release -COMPATIBLE_HOST:mipsarchn32 = "null" -COMPATIBLE_HOST:mipsarchn64 = "null" -COMPATIBLE_HOST:powerpc = "null" -COMPATIBLE_HOST:powerpc64 = "null" -COMPATIBLE_HOST:powerpc64le = "null" -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb new file mode 100644 index 0000000000..54eef87a41 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "snort3" +DESCRIPTION = "snort3 - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" + +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" + +S = "${WORKDIR}/git" + +PACKAGES =+ "${PN}-scripts" + +inherit cmake pkgconfig + +do_install:append() { + sed -i "s#${RECIPE_SYSROOT_NATIVE}##g; s#${RECIPE_SYSROOT}##g" ${D}${libdir}/pkgconfig/snort.pc +} + +FILES:${PN} += "${libdir}/snort/daq/*.so" + +FILES:${PN}-scripts = "${bindir}/appid_detector_builder.sh" + +RDEPENDS:${PN}-scripts += "bash" + +# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" +COMPATIBLE_HOST:powerpc = "null" +COMPATIBLE_HOST:powerpc64 = "null" +COMPATIBLE_HOST:powerpc64le = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" -- cgit v1.2.3-54-g00ecf