Build without OpenSSL ENGINE support on Fedora 41 onwards

dnssec-tools-2.2.3-add_ifdedf_to_engine.patch

@@ -0,0 +1,38 @@
+diff -r -u dnssec-tools-2.2.3.orig/validator/libval/val_context.c dnssec-tools-2.2.3/validator/libval/val_context.c
+--- dnssec-tools-2.2.3.orig/validator/libval/val_context.c	2024-11-05 11:39:33.696730353 +0100
++++ dnssec-tools-2.2.3/validator/libval/val_context.c	2024-11-05 11:44:01.428711438 +0100
+@@ -17,9 +17,10 @@
+ 
+ #include <openssl/conf.h>
+ #include <openssl/evp.h>
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
++#endif /* !defined(OPENSSL_NO_ENGINE) */
+ #include <openssl/err.h>
+-
+ #include "val_support.h"
+ #include "val_policy.h"
+ #include "val_cache.h"
+@@ -853,7 +854,9 @@
+     /* Whole bunch of openssl cleanup routines */
+     CONF_modules_unload(1); 
+     EVP_cleanup(); 
++#ifndef OPENSSL_NO_ENGINE
+     ENGINE_cleanup(); 
++#endif
+     CRYPTO_cleanup_all_ex_data(); 
+     ERR_remove_state(0); 
+     ERR_free_strings(); 
+diff -r -u dnssec-tools-2.2.3.orig/validator/libval/val_crypto.c dnssec-tools-2.2.3/validator/libval/val_crypto.c
+--- dnssec-tools-2.2.3.orig/validator/libval/val_crypto.c	2024-11-05 11:39:33.695730345 +0100
++++ dnssec-tools-2.2.3/validator/libval/val_crypto.c	2024-11-05 11:40:17.569919704 +0100
+@@ -22,7 +22,9 @@
+ #include <crypto/sha2.h>
+ #endif
+ #include <openssl/dsa.h>
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
++#endif /* !defined(OPENSSL_NO_ENGINE) */
+ #include <openssl/md5.h>
+ #include <openssl/rsa.h>
+ #include <openssl/err.h>

dnssec-tools.spec

@@ -1,7 +1,14 @@
+# OpenSSL ENGINE support deprecated in Fedora 41 onwards
+# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine
+%if 0%{?fedora} > 40
+%global _preprocessor_defines %{?_preprocessor_defines} -DOPENSSL_NO_ENGINE
+%endif
+
+
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -29,6 +36,7 @@ Patch18: dnssec-tools-new-openssl-APIs.patch
 Patch19: 7287c6b96422e499560fb10b95c1a481ea82656d.patch
 # link libval-threads with libs
 Patch20: dnssec-tools-2.2.3-link-libval-threads-with-libs.patch
+Patch21: dnssec-tools-2.2.3-add_ifdedf_to_engine.patch
 
 %description
 
@@ -74,6 +82,7 @@ C-based libraries useful for developing dnssec aware tools.
 #%%patch18 -p2
 %patch -P19 -p2
 %patch -P20 -p1 -b .link-with-libs
+%patch -P21 -p1
 
 %build
 %configure --with-validator-testcases-file=%{_datadir}/dnssec-tools/validator-testcases --with-perl-build-args="INSTALLDIRS=vendor OPTIMIZE='$RPM_OPT_FLAGS'" --sysconfdir=/etc --with-root-hints=/etc/dnssec-tools/root.hints --with-resolv-conf=/etc/dnssec-tools/resolv.conf --disable-static --with-nsec3 --with-ipv6 --with-dlv --disable-bind-checks
@@ -362,6 +371,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Tue Nov 05 2024 Michal Josef Špaček <mspacek@redhat.com> - 2.2.3-26
+- Build without OpenSSL ENGINE support on Fedora 41 onwards
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild