From 0ea537726de62e04b3c481bc1cbbc80b538cc8b9 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Aug 24 2016 10:51:54 +0000 Subject: Patch & rebuild for bind 9.10.4-P2 Resolves: #1369738 libdns.so.162()(64bit) needed by 8.0-4.fc23 --- diff --git a/bind-dyndb-ldap-thozza-0001-hashsize-return-type-changed-in-libdns-v164.patch b/bind-dyndb-ldap-thozza-0001-hashsize-return-type-changed-in-libdns-v164.patch new file mode 100644 index 0000000..5af0374 --- /dev/null +++ b/bind-dyndb-ldap-thozza-0001-hashsize-return-type-changed-in-libdns-v164.patch @@ -0,0 +1,34 @@ +From 91b4fdefc5836c259b783e56d77ff3e27ad62236 Mon Sep 17 00:00:00 2001 +From: Tomas Hozza +Date: Fri, 27 May 2016 10:21:15 +0200 +Subject: [PATCH] hashsize() return type changed in libdns v164 + +Since bind version 9.10.4b1 (libdns version 164), the return type of +hashsize() has changed from unsigned int to size_t. Without this change +the plugin does not compile against bind 9.10.4b1 or newer on 64bit +architecture. + +Signed-off-by: Tomas Hozza +--- + src/ldap_driver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/ldap_driver.c b/src/ldap_driver.c +index 5727641..83ec00a 100644 +--- a/src/ldap_driver.c ++++ b/src/ldap_driver.c +@@ -871,7 +871,11 @@ setcachestats(dns_db_t *db, isc_stats_t *stats) + return dns_db_setcachestats(ldapdb->rbtdb, stats); + } + ++#if LIBDNS_VERSION_MAJOR >= 164 ++size_t ++#else + unsigned int ++#endif /* LIBDNS_VERSION_MAJOR >= 164 */ + hashsize(dns_db_t *db) + { + ldapdb_t *ldapdb = (ldapdb_t *) db; +-- +2.5.5 + diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec index 62f8cdb..6bc5362 100644 --- a/bind-dyndb-ldap.spec +++ b/bind-dyndb-ldap.spec @@ -2,7 +2,7 @@ Name: bind-dyndb-ldap Version: 8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LDAP back-end plug-in for BIND Group: System Environment/Libraries @@ -10,6 +10,7 @@ License: GPLv2+ URL: https://fedorahosted.org/bind-dyndb-ldap Source0: https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.bz2 Source1: https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.bz2.asc +Patch0: bind-dyndb-ldap-thozza-0001-hashsize-return-type-changed-in-libdns-v164.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bind-devel >= 32:9.9.0-1, bind-lite-devel >= 32:9.9.0-1 @@ -32,6 +33,7 @@ off of your LDAP server. %prep %setup -q -n %{name}-%{VERSION} +%patch0 -p1 %build export CFLAGS="`isc-config.sh --cflags dns` $RPM_OPT_FLAGS" @@ -79,8 +81,11 @@ rm -rf %{buildroot} %dir %attr(770, root, named) %{_localstatedir}/named/dyndb-ldap %{_libdir}/bind/ldap.so - %changelog +* Wed Aug 24 2016 Petr Spacek - 8.0-5 +- Patch & rebuild for bind 9.10.4-P2 +- Resolves: #1369738 libdns.so.162()(64bit) needed by 8.0-4.fc23 + * Thu Dec 17 2015 Tomas Hozza - 8.0-4 - Rebuild against bind-9.10.3-P2