Forráskód Böngészése

package/fluent-bit: bump to 4.0.3

News:
- https://fluentbit.io/announcements/v4.0.3/

Other remarks:
- Dropped 0003-lib-miniz-only-require-a-C-compiler.patch
  as it is upstream. [1]

- Added msgpack-c as a system dependency since this has been
  added to buildroot.

- Added sqlite as system dependency as it can't really be
  disabled otherwise due to an upstream compile bug. [2]

- Sorted the config entries while at it.

[1] https://github.com/fluent/fluent-bit/pull/10315
[2] https://github.com/fluent/fluent-bit/issues/9757

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Thomas Devoogdt 2 hónapja
szülő
commit
e0bd9bafb4

+ 0 - 31
package/fluent-bit/0003-lib-miniz-only-require-a-C-compiler.patch

@@ -1,31 +0,0 @@
-From abb3b388aaf7ea72ea1fcad77ead52f15a0cf543 Mon Sep 17 00:00:00 2001
-From: Thomas Devoogdt <thomas@devoogdt.com>
-Date: Tue, 1 Apr 2025 22:56:00 +0200
-Subject: [PATCH] lib: miniz: only require a C compiler
-
-Commit https://github.com/richgel999/miniz/commit/05ab4dc05c9d1e1f951f5849b659e2c7e291a620
-"Add some catch2 tests" dropped that C flag, but should instead only have added a simple
-enable_language call for the tests only.
-
-Upstream: https://github.com/richgel999/miniz/commit/383e551cccf41fc2ce1177712d6a37a85d936642
-Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
----
- lib/miniz/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/miniz/CMakeLists.txt b/lib/miniz/CMakeLists.txt
-index 859133ad0..f3d80f80a 100644
---- a/lib/miniz/CMakeLists.txt
-+++ b/lib/miniz/CMakeLists.txt
-@@ -7,7 +7,7 @@ if(DEFINED PROJECT_NAME)
- endif()
- 
- if(CMAKE_MINOR_VERSION LESS 12)
--  project(miniz)
-+  project(miniz C)
-   # see issue https://gitlab.kitware.com/cmake/cmake/merge_requests/1799
- else()
-   project(miniz C)
--- 
-2.43.0
-

+ 4 - 2
package/fluent-bit/Config.in

@@ -4,12 +4,14 @@ config BR2_PACKAGE_FLUENT_BIT
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_STATIC_LIBS # dlfcn.h
 	select BR2_PACKAGE_C_ARES
+	select BR2_PACKAGE_LIBOPENSSL_ENGINES # needed by bundled librdkafka
+	select BR2_PACKAGE_LIBYAML
+	select BR2_PACKAGE_MSGPACK_C
 	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_NGHTTP2
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
-	select BR2_PACKAGE_LIBOPENSSL_ENGINES # needed by bundled librdkafka
-	select BR2_PACKAGE_LIBYAML
+	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_ZSTD
 	help
 	  Fast and Lightweight Logs and Metrics processor.

+ 1 - 1
package/fluent-bit/fluent-bit.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256  aa0577ba7251081c8d5398b2a905b5b0585bb657ca13b39a5e12931437516f08  fluent-bit-4.0.2.tar.gz
+sha256  c7d276238d25242467218941842d8cd4df6cfa52cc9379ae5755220cdefd1dc1  fluent-bit-4.0.3.tar.gz
 sha256  0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594  LICENSE

+ 5 - 3
package/fluent-bit/fluent-bit.mk

@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-FLUENT_BIT_VERSION = 4.0.2
+FLUENT_BIT_VERSION = 4.0.3
 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION))
 FLUENT_BIT_LICENSE = Apache-2.0
 FLUENT_BIT_LICENSE_FILES = LICENSE
 FLUENT_BIT_CPE_ID_VENDOR = treasuredata
 FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit
-FLUENT_BIT_DEPENDENCIES = c-ares host-bison host-flex libyaml nghttp2 openssl \
-	zstd
+FLUENT_BIT_DEPENDENCIES = c-ares host-bison host-flex libyaml msgpack-c \
+	nghttp2 openssl sqlite zstd
 
 FLUENT_BIT_CMAKE_BACKEND = ninja
 
@@ -22,7 +22,9 @@ FLUENT_BIT_CONF_OPTS += \
 	-DFLB_EXAMPLES=No \
 	-DFLB_CHUNK_TRACE=No \
 	-DFLB_PREFER_SYSTEM_LIB_CARES=Yes \
+	-DFLB_PREFER_SYSTEM_LIB_MSGPACK=Yes \
 	-DFLB_PREFER_SYSTEM_LIB_NGHTTP2=Yes \
+	-DFLB_PREFER_SYSTEM_LIB_SQLITE=Yes \
 	-DFLB_PREFER_SYSTEM_LIB_ZSTD=Yes
 
 ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y)