diff options
| author | Nguyen Dat Tho <tho3.nguyen@lge.com> | 2025-03-31 18:15:35 +0900 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-03-31 14:42:08 -0700 |
| commit | ffe4c94dca7a56d431b2e4bafec067e8bcf1c3fb (patch) | |
| tree | 5d87f69175bbdad441938a9880d45cd68636a4ff | |
| parent | 43052923fca9328ca11d9266840547e028f629f3 (diff) | |
| download | meta-openembedded-ffe4c94dca7a56d431b2e4bafec067e8bcf1c3fb.tar.gz | |
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 <tho3.nguyen@lge.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch | 79 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb (renamed from meta-networking/recipes-connectivity/snort/snort3_3.6.1.0.bb) | 5 |
2 files changed, 82 insertions, 2 deletions
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 @@ | |||
| 1 | From 2bfb46b11d35f2fc5f3926376651cc936c6eab13 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> | ||
| 3 | Date: Mon, 31 Mar 2025 15:59:51 +0900 | ||
| 4 | Subject: [PATCH] Fix build with gcc-15 | ||
| 5 | |||
| 6 | Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com> | ||
| 7 | |||
| 8 | Upstream-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 | |||
| 17 | diff --git a/tools/snort2lua/config_states/config_ignore_ports.cc b/tools/snort2lua/config_states/config_ignore_ports.cc | ||
| 18 | index 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" | ||
| 29 | diff --git a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc | ||
| 30 | index 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 | { | ||
| 41 | diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc | ||
| 42 | index 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" | ||
| 53 | diff --git a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc | ||
| 54 | index 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" | ||
| 65 | diff --git a/tools/snort2lua/rule_states/rule_gid_sid.cc b/tools/snort2lua/rule_states/rule_gid_sid.cc | ||
| 66 | index 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 | -- | ||
| 78 | 2.34.1 | ||
| 79 | |||
diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.6.1.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb index 622ab56ae9..54eef87a41 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_3.6.1.0.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb | |||
| @@ -9,9 +9,10 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l | |||
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ | 10 | SRC_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 | ||
| 14 | SRCREV = "2f8c230d6605279b19dac8fe59e27f034ee81510" | 15 | SRCREV = "6a11279883a8584e06ad9ab2df162c639961cd61" |
| 15 | 16 | ||
| 16 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
| 17 | 18 | ||
