From fdce488bae5ef2b41787da5b60d42b3ce7a3683b Mon Sep 17 00:00:00 2001
From: Wes Hardaker <opensource@hardakers.net>
Date: Wed, 29 Aug 2018 14:53:21 -0700
Subject: [PATCH 01/36] Added Mail::Send

---
 dnssec-tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index bfe5319..e35d326 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -12,7 +12,7 @@ Source2: libval-config
 # Require note: the auto-detection for perl-Net-DNS-SEC will not work since
 # the tools do run time tests for their existence.  But most of the tools
 # are much more useful with the modules in place, so we hand require them.
-Requires: perl(Net::DNS), perl(Net::DNS::SEC), dnssec-tools-perlmods, bind, perl(Getopt::GUI::Long)
+Requires: perl(Net::DNS), perl(Net::DNS::SEC), dnssec-tools-perlmods, bind, perl(Getopt::GUI::Long) perl(Mail::Send)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(GraphViz)
 BuildRequires:  gcc

From 13b73724b670b348841dff58570eb8e19f568f70 Mon Sep 17 00:00:00 2001
From: Wes Hardaker <opensource@hardakers.net>
Date: Wed, 29 Aug 2018 14:57:54 -0700
Subject: [PATCH 02/36] version bump

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index e35d326..16d2a6f 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -365,6 +365,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Wed Aug 29 2018 Wes Hardaker <wjhns174@hardakers.net> - 2.2.1-2
+- add Mail::Send
+
 * Thu Jul 30 2018 Wes Hardaker <wjhns174@hardakers.net> - 2.2.1-1
 - fix build issues
 

From 3f09ae8cfcace90ff2566dc679ebafb7775896b4 Mon Sep 17 00:00:00 2001
From: Wes Hardaker <opensource@hardakers.net>
Date: Wed, 29 Aug 2018 16:12:02 -0700
Subject: [PATCH 03/36] missed merge section

---
 dnssec-tools.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index f790487..a2bd275 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,12 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
-<<<<<<< HEAD
-Version: 2.2.1
-Release: 2%{?dist}
-=======
 Version: 2.2.3
 Release: 1%{?dist}
->>>>>>> f28
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/

From fabbfde0b4d0ae4cebf8119809fc5702ad10514f Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:38:50 +0100
Subject: [PATCH 04/36] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 dnssec-tools.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 4b03143..9997fd4 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -105,9 +105,7 @@ mv ${RPM_BUILD_ROOT}/%{_bindir}/libval-config ${RPM_BUILD_ROOT}/%{_bindir}/libva
 # Add a new wrapper script that calls the right file at run time
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
 %files
 %doc README.md INSTALL COPYING

From f9e112eb2f6ab1170594972a028667e9d83c659b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:42 +0100
Subject: [PATCH 05/36] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 dnssec-tools.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 9997fd4..a36fb3c 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -3,7 +3,6 @@ Name: dnssec-tools
 Version: 2.2.3
 Release: 2%{?dist}
 License: BSD
-Group: System Environment/Base
 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
@@ -34,7 +33,6 @@ patches, applications, wrappers, extensions, and plugins that will
 help ease the deployment of DNSSEC-related technologies.
 
 %package perlmods
-Group: System Environment/Libraries
 Summary: Perl modules supporting DNSSEC (needed by the dnssec-tools)
 Requires: perl(Net::DNS), perl(Net::DNS::SEC)
 
@@ -45,7 +43,6 @@ required by the DNSSEC tools themselves as well as modules that are
 useful for other developers.
 
 %package libs
-Group: System Environment/Libraries
 Summary: C-based libraries for dnssec aware tools
 Requires: openssl
 
@@ -53,7 +50,6 @@ Requires: openssl
 C-based libraries useful for developing dnssec aware tools.
 
 %package libs-devel
-Group: Development/Libraries
 Summary: C-based development libraries for dnssec aware tools
 Requires: dnssec-tools-libs = %{version}-%{release}
 

