From d63e24c757fb895dfb21beb48faadc112e7f3b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 19 Aug 2021 17:05:11 +0200
Subject: [PATCH] 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 50e206624d5dc36e17fef68eddd009768f220be0)

Related: rhbz#1956777
---
 bind-9.16.20-map-format-fix.patch | 8 ++++++++
 bind.spec                         | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 bind-9.16.20-map-format-fix.patch

diff --git a/bind-9.16.20-map-format-fix.patch b/bind-9.16.20-map-format-fix.patch
new file mode 100644
index 0000000..f6e3c9b
--- /dev/null
+++ b/bind-9.16.20-map-format-fix.patch
@@ -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
diff --git a/bind.spec b/bind.spec
index 27f93c6..ca18558 100644
--- a/bind.spec
+++ b/bind.spec
@@ -51,7 +51,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.20
-Release:  1%{?dist}
+Release:  2%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -102,6 +102,9 @@ Patch157:bind-9.11-fips-tests.patch
 Patch164:bind-9.11-rh1666814.patch
 Patch170:bind-9.11-feature-test-named.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}
 Requires:       coreutils
@@ -402,6 +405,7 @@ in HTML and PDF format.
 %patch164 -p1 -b .rh1666814
 %patch170 -p1 -b .featuretest-named
 %patch171 -p1 -b .test-variant
+%patch172 -p1 -b .map-format
 
 %if %{with PKCS11}
 %patch135 -p1 -b .config-pkcs11
@@ -1125,6 +1129,9 @@ fi;
 %endif
 
 %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
 - Update to 9.16.20