.gitignore

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

.librdkafka.metadata

@@ -1 +1 @@
-00e5b9c610697a0f32910fd1ef19e9b2c684824e SOURCES/librdkafka-0.11.4.tar.gz
+ed93d236670e1ec1fa47d6fa8c2b3806b0d93930 SOURCES/librdkafka-1.6.1.tar.gz

SOURCES/librdkafka-python3.patch

@@ -1,42 +0,0 @@
-diff -up ./configure.librdkafka.python3 ./configure.librdkafka
---- ./configure.librdkafka.python3	2018-06-28 14:31:29.059417830 +0200
-+++ ./configure.librdkafka	2018-06-28 14:31:54.328300531 +0200
-@@ -179,7 +179,7 @@ void foo (void) {
- 
-     # The linker-script generator (lds-gen.py) requires python
-     if [[ $WITH_LDS == y ]]; then
--        if ! mkl_command_check python "HAVE_PYTHON" "disable" "python -V"; then
-+        if ! mkl_command_check python "HAVE_PYTHON" "disable" "python3 -V"; then
-             mkl_err "disabling linker-script since python is not available"
-             mkl_mkvar_set WITH_LDS WITH_LDS "n"
-         fi
-diff -up ./lds-gen.py.python3 ./lds-gen.py
---- ./lds-gen.py.python3	2017-07-19 22:10:29.000000000 +0200
-+++ ./lds-gen.py	2018-06-28 14:22:12.745022430 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #
- # Generate linker script to only expose symbols of the public API
-diff -up ./Makefile.python3 ./Makefile
---- ./Makefile.python3	2018-06-28 14:32:46.176059853 +0200
-+++ ./Makefile	2018-06-28 14:32:56.542011734 +0200
-@@ -5,7 +5,7 @@ CHECK_FILES+=	CONFIGURATION.md \
- 		examples/rdkafka_example_cpp
- 
- PACKAGE_NAME?=	librdkafka
--VERSION?=	$(shell python packaging/get_version.py src/rdkafka.h)
-+VERSION?=	$(shell python3 packaging/get_version.py src/rdkafka.h)
- 
- # Jenkins CI integration
- BUILD_NUMBER ?= 1
-diff -up ./packaging/get_version.py.python3 ./packaging/get_version.py
---- ./packaging/get_version.py.python3	2018-06-28 14:33:48.825769032 +0200
-+++ ./packaging/get_version.py	2018-06-28 14:33:57.385729296 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import sys
- 

SOURCES/rsyslog-0.11.4-rhbz1842817-crypto-compliance.patch

@@ -1,13 +0,0 @@
-diff -up librdkafka-0.11.4/src/rdkafka_conf.c.orig librdkafka-0.11.4/src/rdkafka_conf.c
---- librdkafka-0.11.4/src/rdkafka_conf.c.orig	2021-11-01 18:29:29.669679125 +0100
-+++ librdkafka-0.11.4/src/rdkafka_conf.c	2021-11-01 18:30:21.007126511 +0100
-@@ -468,7 +468,8 @@ static const struct rd_kafka_property rd
- 	  "encryption, MAC and key exchange algorithm used to negotiate the "
- 	  "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)."
-+	  "`SSL_CTX_set_cipher_list(3).",
-+	  .sdef = "PROFILE=SYSTEM"
- 	},
- 	{ _RK_GLOBAL, "ssl.key.location", _RK_C_STR,
- 	  _RK(ssl.key_location),

SOURCES/rsyslog-1.6.1-rhbz2032923-crypto-compliance.patch

@@ -0,0 +1,11 @@
+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,

SPECS/librdkafka.spec

@@ -1,22 +1,24 @@
 Name:		librdkafka
-Version:	0.11.4
+Version:	1.6.1
-Release:	3%{?dist}
+Release:	102%{?dist}
 Summary:	The Apache Kafka C library
 
-Group:		Development/Libraries
 License:	BSD
 URL:		https://github.com/edenhill/librdkafka
-Source0:	https://github.com/edenhill/librdkafka/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
+BuildRequires:	make
 BuildRequires:	python3
+BuildRequires:	libzstd-devel
+BuildRequires:	lz4-devel
 BuildRequires:	openssl-devel
 BuildRequires:	cyrus-sasl-devel
-BuildRequires:  lz4-devel
+BuildRequires:	zlib-devel
+BuildRequires:	rapidjson-devel
 
-Patch1: librdkafka-python3.patch
+Patch0: rsyslog-1.6.1-rhbz2032923-crypto-compliance.patch
-Patch2: rsyslog-0.11.4-rhbz1842817-crypto-compliance.patch
 
 %description
 Librdkafka is a C/C++ library implementation of the Apache Kafka protocol,
@@ -27,7 +29,6 @@ messages/second for the consumer.
 
 %package	devel
 Summary:	The Apache Kafka C library (Development Environment)
-Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description	devel
@@ -37,14 +38,25 @@ This package contains headers and libraries required to build applications
 using librdkafka.
 
 %prep
-%setup -q
+%autosetup -p1
-
-%patch1 -p1 -b .python3
-%patch2 -p1 -b .crypto-compliance
 
 %build
-%configure --enable-lz4 \
+# This package has a configure test which uses ASMs, but does not link the
+# resultant .o files.  As such the ASM test is always successful, even on
+# architectures were the ASM is not valid when compiling with LTO.
+#
+# -ffat-lto-objects is sufficient to address this issue.  It is the default
+# for F33, but is expected to only be enabled for packages that need it in
+# F34, so we use it here explicitly
+%define _lto_cflags -flto=auto -ffat-lto-objects
+
+%configure \
+    --enable-zlib \
+    --enable-zstd \
+    --enable-lz4 \
+    --enable-lz4-ext \
     --enable-ssl \
+    --enable-gssapi \
     --enable-sasl
 
 %make_build
@@ -55,47 +67,116 @@ make check
 %install
 %make_install
 find %{buildroot} -name '*.a' -delete -print
+find %{buildroot} -name '*-static.pc' -delete -print
 
-%post	-p /sbin/ldconfig
+%ldconfig_scriptlets
-%postun	-p /sbin/ldconfig
 
 %files
 %{_libdir}/librdkafka.so.*
 %{_libdir}/librdkafka++.so.*
-%doc README.md CONFIGURATION.md INTRODUCTION.md
+%doc README.md CONFIGURATION.md INTRODUCTION.md LICENSE LICENSES.txt STATISTICS.md CHANGELOG.md
 %license LICENSE LICENSE.pycrc LICENSE.snappy
 
 %files devel
 %dir %{_includedir}/librdkafka
 %attr(0644,root,root) %{_includedir}/librdkafka/*
-%{_libdir}/librdkafka.so
+%attr(0755,root,root) %{_libdir}/librdkafka.so
-%{_libdir}/librdkafka++.so
+%attr(0755,root,root) %{_libdir}/librdkafka++.so
 %{_libdir}/pkgconfig/rdkafka.pc
 %{_libdir}/pkgconfig/rdkafka++.pc
-%{_libdir}/pkgconfig/rdkafka-static.pc
-%{_libdir}/pkgconfig/rdkafka++-static.pc
 
 
 %changelog
-* Mon Nov 01 2021 Attila Lakatos <alakatos@redhat.com> - 0.11.4-3
+* Tue Feb 08 2022 Sergio Arroutbi <sarroutb@redhat.com> - 1.6.1-102
-- Set SSL_CTX_set_cipher_list to use system-wide crypto policies
+- Changes for tests to compile and run appropriately
-  resolves: rhbz#1842817
+  Related: rhbz#2032923
+
+* Mon Feb 07 2022 Sergio Arroutbi <sarroutb@redhat.com> - 1.6.1-101
+- Add missing tests
+  Related: rhbz#2032923
+
+* Fri Feb 04 2022 Sergio Arroutbi <sarroutb@redhat.com> - 1.6.1-100
+- Fix for rpmlint reporting crypto-policy-non-compliance-openssl
+  resolves: rhbz#2032923
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-3
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 08 2021 Attila Lakatos <alakatos@redhat.com> - 1.6.1-1
+- Update to upstream 1.6.1
+  resolves: rhbz#1932286
+
+* Wed Feb 03 2021 Neal Gompa <ngompa@datto.com> - 1.6.0-1
+- Update to upstream 1.6.0
+  resolves: rhbz#1883910
+- Enable all missing features
+- Fix linking to external lz4 library
+- Minor spec cleanups
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Sep 09 2020 Zoltan Fridrich <zfridric@redhat.com> - 1.5.0-1
+- Update to upstream 1.5.0
+  resolves: rhbz#1818082
+
+* Wed Sep 09 2020 Zoltan Fridrich <zfridric@redhat.com> - 1.3.0-6
+- Switch BuildRequires from python2 to python3
+  resolves: rhbz#1808329
+
+* Fri Aug 21 2020 Jeff Law <law@redhat.com> - 1.3.0-5
+- Re-enable LTO
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Jeff Law <law@redhat.com> - 1.3.0-3
+- Disable LTO
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 30 2019 Michal Luscon <mluscon@gmail.com> - 1.3.0-1
+- Update to upstream 1.3.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Dec 12 2018 Javier Peña <jpena@redhat.com> - 0.11.6-1
+- Update to upstream 0.11.6
+
+* Mon Sep 17 2018 Michal Luscon <mluscon@gmail.com> - 0.11.5-1
+- Update to upstream 0.11.5
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Apr 20 2018 Michal Luscon <mluscon@gmail.com> - 0.11.4-1
+- Update to upstream 0.11.4
 
-* Mon Jun 03 2019 Radovan Sroka <rsroka@redhat.com> - 0.11.4-2
+* Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.11.3-3
-- rebuild
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 
-* Fri Feb 08 2019 Jiri Vymazal <jvymazal@redhat.com> - 0.11.4-1
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.3-2
-- rebase to v0.11.4 (0.11.5 was breaking rsyslog-kafka)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-  resolves: rhbz#1614697
 
-* Fri Aug 10 2018 Jiri Vymazal <jvymazal@redhat.com> - 0.11.5-1
+* Tue Jan 09 2018 Michal Luscon <mluscon@gmail.com> - 0.11.3-1
-- rebase to v0.11.5
+- Update to upstream 0.11.3
-  resolves: rhbz#1614697
-- removed explicit %attr on symlinks
 
-* Thu Jun 28 2018 Radovan Sroka <rsroka@redhat.com> - 0.11.0-2
+* Thu Nov 02 2017 Michal Luscon <mluscon@gmail.com> - 0.11.1-1
-- switch from python2 to python3
+- Update to upstream 0.11.1
-  resolves: rhbz#1595795
 
 * Thu Aug 31 2017 Michal Luscon <mluscon@gmail.com> - 0.11.0-1
 - Update to 0.11.0