From ebd889d522d4290c3aee6bf3ba0872a1cc37368d Mon Sep 17 00:00:00 2001
From: renmingshuai <renmingshuai@huawei.com>
Date: Mon, 13 Feb 2023 15:06:58 +0800
Subject: [PATCH] fix bind-9.18-zt-include-rwlock.patch

(cherry picked from commit 8bc60a375ccb2fd76fec275bbadba74aef96dc6f)
---
 bind-9.18-zt-include-rwlock.patch | 26 ++++++++++++++++++++++++++
 bind.spec                         | 10 ++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 bind-9.18-zt-include-rwlock.patch

diff --git a/bind-9.18-zt-include-rwlock.patch b/bind-9.18-zt-include-rwlock.patch
new file mode 100644
index 0000000..4375a2f
--- /dev/null
+++ b/bind-9.18-zt-include-rwlock.patch
@@ -0,0 +1,26 @@
+From 395d6fca2638129e1cc1f55ee4b3aa0dbba44dc0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Mon, 16 Jan 2023 11:45:31 +0100
+Subject: [PATCH] Include isc_rwlocktype_t type definition in zt.h
+ 
+After changes zt.h uses rwlock type, which is not enforced to be always
+defined. Ensure full type definition is ready by including appropriate
+header.
+---
+ 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 077b26ddea..037d0a9495 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.39.0
diff --git a/bind.spec b/bind.spec
index e87c837..2c73154 100644
--- a/bind.spec
+++ b/bind.spec
@@ -30,7 +30,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.37
-Release:  2
+Release:  3
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -74,7 +74,7 @@ Patch112:bind97-rh645544.patch
 Patch130:bind-9.9.1-P2-dlz-libdb.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
 Patch164:bind-9.11-rh1666814.patch
-
+Patch165:bind-9.18-zt-include-rwlock.patch
 
 Patch9000:bugfix-limit-numbers-of-test-threads.patch
 
@@ -1086,6 +1086,12 @@ fi;
 %endif
 
 %changelog
+* Mon Feb 13 2023 zhanghao<zhanghao383@huawei.com> - 32:9.16.37-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix bind-9.18-zt-include-rwlock.patch
+
 * Thu Feb 09 2023 zhanghao<zhanghao383@huawei.com> - 32:9.16.37-2
 - Type:bugfix
 - CVE:NA
-- 
Gitee