Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/bind-dyndb-ldap.git#0f36ba2830b3e67d2cdd32a7fd0a1304b4bc2e04

bind-dyndb-ldap-11.6-bind-9.16.9.patch

@@ -0,0 +1,30 @@
+From 2a732bb03812878a9cc00d27d6c80f3993520626 Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Thu, 26 Nov 2020 17:31:21 +0100
+Subject: [PATCH] Support BIND 9.16.9
+
+Two new functions were added to database interface. They are more
+related to caching server and not authoritative. Add just null pointers,
+returning not supporter error if used.
+---
+ src/ldap_driver.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/ldap_driver.c b/src/ldap_driver.c
+index 2f6574ea5..c524b7cc5 100644
+--- a/src/ldap_driver.c
++++ b/src/ldap_driver.c
+@@ -959,6 +959,10 @@ static dns_dbmethods_t ldapdb_methods = {
+ 	setservestalettl,
+ 	getservestalettl,
+ #endif
++#if LIBDNS_VERSION_MAJOR >= 1609
++	NULL, /* setservestalerefresh */
++	NULL, /* getservestalerefresh */
++#endif
+ #if LIBDNS_VERSION_MAJOR >= 1600
+ 	NULL, /* setgluecachestats */
+ #endif
+-- 
+2.26.2
+

bind-dyndb-ldap.spec

@@ -12,7 +12,7 @@
 
 Name:           bind-dyndb-ldap
 Version:        11.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 License:        GPLv2+
@@ -20,17 +20,23 @@ 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
 
-BuildRequires:  bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version}
+Patch1:         bind-dyndb-ldap-11.6-bind-9.16.9.patch
+
+BuildRequires:  bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}
 BuildRequires:  krb5-devel
 BuildRequires:  openldap-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  automake, autoconf, libtool
 
 %if %{with bind_pkcs11}
-Requires:       bind-pkcs11 >= %{bind_version}, bind-pkcs11-utils >= %{bind_version}
+BuildRequires:  bind-pkcs11-devel >= %{bind_version}
+BuildRequires: make
+Requires(pre): bind-pkcs11 >= %{bind_version}
+Requires: bind-pkcs11-utils >= %{bind_version}
 %else
 Requires: softhsm >= %{softhsm_version}
 Requires: openssl-pkcs11 >= %{openssl_pkcs11_version}
+Requires(pre): bind >= %{bind_version}
 %endif
 
 %description
@@ -40,10 +46,11 @@ off of your LDAP server.
 
 
 %prep
-%setup -q -n %{name}-%{VERSION}
+%autosetup -n %{name}-%{VERSION} -p1
 
 %build
 autoreconf -fiv
+export BIND9_CFLAGS='-I /usr/include/bind9 -DHAVE_TLS -DHAVE_THREAD_LOCAL'
 %configure
 make %{?_smp_mflags}
 
@@ -59,6 +66,8 @@ rm -r %{buildroot}%{_datadir}/doc/%{name}
 
 
 %post
+[ -f /etc/named.conf ] || exit 0
+
 # Transform named.conf if it still has old-style API.
 PLATFORM=$(uname -m)
 
@@ -106,6 +115,10 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
 
 
 %changelog
+* Thu Dec 17 2020 Alexander Bokovoy <abokovoy@redhat.com> - 11.6-2
+- Fix requires to bind: require bind installed before bind-dyndb-ldap
+  as we depend on named group
+
 * Mon Nov 23 2020 Alexander Bokovoy <abokovoy@redhat.com> - 11.6-1
 - Upstream release 11.6
 - Use reference counting semantics in destructors according to BIND version