Bug#769138: unblock: dlz-ldap-enum/1.0.3-1 - uploaded
Control: -1 - moreinfo
The bind9 package was fixed (now includes the required header file
dlz_dlopen.h)
I've uploaded dlz-ldap-enum v1.0.3-1 to sid and it builds OK now using
the new bind9 dev package, please approve the unblock.
https://buildd.debian.org/status/package.php?p=dlz-ldap-enum&suite=unstable
The debdiff is attached
The debdiff excludes autotools files and also one renamed file (an
embedded copy of the dlz_dlopen.h from bind 9.8.x, not used in the build
any more)
$ debdiff dlz-ldap-enum_1.0.2-2.dsc dlz-ldap-enum_1.0.3-1.dsc |
filterdiff -x '*/aclocal.m4' -x '*/config.*' -x '*/configure' -x
'*/depcomp' -x '*/*.in' -x '*/install-sh' -x '*/ltmain.sh' -x '*/m4/*'
-x '*/missing' -x '*/*dlz_dlopen.h' > /tmp/dlz-ldap-enum-1.0.3-1.debdiff
diff -Nru dlz-ldap-enum-1.0.2/aclocal.m4 dlz-ldap-enum-1.0.3/aclocal.m4
diff -Nru dlz-ldap-enum-1.0.2/bind98_dlz_dlopen.h dlz-ldap-enum-1.0.3/bind98_dlz_dlopen.h
diff -Nru dlz-ldap-enum-1.0.2/config.h.in dlz-ldap-enum-1.0.3/config.h.in
diff -Nru dlz-ldap-enum-1.0.2/config.sub dlz-ldap-enum-1.0.3/config.sub
diff -Nru dlz-ldap-enum-1.0.2/configure dlz-ldap-enum-1.0.3/configure
diff -Nru dlz-ldap-enum-1.0.2/configure.ac dlz-ldap-enum-1.0.3/configure.ac
--- dlz-ldap-enum-1.0.2/configure.ac 2012-05-17 23:41:39.000000000 +0200
+++ dlz-ldap-enum-1.0.3/configure.ac 2014-11-11 17:29:34.000000000 +0100
@@ -1,10 +1,10 @@
dnl dlz-ldap-enum: bind9 DLZ module for using an LDAP database to answer
dnl ENUM queries over DNS
-dnl Copyright (C) 2012 Daniel Pocock
+dnl Copyright (C) 2012-2014 Daniel Pocock
dnl
dnl Please see the COPYING file for license terms
-AC_INIT(dlz-ldap-enum,1.0.2)
+AC_INIT(dlz-ldap-enum,1.0.3)
AC_CONFIG_SRCDIR(dlz_ldap_enum_driver.c)
AM_INIT_AUTOMAKE
@@ -19,6 +19,11 @@
AC_PROG_LIBTOOL
+AC_ARG_ENABLE(bind99,
+[ --enable-bind99 Enable building for bind9 9.9.x and later],
+ [AC_DEFINE([BIND_9_9], , [Indicates we are compiling for bind9 9.9 or later])],
+ [])
+
AC_OUTPUT(Makefile)
diff -Nru dlz-ldap-enum-1.0.2/debian/changelog dlz-ldap-enum-1.0.3/debian/changelog
--- dlz-ldap-enum-1.0.2/debian/changelog 2014-09-14 10:27:58.000000000 +0200
+++ dlz-ldap-enum-1.0.3/debian/changelog 2014-11-11 17:47:04.000000000 +0100
@@ -1,3 +1,10 @@
+dlz-ldap-enum (1.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * dlz_lookup function updated for bind9 9.9.x. (Closes: #769134)
+
+ -- Daniel Pocock <daniel@pocock.pro> Tue, 11 Nov 2014 17:38:11 +0100
+
dlz-ldap-enum (1.0.2-2) unstable; urgency=low
* Update maintainer and VCS details.
diff -Nru dlz-ldap-enum-1.0.2/debian/rules dlz-ldap-enum-1.0.3/debian/rules
--- dlz-ldap-enum-1.0.2/debian/rules 2014-10-26 07:06:43.000000000 +0100
+++ dlz-ldap-enum-1.0.3/debian/rules 2014-11-11 17:37:10.000000000 +0100
@@ -11,10 +11,7 @@
# Add here any variable or target overrides you need.
-DLZ_DLOPEN_H=/usr/include/dns/dlz_dlopen.h
-ifeq ("$(readlink $(DLZ_DLOPEN_H))","")
-CPPFLAGS:="-DUSE_COPIED_DLZ_DLOPEN_H"
-endif
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-bind99
binary-fixup/dlz-ldap-enum::
sed -i "/dependency_libs/ s/'.*'/''/" `find debian/dlz-ldap-enum -name '*.la'`
diff -Nru dlz-ldap-enum-1.0.2/depcomp dlz-ldap-enum-1.0.3/depcomp
diff -Nru dlz-ldap-enum-1.0.2/dlz_dlopen.h dlz-ldap-enum-1.0.3/dlz_dlopen.h
diff -Nru dlz-ldap-enum-1.0.2/dlz_ldap_enum_driver.c dlz-ldap-enum-1.0.3/dlz_ldap_enum_driver.c
--- dlz-ldap-enum-1.0.2/dlz_ldap_enum_driver.c 2012-05-17 16:36:27.000000000 +0200
+++ dlz-ldap-enum-1.0.3/dlz_ldap_enum_driver.c 2014-11-11 17:29:34.000000000 +0100
@@ -117,6 +117,10 @@
int default_ttl;
} ldap_instance_t;
+#ifdef BIND_9_9
+isc_mem_t *ns_g_mctx = NULL;
+#endif
+
/*
* Private methods
*/
@@ -998,8 +1002,15 @@
}
isc_result_t
+#ifndef BIND_9_9
dlz_lookup(const char *zone, const char *name,
void *dbdata, dns_sdlzlookup_t *lookup)
+#else
+dlz_lookup(const char *zone, const char *name,
+ void *dbdata, dns_sdlzlookup_t *lookup,
+ dns_clientinfomethods_t *methods,
+ dns_clientinfo_t *clientinfo)
+#endif
{
isc_result_t result;
@@ -1023,6 +1034,14 @@
int protocol;
int method;
+ result = isc_mem_create(0, 0, &ns_g_mctx);
+ if (result != ISC_R_SUCCESS) {
+ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
+ DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
+ "Memory init failed");
+ return (result);
+ }
+
#ifdef ISC_PLATFORM_USETHREADS
/* if multi-threaded, we need a few extra variables. */
int dbcount;
diff -Nru dlz-ldap-enum-1.0.2/dlz_ldap_enum_driver.h dlz-ldap-enum-1.0.3/dlz_ldap_enum_driver.h
--- dlz-ldap-enum-1.0.2/dlz_ldap_enum_driver.h 2012-05-17 16:45:21.000000000 +0200
+++ dlz-ldap-enum-1.0.3/dlz_ldap_enum_driver.h 2014-11-11 17:29:34.000000000 +0100
@@ -40,10 +40,13 @@
#include <dns/dlz_dlopen.h>
#else
+#ifdef BIND_9_9
+#error The bundled copy of dlz_dlopen.h only works with bind9 9.8.x, bind9 up to 9.9.5 does not install dlz_dlopen.h under /usr/include but 9.9.6 or later does.
+#endif
// These things are borrowed from the main bind sources,
// this is meant to be installed as part of the public API,
// but may not be available on all systems.
-#include "dlz_dlopen.h"
+#include "bind98_dlz_dlopen.h"
// ---from named/globals.h---
// this is used from the traditional dlz_ldap code, now
// that we have dlz_dlopen, maybe the memory management
diff -Nru dlz-ldap-enum-1.0.2/ltmain.sh dlz-ldap-enum-1.0.3/ltmain.sh
diff -Nru dlz-ldap-enum-1.0.2/m4/libtool.m4 dlz-ldap-enum-1.0.3/m4/libtool.m4
diff -Nru dlz-ldap-enum-1.0.2/Makefile.am dlz-ldap-enum-1.0.3/Makefile.am
--- dlz-ldap-enum-1.0.2/Makefile.am 2012-05-17 17:19:49.000000000 +0200
+++ dlz-ldap-enum-1.0.3/Makefile.am 2014-11-11 17:29:34.000000000 +0100
@@ -11,7 +11,7 @@
dlz_ldap_enum_la_LIBADD = -lldap
noinst_HEADERS = dlz_ldap_enum_driver.h
-noinst_HEADERS += dlz_dlopen.h
+noinst_HEADERS += bind98_dlz_dlopen.h
noinst_HEADERS += sdlz_helper.h
EXTRA_DIST = dlz_ldap_enum.conf
diff -Nru dlz-ldap-enum-1.0.2/Makefile.in dlz-ldap-enum-1.0.3/Makefile.in
Reply to: