From 561ec456ec1cc9fcb3a64b5b53f28442aa906842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 09:03:19 +0200 Subject: [PATCH 1/6] 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ý - 2.2.3-26 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 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?= Date: Tue, 5 Nov 2024 15:39:36 +0100 Subject: [PATCH 2/6] 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 + #include ++#ifndef OPENSSL_NO_ENGINE + #include ++#endif /* !defined(OPENSSL_NO_ENGINE) */ + #include +- + #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 + #endif + #include ++#ifndef OPENSSL_NO_ENGINE + #include ++#endif /* !defined(OPENSSL_NO_ENGINE) */ + #include + #include + #include 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 - 2.2.3-27 +- Build without OpenSSL ENGINE support on Fedora 41 onwards + * Wed Aug 28 2024 Miroslav Suchý - 2.2.3-26 - convert license to SPDX From f5fda170400ab9c4396aad7bbfd0b5e7392711a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Tue, 5 Nov 2024 15:39:36 +0100 Subject: [PATCH 3/6] 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 + #include ++#ifndef OPENSSL_NO_ENGINE + #include ++#endif /* !defined(OPENSSL_NO_ENGINE) */ + #include +- + #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 + #endif + #include ++#ifndef OPENSSL_NO_ENGINE + #include ++#endif /* !defined(OPENSSL_NO_ENGINE) */ + #include + #include + #include diff --git a/dnssec-tools.spec b/dnssec-tools.spec index 6fe544e..66fbbd9 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: 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 - 2.2.3-26 +- Build without OpenSSL ENGINE support on Fedora 41 onwards + * Wed Jul 17 2024 Fedora Release Engineering - 2.2.3-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 51eeaa7376e806848212715853c549521192404c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:00:53 +0000 Subject: [PATCH 4/6] 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 - 2.2.3-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 05 2024 Michal Josef Špaček - 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 Date: Mon, 7 Jul 2025 15:46:36 +0200 Subject: [PATCH 5/6] 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 - 2.2.3-29 +- Perl 5.42 rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 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 Date: Wed, 23 Jul 2025 19:24:34 +0000 Subject: [PATCH 6/6] 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 - 2.2.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 2.2.3-29 - Perl 5.42 rebuild