5 files changed, 199 insertions, 7 deletions

diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..c221172cc8
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,110 @@
+From cc3724348c8e6371351e4370f158d17f28838e3b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Sat, 26 Apr 2025 11:40:45 +0200
+Subject: [PATCH] Fix build with gcc-15
+
+* fixes:
+  http://errors.yoctoproject.org/Errors/Details/852983/
+
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp_PDF.c:1062:13: error: conflicting types for 'File_Decomp_PDF'; have 'fd_status_t(struct fd_session_s *)' {aka 'enum fd_status(struct fd_session_s *)'}
+ 1062 | fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr )
+      |             ^~~~~~~~~~~~~~~
+In file included from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp.h:59,
+                 from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp_PDF.c:31:
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp_PDF.h:83:13: note: previous declaration of 'File_Decomp_PDF' with type 'fd_status_t(void)' {aka 'enum fd_status(void)'}
+   83 | fd_status_t File_Decomp_PDF();
+      |             ^~~~~~~~~~~~~~~
+make[5]: *** [Makefile:374: file_decomp_PDF.o] Error 1
+make[5]: *** Waiting for unfinished jobs....
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c: In function 'Process_Decompression':
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c:245:24: error: too many arguments to function 'File_Decomp_PDF'; expected 0, have 1
+  245 |             Ret_Code = File_Decomp_PDF( SessionPtr );
+      |                        ^~~~~~~~~~~~~~~  ~~~~~~~~~~
+In file included from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp.h:59,
+                 from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c:34:
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp_PDF.h:83:13: note: declared here
+   83 | fd_status_t File_Decomp_PDF();
+      |             ^~~~~~~~~~~~~~~
+
+  http://errors.yoctoproject.org/Errors/Details/852992/
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_InitGlobal':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:348:25: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+  348 |         size_t memcap = DCE2_GetReloadSafeMemcap(dce2_config);
+      |                         ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadGlobal':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1291:25: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1291 |         size_t memcap = DCE2_GetReloadSafeMemcap(dce2_swap_config);
+      |                         ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadVerify':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1436:35: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1436 |     uint32_t current_memcap     = DCE2_GetReloadSafeMemcap(dce2_config);
+      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1437:35: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1437 |     uint32_t new_memcap         = DCE2_GetReloadSafeMemcap(dce2_swap_config);
+      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadSwap':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1535:26: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1535 |         current_memcap = DCE2_GetReloadSafeMemcap(dce2_config);
+      |                          ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1538:26: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1538 |         swap_memcap    = DCE2_GetReloadSafeMemcap(dce2_swap_config);
+      |                          ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: At top level:
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1673:17: error: conflicting types for 'DCE2_GetReloadSafeMemcap'; have 'uint32_t(tSfPolicyUserContext *)' {aka 'unsigned int(tSfPolicyUserContext *)'}
+ 1673 | static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig)
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: previous declaration of 'DCE2_GetReloadSafeMemcap' with type 'uint32_t(void)' {aka 'unsigned int(void)'}
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Backport [resolved in snort3 https://github.com/snort3/snort3/commit/c3cc27355ac302bd24ee3e9d613166898ec2be64]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/dynamic-preprocessors/dcerpc2/spp_dce2.c            | 2 +-
+ src/preprocessors/HttpInspect/include/file_decomp_PDF.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
+index 7fd78ee..150645f 100644
+--- a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
++++ b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
+@@ -160,7 +160,7 @@ static void DCE2_ReloadSwapFree(void *);
+ static void DCE2_AddPortsToPaf(struct _SnortConfig *, DCE2_Config *, tSfPolicyId);
+ static void DCE2_ScAddPortsToPaf(struct _SnortConfig *, void *);
+ static uint32_t max(uint32_t a, uint32_t b);
+-static uint32_t DCE2_GetReloadSafeMemcap();
++static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig);
+ 
+ static bool dce2_file_cache_is_enabled = false;
+ static bool dce2_file_cache_was_enabled = false;
+diff --git a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
+index 8d39185..0e624f7 100644
+--- a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
++++ b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
+@@ -80,6 +80,6 @@ fd_status_t File_Decomp_Init_PDF( fd_session_p_t SessionPtr );
+ 
+ fd_status_t File_Decomp_End_PDF( fd_session_p_t SessionPtr );
+ 
+-fd_status_t File_Decomp_PDF();
++fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr );
+ 
+ #endif /* FILE_DECOMP_PDF_H */
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 <tho3.nguyen@lge.com>
+Date: Mon, 31 Mar 2025 15:59:51 +0900
+Subject: [PATCH] Fix build with gcc-15
+
+Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
+
+Upstream-Status: Submitted <https://github.com/snort3/snort3/pull/408>
+---
+ 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 <vector>
+ #include <string>
+ #include <stdexcept>
++#include <cstdint>
+ 
+ #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 <algorithm>
+ #include <cstring>
++#include <cstdint>
+ 
+ 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 <sstream>
+ #include <vector>
++#include <cstdint>
+ 
+ #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 <sstream>
+ #include <vector>
+ #include <string>
++#include <cstdint>
+ 
+ #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 <sstream>
+ #include <unordered_map>
++#include <cstdint>
+ 
+ #include "conversion_state.h"
+ #include "helpers/converter.h"
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch
index ec7b90cfb4..626f412731 100644
--- a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch
+++ b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch
@@ -8,6 +8,7 @@ could be absolute build paths, since these files end up in dbg packages
 this can be flagged as a build/packaging warning.
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  cmake/configure_options.cmake | 2 +-
diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb
index ee84aa17e7..e9169a050f 100644
--- a/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb
+++ b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb
@@ -9,10 +9,11 @@ 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"
-SRCREV = "e7312efd840d66a52a2019abe1db7cc89ca0f39a"
+           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"
 
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb
index 8b9092b418..7f1b779cc4 100644
--- a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb
+++ b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb
@@ -15,6 +15,7 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \
     file://fix-host-contamination-when-enable-static-daq.patch \
     file://disable-run-test-program-while-cross-compiling.patch \
     file://configure.in-disable-tirpc-checking-for-fedora.patch \
+    file://0001-Fix-build-with-gcc-15.patch \
 "
 SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c"
 
@@ -76,18 +77,18 @@ do_install:append() {
 
     cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort
+        install -m 755 ${UNPACKDIR}/snort.init ${D}${sysconfdir}/init.d/snort
     fi
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}/${systemd_system_unitdir}
-        install -m 644 ${WORKDIR}/snort.service ${D}/${systemd_system_unitdir}
+        install -m 644 ${UNPACKDIR}/snort.service ${D}/${systemd_system_unitdir}
         # Install default environment file
         install -d ${D}/${sysconfdir}/default
-        install -m 0644 ${WORKDIR}/snort.default ${D}${sysconfdir}/default/snort
+        install -m 0644 ${UNPACKDIR}/snort.default ${D}${sysconfdir}/default/snort
     fi
     install -d ${D}${sysconfdir}/default/volatiles
-    install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort
+    install -m 0644 ${UNPACKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort
 
     sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc
 }