From 3aea08e97a4598f473677713b088572921788bdb Mon Sep 17 00:00:00 2001
From: xinghe <xinghe2@h-partners.com>
Date: Wed, 20 Mar 2024 05:52:32 +0000
Subject: [PATCH 1/2] fix build failed

---
 backport-bind-dyndb-ldap-bind-9.18.24.patch | 32 +++++++++++++++++++++
 bind-dyndb-ldap.spec                        |  9 +++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 backport-bind-dyndb-ldap-bind-9.18.24.patch

diff --git a/backport-bind-dyndb-ldap-bind-9.18.24.patch b/backport-bind-dyndb-ldap-bind-9.18.24.patch
new file mode 100644
index 0000000..db720b2
--- /dev/null
+++ b/backport-bind-dyndb-ldap-bind-9.18.24.patch
@@ -0,0 +1,32 @@
+From 628db201764a0dc76f8e48c1524850de64e2f2fe Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Wed, 14 Feb 2024 15:45:57 +0200
+Subject: [PATCH] Include dydnb-config.h prior to any BIND headers
+ 
+Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ src/syncrepl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ 
+diff --git a/src/syncrepl.c b/src/syncrepl.c
+index f94379c..4725bb8 100644
+--- a/src/syncrepl.c
++++ b/src/syncrepl.c
+@@ -4,6 +4,7 @@
+ 
+ #include <unistd.h>
+ 
++#include "dyndb-config.h"
+ #include <isc/condition.h>
+ #include <isc/event.h>
+ #include <isc/mutex.h>
+@@ -11,7 +12,6 @@
+ #include <isc/time.h>
+ #include <isc/util.h>
+ 
+-#include "dyndb-config.h"
+ #include "ldap_helper.h"
+ #include "util.h"
+ #include "semaphore.h"
+-- 
+2.43.0
\ No newline at end of file
diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec
index 79aceb5..d001e0d 100644
--- a/bind-dyndb-ldap.spec
+++ b/bind-dyndb-ldap.spec
@@ -5,7 +5,7 @@
 
 Name:           bind-dyndb-ldap
 Version:        11.10
-Release:        2
+Release:        3
 Summary:        LDAP back-end plug-in for BIND
 License:        GPLv2+
 URL:            https://releases.pagure.org/bind-dyndb-ldap
@@ -19,6 +19,7 @@ Patch4:         bind-dyndb-ldap-11.10-bind-9.18.11.patch
 Patch5:         backport-bind-dyndb-ldap-11.10-bind-9.18.13.patch
 Patch6:         backport-bind-dyndb-ldap-11.10-bind-9.18.19.patch
 Patch7:         backport-bind-dyndb-ldap-11.10-dns_name_init.patch
+Patch8:         backport-bind-dyndb-ldap-bind-9.18.24.patch
 
 BuildRequires:  bind-devel >= %{bind_version}
 BuildRequires:  krb5-devel
@@ -100,6 +101,12 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
 
 
 %changelog
+* Wed Mar 20 2024 xinghe <xinghe2@h-partners.com> - 11.10-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix build failed
+
 * Tue Mar 05 2024 xinghe <xinghe2@h-partners.com> - 11.10-2
 - Type:bugfix
 - CVE:NA
-- 
Gitee


From 4cd86e9bf98a143bc69d503031d256c310ecc0cd Mon Sep 17 00:00:00 2001
From: shafeipaozi <2829702579@qq.com>
Date: Fri, 22 Mar 2024 11:09:22 +0800
Subject: [PATCH 2/2] fix clang

---
 bind-dyndb-ldap.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec
index 90dfcaa..a2de4b6 100644
--- a/bind-dyndb-ldap.spec
+++ b/bind-dyndb-ldap.spec
@@ -24,6 +24,7 @@ Patch8:         backport-bind-dyndb-ldap-bind-9.18.24.patch
 %if "%toolchain" == "clang"
 Patch9000:         bind-dyndb-ldap-fix-clang-atomic.patch
 %endif
+
 BuildRequires:  bind-devel >= %{bind_version}
 BuildRequires:  krb5-devel
 BuildRequires:  openldap-devel
-- 
Gitee