diff --git a/.bind-dyndb-ldap.metadata b/.bind-dyndb-ldap.metadata index 1025ef6..81f0460 100644 --- a/.bind-dyndb-ldap.metadata +++ b/.bind-dyndb-ldap.metadata @@ -1 +1 @@ -0552e2595814b82626c4966af59b3d7f9bf3e990 SOURCES/bind-dyndb-ldap-11.2.tar.bz2 +93bf4817926ca4b9864a5f837841962cb2b88a13 SOURCES/bind-dyndb-ldap-11.3.tar.bz2 diff --git a/.gitignore b/.gitignore index 8d61224..580be37 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/bind-dyndb-ldap-11.2.tar.bz2 +SOURCES/bind-dyndb-ldap-11.3.tar.bz2 diff --git a/SOURCES/0001-bind-dyndb-ldap-11.2-servestale.patch b/SOURCES/0001-bind-dyndb-ldap-11.2-servestale.patch deleted file mode 100644 index 1254d7f..0000000 --- a/SOURCES/0001-bind-dyndb-ldap-11.2-servestale.patch +++ /dev/null @@ -1,73 +0,0 @@ -From fecc0fd86f598807129ea9fa1e4e7b74cf2aba21 Mon Sep 17 00:00:00 2001 -From: Petr Mensik -Date: Mon, 11 Nov 2019 17:36:58 +0100 -Subject: [PATCH] Add support for servestale records - -Serve-stale support includes two new database methods. Add wrapper into -ldap database. ---- - configure.ac | 5 +++++ - src/ldap_driver.c | 24 ++++++++++++++++++++++++ - 2 files changed, 29 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d05bad9..7997898 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,6 +120,11 @@ int main(void) { - [AC_MSG_ERROR([Cross compiling is not supported.])] - ) - -+dnl dns_db_setservestalettl() can be backported, detect support -+AC_CHECK_LIB([dns], [dns_db_setservestalettl], -+ [AC_DEFINE([HAVE_DNS_SERVESTALE], 1, [Define if dns library provides dns_db_setservestalettl])] -+) -+ - dnl Older autoconf (2.59, for example) doesn't define docdir - [[ ! -n "$docdir" ]] && docdir='${datadir}/doc/${PACKAGE_TARNAME}' - AC_SUBST([docdir]) -diff --git a/src/ldap_driver.c b/src/ldap_driver.c -index b9161fe..dcf65d0 100644 ---- a/src/ldap_driver.c -+++ b/src/ldap_driver.c -@@ -823,6 +823,26 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) - return dns_db_nodefullname(ldapdb->rbtdb, node, name); - } - -+#ifdef HAVE_DNS_SERVESTALE -+static isc_result_t -+setservestalettl(dns_db_t *db, dns_ttl_t ttl) { -+ ldapdb_t *ldapdb = (ldapdb_t *) db; -+ -+ REQUIRE(VALID_LDAPDB(ldapdb)); -+ -+ return dns_db_setservestalettl(ldapdb->rbtdb, ttl); -+} -+ -+static isc_result_t -+getservestalettl(dns_db_t *db, dns_ttl_t *ttl) { -+ ldapdb_t *ldapdb = (ldapdb_t *) db; -+ -+ REQUIRE(VALID_LDAPDB(ldapdb)); -+ -+ return dns_db_getservestalettl(ldapdb->rbtdb, ttl); -+} -+#endif -+ - static dns_dbmethods_t ldapdb_methods = { - attach, - detach, -@@ -869,6 +889,10 @@ static dns_dbmethods_t ldapdb_methods = { - hashsize, - nodefullname, - NULL, // getsize method not implemented (related BZ1353563) -+#ifdef HAVE_DNS_SERVESTALE -+ setservestalettl, -+ getservestalettl, -+#endif - }; - - isc_result_t ATTR_NONNULLS --- -2.20.1 - diff --git a/SOURCES/bind-dyndb-ldap-11.2.tar.bz2.asc b/SOURCES/bind-dyndb-ldap-11.2.tar.bz2.asc deleted file mode 100644 index a1a7484..0000000 --- a/SOURCES/bind-dyndb-ldap-11.2.tar.bz2.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEQepdgpabRRLDzQC/fTs0GEpfA1kFAl3BmvcACgkQfTs0GEpf -A1loIQgAvwg/JJTv8B5CWVc3/a1CgnokwQWKVFdD6uni3EGEH1vSRf58y2Faw8SI -PhNiUNEQYazJyTVZ9uk5CT9IzVaMOrMXjY3U/CyzY59BvX7UODts3pOTAoyPaBMi -fgDgWbF5NXfg/blgKKTCTSWdaCV5Pa85teva06mLj29Kxe2r5qRuAgiqGb4Paxc2 -pYnqlLtyyucrOz75gBDYkQndXqcJp1BVGQy+47gowfcn4e5ivVM8aexYRO2og+YD -pmkN5P77hqe2RdrWG3Lz65LyCFglk4ll+466xUkKkQg/9w606e/yx8dUXAl0+4MA -7eul6NowBs6Ok3azHh7ZPShTvlgcTg== -=DvdK ------END PGP SIGNATURE----- diff --git a/SOURCES/bind-dyndb-ldap-11.3.tar.bz2.asc b/SOURCES/bind-dyndb-ldap-11.3.tar.bz2.asc new file mode 100644 index 0000000..55a558c --- /dev/null +++ b/SOURCES/bind-dyndb-ldap-11.3.tar.bz2.asc @@ -0,0 +1,16 @@ +-----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/SPECS/bind-dyndb-ldap.spec b/SPECS/bind-dyndb-ldap.spec index 447dbab..ca38547 100644 --- a/SPECS/bind-dyndb-ldap.spec +++ b/SPECS/bind-dyndb-ldap.spec @@ -1,10 +1,10 @@ %define VERSION %{version} -%define bind_version 32:9.11.12-1 +%define bind_version 32:9.11.18-1 Name: bind-dyndb-ldap -Version: 11.2 -Release: 3%{?dist} +Version: 11.3 +Release: 1%{?dist} Summary: LDAP back-end plug-in for BIND Group: System Environment/Libraries @@ -12,7 +12,6 @@ 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 -Patch1: 0001-bind-dyndb-ldap-11.2-servestale.patch BuildRequires: bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version} BuildRequires: krb5-devel @@ -31,7 +30,6 @@ off of your LDAP server. %prep %setup -q -n %{name}-%{VERSION} -%patch1 -p1 -b .servestale %build autoreconf -fiv @@ -98,6 +96,14 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf %changelog +* Mon Jun 08 2020 Alexander Bokovoy - 11.3-1 +- New upstream release +- Resolves: rhbz#1845211 + +* Mon May 11 2020 Alexander Bokovoy - 11.2-4 +- Rebuild against bind 9.11.18 + Resolves: rhbz#1834264 + * Wed Nov 27 2019 Alexander Bokovoy - 11.2-3 - Rebuild against bind 9.11.13 Related: RHBZ#1762813