From 529d4963976f67ec564d49245ef1bb5545d41703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Fri, 19 Jul 2024 13:30:39 +0200
Subject: [PATCH] Explicitly disable openssl engine use

Resolves: RHEL-33736
---
 ldns-1.8-openssl-engine.patch | 24 ++++++++++++++++++++++++
 ldns.spec                     | 11 ++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 ldns-1.8-openssl-engine.patch

diff --git a/ldns-1.8-openssl-engine.patch b/ldns-1.8-openssl-engine.patch
new file mode 100644
index 0000000..8005eb9
--- /dev/null
+++ b/ldns-1.8-openssl-engine.patch
@@ -0,0 +1,24 @@
+From d7c107aff35800cd571f69d56a118d9ec91bd152 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Fri, 19 Jul 2024 12:58:05 +0200
+Subject: [PATCH] Remove unused openssl/engine.h header
+
+---
+ ldns-1.8.3/examples/ldns-nsec3-hash.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ldns-1.8.3/examples/ldns-nsec3-hash.c b/ldns-1.8.3/examples/ldns-nsec3-hash.c
+index f9325d3..f04f1aa 100644
+--- a/ldns-1.8.3/examples/ldns-nsec3-hash.c
++++ b/ldns-1.8.3/examples/ldns-nsec3-hash.c
+@@ -18,7 +18,6 @@
+ 
+ #ifdef HAVE_SSL
+ #include <openssl/conf.h>
+-#include <openssl/engine.h>
+ #endif /* HAVE_SSL */
+ 
+ #define MAX_FILENAME_LEN 250
+-- 
+2.45.2
+
diff --git a/ldns.spec b/ldns.spec
index 17e96f0..e0a57ec 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -37,7 +37,7 @@
 Summary: Low-level DNS(SEC) library with API
 Name: ldns
 Version: 1.8.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD-3-Clause
 Url: https://www.nlnetlabs.nl/%{name}/
@@ -54,6 +54,7 @@ Patch3: ldns-1.8-root-servers.net.patch
 Patch4: ldns-swig-4.2.patch
 # https://github.com/NLnetLabs/ldns/pull/233
 Patch5: ldns-swig-32bit.patch
+Patch6: ldns-1.8-openssl-engine.patch
 
 BuildRequires: libtool
 BuildRequires: autoconf
@@ -184,8 +185,8 @@ cp -a %{pkgname} %{pkgname}_python2
 
 
 %build
-CFLAGS="%{optflags} -fPIC -fno-strict-aliasing"
-CXXFLAGS="%{optflags} -fPIC -fno-strict-aliasing"
+CFLAGS="%{optflags} -fPIC -fno-strict-aliasing -DOPENSSL_NO_ENGINE"
+CXXFLAGS="%{optflags} -fPIC -fno-strict-aliasing -DOPENSSL_NO_ENGINE"
 LDFLAGS="$RPM_LD_FLAGS -Wl,-z,now -pie"
 export CFLAGS CXXFLAGS LDFLAGS
 
@@ -361,6 +362,10 @@ rm -rf doc/man
 %doc doc
 
 %changelog
+* Fri Jul 19 2024 Petr Menšík <pemensik@redhat.com> - 1.8.3-15
+- Remove unneeded openssl/engine.h causing build failures
+- Explicitly disable openssl engine (RHEL-33736)
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.8.3-14
 - Bump release for June 2024 mass rebuild