From f8d94140461c3965f6a0d048949c041c686d5232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Mon, 29 Jul 2024 15:20:59 +0200
Subject: [PATCH] Related: RHEL-33728 - drop ENGINE support from apr_crypto

---
 apr-util-1.6.3-drop-engine-headers.patch | 23 +++++++++++++++++++++++
 apr-util.spec                            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 apr-util-1.6.3-drop-engine-headers.patch

diff --git a/apr-util-1.6.3-drop-engine-headers.patch b/apr-util-1.6.3-drop-engine-headers.patch
new file mode 100644
index 0000000..c1afa35
--- /dev/null
+++ b/apr-util-1.6.3-drop-engine-headers.patch
@@ -0,0 +1,23 @@
+diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c
+index 34d0559..4069cf9 100644
+--- a/crypto/apr_crypto_openssl.c
++++ b/crypto/apr_crypto_openssl.c
+@@ -37,7 +37,6 @@
+ 
+ #include <openssl/evp.h>
+ #include <openssl/rand.h>
+-#include <openssl/engine.h>
+ #include <openssl/opensslv.h>
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000
+ #include <openssl/macros.h>
+@@ -92,6 +91,10 @@
+ #define APR_USE_OPENSSL_ENGINE_API 0
+ #endif
+ 
++#if APR_USE_OPENSSL_ENGINE_API
++#include <openssl/engine.h>
++#endif
++
+ #define LOG_PREFIX "apr_crypto_openssl: "
+ 
+ struct apr_crypto_t {
diff --git a/apr-util.spec b/apr-util.spec
index 280e4e9..e91393e 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -56,6 +56,7 @@ Patch5: apr-util-1.6.3-lmdb-support.patch
 Patch6: apr-util-1.6.3-r1908584.patch
 Patch7: apr-util-1.6.3-r1908585.patch
 Patch8: apr-util-1.6.3-r1908586.patch
+Patch9: apr-util-1.6.3-drop-engine-headers.patch
 BuildRequires: gcc
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: %{dbdep}, expat-devel, libuuid-devel
@@ -284,6 +285,7 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
 %changelog
 * Mon Jul 29 2024 Luboš Uhliarik <luhliari@redhat.com> - 1.6.3-19
 - Resolves: RHEL-50386 - drop unnecessary apr-util-devel dependencies
+- Related: RHEL-33728 - drop ENGINE support from apr_crypto
 
 * Tue Jun 25 2024 Joe Orton <jorton@redhat.com> - 1.6.3-18
 - drop ENGINE support from apr_crypto (RHEL-33728)