rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Renumber disabled pkcs11 patch, start using %autosetup

Browse Source 
Remove manual applying using %patchX by using %autopatch with ranges.
Those ranges are used because of PKCS11 feature, which is still
disabled.

Resolves: RHEL-6454
This commit is contained in:
Petr Menšík 2024-07-16 19:08:04 +02:00 committed by Fedor Vorobev
parent 26344a74ea
commit c9d7922fed
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bind.spec
View File

@ -100,7 +100,8 @@ Patch135:bind-9.14-config-pkcs11.patch
# Fedora specific patch to distribute native-pkcs#11 functionality # Fedora specific patch to distribute native-pkcs#11 functionality
Patch136:bind-9.10-dist-native-pkcs11.patch Patch136:bind-9.10-dist-native-pkcs11.patch
# Do not use isc-pkcs11. # Do not use isc-pkcs11.
Patch149:bind-9.11-kyua-pkcs11.patch Patch137:bind-9.11-kyua-pkcs11.patch
# Patch 138-139 reserved for pkcs11
Patch157:bind-9.11-fips-tests.patch Patch157:bind-9.11-fips-tests.patch
Patch164:bind-9.11-rh1666814.patch Patch164:bind-9.11-rh1666814.patch
@ -460,18 +461,16 @@ in HTML and PDF format.
%autosetup -N %autosetup -N
# Common patches # Common patches
%autopatch -p1 -m 1 -M 134 %autopatch -p1 -m 0 -M 134
# PKCS11 patches 135 136 and 149 are applied later. %autopatch -p1 -m 140
%autopatch -p1 -m 150
%if %{with PKCS11} %if %{with PKCS11}
%autopatch -p1 135 %autopatch -p1 -m 135 -M 135
cp -r bin/named{,-pkcs11} cp -r bin/named{,-pkcs11}
cp -r bin/dnssec{,-pkcs11} cp -r bin/dnssec{,-pkcs11}
cp -r lib/dns{,-pkcs11} cp -r lib/dns{,-pkcs11}
cp -r lib/ns{,-pkcs11} cp -r lib/ns{,-pkcs11}
%autopatch -p1 136 %autopatch -p1 -m 136 -M 139
%autopatch -p1 149
%endif %endif
# Sparc and s390 arches need to use -fPIE # Sparc and s390 arches need to use -fPIE