mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
7a037d0913
This is a major release that introduces new features, including one highlighted in the release notes: "The v4.2 release introduces a powerful new Direct Routing capability that allows inputs to specify routes directly to outputs, bypassing the traditional routing mechanism." But it also brings some security fixes. Not all of them are relevant, but some piece of lecture can be found here [1]. It fixes the following CVEs: CVE-2025-12977 CVE-2025-12978 CVE-2025-12972 CVE-2025-12970 CVE-2025-12969 News: - https://fluentbit.io/announcements/v4.1.0/ - https://fluentbit.io/announcements/v4.1.1/ - https://fluentbit.io/announcements/v4.2.0/ The patch 0001-plugins-kafka-fix-cmake-cross-compile-error.patch can be dropped as it has been merged upstream [2]. [1] https://www.theregister.com/2025/11/24/fluent_bit_cves/ [2] https://github.com/fluent/fluent-bit/pull/9600 Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
119 lines
4.5 KiB
Diff
119 lines
4.5 KiB
Diff
From 7329316bdcc72aceb6bbbdf8711f5bf8894c2a15 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
|
Date: Tue, 25 Jul 2023 09:10:41 +0200
|
|
Subject: [PATCH] lib: librdkafka: only require a C compiler
|
|
|
|
Upstream: https://github.com/confluentinc/librdkafka/pull/4366
|
|
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
|
---
|
|
lib/librdkafka-2.10.1/CMakeLists.txt | 22 +++++++++++--
|
|
lib/librdkafka-2.10.1/examples/CMakeLists.txt | 31 ++++++++++++-------
|
|
2 files changed, 39 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/lib/librdkafka-2.10.1/CMakeLists.txt b/lib/librdkafka-2.10.1/CMakeLists.txt
|
|
index f3d05bad7..8ef47053a 100644
|
|
--- a/lib/librdkafka-2.10.1/CMakeLists.txt
|
|
+++ b/lib/librdkafka-2.10.1/CMakeLists.txt
|
|
@@ -3,7 +3,16 @@ cmake_minimum_required(VERSION 3.5)
|
|
include("packaging/cmake/parseversion.cmake")
|
|
parseversion("src/rdkafka.h")
|
|
|
|
-project(RdKafka VERSION ${RDKAFKA_VERSION})
|
|
+project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C)
|
|
+
|
|
+# Check for CXX support
|
|
+include(CheckLanguage)
|
|
+check_language(CXX)
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ enable_language(CXX)
|
|
+else()
|
|
+ message(STATUS "C++ compiler not found, skipping C++ support")
|
|
+endif()
|
|
|
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/")
|
|
|
|
@@ -181,7 +190,11 @@ endif()
|
|
|
|
option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF)
|
|
option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON)
|
|
-option(RDKAFKA_BUILD_TESTS "Build tests" ON)
|
|
+
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ option(RDKAFKA_BUILD_TESTS "Build tests" ON)
|
|
+endif()
|
|
+
|
|
if(WIN32)
|
|
option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON)
|
|
endif(WIN32)
|
|
@@ -279,7 +292,10 @@ install(
|
|
)
|
|
|
|
add_subdirectory(src)
|
|
-add_subdirectory(src-cpp)
|
|
+
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ add_subdirectory(src-cpp)
|
|
+endif()
|
|
|
|
if(RDKAFKA_BUILD_EXAMPLES)
|
|
add_subdirectory(examples)
|
|
diff --git a/lib/librdkafka-2.10.1/examples/CMakeLists.txt b/lib/librdkafka-2.10.1/examples/CMakeLists.txt
|
|
index 91851d2cb..6874195ce 100644
|
|
--- a/lib/librdkafka-2.10.1/examples/CMakeLists.txt
|
|
+++ b/lib/librdkafka-2.10.1/examples/CMakeLists.txt
|
|
@@ -5,8 +5,10 @@ endif(WIN32)
|
|
add_executable(producer producer.c ${win32_sources})
|
|
target_link_libraries(producer PUBLIC rdkafka)
|
|
|
|
-add_executable(producer_cpp producer.cpp ${win32_sources})
|
|
-target_link_libraries(producer_cpp PUBLIC rdkafka++)
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ add_executable(producer_cpp producer.cpp ${win32_sources})
|
|
+ target_link_libraries(producer_cpp PUBLIC rdkafka++)
|
|
+endif()
|
|
|
|
add_executable(consumer consumer.c ${win32_sources})
|
|
target_link_libraries(consumer PUBLIC rdkafka)
|
|
@@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka)
|
|
add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources})
|
|
target_link_libraries(rdkafka_performance PUBLIC rdkafka)
|
|
|
|
-add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
|
|
-target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
|
|
+ target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
|
|
+endif()
|
|
|
|
-add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
|
|
-target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
|
|
+ target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
|
|
+endif()
|
|
|
|
-add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
|
|
-target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
|
|
+if(CMAKE_CXX_COMPILER)
|
|
+ add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
|
|
+ target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
|
|
+endif()
|
|
|
|
add_executable(misc misc.c ${win32_sources})
|
|
target_link_libraries(misc PUBLIC rdkafka)
|
|
@@ -73,7 +81,8 @@ if(NOT WIN32)
|
|
add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c)
|
|
target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka)
|
|
|
|
- add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
|
|
- target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
|
|
-
|
|
+ if(CMAKE_CXX_COMPILER)
|
|
+ add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
|
|
+ target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
|
|
+ endif()
|
|
endif(NOT WIN32)
|
|
--
|
|
2.43.0
|
|
|