From b24ca951fdc98a1b840d1c8799e7f0bf491af89b Mon Sep 17 00:00:00 2001
From: alakatos <alakatos@redhat.com>
Date: Mon, 5 Aug 2024 14:28:29 +0200
Subject: [PATCH] Remove mmtaghostname subpackage resolves: RHEL-52863

---
 disable-openssl-engine.patch | 21 +++++++++++++++++++++
 rsyslog.spec                 | 17 +++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 disable-openssl-engine.patch

diff --git a/disable-openssl-engine.patch b/disable-openssl-engine.patch
new file mode 100644
index 0000000..5ea9884
--- /dev/null
+++ b/disable-openssl-engine.patch
@@ -0,0 +1,21 @@
+diff -up rsyslog-8.2312.0/runtime/nsd_ossl.c.orig rsyslog-8.2312.0/runtime/nsd_ossl.c
+--- rsyslog-8.2312.0/runtime/nsd_ossl.c.orig	2024-08-05 16:06:56.234410525 +0200
++++ rsyslog-8.2312.0/runtime/nsd_ossl.c	2024-08-05 16:07:21.740650844 +0200
+@@ -35,7 +35,7 @@
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #	include <openssl/bioerr.h>
+ #endif
+-#include <openssl/engine.h>
++// #include <openssl/engine.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+@@ -992,7 +992,7 @@ osslGlblExit(void)
+ {
+ 	DEFiRet;
+ 	DBGPRINTF("openssl: entering osslGlblExit\n");
+-	ENGINE_cleanup();
++	// ENGINE_cleanup();
+ 	ERR_free_strings();
+ 	EVP_cleanup();
+ 	CRYPTO_cleanup_all_ex_data();
diff --git a/rsyslog.spec b/rsyslog.spec
index 7dc22d1..9a0189e 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -10,6 +10,7 @@
 %bcond_with libdbi
 %bcond_with mongodb
 %bcond_with rabbitmq
+%bcond_with mmtaghostname
 %else
 %bcond_without hiredis
 %bcond_without libdbi
@@ -32,12 +33,11 @@
 %bcond_without pgsql
 %bcond_without snmp
 %bcond_without udpspoof
-%bcond_without mmtaghostname
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.2312.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL-3.0-or-later AND Apache-2.0
 URL: http://www.rsyslog.com/
 Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -70,6 +70,8 @@ BuildRequires: systemd-rpm-macros
 BuildRequires: zlib-devel
 BuildRequires: libcap-ng-devel
 
+Patch0: disable-openssl-engine.patch
+
 Recommends: logrotate
 Obsoletes: rsyslog-logrotate < 8.2310.0-2
 Provides: rsyslog-logrotate = %{version}-%{release}
@@ -271,8 +273,10 @@ advantage if a field-based log format is to be processed, like for example CEF
 and either a large number of fields is needed or a specific field is used multiple
 times inside filters.
 
+%if %{with mmtaghostname}
 %description mmtaghostname
 This module provides message modification for changing or adding the host name.
+%endif
 
 %if %{with snmp}
 %description mmsnmptrapd
@@ -381,6 +385,8 @@ mv build doc
 # set up rsyslog sources
 %setup -q -D
 
+%patch -P 0 -p1
+
 %if %{with omamqp1}
 # Unpack qpid-proton
 %setup -q -D -T -b 6
@@ -666,8 +672,10 @@ done
 %files mmnormalize
 %{_libdir}/rsyslog/mmnormalize.so
 
+%if %{with mmtaghostname}
 %files mmtaghostname
 %{_libdir}/rsyslog/mmtaghostname.so
+%endif
 
 %if %{with snmp}
 %files mmsnmptrapd
@@ -758,6 +766,11 @@ done
 
 
 %changelog
+* Mon Aug 05 2024 Attila Lakatos <alakatos@redhat.com> - 8.2312.0-3
+- Remove mmtaghostname subpackage
+- Do not build with openssl engine support
+  resolves: RHEL-52863
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 8.2312.0-2
 - Bump release for June 2024 mass rebuild