diff --git a/backport-bind-dyndb-ldap-11.9-bind-9.16.17.patch b/backport-bind-dyndb-ldap-11.9-bind-9.16.17.patch new file mode 100644 index 0000000..6796497 --- /dev/null +++ b/backport-bind-dyndb-ldap-11.9-bind-9.16.17.patch @@ -0,0 +1,34 @@ +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-11.3.tar.bz2 b/bind-dyndb-ldap-11.3.tar.bz2 deleted file mode 100644 index 9cf3f0c..0000000 Binary files a/bind-dyndb-ldap-11.3.tar.bz2 and /dev/null differ diff --git a/bind-dyndb-ldap-11.3.tar.bz2.asc b/bind-dyndb-ldap-11.3.tar.bz2.asc deleted file mode 100644 index 55a558c..0000000 --- a/bind-dyndb-ldap-11.3.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEhAodHH8+xLL+UwQ1RxniuKu/YhoFAl7eZOEACgkQRxniuKu/ -YhqWrg//S+qgy+mv0H1cdKsBMFax0PK3hWAmS6/8eZPFOXIfZnx9Q0yCD/EYr2GA -tdyNo71Jxnk9cnvIIDVttFgscnDDVAMKjGTtvlkgjqbRhr1jNxTeR2A9V6XZWU4m -cq4+mJya72mnLZH0dA2kb0aeQEggSBu1aD/xxooWO4vt91aUf6ma5+OBnkGHiRfn -zKzPx9pZeNigZuEIb3dyheymSe7zTbWUa/Ny51zv0XJdIotR+KWAzgHrt7/h5i75 -tQCkS/jxYH6vz3f6nrEkNg5UmW16PMFQcQQKSeCM2Dre3PxpRQyzXMi/YDwCx8ns -HPjZ3hBDbCpiylsYbwNWnGtHQGsEUXphGyGV/bPyu3ls017m3hcpkokYWwA80RXt -vLZtTwJIUtWiUBiecOF00TSURHlQ5YkGLIat2Eh1vdLXk3UfXBOVeA30Tjvuqumy -DCZSgy6VEx0pWL3aXjWzom3UZPEbVkHoXZz+hVk7SxLrvarXKc4GwhBzSioMYhHX -1gt/CFXT1nglH41RzucxFxLpp7VwqjP30uUeKh2dCBdfLJiiXD9AzQfdYsqCf3FH -bQ9QHKvHz5JIJGyfU/J4UR0Nt+qELrp0kG6isgl0JCr6Z8l54ykJBCQL/rgr4CJw -0lMTxSBhDQmQV0eiBe0Dri1DCkpH39saWPtaJfNTsy+nG/7NfWA= -=2sD+ ------END PGP SIGNATURE----- diff --git a/bind-dyndb-ldap-11.9.tar.bz2 b/bind-dyndb-ldap-11.9.tar.bz2 new file mode 100644 index 0000000..0dce687 Binary files /dev/null and b/bind-dyndb-ldap-11.9.tar.bz2 differ diff --git a/bind-dyndb-ldap-11.9.tar.bz2.asc b/bind-dyndb-ldap-11.9.tar.bz2.asc new file mode 100644 index 0000000..9b4924e --- /dev/null +++ b/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----- diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec index 5ac7cd7..65d34c3 100644 --- a/bind-dyndb-ldap.spec +++ b/bind-dyndb-ldap.spec @@ -1,20 +1,34 @@ -%define bind_version 32:9.11.3-5 +%define bind_version 32:9.16.16 +%global openssl_pkcs11_version 0.4.10-6 +%global softhsm_version 2.5.0-4 +%global with_bind_pkcs11 0 Name: bind-dyndb-ldap -Version: 11.3 +Version: 11.9 Release: 1 Summary: LDAP back-end plug-in for BIND 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 -BuildRequires: bind-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version} + +Patch1: backport-bind-dyndb-ldap-11.9-bind-9.16.17.patch + +BuildRequires: bind-devel >= %{bind_version} BuildRequires: krb5-devel BuildRequires: openldap-devel BuildRequires: libuuid-devel BuildRequires: automake, autoconf, libtool BuildRequires: openssl-devel + +%if %{with bind_pkcs11} +BuildRequires: bind-pkcs11-devel >= %{bind_version} +Requires(pre): bind-pkcs11 >= %{bind_version} Requires: bind-pkcs11 >= %{bind_version}, bind-pkcs11-utils >= %{bind_version} +%else +Requires(pre): bind >= %{bind_version} +Requires: softhsm >= %{softhsm_version}, openssl-pkcs11 >= %{openssl_pkcs11_version}, bind >= %{bind_version} +%endif %description This package provides an LDAP back-end, the dynamic LDAP back-end is @@ -25,6 +39,7 @@ a plug-in for BIND that provides an LDAP database back-end capabilities. %build autoreconf -fiv +export BIND9_CFLAGS='-I /usr/include/bind9 -DHAVE_TLS -DHAVE_THREAD_LOCAL' %configure %make_build @@ -34,6 +49,7 @@ rm -rf %{buildroot} install -d -m 770 %{buildroot}/%{_localstatedir}/named/dyndb-ldap %post +[ -f /etc/named.conf ] || exit 0 # Transform named.conf if it still has old-style API. PLATFORM=$(uname -m) @@ -70,6 +86,12 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf %changelog +* Mon Mar 21 2022 xihaochen - 11.9-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update to 11.9 + * Mon Jul 27 2020 gaihuiying - 11.3-1 - Type:requirement - ID:NA