[bind-dyndb-ldap/f18] Fix build errors

Tomas Hozza thozza at fedoraproject.org
Mon Jun 3 14:43:10 UTC 2013


commit b99f4521bf784e89e5d376c70d03769dd4343d55
Author: Tomas Hozza <thozza at redhat.com>
Date:   Mon Jun 3 16:33:44 2013 +0200

    Fix build errors
    
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 bind-dyndb-ldap-build-fixes.patch |   50 +++++++++++++++++++++++++++++++++++++
 bind-dyndb-ldap.spec              |    4 +++
 2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/bind-dyndb-ldap-build-fixes.patch b/bind-dyndb-ldap-build-fixes.patch
new file mode 100644
index 0000000..726adab
--- /dev/null
+++ b/bind-dyndb-ldap-build-fixes.patch
@@ -0,0 +1,50 @@
+From 4374791563602f026b870b0c37979506f02683ae Mon Sep 17 00:00:00 2001
+From: Tomas Babej <tbabej at redhat.com>
+Date: Mon, 6 May 2013 07:23:08 -0400
+Subject: [PATCH] Build fixes for Fedora 19
+
+This patch contains various (gcc-related) fixes to make build
+on F19 possible.
+---
+ src/acl.c         | 4 ++--
+ src/ldap_helper.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/acl.c b/src/acl.c
+index 754cd53dc3d31b99d0954836feafbd46747c48c2..2d4f54db89c73b7e9387f21bbd94eedc364c152b 100644
+--- a/src/acl.c
++++ b/src/acl.c
+@@ -179,7 +179,7 @@ parse(cfg_parser_t *parser, const char *string, cfg_type_t **type,
+ 	RUNTIME_CHECK(isc_once_do(&once, init_cfgtypes) == ISC_R_SUCCESS);
+ 
+ 	string_len = strlen(string);
+-	isc_buffer_init(&buffer, string, string_len);
++	isc_buffer_init(&buffer, (char *)string, string_len);
+ 	isc_buffer_add(&buffer, string_len);
+ 
+ 	result = cfg_parse_buffer(parser, &buffer, *type, &ret);
+@@ -296,7 +296,7 @@ get_fixed_name(const cfg_obj_t *obj, const char *name, dns_fixedname_t *fname)
+ 	str = cfg_obj_asstring(obj);
+ 
+ 	len = strlen(str);
+-	isc_buffer_init(&buf, str, len);
++	isc_buffer_init(&buf, (char *)str, len);
+ 
+ 	/*
+ 	 * Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=728925
+diff --git a/src/ldap_helper.c b/src/ldap_helper.c
+index 037629f3e50fdba2c17c1a180736ed3b64169aae..eda17fa8fed63e43d702c7ad9984b176e0b27065 100644
+--- a/src/ldap_helper.c
++++ b/src/ldap_helper.c
+@@ -2037,7 +2037,7 @@ parse_rdata(isc_mem_t *mctx, ldap_qresult_t *qresult,
+ 	text.base = rdata_text;
+ 	text.length = strlen(text.base);
+ 
+-	isc_buffer_init(&lex_buffer, text.base, text.length);
++	isc_buffer_init(&lex_buffer, (char *)text.base, text.length);
+ 	isc_buffer_add(&lex_buffer, text.length);
+ 	isc_buffer_setactive(&lex_buffer, text.length);
+ 
+-- 
+1.8.1.4
+
diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec
index 44f6f28..5b3ffb1 100644
--- a/bind-dyndb-ldap.spec
+++ b/bind-dyndb-ldap.spec
@@ -22,6 +22,8 @@ BuildRequires:  automake, autoconf, libtool
 
 Requires:       bind >= 32:9.6.1-0.3.b1
 
+Patch0:         bind-dyndb-ldap-build-fixes.patch
+
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
 support for dynamic updates and internal caching, to lift the load
@@ -31,6 +33,8 @@ off of your LDAP server.
 %prep
 %setup -q -n %{name}-%{VERSION}
 
+%patch0 -p1 -b .build_fix
+
 %build
 export CFLAGS="`isc-config.sh --cflags dns` $RPM_OPT_FLAGS"
 autoreconf -fiv


More information about the scm-commits mailing list