Fix regression in map fileformat compatibility

https://gitlab.isc.org/isc-projects/bind9/-/issues/2872
https://kb.isc.org/docs/map-zone-format-incompatibility-in-bind-9-16-20-and-9-17-17

(cherry picked from commit 50e206624d)

Related: rhbz#1956777
This commit is contained in:
Petr Menšík 2021-08-19 17:05:11 +02:00
parent 4b70312f6d
commit d63e24c757
2 changed files with 16 additions and 1 deletions

View File

@ -0,0 +1,8 @@
--- a/lib/dns/mapapi
+++ b/lib/dns/mapapi
@@ -13,4 +13,4 @@
# Whenever releasing a new major release of BIND9, set this value
# back to 1.0 when releasing the first alpha. Map files are *never*
# compatible across major releases.
-MAPAPI=2.0
+MAPAPI=3.0

View File

@ -51,7 +51,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.16.20 Version: 9.16.20
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -102,6 +102,9 @@ Patch157:bind-9.11-fips-tests.patch
Patch164:bind-9.11-rh1666814.patch Patch164:bind-9.11-rh1666814.patch
Patch170:bind-9.11-feature-test-named.patch Patch170:bind-9.11-feature-test-named.patch
Patch171:bind-9.11-tests-variants.patch Patch171:bind-9.11-tests-variants.patch
# https://gitlab.isc.org/isc-projects/bind9/-/issues/2872
# https://kb.isc.org/docs/map-zone-format-incompatibility-in-bind-9-16-20-and-9-17-17
Patch172:https://downloads.isc.org/isc/bind9/9.16.20/patches/bind-9.16.20-map-format-fix.patch
%{?systemd_ordering} %{?systemd_ordering}
Requires: coreutils Requires: coreutils
@ -402,6 +405,7 @@ in HTML and PDF format.
%patch164 -p1 -b .rh1666814 %patch164 -p1 -b .rh1666814
%patch170 -p1 -b .featuretest-named %patch170 -p1 -b .featuretest-named
%patch171 -p1 -b .test-variant %patch171 -p1 -b .test-variant
%patch172 -p1 -b .map-format
%if %{with PKCS11} %if %{with PKCS11}
%patch135 -p1 -b .config-pkcs11 %patch135 -p1 -b .config-pkcs11
@ -1125,6 +1129,9 @@ fi;
%endif %endif
%changelog %changelog
* Thu Aug 19 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.20-2
- Fix map file format incompatibility
* Tue Aug 17 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.20-1 * Tue Aug 17 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.20-1
- Update to 9.16.20 - Update to 9.16.20