From: Patrick Wicki <[email protected]> Refresh patches and drop one for musl which is no longer required.
Release notes: - https://fluentbit.io/announcements/v4.1.0/ - https://fluentbit.io/announcements/v4.2.0/ This addresses CVE-2025-12977. Signed-off-by: Patrick Wicki <[email protected]> --- ...rivate-makefile-targets-in-CMakelist.patch | 14 +++++++-- ...-not-hardcode-compilation-directorie.patch | 8 +++-- ...ts.txt-Revise-init-manager-deduction.patch | 8 +++-- ...nkio-Link-with-fts-library-with-musl.patch | 7 +++-- .../0005-Use-posix-strerror_r-with-musl.patch | 31 ------------------- ...{fluentbit_4.0.1.bb => fluentbit_4.2.0.bb} | 3 +- 6 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch rename meta-oe/recipes-extended/fluentbit/{fluentbit_4.0.1.bb => fluentbit_4.2.0.bb} (98%) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch index 32f4fdec51..1756d74560 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch @@ -1,4 +1,4 @@ -From 7e6295f14ea057562a235fbf6762d867e739a181 Mon Sep 17 00:00:00 2001 +From 4b47a8f0e3d1d429356cdda8efa7682ab88d344a Mon Sep 17 00:00:00 2001 From: Niko Mauno <[email protected]> Date: Sun, 29 Sep 2024 12:00:00 +0000 Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt @@ -28,6 +28,8 @@ Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450] lib/monkey/CMakeLists.txt | 4 +--- 4 files changed, 7 insertions(+), 21 deletions(-) +diff --git a/lib/cfl/CMakeLists.txt b/lib/cfl/CMakeLists.txt +index 489570026..06d99cbbe 100644 --- a/lib/cfl/CMakeLists.txt +++ b/lib/cfl/CMakeLists.txt @@ -40,12 +40,8 @@ if(NOT MSVC) @@ -45,6 +47,8 @@ Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450] +diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt +index 5421f8c80..0dcf7645c 100644 --- a/lib/cmetrics/CMakeLists.txt +++ b/lib/cmetrics/CMakeLists.txt @@ -60,12 +60,8 @@ if(NOT MSVC) @@ -61,11 +65,13 @@ Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450] +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__") # Configuration options - option(CMT_DEV "Enable development mode" No) + option(CMT_DEV "Enable development mode" No) +diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt +index 73723433d..9f60699d5 100644 --- a/lib/ctraces/CMakeLists.txt +++ b/lib/ctraces/CMakeLists.txt @@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 6) - set(CTR_VERSION_PATCH 4) + set(CTR_VERSION_PATCH 6) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") -# Define __FILENAME__ consistently across Operating Systems @@ -79,6 +85,8 @@ Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450] # Configuration options option(CTR_DEV "Enable development mode" No) +diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt +index 3fbace595..1c6ad031c 100644 --- a/lib/monkey/CMakeLists.txt +++ b/lib/monkey/CMakeLists.txt @@ -15,10 +15,8 @@ include(GNUInstallDirs) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch index 025f8729ea..4c6cac0cbd 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch @@ -1,4 +1,4 @@ -From c8c9dd3aeb49ab2ec94c3ab081e2368736a5da20 Mon Sep 17 00:00:00 2001 +From 596a53c35166e6cc5c20fb1d28bb5c92a248f695 Mon Sep 17 00:00:00 2001 From: Paulo Neves <[email protected]> Date: Thu, 28 Jul 2022 11:42:31 +0200 Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories @@ -7,12 +7,14 @@ Including the source dir in the header makes the header not reproducible and contaminates it with host builder paths. Instead make it take CMAKE_DEBUG_SRCDIR that can be set to a known reproducible value ---- -Upstream-Status: Pending +Upstream-Status: Pending +--- include/fluent-bit/flb_info.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in +index 3a08f8051..aa6a48f29 100644 --- a/include/fluent-bit/flb_info.h.in +++ b/include/fluent-bit/flb_info.h.in @@ -23,7 +23,7 @@ diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch index 909d1be28d..6bd4c6bbb6 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch @@ -1,4 +1,4 @@ -From bf4e832544e8aa5866ef57859f95b71bd8811154 Mon Sep 17 00:00:00 2001 +From 5cc79bdede89e75d713e23cf0fde26634320bc3e Mon Sep 17 00:00:00 2001 From: Niko Mauno <[email protected]> Date: Mon, 21 Oct 2024 16:02:46 +0000 Subject: [PATCH] CMakeLists.txt: Revise init manager deduction @@ -14,9 +14,11 @@ Upstream-Status: Inappropriate [configuration] src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ac5fe5ef8..f47a01b82 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -569,7 +569,7 @@ if(FLB_BINARY) +@@ -600,7 +600,7 @@ if(FLB_BINARY) set(SYSTEMD_UNITDIR /lib/systemd/system) endif() @@ -25,7 +27,7 @@ Upstream-Status: Inappropriate [configuration] if (FLB_AMAZON_LINUX2) set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") configure_file( -@@ -594,7 +594,7 @@ if(FLB_BINARY) +@@ -625,7 +625,7 @@ if(FLB_BINARY) install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR}) install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary) endif() diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch index c34a0ba71d..6df53613c3 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch @@ -1,4 +1,4 @@ -From a07df56092e529627db0946c025cb4964567280c Mon Sep 17 00:00:00 2001 +From cc688b91c02df9a45ca8816a1d09649fadb9dc4a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 10 Aug 2022 01:27:16 -0700 Subject: [PATCH] chunkio: Link with fts library with musl @@ -7,14 +7,15 @@ Fixes cio_utils.c:(.text+0x64): undefined reference to `fts_read' Signed-off-by: Khem Raj <[email protected]> ---- + Upstream-Status: Pending +--- lib/chunkio/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/chunkio/src/CMakeLists.txt b/lib/chunkio/src/CMakeLists.txt -index bb52273d4..524500919 100644 +index 3590143fd..b43f08928 100644 --- a/lib/chunkio/src/CMakeLists.txt +++ b/lib/chunkio/src/CMakeLists.txt @@ -14,6 +14,7 @@ set(src diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch deleted file mode 100644 index 281bf66fb9..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0c4310483875509f464883fa345f54e0d3ae25a5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 10 Aug 2022 01:23:48 -0700 -Subject: [PATCH] Use posix strerror_r with musl - -Default with glibc is GNU extention of strerror_r -where as musl uses posix variant, call that out - -Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc] -Signed-off-by: Khem Raj <[email protected]> - -Resolved conflicts while upgrading recipe from v1.9.9 to v3.1.9. - -Signed-off-by: Niko Mauno <[email protected]> ---- - src/flb_network.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/flb_network.c b/src/flb_network.c -index 8f8ca33f6..dd098a2ea 100644 ---- a/src/flb_network.c -+++ b/src/flb_network.c -@@ -605,7 +605,7 @@ static int net_connect_async(int fd, - /* Connection is broken, not much to do here */ - #if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \ - (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE - 0L >= 600L)) && \ -- (!defined(_GNU_SOURCE)) -+ (!defined(_GNU_SOURCE)) || (!defined(__GLIBC__)) - ret = strerror_r(error, so_error_buf, sizeof(so_error_buf)); - if (ret == 0) { - str = so_error_buf; diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.0.bb similarity index 98% rename from meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb rename to meta-oe/recipes-extended/fluentbit/fluentbit_4.2.0.bb index 05e4fd937f..279486eee3 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.0.bb @@ -17,7 +17,7 @@ DEPENDS = "\ " DEPENDS:append:libc-musl = " fts" -SRCREV = "b12e507090273576d1156342780c7c6d358fa579" +SRCREV = "6bc014390c5485b96521c56b98369b44b9faa08b" SRC_URI = "\ git://github.com/fluent/fluent-bit.git;branch=master;protocol=https \ file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \ @@ -26,7 +26,6 @@ SRC_URI = "\ " SRC_URI:append:libc-musl = "\ file://0004-chunkio-Link-with-fts-library-with-musl.patch \ - file://0005-Use-posix-strerror_r-with-musl.patch \ " # prefix tag with "v" to avoid upgrade to random tags like "20220215" -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122152): https://lists.openembedded.org/g/openembedded-devel/message/122152 Mute This Topic: https://lists.openembedded.org/mt/116518754/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
