.bind-dyndb-ldap.metadata

@@ -1 +1 @@
-fa27009509513d06a65b5aa16b612824280221c6 SOURCES/bind-dyndb-ldap-11.6.tar.bz2
+2ddce96217240ef58962105e7677e70a52550eec SOURCES/bind-dyndb-ldap-11.9.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/bind-dyndb-ldap-11.6.tar.bz2
+SOURCES/bind-dyndb-ldap-11.9.tar.bz2

SOURCES/0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2129844.patch

@@ -1,7 +1,8 @@
 From 7b4c1e28b3e64f7cd075599472e349510f8d33da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 14 Sep 2022 17:10:11 +0200
-Subject: [PATCH] Modify empty zone conflicts under exclusive mode
+From: Petr Menšík <pemensik@redhat.com>
+Date: Sep 14 2022 15:23:20 +0000
+Subject: Modify empty zone conflicts under exclusive mode
+
 
 Does not accept new request when exclusive mode is active. Zone table
 can be modified even after main fwd entries have been added. Ensure
@@ -10,9 +11,8 @@ empty zones handling keeps exclusive mode active.
 Exclusive mode were mentioned as the only protection it had by bind
 maintainer:
 https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/6637#note_308928
+
 ---
- src/fwd.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/fwd.c b/src/fwd.c
 index 24f6e53..0a3c673 100644
@@ -32,6 +32,4 @@ index 24f6e53..0a3c673 100644
  
  cleanup:
  	run_exclusive_exit(inst, lock_state);
--- 
-2.37.3
 

SOURCES/0002-add-rwlock-before-include-zt-h.patch

@@ -1,10 +0,0 @@
---- a/src/zone_register.h	2020-09-14 11:11:52.000000000 -0400
-+++ a/src/zone_register.h	2022-10-11 10:01:35.293730147 -0400
-@@ -5,6 +5,7 @@
- #ifndef _LD_ZONE_REGISTER_H_
- #define _LD_ZONE_REGISTER_H_
- 
-+#include <isc/rwlock.h>
- #include <dns/zt.h>
- 
- #include "settings.h"

SOURCES/bind-dyndb-ldap-11.6.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEhAodHH8+xLL+UwQ1RxniuKu/YhoFAl+7wQUACgkQRxniuKu/
-YhrK4Q/7B3njZOLSN1nor1ftoGGgXHvOvAGZTH+S0aI/u2bGfMIy3iT6NCcXZaVy
-LftvbYUKZ1zT92LYyTng7d8qgc8B7fmIAHPKye2uuxfPgwYkqdBLLKOMoAjbijjI
-P3Qkoee9bAF89wjnEnyfE9beJ9Vwe6PQLuCovIIauYEfhXjazOhSt7aDpYQ1X5Ui
-WyUKMhbO9WZ+TokW6wMTLGC8eCJdIJz0OXrROsLp6KZW4Y4wxf/zcU/XztDmEcOm
-DIeDir1ohp8xyssfBYr9tmamD+FzoU9+oR1+WjQav/pxFBqezzm7U3cvq9PrQ7SK
-Q5jpmeNOTvoUjnEMBW/AXPxth0yXVX3XlIYjhVX3R4r/ZXwmK1g6hqsT2kSbCvAS
-/DR7yfou2SQLuH1z6qs6vd+IdTYVpsHMBBdQtHSeZ5701fyJgIABI98oMMV/KplL
-bwfL/uhTPjuH1nett7h7NuINiVET0Yy63/CRicQs199ORGLVBaQ+AVCxj33m5NH/
-ggMKhA5VNmMSSvyI/TiytLbqhjw29kjRo4/vDEqv1co9fB2J2MBdTCtSF4gixB0n
-da/W6PnKiS45f0NdqpU5oUxLDTni+hYrQV1GXavdnx8lpnab9jlJO6vOZSCodSS+
-0eMJRH7knFDrY7EEjbUD7/pPZphPQUamvecmYhgn+La4SHkf2wA=
-=cGu/
------END PGP SIGNATURE-----

SOURCES/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?= <pemensik@redhat.com>
+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
+

SOURCES/bind-dyndb-ldap-11.9.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEhAodHH8+xLL+UwQ1RxniuKu/YhoFAmCtCAoACgkQRxniuKu/
+YhptNQ//QvGsnJsvlhZddT1EnoiiNhmKyW6HAV7f/0z4L/1RE9sng930mLhRD5mI
+wFPzeJBBYVTM82hZwjboaa8r5hpAHiq29Q6o7cBCIcOEN6YhNZePoO7RmU1TaF57
+6LGIzmUuEHfHaajV7fvYUY/kW0mJrxLwu58IJX7wi8OsJi+Exx8EqjVIVPJYkj3n
+hen17jJmxnPyjI3fhwZt+ON3X3yfocLgsg08Zl4dtB6MTHMeb0a6gxZ2MQwpCGrq
+zmo+Qv3OkvxJHPtpKO46je4GHZ3JYSNfCu8fVSqFiZfqu0Zv1DF6YUjxsHHU1BVk
+64CCEN1vNal1rIblwz447oEAwBWQ0ky0r+EtAYfUggSHZ/Lwjh8LX44VYISa/4Io
+R3aq3Egz8YwttXoH1PEGqv6ag9O7S8dVqKRm2+UmC6ajKtDtQimvWfyiInAjAsm4
+ngwiWoqfYVYvs38YSc9oL/VFc0N7NglNGTVOKzgrkUlG8RF2GEdeMqXBcPflIL16
++R8AEgaFOcFmyrv1DMTglK6Mq2EjSDlfxVb8Rv1jiBmglB1z0hzLi0yVLNIAobPF
+eOgi5Aq7UYWnT7oE8t6m1PWomVBObNFtC7OgMTdXt0lT7ZdqbRkxaW0CCY1+e645
+4NlyEvwONUGPKzl7jlSNH/5eE0GuYp6Qi68b+LkBf5wfK4axfdY=
+=OlUq
+-----END PGP SIGNATURE-----