From e33602fdb69792c42e356b331806b6088123046e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 17:25:17 +0000
Subject: [PATCH 06/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index a36fb3c..acf93b3 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -356,6 +356,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Oct 4 2018 Wes Hardaker <wjhns174@hardakers.net> - 2.2.3-2
 - update default dnsval.conf
 

From 25fde37185f604f0239e022eb17c17f01e63c6e4 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 30 May 2019 13:29:56 +0200
Subject: [PATCH 07/36] Perl 5.30 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index acf93b3..39435d8 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -356,6 +356,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-4
+- Perl 5.30 rebuild
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 68fe995d4716dc085c14d9ac7ba6db4c03513db7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 22:12:58 +0000
Subject: [PATCH 08/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 39435d8..7fd045e 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -356,6 +356,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-4
 - Perl 5.30 rebuild
 

From 14390e1d3574e9775c2a65058c3937e54d5d9c6f Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 19 Dec 2019 16:39:45 -0500
Subject: [PATCH 09/36] fix libval-threads to link with dependent libs, use
 LDFLAGS

---
 ...c6b96422e499560fb10b95c1a481ea82656d.patch | 51 +++++++++++++++++++
 ...-2.2.3-link-libval-threads-with-libs.patch | 17 +++++++
 dnssec-tools.spec                             | 13 ++++-
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 7287c6b96422e499560fb10b95c1a481ea82656d.patch
 create mode 100644 dnssec-tools-2.2.3-link-libval-threads-with-libs.patch

diff --git a/7287c6b96422e499560fb10b95c1a481ea82656d.patch b/7287c6b96422e499560fb10b95c1a481ea82656d.patch
new file mode 100644
index 0000000..266de8f
--- /dev/null
+++ b/7287c6b96422e499560fb10b95c1a481ea82656d.patch
@@ -0,0 +1,51 @@
+From 7287c6b96422e499560fb10b95c1a481ea82656d Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 21 Apr 2019 12:55:15 +0200
+Subject: [PATCH] Update makefile to respect users LDFLAGS
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ dnssec-tools/validator/libsres/Makefile.in     | 2 +-
+ dnssec-tools/validator/libval/Makefile.in      | 2 +-
+ dnssec-tools/validator/libval_shim/Makefile.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dnssec-tools/validator/libsres/Makefile.in b/dnssec-tools/validator/libsres/Makefile.in
+index e20f6d788..0ef21cf80 100644
+--- a/dnssec-tools/validator/libsres/Makefile.in
++++ b/dnssec-tools/validator/libsres/Makefile.in
+@@ -63,7 +63,7 @@ clean:
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBRES): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) 
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
+diff --git a/dnssec-tools/validator/libval/Makefile.in b/dnssec-tools/validator/libval/Makefile.in
+index 0d6f35f99..6b361756c 100644
+--- a/dnssec-tools/validator/libval/Makefile.in
++++ b/dnssec-tools/validator/libval/Makefile.in
+@@ -65,7 +65,7 @@ clean:
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBVAL): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
+diff --git a/dnssec-tools/validator/libval_shim/Makefile.in b/dnssec-tools/validator/libval_shim/Makefile.in
+index 8b7c8e550..303943cc3 100644
+--- a/dnssec-tools/validator/libval_shim/Makefile.in
++++ b/dnssec-tools/validator/libval_shim/Makefile.in
+@@ -21,7 +21,7 @@ clean:
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBVAL_SHIM): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) $(EXTRA_LIBS)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(EXTRA_LIBS) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
diff --git a/dnssec-tools-2.2.3-link-libval-threads-with-libs.patch b/dnssec-tools-2.2.3-link-libval-threads-with-libs.patch
new file mode 100644
index 0000000..f160b6b
--- /dev/null
+++ b/dnssec-tools-2.2.3-link-libval-threads-with-libs.patch
@@ -0,0 +1,17 @@
+diff -up dnssec-tools-2.2.3/validator/libval/Makefile.in.link-with-libs dnssec-tools-2.2.3/validator/libval/Makefile.in
+--- dnssec-tools-2.2.3/validator/libval/Makefile.in.link-with-libs	2019-12-19 16:36:05.522457192 -0500
++++ dnssec-tools-2.2.3/validator/libval/Makefile.in	2019-12-19 16:36:11.967342451 -0500
+@@ -1,3 +1,4 @@
++LIBS=@LIBS@
+ 
+ INCL= ../include
+ LIB= ../libsres
+@@ -65,7 +66,7 @@ clean:
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBVAL): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES) $(LDFLAGS)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES) $(LIBS) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 7fd045e..dc25746 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -25,6 +25,11 @@ Patch5: dnssec-tools-linux-conf-paths-1.13.patch
 Patch13: dnssec-tools-2.0-autoconf-for-aarch64.patch
 Patch17: dnssec-tools-new-2017-key.patch
 Patch18: dnssec-tools-new-openssl-APIs.patch
