From d026ace57d6ab0afc9e4bb469790b2b6397cd820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Tue, 22 Jun 2021 17:36:23 +0200 Subject: [PATCH] Include 9.16.17 patch because that release were skipped. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#1960273 Signed-off-by: Petr Menšík --- bind-dyndb-ldap-11.9-bind-9.16.17.patch | 35 +++++++++++++++++++++++++ bind-dyndb-ldap.spec | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 bind-dyndb-ldap-11.9-bind-9.16.17.patch diff --git a/bind-dyndb-ldap-11.9-bind-9.16.17.patch b/bind-dyndb-ldap-11.9-bind-9.16.17.patch new file mode 100644 index 0000000..3f3edbc --- /dev/null +++ b/bind-dyndb-ldap-11.9-bind-9.16.17.patch @@ -0,0 +1,35 @@ +From d7d3032de7f5d3dd3cffea6064549b63a9ad7d59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= +Date: Thu, 17 Jun 2021 17:57:52 +0200 +Subject: [PATCH] Skip isc_bind9 check on BIND 9.16.17+ + +Reference variable refvar from dns_dyndbctx_t were removed. Removed was +also flag requesting different namespace. Skip that check on last stable +version, it should eval to false on all versions anyway. +--- + src/ldap_driver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ldap_driver.c b/src/ldap_driver.c +index e9f1005ee..5f9e00af1 100644 +--- a/src/ldap_driver.c ++++ b/src/ldap_driver.c +@@ -1156,6 +1156,7 @@ dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters, + RUNTIME_CHECK(isc_once_do(&library_init_once, library_init) + == ISC_R_SUCCESS); + ++#if LIBDNS_VERSION_MAJOR < 1617 + /* + * Depending on how dlopen() was called, we may not have + * access to named's global namespace, in which case we need +@@ -1168,6 +1169,7 @@ dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters, + isc_hash_set_initializer(dctx->hashinit); + log_debug(5, "registering library from dynamic ldap driver, %p != %p.", dctx->refvar, &isc_bind9); + } ++#endif + + log_debug(2, "registering dynamic ldap driver for %s.", name); + +-- +2.31.1 + diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec index 56f307a..4150646 100644 --- a/bind-dyndb-ldap.spec +++ b/bind-dyndb-ldap.spec @@ -12,7 +12,7 @@ Name: bind-dyndb-ldap Version: 11.9 -Release: 3%{?dist} +Release: 2%{?dist} Summary: LDAP back-end plug-in for BIND License: GPLv2+ @@ -20,6 +20,8 @@ URL: https://releases.pagure.org/bind-dyndb-ldap Source0: https://releases.pagure.org/%{name}/%{name}-%{VERSION}.tar.bz2 Source1: https://releases.pagure.org/%{name}/%{name}-%{VERSION}.tar.bz2.asc +Patch1: bind-dyndb-ldap-11.9-bind-9.16.17.patch + BuildRequires: bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version} BuildRequires: krb5-devel BuildRequires: openldap-devel