dnssec-tools-2.2.3-add_ifdedf_to_engine.patch

@@ -1,38 +0,0 @@
-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,16 +1,8 @@
-# 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: 30%{?dist}
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD
+Release: 21%{?dist}
+License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
 Source0: https://www.hardakers.net/software/%{name}-%{version}.tar.gz
@@ -37,7 +29,6 @@ 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
 
@@ -72,7 +63,7 @@ C-based libraries useful for developing dnssec aware tools.
 %prep
 %setup -q
 
-%patch -P5 -p0 
+%patch5 -p0 
 #%%patch6 -p2
 #%%patch12 -p2
 #%%patch13 -p2
@@ -81,9 +72,8 @@ C-based libraries useful for developing dnssec aware tools.
 #%%patch16 -p2
 #%%patch17 -p2
 #%%patch18 -p2
-%patch -P19 -p2
-%patch -P20 -p1 -b .link-with-libs
-%patch -P21 -p1
+%patch19 -p2
+%patch20 -p1 -b .link-with-libs
 
 %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
@@ -372,33 +362,6 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-29
-- Perl 5.42 rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Nov 05 2024 Michal Josef Špaček <mspacek@redhat.com> - 2.2.3-27
-- Build without OpenSSL ENGINE support on Fedora 41 onwards
-
-* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 2.2.3-26
-- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 10 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-24
-- Perl 5.40 rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild