From 50e206624d5dc36e17fef68eddd009768f220be0 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
---
 bind-9.16-nodelock-count.patch | 38 ++++++++++++++++++++++++++++++++++
 bind.spec                      |  8 ++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 bind-9.16-nodelock-count.patch

diff --git a/bind-9.16-nodelock-count.patch b/bind-9.16-nodelock-count.patch
new file mode 100644
index 0000000..4462811
--- /dev/null
+++ b/bind-9.16-nodelock-count.patch
@@ -0,0 +1,38 @@
+From 33e5888cb723bb43bc622eaa8ded2c9f383e4a54 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 16:58:14 +0200
+Subject: [PATCH] Revert "Reduce the nodelock count for both cache and regular
+ rbtdb"
+
+This reverts commit bceda720e420cd22e60c7a407535746281efb33b.
+
+https://gitlab.isc.org/isc-projects/bind9/-/issues/2872
+---
+ lib/dns/rbtdb.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
+index 18503950ad..5c37b7d049 100644
+--- a/lib/dns/rbtdb.c
++++ b/lib/dns/rbtdb.c
+@@ -348,7 +348,7 @@ typedef ISC_LIST(dns_rbtnode_t) rbtnodelist_t;
+ 	(((header)->rdh_ttl > (now)) || \
+ 	 ((header)->rdh_ttl == (now) && ZEROTTL(header)))
+ 
+-#define DEFAULT_NODE_LOCK_COUNT	    7 /*%< Should be prime. */
++#define DEFAULT_NODE_LOCK_COUNT	    53 /*%< Should be prime. */
+ #define RBTDB_GLUE_TABLE_INIT_BITS  2U
+ #define RBTDB_GLUE_TABLE_MAX_BITS   32U
+ #define RBTDB_GLUE_TABLE_OVERCOMMIT 3
+@@ -380,7 +380,7 @@ hash_32(uint32_t val, unsigned int bits) {
+ #define DEFAULT_CACHE_NODE_LOCK_COUNT DNS_RBTDB_CACHE_NODE_LOCK_COUNT
+ #endif /* if DNS_RBTDB_CACHE_NODE_LOCK_COUNT <= 1 */
+ #else  /* ifdef DNS_RBTDB_CACHE_NODE_LOCK_COUNT */
+-#define DEFAULT_CACHE_NODE_LOCK_COUNT 17
++#define DEFAULT_CACHE_NODE_LOCK_COUNT 97
+ #endif /* DNS_RBTDB_CACHE_NODE_LOCK_COUNT */
+ 
+ typedef struct {
+-- 
+2.31.1
+
diff --git a/bind.spec b/bind.spec
index c4e9ad4..ef281b9 100644
--- a/bind.spec
+++ b/bind.spec
@@ -53,7 +53,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/
 #
@@ -104,6 +104,8 @@ 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
+Patch172:bind-9.16-nodelock-count.patch
 
 %{?systemd_ordering}
 Requires:       coreutils
@@ -404,6 +406,7 @@ in HTML and PDF format.
 %patch164 -p1 -b .rh1666814
 %patch170 -p1 -b .featuretest-named
 %patch171 -p1 -b .test-variant
+%patch172 -p1 -b .node-count
 
 %if %{with PKCS11}
 %patch135 -p1 -b .config-pkcs11
@@ -1127,6 +1130,9 @@ fi;
 %endif
 
 %changelog
+* Thu Aug 19 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.20-2
+- Fix map file format regression
+
 * Tue Aug 17 2021 Petr Menšík <pemensik@redhat.com> - 32:9.16.20-1
 - Update to 9.16.20