SPECS/bind-dyndb-ldap.spec

@@ -1,39 +1,45 @@
+
 %define VERSION %{version}
 
-%define bind_version 32:9.11.26-1
+%define bind_version 32:9.11.17-1
 
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
-    %global openssl_pkcs11_version 0.4.10-2
-    %global softhsm_version 2.6.0
+%if 0%{?fedora} >= 31 || 0%{?rhel} > 8
+    %global openssl_pkcs11_version 0.4.10-6
+    %global softhsm_version 2.5.0-4
 %else
     %global with_bind_pkcs11 1
 %endif
 
 Name:           bind-dyndb-ldap
-Version:        11.6
-Release:        4%{?dist}
+Version:        11.9
+Release:        8%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
-Group:          System Environment/Libraries
 License:        GPLv2+
 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
 
-Patch0001:      0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2133036.patch
-Patch0002:      0002-add-rwlock-before-include-zt-h.patch
+Patch1:         bind-dyndb-ldap-11.9-bind-9.16.17.patch
+Patch2:         0001-Modify-empty-zone-conflicts-under-exclusive-mode_rhbz#2129844.patch
 
-BuildRequires:  bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version}
+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 >= %{bind_version}
+Requires: bind-pkcs11-utils >= %{bind_version}
 %else
 Requires: softhsm >= %{softhsm_version}
 Requires: openssl-pkcs11 >= %{openssl_pkcs11_version}
+Requires(pre): bind >= %{bind_version}
+Requires: bind >= %{bind_version}
 %endif
 
 %description
@@ -43,21 +49,17 @@ off of your LDAP server.
 
 
 %prep
-%setup -q -n %{name}-%{VERSION}
-
-for p in %patches; do
-    %__patch -p1 -i $p
-done
+%autosetup -n %{name}-%{VERSION} -p1
 
 %build
 autoreconf -fiv
+export BIND9_CFLAGS='-I /usr/include/bind9 -DHAVE_TLS -DHAVE_THREAD_LOCAL'
 %configure
-make %{?_smp_mflags}
+%make_build
 
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%make_install
 mkdir -m 770 -p %{buildroot}/%{_localstatedir}/named/dyndb-ldap
 
 # Remove unwanted files
@@ -66,6 +68,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)
 
@@ -107,64 +111,138 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
 
 
 %files
-%defattr(-,root,root,-)
 %doc NEWS README.md COPYING doc/{example,schema}.ldif
 %dir %attr(770, root, named) %{_localstatedir}/named/dyndb-ldap
 %{_libdir}/bind/ldap.so
 
 
 %changelog
-* Thu Oct 13 2022 Rafael Jeffman <rjeffman@redhat.com> - 11.6-4
+* Wed Oct 19 2022 Rafael Jeffman <rjeffman<redhat.com> - 11.9-8
 - Modify empty zone conflicts under exclusive mode
-  Resolves: rhbz#2126877
+  Resolves: rhbz#2129844, rhbz#2130614
 
