From ca0f46336e6736972ad3d2c382325aa890c284ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Thu, 13 Oct 2022 15:44:05 +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.

Resolves: rhbz#2162795
---
 bind-9.16-rh2133889.patch | 31 +++++++++++++++++++++++++++++++
 bind.spec                 |  8 +++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 bind-9.16-rh2133889.patch

diff --git a/bind-9.16-rh2133889.patch b/bind-9.16-rh2133889.patch
new file mode 100644
index 0000000..710bf53
--- /dev/null
+++ b/bind-9.16-rh2133889.patch
@@ -0,0 +1,31 @@
+From 606fc6d4aa8e8884f53f53e72dc1bd7babf37a47 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
+Date: Mon, 16 Jan 2023 11:06:48 +0000
+Subject: [PATCH] Merge branch 'feature/main/zt-rwlock.h' into 'main'
+
+Include isc_rwlocktype_t type definition in zt.h
+
+See merge request isc-projects/bind9!7376
+
+(cherry picked from commit d7bcdf8bd6c5395726f708535120ce9a97eaa935)
+
+395d6fca Include isc_rwlocktype_t type definition in zt.h
+---
+ 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 189092bc3b..2964fc971f 100644
+--- a/lib/dns/include/dns/zt.h
++++ b/lib/dns/include/dns/zt.h
+@@ -19,6 +19,7 @@
+ #include <stdbool.h>
+ 
+ #include <isc/lang.h>
++#include <isc/rwlock.h>
+ 
+ #include <dns/types.h>
+ 
+-- 
+2.39.0
+
diff --git a/bind.spec b/bind.spec
index a2952eb..2ae66a4 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.23
-Release:  7%{?dist}
+Release:  8%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -113,6 +113,8 @@ Patch177:bind-9.16-CVE-2022-38178.patch
 Patch178:bind-9.16-CVE-2022-2795.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/6695
 Patch179:bind-9.16-rh2101712.patch
+# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/7376
+Patch181:bind-9.16-rh2133889.patch
 
 %{?systemd_ordering}
 Requires:       coreutils
@@ -421,6 +423,7 @@ in HTML and PDF format.
 %patch177 -p1 -b .CVE-2022-38178
 %patch178 -p1 -b .CVE-2022-2795
 %patch179 -p1 -b .rh2101712
+%patch181 -p1 -b .rh2133889
 
 %if %{with PKCS11}
 %patch135 -p1 -b .config-pkcs11
@@ -1144,6 +1147,9 @@ fi;
 %endif
 
 %changelog
+* Thu Oct 13 2022 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-8
+- Correct regression preventing bind-dyndb-ldap build (#2162795)
+
 * Tue Oct 04 2022 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-7
 - Prevent freeing zone during statistics rendering (#2101712)