public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/fluent-bit] rawhide: Fix build with OpenSSL 4.0
Date: Fri, 12 Jun 2026 19:08:38 GMT [thread overview]
Message-ID: <178129131838.1.18435958015409518273.rpms-fluent-bit-6f6ff7db322f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fluent-bit
Branch : rawhide
Commit : 6f6ff7db322feb3a326be255a9a5c34af5a0b36a
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-05-03T16:29:49-04:00
Stats : +61/-3 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/fluent-bit/c/6f6ff7db322feb3a326be255a9a5c34af5a0b36a?branch=rawhide
Log:
Fix build with OpenSSL 4.0
https://github.com/fluent/fluent-bit/pull/11771
---
diff --git a/fluent-bit.spec b/fluent-bit.spec
index 3da5965..1113539 100644
--- a/fluent-bit.spec
+++ b/fluent-bit.spec
@@ -6,6 +6,8 @@ Summary: Fluent Bit is a super fast, lightweight, and highly scalable logging an
License: Apache-2.0
URL: https://github.com/fluent/fluent-bit
Source0: https://github.com/fluent/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+# https://github.com/fluent/fluent-bit/pull/11771
+Patch0: openssl-no-engine.patch
BuildRequires: pkgconfig
@@ -28,13 +30,12 @@ BuildRequires: libyaml-devel
BuildRequires: libzstd-devel
BuildRequires: openssl
-%if 0%{?rhel} <= 9
+%if 0%{?fedora} || 0%{?rhel} <= 9
BuildRequires: netcat
%endif
-%if 0%{?fedora} >= 41
+%if 0%{?fedora} >= 41 && 0%{?fedora} < 45
BuildRequires: openssl-devel-engine
-BuildRequires: netcat
%endif
%{?systemd_requires}
diff --git a/openssl-no-engine.patch b/openssl-no-engine.patch
new file mode 100644
index 0000000..0e11d34
--- /dev/null
+++ b/openssl-no-engine.patch
@@ -0,0 +1,57 @@
+From 0867fe505407feb73de9cb73010d7d03fa0d2123 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Sun, 3 May 2026 16:19:42 -0400
+Subject: [PATCH] crypto: fix build with OPENSSL_NO_ENGINE
+
+ENGINE was deprecated in openssl 3.0 (and disabled in RHEL 10), and
+completely removed in 4.0.
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ include/fluent-bit/flb_crypto.h | 2 ++
+ include/fluent-bit/flb_hash.h | 2 ++
+ include/fluent-bit/flb_hmac.h | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/include/fluent-bit/flb_crypto.h b/include/fluent-bit/flb_crypto.h
+index 3691cd8d1d9..a863e98d75c 100644
+--- a/include/fluent-bit/flb_crypto.h
++++ b/include/fluent-bit/flb_crypto.h
+@@ -24,7 +24,9 @@
+ #include <openssl/sha.h>
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
++#endif
+ #include <fluent-bit/flb_crypto_constants.h>
+
+
+diff --git a/include/fluent-bit/flb_hash.h b/include/fluent-bit/flb_hash.h
+index 8c1c7bdf25e..78e4f9e363d 100644
+--- a/include/fluent-bit/flb_hash.h
++++ b/include/fluent-bit/flb_hash.h
+@@ -51,7 +51,9 @@
+ #include <openssl/sha.h>
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
++#endif
+ #include <fluent-bit/flb_crypto_constants.h>
+
+
+diff --git a/include/fluent-bit/flb_hmac.h b/include/fluent-bit/flb_hmac.h
+index 73ad2439070..49fc4979017 100644
+--- a/include/fluent-bit/flb_hmac.h
++++ b/include/fluent-bit/flb_hmac.h
+@@ -23,7 +23,9 @@
+ #include <openssl/sha.h>
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
++#endif
+ #include <fluent-bit/flb_crypto_constants.h>
+
+ struct flb_hmac {
reply other threads:[~2026-06-12 19:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178129131838.1.18435958015409518273.rpms-fluent-bit-6f6ff7db322f@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox