From 252467c9919e4029ba6a8dd0c069b4503e8c3cc9 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 10 Oct 2024 14:51:35 +0200 Subject: [PATCH 1/3] Updated fluent-bit to upstream 3.1.9 --- SPECS/fluent-bit/fluent-bit.signatures.json | 2 +- SPECS/fluent-bit/fluent-bit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/fluent-bit/fluent-bit.signatures.json b/SPECS/fluent-bit/fluent-bit.signatures.json index 15168d78cea..698bfe786fc 100644 --- a/SPECS/fluent-bit/fluent-bit.signatures.json +++ b/SPECS/fluent-bit/fluent-bit.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "fluent-bit-3.0.6.tar.gz": "2cad0ac1e04646bc084b7bb3d5552589fa1997eaa5ba3fe2137a65ecf101cd9f" + "fluent-bit-3.1.9.tar.gz": "ac3a3e235e7f8a92d35f10c99f400f0b0571417a92e3c4caa467073733d42547" } } diff --git a/SPECS/fluent-bit/fluent-bit.spec b/SPECS/fluent-bit/fluent-bit.spec index d752a5444ed..a77a2d6ce0f 100644 --- a/SPECS/fluent-bit/fluent-bit.spec +++ b/SPECS/fluent-bit/fluent-bit.spec @@ -1,6 +1,6 @@ Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX Name: fluent-bit -Version: 3.0.6 +Version: 3.1.9 Release: 1%{?dist} License: Apache-2.0 Vendor: Microsoft Corporation From a6a28b0adb00ecc87621cd58e7adb4237e722891 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 10 Oct 2024 14:54:12 +0200 Subject: [PATCH 2/3] Allow lua plugin using system libraries (instead of pulling in a vendored version of luajit) --- SPECS/fluent-bit/fluent-bit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SPECS/fluent-bit/fluent-bit.spec b/SPECS/fluent-bit/fluent-bit.spec index a77a2d6ce0f..7c5176635e5 100644 --- a/SPECS/fluent-bit/fluent-bit.spec +++ b/SPECS/fluent-bit/fluent-bit.spec @@ -23,6 +23,7 @@ BuildRequires: pkgconfig BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros BuildRequires: zlib-devel +BuildRequires: luajit-devel %description @@ -57,7 +58,7 @@ Development files for %{name} -DFLB_DEBUG=Off \ -DFLB_TLS=On \ -DFLB_JEMALLOC=On \ - -DFLB_LUAJIT=Off \ + -DFLB_PREFER_SYSTEM_LIBS=On %cmake_build @@ -65,7 +66,7 @@ Development files for %{name} %cmake_install %check -%ctest --exclude-regex "flb-rt-in_podman_metrics|flb-rt-filter_lua|.*\\.sh" +%ctest --exclude-regex "flb-rt-in_podman_metrics|.*\\.sh" %files %license LICENSE @@ -80,6 +81,9 @@ Development files for %{name} %{_libdir}/fluent-bit/*.so %changelog +* Thu Oct 10 2024 Paul Meyer - 3.1.9-1 +- Update to 3.1.9 to enable Lua filter plugin using system luajit library. + * Tue May 28 2024 Neha Agarwal - 3.0.6-1 - Update to v3.0.6 to fix CVE-2024-4323. From f8063997750b697566e7ca84e98b66d4e82b2c0c Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 10 Oct 2024 15:29:18 +0200 Subject: [PATCH 3/3] Updated cgmanifest --- cgmanifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index bd38ff8b244..ddc96111d11 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3678,8 +3678,8 @@ "type": "other", "other": { "name": "fluent-bit", - "version": "3.0.6", - "downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v3.0.6.tar.gz" + "version": "3.1.9", + "downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v3.1.9.tar.gz" } } },