Fix build failure caused by bind update to 9.18.21-3

After update to openEuler bind 9.18.21-3, those cves introduced
 new database interface change, backport upstream patch and modify
it to adapte openEuler bind version.
This commit is contained in:
Zhao Mengmeng 2024-08-07 15:03:42 +08:00
parent 8c38e033a8
commit 13e62a7583
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From e81a47bd0b8bb5b3d50b233a802e9930c08a98fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 31 Jul 2024 16:21:52 +0000
Subject: [PATCH] Support for bind 9.18.28
New CVEs introduced new database interface change. Do just minimal
change to allow fast rebuild of plugin.
Fixes #233.
Notice: openEuler's bind majar version is still 9.18.21, but contains
CVE fixed in upstream 9.18.28, so change LIBDNS_VERSION_MAJOR from
1828 to 1821.
---
src/ldap_driver.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/ldap_driver.c b/src/ldap_driver.c
index 20e12fc..63e7a72 100644
--- a/src/ldap_driver.c
+++ b/src/ldap_driver.c
@@ -976,6 +976,10 @@ static dns_dbmethods_t ldapdb_methods = {
#if LIBDNS_VERSION_MAJOR >= 1606 && LIBDNS_VERSION_MAJOR < 1720
adjusthashsize, /* adjusthashsize */
#endif
+#if LIBDNS_VERSION_MAJOR >= 1821
+ NULL, /* setmaxrrperset */
+ NULL, /* setmaxtypepername */
+#endif
};
isc_result_t ATTR_NONNULLS
--
2.43.0

View File

@ -5,7 +5,7 @@
Name: bind-dyndb-ldap
Version: 11.10
Release: 3
Release: 4
Summary: LDAP back-end plug-in for BIND
License: GPLv2+
URL: https://releases.pagure.org/bind-dyndb-ldap
@ -20,6 +20,7 @@ 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
Patch9: backport-bind-dyndb-ldap-11.10-support-for-bind-9.18.21.3.patch
BuildRequires: bind-devel >= %{bind_version}
BuildRequires: krb5-devel
@ -101,6 +102,12 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
%changelog
* Wed Aug 07 2024 Zhao Mengmeng <zhaomengmeng@kylinos.cn> - 11.10-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC: fix build failure caused by bind update to 9.18.21-3
* Wed Mar 20 2024 xinghe <xinghe2@h-partners.com> - 11.10-3
- Type:bugfix
- CVE:NA