+# Update Makefile to respect users LDFLAGS
+# https://github.com/DNSSEC-Tools/DNSSEC-Tools/commit/7287c6b96422e499560fb10b95c1a481ea82656d
+Patch19: 7287c6b96422e499560fb10b95c1a481ea82656d.patch
+# link libval-threads with libs
+Patch20: dnssec-tools-2.2.3-link-libval-threads-with-libs.patch
 
 %description
 
@@ -68,6 +73,8 @@ C-based libraries useful for developing dnssec aware tools.
 #%patch16 -p2
 #%patch17 -p2
 #%patch18 -p2
+%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
@@ -356,6 +363,10 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu Dec 19 2019 Tom Callaway <spot@fedoraproject.org> - 2.2.3-6
+- fix libval-threads to link with dependent libs
+- use LDFLAGS
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From b8364d760629d06a0edfb39201c26ae8d3f246e9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 16:04:37 +0000
Subject: [PATCH 10/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index dc25746..0fce442 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Dec 19 2019 Tom Callaway <spot@fedoraproject.org> - 2.2.3-6
 - fix libval-threads to link with dependent libs
 - use LDFLAGS

From f42aad502943cf813ba7e23569fab015c82b3092 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 22 Jun 2020 17:42:35 +0200
Subject: [PATCH 11/36] Perl 5.32 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 0fce442..0ce79c8 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-8
+- Perl 5.32 rebuild
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 056abbe8cba0e9f76654c7510ab2e94494ec127f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 15:35:15 +0000
Subject: [PATCH 12/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 0ce79c8..9b68f2c 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-8
 - Perl 5.32 rebuild
 

From 230e3cccbf162f2d5c81758af5c2e95a009f1cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 25 Sep 2020 11:18:23 +0200
Subject: [PATCH 13/36] Build-require perl-macros for Perl RPM macros

%perl_vendorlib and %perl_vendorarch are delivered by perl-macros
package. That package was required by perl-interpreter by an
accident and it was corrected in perl-interpreter-5.32.0-463.fc34.
Packages have to build-require perl-macros or perl-generators
explictly.
---
 dnssec-tools.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 9b68f2c..8b6e023 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -17,8 +17,7 @@ Requires: perl(GraphViz)
 BuildRequires:  gcc
 BuildRequires: openssl-devel
 BuildRequires: perl-devel
-#BuildRequires: perl-generators
-#BuildRequires: perl-generators
+BuildRequires: perl-macros
 BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
 # Makes the code installation linux filesystem friendly
 Patch5: dnssec-tools-linux-conf-paths-1.13.patch
@@ -363,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Fri Sep 25 2020 Petr Pisar <ppisar@redhat.com> - 2.2.3-10
+- Build-require perl-macros for Perl RPM macros
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 141e3d36f6382d90cb682028e8352c358b891c41 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 17 Dec 2020 04:39:18 +0000
Subject: [PATCH 14/36] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 dnssec-tools.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 8b6e023..29dd3a2 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -19,6 +19,7 @@ BuildRequires: openssl-devel
 BuildRequires: perl-devel
 BuildRequires: perl-macros
 BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
+BuildRequires: make
 # Makes the code installation linux filesystem friendly
 Patch5: dnssec-tools-linux-conf-paths-1.13.patch
 Patch13: dnssec-tools-2.0-autoconf-for-aarch64.patch

From 0f89df97008f314fccb66888a29ee3940136d740 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 03:36:19 +0000
Subject: [PATCH 15/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 29dd3a2..9d85d10 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Sep 25 2020 Petr Pisar <ppisar@redhat.com> - 2.2.3-10
 - Build-require perl-macros for Perl RPM macros
 

From 3a8ca5ae9f3f83902d843e9027bda23c46282fd0 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Fri, 21 May 2021 12:03:42 +0200
Subject: [PATCH 16/36] Perl 5.34 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 9d85d10..c794a1e 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-12
+- Perl 5.34 rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 63ee41053d21c037534eb7ed1431a8693ec1208a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 20:58:38 +0000
Subject: [PATCH 17/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index c794a1e..2733b84 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-12
 - Perl 5.34 rebuild
 

From 05482a67aa85b1e665090dfa3c9fd3590d48c535 Mon Sep 17 00:00:00 2001
From: Sahana Prasad <sahana@redhat.com>
Date: Tue, 14 Sep 2021 19:00:38 +0200
Subject: [PATCH 18/36] Rebuilt with OpenSSL 3.0.0

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 2733b84..471562d 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.3-14
+- Rebuilt with OpenSSL 3.0.0
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 3b002d284871dcd9aee4fa26a25b8735006e4cea Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 00:52:07 +0000
Subject: [PATCH 19/36] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 471562d..03ea72b 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.3-14
 - Rebuilt with OpenSSL 3.0.0
 

From df690ddabaab37416e9b32e4f010004e2a61cd58 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 30 May 2022 19:50:14 +0200
Subject: [PATCH 20/36] Perl 5.36 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 03ea72b..f94bbff 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-16
+- Perl 5.36 rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 5b370ed1fa99c97377c383200e0f9876ab0fa08f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 00:42:19 +0000
Subject: [PATCH 21/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index f94bbff..8dbcd70 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
@@ -363,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-16
 - Perl 5.36 rebuild
 

From c63c27db16ccec676bee7c89fece58ea07c35b0d Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Wed, 21 Dec 2022 08:17:27 +0100
Subject: [PATCH 22/36] Add BR perl-generators to automatically generates
 run-time dependencies

for installed Perl files
---
 dnssec-tools.spec | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 8dbcd70..18887f2 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,23 +1,23 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
-#Source0: https://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
+#Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
 Source0: https://www.hardakers.net/software/%{name}-%{version}.tar.gz
 Source1: dnssec-tools-dnsval.conf
 Source2: libval-config
 # Require note: the auto-detection for perl-Net-DNS-SEC will not work since
 # the tools do run time tests for their existence.  But most of the tools
 # are much more useful with the modules in place, so we hand require them.
-Requires: perl(Net::DNS), perl(Net::DNS::SEC), dnssec-tools-perlmods, bind, perl(Getopt::GUI::Long) perl(Mail::Send)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: dnssec-tools-perlmods, bind, perl(Getopt::GUI::Long)
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(GraphViz)
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: openssl-devel
 BuildRequires: perl-devel
-BuildRequires: perl-macros
+BuildRequires: perl-generators
 BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
 BuildRequires: make
 # Makes the code installation linux filesystem friendly
@@ -39,7 +39,7 @@ help ease the deployment of DNSSEC-related technologies.
 
 %package perlmods
 Summary: Perl modules supporting DNSSEC (needed by the dnssec-tools)
-Requires: perl(Net::DNS), perl(Net::DNS::SEC)
+Requires: perl(Getopt::GUI::Long)
 
 %description perlmods
 
@@ -65,14 +65,14 @@ C-based libraries useful for developing dnssec aware tools.
 %setup -q
 
 %patch5 -p0 
-#%patch6 -p2
-#%patch12 -p2
-#%patch13 -p2
-#%patch14 -p2
-#%patch15 -p2
-#%patch16 -p2
-#%patch17 -p2
-#%patch18 -p2
+#%%patch6 -p2
+#%%patch12 -p2
+#%%patch13 -p2
+#%%patch14 -p2
+#%%patch15 -p2
+#%%patch16 -p2
+#%%patch17 -p2
+#%%patch18 -p2
 %patch19 -p2
 %patch20 -p1 -b .link-with-libs
 
@@ -83,7 +83,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' validator/libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' validator/libtool
 # makefile dependencies are broken; we can't use smp_mflags:
-#make %{?_smp_mflags} CCFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+#make %%{?_smp_mflags} CCFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 make CCFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 %install
@@ -128,7 +128,7 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 %{_bindir}/maketestzone
 %{_bindir}/mapper
 %{_bindir}/zonesigner
-# this doesn't use %{_datadir} because patch6 above uses this exact path
+# this doesn't use %%{_datadir} because patch6 above uses this exact path
 /usr/share/dnssec-tools
 #/usr/share/dnssec-tools/donuts
 #/usr/share/dnssec-tools/donuts/rules
@@ -155,7 +155,7 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 %{_bindir}/dt-libval_check_conf
 %{_bindir}/dt-validate
 # configure above 
-#%{_datadir}/dnssec-tools/validator-testcases
+#%%{_datadir}/dnssec-tools/validator-testcases
 %{_bindir}/dt-getaddr
 %{_bindir}/dt-gethost
 %{_bindir}/dt-getname
@@ -300,8 +300,8 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 %files libs
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/dnssec-tools
-#%config(noreplace) %{_sysconfdir}/dnssec-tools/dnsval.conf
-#%config(noreplace) %{_sysconfdir}/dnssec-tools/root.hints
+#%%config(noreplace) %%{_sysconfdir}/dnssec-tools/dnsval.conf
+#%%config(noreplace) %%{_sysconfdir}/dnssec-tools/root.hints
 
 %files libs-devel
 %{_includedir}/validator
@@ -337,7 +337,7 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 %{_mandir}/man3/val_isvalidated.3.gz
 %{_mandir}/man3/val_res_query.3.gz
 %{_mandir}/man3/val_res_search.3.gz
-#%{_mandir}/man3/val_addrinfo.3.gz
+#%%{_mandir}/man3/val_addrinfo.3.gz
 %{_mandir}/man3/val_add_valpolicy.3.gz
 %{_mandir}/man3/val_context_setqflags.3.gz
 %{_mandir}/man3/val_does_not_exist.3.gz
@@ -363,6 +363,10 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Mon Dec 19 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-18
+- Add BR perl-generators to automatically generates run-time dependencies
+  for installed Perl files
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 1ad729e6b902edb105472265840f2902fdde0993 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Fri, 13 Jan 2023 09:31:50 +0100
Subject: [PATCH 23/36] Remove perl(MODULE_COMPAT), it will be replaced by
 generators

---
 dnssec-tools.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 18887f2..145aa25 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -12,7 +12,6 @@ Source2: libval-config
 # the tools do run time tests for their existence.  But most of the tools
 # are much more useful with the modules in place, so we hand require them.
 Requires: dnssec-tools-perlmods, bind, perl(Getopt::GUI::Long)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(GraphViz)
 BuildRequires: gcc
 BuildRequires: openssl-devel

From 80915b4efd2ec15db5117ec3b3b782e073684665 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 01:36:54 +0000
Subject: [PATCH 24/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 145aa25..ce3c0d2 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Mon Dec 19 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-18
 - Add BR perl-generators to automatically generates run-time dependencies
   for installed Perl files

From 578162a7190ffa5cf4156250b971a58b22dd6451 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Tue, 11 Jul 2023 16:02:01 +0200
Subject: [PATCH 25/36] Perl 5.38 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index ce3c0d2..a88bb3c 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-20
+- Perl 5.38 rebuild
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From f7f1f3a5768629fe02ffbf8abf5c5c11f7d00bd8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 17:41:47 +0000
Subject: [PATCH 26/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index a88bb3c..627ecdb 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2.2.3-20
 - Perl 5.38 rebuild
 

From 7e668fbdc81f05f92523202828c23010fa091dbf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 17:22:33 +0000
Subject: [PATCH 27/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 627ecdb..d68e2f9 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From 2c95ad21b6c0dc0c917237db27d3886b3131465d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 09:38:59 +0000
Subject: [PATCH 28/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index d68e2f9..421955e 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From adae71b254069a5ecf9c9b4c1ed0cdc738407525 Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:46 +0200
Subject: [PATCH 29/36] Eliminate use of obsolete %patchN syntax (#2283636)

---
 dnssec-tools.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 421955e..e1e2a57 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -63,7 +63,7 @@ C-based libraries useful for developing dnssec aware tools.
 %prep
 %setup -q
 
-%patch5 -p0 
+%patch -P5 -p0 
 #%%patch6 -p2
 #%%patch12 -p2
 #%%patch13 -p2
@@ -72,8 +72,8 @@ C-based libraries useful for developing dnssec aware tools.
 #%%patch16 -p2
 #%%patch17 -p2
 #%%patch18 -p2
-%patch19 -p2
-%patch20 -p1 -b .link-with-libs
+%patch -P19 -p2
+%patch -P20 -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

From 3d3384bf761b06b6393b661a78c09bc14aa2d6dc Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 10 Jun 2024 20:52:55 +0200
Subject: [PATCH 30/36] Perl 5.40 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index e1e2a57..3530f2c 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From 4d4b29ea2a14f54ecd4f042ce0234e2755d851fb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 21:12:22 +0000
Subject: [PATCH 31/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 3530f2c..6fe544e 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: BSD
 URL: http://www.dnssec-tools.org/
 #Source0: https://www.dnssec-tools.org/download/%%{name}-%%{version}.tar.gz
@@ -362,6 +362,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From 561ec456ec1cc9fcb3a64b5b53f28442aa906842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 28 Aug 2024 09:03:19 +0200
Subject: [PATCH 32/36] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 dnssec-tools.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 6fe544e..067f399 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -1,8 +1,9 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 25%{?dist}
-License: BSD
+Release: 26%{?dist}
+# Automatically converted from old format: BSD - review is highly recommended.
+License: LicenseRef-Callaway-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
@@ -362,6 +363,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From 772e0c3fcbbf355b43c95012fe049c0132f219ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= <mspacek@redhat.com>
Date: Tue, 5 Nov 2024 15:39:36 +0100
Subject: [PATCH 33/36] Build without OpenSSL ENGINE support on Fedora 41
 onwards

---
 dnssec-tools-2.2.3-add_ifdedf_to_engine.patch | 38 +++++++++++++++++++
 dnssec-tools.spec                             | 14 ++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 dnssec-tools-2.2.3-add_ifdedf_to_engine.patch

diff --git a/dnssec-tools-2.2.3-add_ifdedf_to_engine.patch b/dnssec-tools-2.2.3-add_ifdedf_to_engine.patch
new file mode 100644
index 0000000..5c6820e
--- /dev/null
+++ b/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>
diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 067f399..928f2df 100644
--- a/dnssec-tools.spec
+++ b/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: 26%{?dist}
+Release: 27%{?dist}
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
 URL: http://www.dnssec-tools.org/
@@ -30,6 +37,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
 
@@ -75,6 +83,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
@@ -363,6 +372,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-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
 

From 51eeaa7376e806848212715853c549521192404c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 16:00:53 +0000
Subject: [PATCH 34/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 928f2df..50bae1f 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -8,7 +8,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 27%{?dist}
+Release: 28%{?dist}
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
 URL: http://www.dnssec-tools.org/
@@ -372,6 +372,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From 9e4f8b59b02996f1ecfe88cffe145c65fab02f26 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 7 Jul 2025 15:46:36 +0200
Subject: [PATCH 35/36] Perl 5.42 rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 50bae1f..b0075d5 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -8,7 +8,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 28%{?dist}
+Release: 29%{?dist}
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
 URL: http://www.dnssec-tools.org/
@@ -372,6 +372,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* 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
 

From 8ca6021697d846dab98e56fe6485ec336cdd8ca0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 19:24:34 +0000
Subject: [PATCH 36/36] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 dnssec-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index b0075d5..92889ca 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -8,7 +8,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 29%{?dist}
+Release: 30%{?dist}
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
 URL: http://www.dnssec-tools.org/
@@ -372,6 +372,9 @@ 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