Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable lua support for fluent-bit #11009

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions SPECS/fluent-bit/CVE-2024-25629.patch

This file was deleted.

91 changes: 0 additions & 91 deletions SPECS/fluent-bit/CVE-2024-28182.patch

This file was deleted.

2 changes: 1 addition & 1 deletion SPECS/fluent-bit/fluent-bit.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"fluent-bit-3.0.6.tar.gz": "2cad0ac1e04646bc084b7bb3d5552589fa1997eaa5ba3fe2137a65ecf101cd9f"
"fluent-bit-3.1.9.tar.gz": "ac3a3e235e7f8a92d35f10c99f400f0b0571417a92e3c4caa467073733d42547"
}
}
15 changes: 9 additions & 6 deletions SPECS/fluent-bit/fluent-bit.spec
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
Name: fluent-bit
Version: 3.0.6
Release: 2%{?dist}
Version: 3.1.9
Release: 1%{?dist}
License: Apache-2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://fluentbit.io
Source0: https://github.com/fluent/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: CVE-2024-34250.patch
Patch1: CVE-2024-25629.patch
Patch2: CVE-2024-28182.patch
BuildRequires: bison
BuildRequires: cmake
BuildRequires: cyrus-sasl-devel
Expand All @@ -26,6 +24,7 @@ BuildRequires: pkgconfig
BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel
BuildRequires: luajit-devel
dmcilvaney marked this conversation as resolved.
Show resolved Hide resolved

%description

Expand Down Expand Up @@ -60,15 +59,15 @@ Development files for %{name}
-DFLB_DEBUG=Off \
-DFLB_TLS=On \
-DFLB_JEMALLOC=On \
-DFLB_LUAJIT=Off \
-DFLB_PREFER_SYSTEM_LIBS=On

%cmake_build

%install
%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
Expand All @@ -83,6 +82,10 @@ Development files for %{name}
%{_libdir}/fluent-bit/*.so

%changelog
* Tue Nov 05 2024 Paul Meyer <[email protected]> - 3.1.9-1
- Update to 3.1.9 to enable Lua filter plugin using system luajit library.
- Remove patches for CVE-2024-25629 and CVE-2024-28182 as they are fixed in 3.1.9.

* Tue Oct 15 2024 Chris Gunn <[email protected]> - 3.0.6-2
- CVE-2024-34250
- CVE-2024-25629
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
Loading