From a1695fd72efdded44bd871cb8d3568c09b8bb0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Mon, 3 Feb 2025 17:14:42 +0100
Subject: [PATCH] Change patches applying to autopatch

RPM tools keep complaining about old-style patches applying with
%patchX. Avoid that by using autopatch from now on, applying all changes
sorted but patch number.

Related: RHEL-76884
---
 bind.spec | 67 +++++++++----------------------------------------------
 1 file changed, 11 insertions(+), 56 deletions(-)

diff --git a/bind.spec b/bind.spec
index e73579c..15eb8fb 100644
--- a/bind.spec
+++ b/bind.spec
@@ -54,7 +54,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.23
-Release:  25%{?dist}
+Release:  26%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -465,69 +465,21 @@ in HTML and PDF format.
 # RHEL does not yet support this verification
 %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
 %endif
-%setup -q
+%autosetup -N
 
 # Common patches
-%patch10 -p1 -b .PIE
-%patch16 -p1 -b .redhat_doc
-%patch72 -p1 -b .64bit
-%patch106 -p1 -b .rh490837
-%patch112 -p1 -b .rh645544
-%patch130 -p1 -b .libdb
-%patch157 -p1 -b .fips-tests
-%patch164 -p1 -b .rh1666814
-%patch170 -p1 -b .featuretest-named
-%patch171 -p1 -b .test-variant
-%patch172 -p1 -b .CVE-2022-0396
-%patch173 -p1 -b .CVE-2021-25220
-%patch174 -p1 -b .CVE-2021-25220-test
-%patch175 -p1 -b .CVE-2022-3080
-%patch176 -p1 -b .CVE-2022-38177
-%patch177 -p1 -b .CVE-2022-38178
-%patch178 -p1 -b .CVE-2022-2795
-%patch179 -p1 -b .rh2101712
-%patch181 -p1 -b .rh2133889
-%patch182 -p1 -b .CVE-2022-3094
-%patch183 -p1 -b .CVE-2022-3094
-%patch184 -p1 -b .CVE-2022-3094
-%patch185 -p1 -b .CVE-2022-3094-test
-%patch186 -p1 -b .CVE-2022-3736
-%patch187 -p1 -b .CVE-2022-3924
-%patch188 -p1 -b .CVE-2023-2828
-%patch189 -p1 -b .CVE-2023-2911-1
-%patch190 -p1 -b .CVE-2023-2911-2
-%patch191 -p1 -b .CVE-2023-2911-3
-%patch192 -p1 -b .CVE-2023-3341
-%patch193 -p1 -b .b.root-servers.net
-%patch194 -p1 -b .CVE-2023-4408
-%patch195 -p1 -b .CVE-2023-5517
-%patch196 -p1 -b .CVE-2023-5679
-%patch197 -p1 -b .CVE-2023-6516
-%patch198 -p1 -b .CVE-2023-50387
-%patch199 -p1
-%patch200 -p1
-%patch201 -p1 -b .test-variant-def
-%patch202 -p1 -b .mempool-attach
-%patch203 -p1 -b .isc_hp-CVE-2023-50387
-%patch204 -p1 -b .CVE-2023-6516-test
-%patch205 -p1 -b .RHEL-39131
-%patch206 -p1 -b .CVE-2024-1975
-%patch207 -p1 -b .CVE-2024-1737
-%patch208 -p1 -b .CVE-2024-4076
-%patch210 -p1 -b .CVE-2024-1737-records
-%patch211 -p1 -b .CVE-2024-1737-records-test
-%patch212 -p1 -b .CVE-2024-1737-types
-%patch213 -p1 -b .CVE-2024-1737-types-test
-%patch214 -p1 -b .CVE-2024-1737-records-test2
+%autopatch -p1 -m 1 -M 134
+# PKCS11 patches 135 136 and 149 are applied later.
+%autopatch -p1 -m 150
 
 %if %{with PKCS11}
-%patch135 -p1 -b .config-pkcs11
+%autopatch -p1 135
 cp -r bin/named{,-pkcs11}
 cp -r bin/dnssec{,-pkcs11}
 cp -r lib/dns{,-pkcs11}
 cp -r lib/ns{,-pkcs11}
-%patch136 -p1 -b .dist_pkcs11
-%patch149 -p1 -b .kyua-pkcs11
+%autopatch -p1 136
+%autopatch -p1 149
 %endif
 
 # Sparc and s390 arches need to use -fPIE
@@ -1247,6 +1199,9 @@ fi;
 %endif
 
 %changelog
+* Wed Feb 05 2025 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-26
+- Switch to autopatch changes applying
+
 * Fri Sep 06 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-25
 - Bump version above RHEL 9.5