Resolves: RHEL-54298
This commit is contained in:
alakatos 2024-08-15 08:09:50 +02:00
parent 19bbc422d4
commit 913a9ebf5d
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,21 @@
diff -up librelp-1.11.0/src/tcp.c.orig librelp-1.11.0/src/tcp.c
--- librelp-1.11.0/src/tcp.c.orig 2024-08-15 08:31:29.699002010 +0200
+++ librelp-1.11.0/src/tcp.c 2024-08-15 08:31:46.552178361 +0200
@@ -69,7 +69,7 @@
# if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
# include <openssl/bioerr.h>
# endif
-# include <openssl/engine.h>
+// # include <openssl/engine.h>
/* OpenSSL API differences */
# if OPENSSL_VERSION_NUMBER >= 0x10100000L
# define RSYSLOG_X509_NAME_oneline(X509CERT) X509_get_subject_name(X509CERT)
@@ -1989,7 +1989,7 @@ relpTcpExitTLS_ossl(void)
SSL_CTX_free(ctx);
ctx = NULL;
}
- ENGINE_cleanup();
+ // ENGINE_cleanup();
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();

View File

@ -1,11 +1,13 @@
Summary: The Reliable Event Logging Protocol library
Name: librelp
Version: 1.11.0
Release: 5%{?dist}
Release: 6%{?dist}
License: GPL-3.0-or-later
URL: http://www.rsyslog.com/
Source0: http://download.rsyslog.com/%{name}/%{name}-%{version}.tar.gz
Patch0: disable-openssl-engine.patch
%description
Librelp is an easy to use library for the RELP protocol. RELP (stands
for Reliable Event Logging Protocol) is a general-purpose, extensible
@ -30,6 +32,8 @@ to develop applications using librelp.
%prep
%setup -q
%patch -P 0 -p1
%build
autoreconf -ivf
%configure --disable-static --enable-tls --enable-tls-openssl
@ -53,6 +57,10 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.la
%{_libdir}/pkgconfig/relp.pc
%changelog
* Thu Aug 15 2024 Attila Lakatos <alakatos@redhat.com> - 1.11.0-6
- Rebuild
Resolves: RHEL-54298
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.11.0-5
- Bump release for June 2024 mass rebuild