Compare commits

...

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

2
.gitignore vendored

@ -1 +1 @@
SOURCES/librdkafka-1.6.1.tar.gz SOURCES/librdkafka-2.1.1.tar.gz

@ -1 +1 @@
ed93d236670e1ec1fa47d6fa8c2b3806b0d93930 SOURCES/librdkafka-1.6.1.tar.gz fb4f717dc82c5a11304e1d689d011a04c2dcff21 SOURCES/librdkafka-2.1.1.tar.gz

@ -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 */

@ -1,11 +0,0 @@
diff -up librdkafka-1.6.1/src/rdkafka_conf.c.orig librdkafka-1.6.1/src/rdkafka_conf.c
--- librdkafka-1.6.1/src/rdkafka_conf.c.orig 2022-02-03 12:07:59.066520253 +0100
+++ librdkafka-1.6.1/src/rdkafka_conf.c 2022-02-03 12:18:06.477192751 +0100
@@ -707,6 +707,7 @@ static const struct rd_kafka_property rd
"security settings for a network connection using TLS or SSL network "
"protocol. See manual page for `ciphers(1)` and "
"`SSL_CTX_set_cipher_list(3).",
+ .sdef = "PROFILE=SYSTEM",
_UNSUPPORTED_SSL
},
{ _RK_GLOBAL, "ssl.curves.list", _RK_C_STR,

@ -1,9 +1,9 @@
Name: librdkafka Name: librdkafka
Version: 1.6.1 Version: 2.1.1
Release: 102%{?dist} Release: 6%{?dist}
Summary: The Apache Kafka C library Summary: The Apache Kafka C library
License: BSD License: Apache-2.0
URL: https://github.com/edenhill/librdkafka URL: https://github.com/edenhill/librdkafka
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@ -18,7 +18,7 @@ BuildRequires: cyrus-sasl-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: rapidjson-devel BuildRequires: rapidjson-devel
Patch0: rsyslog-1.6.1-rhbz2032923-crypto-compliance.patch Patch0: disable-ssl-engine.patch
%description %description
Librdkafka is a C/C++ library implementation of the Apache Kafka protocol, Librdkafka is a C/C++ library implementation of the Apache Kafka protocol,
@ -57,7 +57,8 @@ using librdkafka.
--enable-lz4-ext \ --enable-lz4-ext \
--enable-ssl \ --enable-ssl \
--enable-gssapi \ --enable-gssapi \
--enable-sasl --enable-sasl \
--disable-ssl-engine
%make_build %make_build
@ -79,36 +80,55 @@ find %{buildroot} -name '*-static.pc' -delete -print
%files devel %files devel
%dir %{_includedir}/librdkafka %dir %{_includedir}/librdkafka
%attr(0644,root,root) %{_includedir}/librdkafka/* %{_includedir}/librdkafka/*
%attr(0755,root,root) %{_libdir}/librdkafka.so %{_libdir}/librdkafka.so
%attr(0755,root,root) %{_libdir}/librdkafka++.so %{_libdir}/librdkafka++.so
%{_libdir}/pkgconfig/rdkafka.pc %{_libdir}/pkgconfig/rdkafka.pc
%{_libdir}/pkgconfig/rdkafka++.pc %{_libdir}/pkgconfig/rdkafka++.pc
%changelog %changelog
* Tue Feb 08 2022 Sergio Arroutbi <sarroutb@redhat.com> - 1.6.1-102 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.1-6
- Changes for tests to compile and run appropriately - Bump release for June 2024 mass rebuild
Related: rhbz#2032923
* Mon Feb 07 2022 Sergio Arroutbi <sarroutb@redhat.com> - 1.6.1-101 * Mon May 27 2024 Attila Lakatos <alakatos@redhat.com> - 2.1.1-5
- Add missing tests - Disable building with openssl engine support
Related: rhbz#2032923 resolves: RHEL-33739
* Fri Feb 04 2022 Sergio Arroutbi <sarroutb@redhat.com> - 1.6.1-100 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
- Fix for rpmlint reporting crypto-policy-non-compliance-openssl - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
resolves: rhbz#2032923
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-4 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Related: rhbz#1991688
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-3 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
- Rebuilt for RHEL 9 BETA for openssl 3.0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Related: rhbz#1971065
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-2 * Thu Jun 15 2023 Attila Lakatos <alakatos@redhat.com> - 2.1.1-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebase to latest upstream version
resolves: rhbz#1947184
* Wed May 31 2023 Attila Lakatos <alakatos@redhat.com> - 1.9.2-3
- Update License tag for SPDX
- Upstream sources claim that the Apache 2.0 is used
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Sep 12 2022 Steve Traylen <steve.traylen@cern.ch> - 1.9.2-1
- Update to 1.9.2
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.6.1-3
- Rebuilt with OpenSSL 3.0.0
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Mar 08 2021 Attila Lakatos <alakatos@redhat.com> - 1.6.1-1 * Mon Mar 08 2021 Attila Lakatos <alakatos@redhat.com> - 1.6.1-1
- Update to upstream 1.6.1 - Update to upstream 1.6.1

Loading…
Cancel
Save