diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-11-10 19:49:22 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-11-10 20:31:54 -0800 |
| commit | f2fa2dc3cfc1f55cb99f5603157f1af81fa4f0a9 (patch) | |
| tree | 4eda7d2a834c266163a34a0efefadf48a157f8e4 /meta-networking/recipes-connectivity | |
| parent | 4704de2b6ad17ffe1f40ff46a89193523ff0f522 (diff) | |
| download | meta-openembedded-f2fa2dc3cfc1f55cb99f5603157f1af81fa4f0a9.tar.gz | |
snort3: Upgrade to 3.9.7.0
Fix build with C23 glibc while here
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
| -rw-r--r-- | meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch | 43 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/snort/snort3_3.9.7.0.bb (renamed from meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb) | 8 |
2 files changed, 48 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch new file mode 100644 index 0000000000..884a4b8fe6 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | From ae5566a7df4851bd47081ef0e00e2a0513b7f331 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 10 Nov 2025 19:41:16 -0800 | ||
| 4 | Subject: [PATCH] Fix build on c23 | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | C23/glibc is now including once_init in stdlib.h | ||
| 10 | |||
| 11 | https://patchwork.sourceware.org/project/glibc/patch/78061085-f04a-0c45-107b-5a8a15521083@redhat.com/#213088 | ||
| 12 | |||
| 13 | This is a name collision with the new C once_flag/call_once that | ||
| 14 | glibc exposes (via <stdlib.h>) and C++’s std::once_flag/std::call_once | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://github.com/snort3/snort3/pull/431] | ||
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 18 | --- | ||
| 19 | src/loggers/alert_fast.cc | 4 ++-- | ||
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/src/loggers/alert_fast.cc b/src/loggers/alert_fast.cc | ||
| 23 | index 7b5deab2..3f88bff6 100644 | ||
| 24 | --- a/src/loggers/alert_fast.cc | ||
| 25 | +++ b/src/loggers/alert_fast.cc | ||
| 26 | @@ -53,7 +53,7 @@ using namespace std; | ||
| 27 | #define FAST_BUF (4*K_BYTES) | ||
| 28 | |||
| 29 | static THREAD_LOCAL TextLog* fast_log = nullptr; | ||
| 30 | -static once_flag init_flag; | ||
| 31 | +static std::once_flag init_flag; | ||
| 32 | |||
| 33 | #define S_NAME "alert_fast" | ||
| 34 | #define F_NAME S_NAME ".txt" | ||
| 35 | @@ -319,7 +319,7 @@ void FastLogger::set_buffer_ids(Inspector* gadget) | ||
| 36 | const BufferIds& FastLogger::get_buffer_ids(Inspector* gadget, Packet* p) | ||
| 37 | { | ||
| 38 | // lazy init required because loggers don't have a configure (yet) | ||
| 39 | - call_once(init_flag, set_buffer_ids, gadget); | ||
| 40 | + std::call_once(init_flag, set_buffer_ids, gadget); | ||
| 41 | |||
| 42 | InspectionBuffer buf; | ||
| 43 | const std::vector<unsigned>& idv = | ||
diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.9.7.0.bb index 598b1f4dfb..64a63ce918 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_3.9.7.0.bb | |||
| @@ -7,11 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" | |||
| 7 | 7 | ||
| 8 | DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" | 8 | DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" |
| 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;tag=${PV} \ |
| 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-on-c23.patch \ | ||
| 14 | " | ||
| 13 | 15 | ||
| 14 | SRCREV = "6730d53f99f3714654804d07203f33e6b1b8a107" | 16 | SRCREV = "892f9f3b04d604797851d60e89d6cfe640a047cd" |
| 15 | 17 | ||
| 16 | PACKAGES =+ "${PN}-scripts" | 18 | PACKAGES =+ "${PN}-scripts" |
| 17 | 19 | ||
