summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/snort
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-connectivity/snort')
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch110
-rw-r--r--meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch79
-rw-r--r--meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb (renamed from meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb)6
-rw-r--r--meta-networking/recipes-connectivity/snort/snort_2.9.20.bb1
4 files changed, 193 insertions, 3 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 @@
1From cc3724348c8e6371351e4370f158d17f28838e3b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Sat, 26 Apr 2025 11:40:45 +0200
4Subject: [PATCH] Fix build with gcc-15
5
6* fixes:
7 http://errors.yoctoproject.org/Errors/Details/852983/
8
9../../../../../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 *)'}
10 1062 | fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr )
11 | ^~~~~~~~~~~~~~~
12In file included from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp.h:59,
13 from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp_PDF.c:31:
14../../../../../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)'}
15 83 | fd_status_t File_Decomp_PDF();
16 | ^~~~~~~~~~~~~~~
17make[5]: *** [Makefile:374: file_decomp_PDF.o] Error 1
18make[5]: *** Waiting for unfinished jobs....
19../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c: In function 'Process_Decompression':
20../../../../../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
21 245 | Ret_Code = File_Decomp_PDF( SessionPtr );
22 | ^~~~~~~~~~~~~~~ ~~~~~~~~~~
23In file included from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp.h:59,
24 from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c:34:
25../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp_PDF.h:83:13: note: declared here
26 83 | fd_status_t File_Decomp_PDF();
27 | ^~~~~~~~~~~~~~~
28
29 http://errors.yoctoproject.org/Errors/Details/852992/
30../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_InitGlobal':
31../../../../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
32 348 | size_t memcap = DCE2_GetReloadSafeMemcap(dce2_config);
33 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
34../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
35 163 | static uint32_t DCE2_GetReloadSafeMemcap();
36 | ^~~~~~~~~~~~~~~~~~~~~~~~
37../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadGlobal':
38../../../../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
39 1291 | size_t memcap = DCE2_GetReloadSafeMemcap(dce2_swap_config);
40 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
41../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
42 163 | static uint32_t DCE2_GetReloadSafeMemcap();
43 | ^~~~~~~~~~~~~~~~~~~~~~~~
44../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadVerify':
45../../../../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
46 1436 | uint32_t current_memcap = DCE2_GetReloadSafeMemcap(dce2_config);
47 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
48../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
49 163 | static uint32_t DCE2_GetReloadSafeMemcap();
50 | ^~~~~~~~~~~~~~~~~~~~~~~~
51../../../../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
52 1437 | uint32_t new_memcap = DCE2_GetReloadSafeMemcap(dce2_swap_config);
53 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
54../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
55 163 | static uint32_t DCE2_GetReloadSafeMemcap();
56 | ^~~~~~~~~~~~~~~~~~~~~~~~
57../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadSwap':
58../../../../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
59 1535 | current_memcap = DCE2_GetReloadSafeMemcap(dce2_config);
60 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
61../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
62 163 | static uint32_t DCE2_GetReloadSafeMemcap();
63 | ^~~~~~~~~~~~~~~~~~~~~~~~
64../../../../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
65 1538 | swap_memcap = DCE2_GetReloadSafeMemcap(dce2_swap_config);
66 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
67../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
68 163 | static uint32_t DCE2_GetReloadSafeMemcap();
69 | ^~~~~~~~~~~~~~~~~~~~~~~~
70../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: At top level:
71../../../../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 *)'}
72 1673 | static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig)
73 | ^~~~~~~~~~~~~~~~~~~~~~~~
74../../../../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)'}
75 163 | static uint32_t DCE2_GetReloadSafeMemcap();
76 | ^~~~~~~~~~~~~~~~~~~~~~~~
77
78Upstream-Status: Backport [resolved in snort3 https://github.com/snort3/snort3/commit/c3cc27355ac302bd24ee3e9d613166898ec2be64]
79
80Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
81---
82 src/dynamic-preprocessors/dcerpc2/spp_dce2.c | 2 +-
83 src/preprocessors/HttpInspect/include/file_decomp_PDF.h | 2 +-
84 2 files changed, 2 insertions(+), 2 deletions(-)
85
86diff --git a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
87index 7fd78ee..150645f 100644
88--- a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
89+++ b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
90@@ -160,7 +160,7 @@ static void DCE2_ReloadSwapFree(void *);
91 static void DCE2_AddPortsToPaf(struct _SnortConfig *, DCE2_Config *, tSfPolicyId);
92 static void DCE2_ScAddPortsToPaf(struct _SnortConfig *, void *);
93 static uint32_t max(uint32_t a, uint32_t b);
94-static uint32_t DCE2_GetReloadSafeMemcap();
95+static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig);
96
97 static bool dce2_file_cache_is_enabled = false;
98 static bool dce2_file_cache_was_enabled = false;
99diff --git a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
100index 8d39185..0e624f7 100644
101--- a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
102+++ b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
103@@ -80,6 +80,6 @@ fd_status_t File_Decomp_Init_PDF( fd_session_p_t SessionPtr );
104
105 fd_status_t File_Decomp_End_PDF( fd_session_p_t SessionPtr );
106
107-fd_status_t File_Decomp_PDF();
108+fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr );
109
110 #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 @@
1From 2bfb46b11d35f2fc5f3926376651cc936c6eab13 Mon Sep 17 00:00:00 2001
2From: Nguyen Dat Tho <tho3.nguyen@lge.com>
3Date: Mon, 31 Mar 2025 15:59:51 +0900
4Subject: [PATCH] Fix build with gcc-15
5
6Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
7
8Upstream-Status: Submitted <https://github.com/snort3/snort3/pull/408>
9---
10 tools/snort2lua/config_states/config_ignore_ports.cc | 1 +
11 tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc | 1 +
12 tools/snort2lua/preprocessor_states/pps_frag3_engine.cc | 1 +
13 tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc | 1 +
14 tools/snort2lua/rule_states/rule_gid_sid.cc | 1 +
15 5 files changed, 5 insertions(+)
16
17diff --git a/tools/snort2lua/config_states/config_ignore_ports.cc b/tools/snort2lua/config_states/config_ignore_ports.cc
18index 4ddfebb5d..ec180a558 100644
19--- a/tools/snort2lua/config_states/config_ignore_ports.cc
20+++ b/tools/snort2lua/config_states/config_ignore_ports.cc
21@@ -21,6 +21,7 @@
22 #include <vector>
23 #include <string>
24 #include <stdexcept>
25+#include <cstdint>
26
27 #include "conversion_state.h"
28 #include "helpers/converter.h"
29diff --git a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
30index 2a41decb8..79e98dd2b 100644
31--- a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
32+++ b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
33@@ -25,6 +25,7 @@
34
35 #include <algorithm>
36 #include <cstring>
37+#include <cstdint>
38
39 namespace preprocessors
40 {
41diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
42index d5c1fcf4d..c0309cc6f 100644
43--- a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
44+++ b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
45@@ -19,6 +19,7 @@
46
47 #include <sstream>
48 #include <vector>
49+#include <cstdint>
50
51 #include "conversion_state.h"
52 #include "helpers/converter.h"
53diff --git a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
54index 1e97a58ad..3df35340e 100644
55--- a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
56+++ b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
57@@ -20,6 +20,7 @@
58 #include <sstream>
59 #include <vector>
60 #include <string>
61+#include <cstdint>
62
63 #include "conversion_state.h"
64 #include "helpers/s2l_util.h"
65diff --git a/tools/snort2lua/rule_states/rule_gid_sid.cc b/tools/snort2lua/rule_states/rule_gid_sid.cc
66index 7f2b84ae4..d3215b655 100644
67--- a/tools/snort2lua/rule_states/rule_gid_sid.cc
68+++ b/tools/snort2lua/rule_states/rule_gid_sid.cc
69@@ -27,6 +27,7 @@
70
71 #include <sstream>
72 #include <unordered_map>
73+#include <cstdint>
74
75 #include "conversion_state.h"
76 #include "helpers/converter.h"
77--
782.34.1
79
diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb
index 0f3d0e986f..e9169a050f 100644
--- a/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb
+++ b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb
@@ -9,11 +9,11 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l
9 9
10SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ 10SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \
11 file://0001-cmake-Check-for-HP-libunwind.patch \ 11 file://0001-cmake-Check-for-HP-libunwind.patch \
12 file://0001-cmake-Pass-noline-flag-to-flex.patch" 12 file://0001-cmake-Pass-noline-flag-to-flex.patch \
13 file://0001-Fix-build-with-gcc-15.patch"
13 14
14SRCREV = "5598e8dd87829cb1bbb478a7b6d4f6fb8b5dabfe" 15SRCREV = "6a11279883a8584e06ad9ab2df162c639961cd61"
15 16
16S = "${WORKDIR}/git"
17 17
18PACKAGES =+ "${PN}-scripts" 18PACKAGES =+ "${PN}-scripts"
19 19
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 9bc14fc56f..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 \
15 file://fix-host-contamination-when-enable-static-daq.patch \ 15 file://fix-host-contamination-when-enable-static-daq.patch \
16 file://disable-run-test-program-while-cross-compiling.patch \ 16 file://disable-run-test-program-while-cross-compiling.patch \
17 file://configure.in-disable-tirpc-checking-for-fedora.patch \ 17 file://configure.in-disable-tirpc-checking-for-fedora.patch \
18 file://0001-Fix-build-with-gcc-15.patch \
18" 19"
19SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c" 20SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c"
20 21
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-07 17:47:40 +0000