Skip to content

Commit 684c696

Browse files
dmcilvaneypaulmey
andauthored
Enable lua support for fluent-bit (#11009)
Co-authored-by: Paul Meyer <paulmey@microsoft.com>
1 parent 1159d26 commit 684c696

5 files changed

Lines changed: 12 additions & 119 deletions

File tree

SPECS/fluent-bit/CVE-2024-25629.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

SPECS/fluent-bit/CVE-2024-28182.patch

Lines changed: 0 additions & 91 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"fluent-bit-3.0.6.tar.gz": "2cad0ac1e04646bc084b7bb3d5552589fa1997eaa5ba3fe2137a65ecf101cd9f"
3+
"fluent-bit-3.1.9.tar.gz": "ac3a3e235e7f8a92d35f10c99f400f0b0571417a92e3c4caa467073733d42547"
44
}
55
}

SPECS/fluent-bit/fluent-bit.spec

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
Summary: Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
22
Name: fluent-bit
3-
Version: 3.0.6
4-
Release: 2%{?dist}
3+
Version: 3.1.9
4+
Release: 1%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
88
URL: https://fluentbit.io
99
Source0: https://github.com/fluent/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1010
Patch0: CVE-2024-34250.patch
11-
Patch1: CVE-2024-25629.patch
12-
Patch2: CVE-2024-28182.patch
1311
BuildRequires: bison
1412
BuildRequires: cmake
1513
BuildRequires: cyrus-sasl-devel
@@ -20,6 +18,7 @@ BuildRequires: gnutls-devel
2018
BuildRequires: graphviz
2119
BuildRequires: libpq-devel
2220
BuildRequires: libyaml-devel
21+
BuildRequires: luajit-devel
2322
BuildRequires: make
2423
BuildRequires: openssl-devel
2524
BuildRequires: pkgconfig
@@ -60,15 +59,15 @@ Development files for %{name}
6059
-DFLB_DEBUG=Off \
6160
-DFLB_TLS=On \
6261
-DFLB_JEMALLOC=On \
63-
-DFLB_LUAJIT=Off \
62+
-DFLB_PREFER_SYSTEM_LIBS=On
6463

6564
%cmake_build
6665

6766
%install
6867
%cmake_install
6968

7069
%check
71-
%ctest --exclude-regex "flb-rt-in_podman_metrics|flb-rt-filter_lua|.*\\.sh"
70+
%ctest --exclude-regex "flb-rt-in_podman_metrics|.*\\.sh"
7271

7372
%files
7473
%license LICENSE
@@ -83,6 +82,10 @@ Development files for %{name}
8382
%{_libdir}/fluent-bit/*.so
8483

8584
%changelog
85+
* Tue Nov 05 2024 Paul Meyer <paul.meyer@microsoft.com> - 3.1.9-1
86+
- Update to 3.1.9 to enable Lua filter plugin using system luajit library.
87+
- Remove patches for CVE-2024-25629 and CVE-2024-28182 as they are fixed in 3.1.9.
88+
8689
* Tue Oct 15 2024 Chris Gunn <chrisgun@microsoft.com> - 3.0.6-2
8790
- CVE-2024-34250
8891
- CVE-2024-25629

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3678,8 +3678,8 @@
36783678
"type": "other",
36793679
"other": {
36803680
"name": "fluent-bit",
3681-
"version": "3.0.6",
3682-
"downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v3.0.6.tar.gz"
3681+
"version": "3.1.9",
3682+
"downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v3.1.9.tar.gz"
36833683
}
36843684
}
36853685
},

0 commit comments

Comments
 (0)