-* Wed Dec 22 2021 Alexander Bokovoy <abokovoy@redhat.com> - 11.6-3
-- Rebuild against bind 9.11.36
-- Resolves: rhbz#2022762
+* Fri Nov 26 2021 Petr Menšík <pemensik@redhat.com> - 11.9-7
+- Rebuilt for BIND 9.16.23 (#2019575)
 
-* Thu Jan 07 2021 Rob Crittenden <rcritten@redhat.com> - 11.6-2
-- Rebuild against bind 9.11.26
-- Resolves: rhbz#1904612
+* Wed Aug 25 2021 Petr Menšík <pemensik@redhat.com> - 11.9-6
+- Rebuilt for BIND 9.16.20 with correct target
+
+* Tue Aug 24 2021 Petr Menšík <pemensik@redhat.com> - 11.9-5
+- Rebuilt for BIND 9.16.20
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.9-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Jul 22 2021 Petr Menšík <pemensik@redhat.com> - 11.9-3
+- Rebuilt for BIND 9.16.19 (#1960273)
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 11.9-2
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Tue May 25 2021 Alexander Bokovoy <abokovoy@redhat.com> - 11.9-1
+- Upstream release 11.9
+- Rebuilt for BIND 9.16.15+
+- Resolves: rhbz#1960273
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 11.7-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Feb 24 2021 Alexander Bokovoy <abokovoy@redhat.com> - 11.7-1
+- Upstream release 11.7
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Petr Menšík <pemensik@redhat.com> - 11.6-6
+- Rebuilt for BIND 9.16.11
+
+* Fri Jan 15 2021 Petr Menšík <pemensik@redhat.com> - 11.6-5
+- Rebuilt for BIND 9.16.10
+
+* Tue Jan 12 2021 Petr Menšík <pemensik@redhat.com> - 11.6-4
+- Support BIND 9.16.10
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Thu Dec 17 2020 Alexander Bokovoy <abokovoy@redhat.com> - 11.6-3
+- Both require bind and require it for pre-install script
+- Resolves: rhbz#1902811
+
+* 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
-- New upstream release
-- Resolves: rhbz#1891735
+- Upstream release 11.6
+- Use reference counting semantics in destructors according to BIND version
+
+* Wed Nov 18 2020 Alexander Bokovoy <abokovoy@redhat.com> - 11.5-1
+- Upstream release 11.5
+- Use OpenSSL pkcs11 engine in BIND instead of native PKCS11
+
+* Fri Oct 23 2020 Petr Menšík <pemensik@redhat.com> - 11.3-5
+- Rebuilt for bind 9.11.24
+
+* Fri Aug 21 2020 Petr Menšík <pemensik@redhat.com> - 11.3-4
+- Rebuilt for bind 9.11.22
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.3-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Mon Jun 08 2020 Alexander Bokovoy <abokovoy@redhat.com> - 11.3-1
-- New upstream release
-- Resolves: rhbz#1845211
+- Upstream release 11.3
 
-* Mon May 11 2020 Alexander Bokovoy <abokovoy@redhat.com> - 11.2-4
-- Rebuild against bind 9.11.18
-  Resolves: rhbz#1834264
+* Tue Mar 31 2020 Petr Menšík <pemensik@redhat.com> - 11.2-5
+- Rebuilt for bind 9.11.17
 
-* Wed Nov 27 2019 Alexander Bokovoy <abokovoy@redhat.com> - 11.2-3
-- Rebuild against bind 9.11.13
-  Related: RHBZ#1762813
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Mon Nov 18 2019 Thomas Woerner <twoerner@redhat.com> - 11.2-2
+* Mon Nov 25 2019 Petr Menšík <pemensik@redhat.com> - 11.2-3
+- Rebuilt for bind 9.11.13
+
+* Mon Nov 11 2019 Petr Menšík <pemensik@redhat.com> - 11.2-2
 - Add support for serve-stale, detected on build time
-  Patch by Petr Menšík <pemensik@redhat.com>
-  Related: RHBZ#1762813
 
-* Thu Nov 07 2019 Alexander Bokovoy <abokovoy@redhat.com> - 11.2-1
-- New upstream release
-- Support BIND9 9.11.11
-- Resolves: rhbz#1762813
+* Tue Nov 05 2019 Alexander Bokovoy <abokovoy@redhat.com> - 11.2-1
+- New upstream release v11.2
 
-* Fri Aug 16 2019 Alexander Bokovoy <abokovoy@redhat.com> - 11.1-14
+* Tue Aug 27 2019 Petr Menšík <pemensik@redhat.com> - 11.1-20
+- Rebuilt for bind 9.11.10
+
+* Fri Aug 16 2019 Alexander Bokovoy <abokovoy@redhat.com> - 11.1-19
 - Fix attribute templating in case of a missing default value
-- Resolves: rhbz#1741896
+- Resolves: rhbz#1705072
 
-* Mon Oct 15 2018 Petr Menšík <pemensik@redhat.com> - 11.1-13
-- Move setting of named selinux boolean to bind (#1639410)
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Wed Aug 08 2018 Alexander Bokovoy <abokovoy@redhat.com> - 11.1-12
-- Make sure we explicitly require openssl-devel for a build
-- Resolves: rhbz#1613942
+* Wed Jul 17 2019 Petr Menšík <pemensik@redhat.com> - 11.1-17
+- Rebuilt for bind 9.11.8
 
-* Mon Jul 23 2018 Petr Menšík <pemensik@redhat.com> - 11.1-11
-- Rebuild against BIND 9.11.4
+* Tue Jun 11 2019 Petr Menšík <pemensik@redhat.com> - 11.1-16
+- Rebuilt for bind 9.11.7
+
+* Fri May 03 2019 Petr Menšík <pemensik@redhat.com> - 11.1-15
+- Rebuilt for bind 9.11.6
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Nov 05 2018 Petr Menšík <pemensik@redhat.com> - 11.1-13
+- Support for bind 9.11.5 headers
+
+* Thu Jul 12 2018 Petr Menšík <pemensik@redhat.com> - 11.1-12
+- Require bind with writable home, update to 9.11.4
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 11.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu Mar 01 2018 Petr Menšík <pemensik@redhat.com> - 11.1-10
 - Rebuild for bind 9.11.3. Minor tweaks to compile.