From c9c587855b1756dd5deb1c1b17e3836814bb80f3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sat, 18 Feb 2023 00:15:20 +0000
Subject: [PATCH] import bind-9.11.36-8.el8

---
 SOURCES/bind-9.11-rh2133889.patch | 26 ++++++++++++++++++++++++++
 SPECS/bind.spec                   |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/bind-9.11-rh2133889.patch

diff --git a/SOURCES/bind-9.11-rh2133889.patch b/SOURCES/bind-9.11-rh2133889.patch
new file mode 100644
index 0000000..c61d902
--- /dev/null
+++ b/SOURCES/bind-9.11-rh2133889.patch
@@ -0,0 +1,26 @@
+From c8f5b31f0637315c1c45d0287f05fcad2250f40f Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Thu, 13 Oct 2022 15:35:46 +0200
+Subject: [PATCH] Add include to rwlocktype_t to dns/zt.h
+
+It got broken as part of bug #2101712 fix. Introduced new definition,
+which passes during bind build, but breaks bind-dyndb-ldap build.
+---
+ lib/dns/include/dns/zt.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
+index 9421225..64c24d6 100644
+--- a/lib/dns/include/dns/zt.h
++++ b/lib/dns/include/dns/zt.h
+@@ -18,6 +18,7 @@
+ #include <stdbool.h>
+ 
+ #include <isc/lang.h>
++#include <isc/rwlock.h>
+ 
+ #include <dns/types.h>
+ 
+-- 
+2.37.3
+
diff --git a/SPECS/bind.spec b/SPECS/bind.spec
index 99544ee..8745dbb 100644
--- a/SPECS/bind.spec
+++ b/SPECS/bind.spec
@@ -68,7 +68,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.11.36
-Release:  7%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  8%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -165,6 +165,8 @@ Patch189: bind-9.16-CVE-2022-38178.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/6695
 Patch190: bind-9.11-rh2101712.patch
 Patch191: bind-9.11-CVE-2022-2795.patch
+# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/7376
+Patch192: bind-9.11-rh2133889.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -566,6 +568,7 @@ are used for building ISC DHCP.
 %patch189 -p1 -b .CVE-2022-38178
 %patch190 -p1 -b .rh2101712
 %patch191 -p1 -b .CVE-2022-2795
+%patch192 -p1 -b .rh2133889
 
 mkdir lib/dns/tests/testdata/dstrandom
 cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
@@ -1618,6 +1621,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Oct 13 2022 Petr Menšík <pemensik@redhat.com> - 32:9.11.36-8
+- Correct regression preventing bind-dyndb-ldap build (#2133889)
+
 * Thu Sep 29 2022 Petr Menšík <pemensik@redhat.com> - 32:9.11.36-7
 - Prevent excessive resource use while processing large delegations.
   (CVE-2022-2795)