From e083b75a92f1085523dcdd87600bab5c9714633a Mon Sep 17 00:00:00 2001 From: alakatos Date: Mon, 27 May 2024 12:20:44 +0200 Subject: [PATCH] Disable building with openssl engine support resolves: RHEL-33739 --- disable-ssl-engine.patch | 24 ++++++++++++++++++++++++ librdkafka.spec | 11 +++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 disable-ssl-engine.patch diff --git a/disable-ssl-engine.patch b/disable-ssl-engine.patch new file mode 100644 index 0000000..df40d16 --- /dev/null +++ b/disable-ssl-engine.patch @@ -0,0 +1,24 @@ +diff -up librdkafka-2.4.0/mklove/modules/configure.libssl.orig librdkafka-2.4.0/mklove/modules/configure.libssl +--- librdkafka-2.4.0/mklove/modules/configure.libssl.orig 2024-05-27 09:24:27.753113899 +0200 ++++ librdkafka-2.4.0/mklove/modules/configure.libssl 2024-05-27 09:25:53.958955299 +0200 +@@ -16,7 +16,7 @@ + # SSL that is the feature, not crypto. + + mkl_toggle_option "Feature" ENABLE_SSL "--enable-ssl" "Enable SSL support" "try" +- ++mkl_toggle_option "Feature" ENABLE_SSL_ENGINE "--enable-ssl-engine" "Enable SSL support" "y" + + function manual_checks { + case "$ENABLE_SSL" in +diff -up librdkafka-2.4.0/src/rdkafka_conf.h.orig librdkafka-2.4.0/src/rdkafka_conf.h +--- librdkafka-2.4.0/src/rdkafka_conf.h.orig 2024-05-27 09:24:25.329090240 +0200 ++++ librdkafka-2.4.0/src/rdkafka_conf.h 2024-05-27 09:25:02.428452354 +0200 +@@ -32,7 +32,7 @@ + #include "rdlist.h" + #include "rdkafka_cert.h" + +-#if WITH_SSL && OPENSSL_VERSION_NUMBER >= 0x10100000 && \ ++#if WITH_SSL && OPENSSL_VERSION_NUMBER >= 0x10100000 && ENABLE_SSL_ENGINE && \ + !defined(OPENSSL_IS_BORINGSSL) + #define WITH_SSL_ENGINE 1 + /* Deprecated in OpenSSL 3 */ diff --git a/librdkafka.spec b/librdkafka.spec index a894e04..6a6b0ff 100644 --- a/librdkafka.spec +++ b/librdkafka.spec @@ -1,6 +1,6 @@ Name: librdkafka Version: 2.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Apache Kafka C library License: Apache-2.0 @@ -18,6 +18,8 @@ BuildRequires: cyrus-sasl-devel BuildRequires: zlib-devel BuildRequires: rapidjson-devel +Patch0: disable-ssl-engine.patch + %description Librdkafka is a C/C++ library implementation of the Apache Kafka protocol, containing both Producer and Consumer support. @@ -55,7 +57,8 @@ using librdkafka. --enable-lz4-ext \ --enable-ssl \ --enable-gssapi \ - --enable-sasl + --enable-sasl \ + --disable-ssl-engine %make_build @@ -85,6 +88,10 @@ find %{buildroot} -name '*-static.pc' -delete -print %changelog +* Mon May 27 2024 Attila Lakatos - 2.1.1-5 +- Disable building with openssl engine support + resolves: RHEL-33739 + * Thu Jan 25 2024 Fedora Release Engineering - 2.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild