From bdb2cdd76ff68ec2bd5c839f8b2f46c5d4b830e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2024 09:38:03 +0100 Subject: update to 2.6.1 fix build with OPENSSL_NO_ENGINE (EL-10) using patch from https://github.com/confluentinc/librdkafka/pull/4911 --- compat_reports/2.6.0_to_2.6.1/compat_report.html | 498 +++++++++++++++++++++++ librdkafka-build.patch | 27 ++ librdkafka.spec | 19 +- librdkafka.xml | 2 +- 4 files changed, 540 insertions(+), 6 deletions(-) create mode 100644 compat_reports/2.6.0_to_2.6.1/compat_report.html create mode 100644 librdkafka-build.patch diff --git a/compat_reports/2.6.0_to_2.6.1/compat_report.html b/compat_reports/2.6.0_to_2.6.1/compat_report.html new file mode 100644 index 0000000..e0bbca5 --- /dev/null +++ b/compat_reports/2.6.0_to_2.6.1/compat_report.html @@ -0,0 +1,498 @@ + + + + + + + + + +librdkafka: 2.6.0 to 2.6.1 compatibility report + + + +

API compatibility report for the librdkafka library between 2.6.0 and 2.6.1 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibrdkafka
Version #12.6.0
Version #22.6.1
Archx86_64
GCC Version13
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files1
Total Libraries1
Total Symbols / Types457 / 174
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  1 

+
+rdkafka.h
+
+
to the top
+

Libraries  1 

+
+librdkafka.so.1
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibrdkafka
Version #12.6.0
Version #22.6.1
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files1
Total Libraries1
Total Symbols / Types457 / 174
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low1
+ + +

Problems with Constants, Low Severity  1 

+rdkafka.h
+ +[+] RD_KAFKA_VERSION +
+ + +
+to the top
+

Header Files  1 

+
+rdkafka.h
+
+
to the top
+

Libraries  1 

+
+librdkafka.so.1
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/librdkafka-build.patch b/librdkafka-build.patch new file mode 100644 index 0000000..0bae5b6 --- /dev/null +++ b/librdkafka-build.patch @@ -0,0 +1,27 @@ +From e6839033360f46f001f4121e815a643468dfc079 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 21 Nov 2024 09:02:57 +0100 +Subject: [PATCH] use OPENSSL_NO_ENGINE from OpenSSL config + +--- + src/rdkafka_conf.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rdkafka_conf.h b/src/rdkafka_conf.h +index 5c41513043..5d9f3ff843 100644 +--- a/src/rdkafka_conf.h ++++ b/src/rdkafka_conf.h +@@ -35,9 +35,13 @@ + + #if WITH_SSL && OPENSSL_VERSION_NUMBER >= 0x10100000 && \ + !defined(OPENSSL_IS_BORINGSSL) ++#ifdef OPENSSL_NO_ENGINE ++#include ++#else + #define WITH_SSL_ENGINE 1 + /* Deprecated in OpenSSL 3 */ + #include ++#endif + #endif /* WITH_SSL && OPENSSL_VERSION_NUMBER >= 0x10100000 */ + + /** diff --git a/librdkafka.spec b/librdkafka.spec index c28421b..b6f899a 100644 --- a/librdkafka.spec +++ b/librdkafka.spec @@ -13,7 +13,7 @@ %bcond_without move_to_opt %global libname librdkafka -%global gh_commit 7fc5a59826ee1e1dee3236b1e43180cc22cfb496 +%global gh_commit cb8c19c43011b66c4b08b25e5150455a247e1ff3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner edenhill %global gh_project %{libname} @@ -24,7 +24,7 @@ %global __arch_install_post /bin/true %endif -%global upstream_version 2.6.0 +%global upstream_version 2.6.1 #global upstream_prever RC4 Name: %{?vendeur:%{vendeur}-}%{libname} @@ -41,6 +41,9 @@ License: BSD-2-Clause AND BSD-3-Clause AND MIT URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz +# use OPENSSL_NO_ENGINE from OpenSSL config +Patch0: %{libname}-build.patch + BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: openssl-devel @@ -79,15 +82,16 @@ developing applications that use %{name}. %if %{with move_to_opt} # Filter in the /opt installation -%{?filter_from_provides: %filter_from_provides /%{libname}/d} -%{?filter_from_requires: %filter_from_requires /%{libname}/d} -%{?filter_setup} +%global __provides_exclude ^(%{libname}.*\\.so|cmake|pkgconfig).*$ +%global __requires_exclude ^(%{libname}.*\\.so|cmake|pkgconfig).*$ %endif %prep %setup -qn %{gh_project}-%{gh_commit} +%patch -P0 -p1 + mkdir rpmdocs cp -pr examples rpmdocs/examples @@ -144,6 +148,11 @@ rm -r %{buildroot}%{_datadir}/doc/%{libname} %changelog +* Thu Nov 21 2024 Remi Collet - 2.6.1-1 +- update to 2.6.1 +- fix build with OPENSSL_NO_ENGINE (EL-10) using patch from + https://github.com/confluentinc/librdkafka/pull/4911 + * Fri Oct 11 2024 Remi Collet - 2.6.0-1 - update to 2.6.0 diff --git a/librdkafka.xml b/librdkafka.xml index c85a0f1..43e7dd0 100644 --- a/librdkafka.xml +++ b/librdkafka.xml @@ -9,7 +9,7 @@ -2.6.0 +2.6.1 -- cgit