Resolved build issue due to changes in libdns API

This commit is contained in:
Tomas Hozza 2016-05-27 10:48:10 +02:00
parent 77602f03cc
commit 8b87b61c7d
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 91b4fdefc5836c259b783e56d77ff3e27ad62236 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
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 <thozza@redhat.com>
---
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

View File

@ -2,7 +2,7 @@
Name: bind-dyndb-ldap
Version: 9.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: LDAP back-end plug-in for BIND
Group: System Environment/Libraries
@ -12,6 +12,8 @@ Source0: https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar
Source1: https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.bz2.asc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: 0001-hashsize-return-type-changed-in-libdns-v164.patch
BuildRequires: bind-devel >= 32:9.9.0-1, bind-lite-devel >= 32:9.9.0-1
BuildRequires: krb5-devel
BuildRequires: openldap-devel
@ -28,6 +30,7 @@ off of your LDAP server.
%prep
%setup -q -n %{name}-%{VERSION}
%patch0 -p1 -b .hashsize_fix
%build
autoreconf -fiv
@ -76,6 +79,9 @@ rm -rf %{buildroot}
%changelog
* Fri May 27 2016 Tomas Hozza <thozza@redhat.com> - 9.0-3
- Resolved build issue due to changes in libdns API
* Thu May 26 2016 Tomas Hozza <thozza@redhat.com> - 9.0-2
- Rebuild against bind-9.10.4-P1