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 0000000000000000000000000000000000000000..db720b24424ca1fd5d3551321d74001f38a907bf --- /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 +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 +--- + 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 + ++#include "dyndb-config.h" + #include + #include + #include +@@ -11,7 +12,6 @@ + #include + #include + +-#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/backport-bind-dyndb-ldap-dns_name_init.patch b/backport-bind-dyndb-ldap-dns_name_init.patch new file mode 100644 index 0000000000000000000000000000000000000000..67dcfcdb821a6d8204b859cc885bb9a9465ca770 --- /dev/null +++ b/backport-bind-dyndb-ldap-dns_name_init.patch @@ -0,0 +1,38 @@ +From dbbcc2f07ea6955c6b0b5a719f8058c54b1d750c Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy +Date: Wed, 14 Feb 2024 14:29:00 +0200 +Subject: [PATCH] use BIND macros when defining DNS names + +Fixes: https://pagure.io/bind-dyndb-ldap/issue/228 + +Signed-off-by: Alexander Bokovoy +--- + src/mldap.c | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/src/mldap.c b/src/mldap.c +index 92a330c..79efddb 100644 +--- a/src/mldap.c ++++ b/src/mldap.c +@@ -50,18 +50,7 @@ + static unsigned char uuid_rootname_ndata[] + = { 4, 'u', 'u', 'i', 'd', 4, 'l', 'd', 'a', 'p', 0 }; + static unsigned char uuid_rootname_offsets[] = { 0, 5, 10 }; +-static dns_name_t uuid_rootname = +-{ +- DNS_NAME_MAGIC, +- uuid_rootname_ndata, +- sizeof(uuid_rootname_ndata), +- sizeof(uuid_rootname_offsets), +- DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, +- uuid_rootname_offsets, +- NULL, +- { (void *)-1, (void *)-1 }, +- { NULL, NULL } +-}; ++static dns_name_t uuid_rootname = DNS_NAME_INITABSOLUTE(uuid_rootname_ndata, uuid_rootname_offsets); + + struct mldapdb { + isc_mem_t *mctx; +-- +2.43.0 \ No newline at end of file diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec index c80aee9828f724ebb04e6139d2f71b1d325ca606..f423d75efbd3c91fa78450fe5108c026b863147f 100644 --- a/bind-dyndb-ldap.spec +++ b/bind-dyndb-ldap.spec @@ -5,7 +5,7 @@ Name: bind-dyndb-ldap Version: 11.9 -Release: 2 +Release: 3 Summary: LDAP back-end plug-in for BIND License: GPLv2+ URL: https://releases.pagure.org/bind-dyndb-ldap @@ -13,6 +13,8 @@ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 Source1: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2.asc Patch1: backport-bind-dyndb-ldap-11.9-bind-9.16.17.patch +Patch2: backport-bind-dyndb-ldap-dns_name_init.patch +Patch3: backport-bind-dyndb-ldap-bind-9.18.24.patch BuildRequires: bind-devel >= %{bind_version} BuildRequires: krb5-devel @@ -93,6 +95,12 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf %changelog +* Wed Mar 20 2024 xinghe - 11.9-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix build failed + * Fri Jun 10 2022 gaihuiying - 11.9-2 - Type:bugfix - CVE:NA