Package: src:bind-dyndb-ldap Version: 8.0-1 Tags: patch
fix build failure with bind9 from experimental.
* workaround-missing-headers.patch: Updated files from current bind9. * Fix build failure with -Werror. diff -Nru bind-dyndb-ldap-8.0/debian/patches/fix-werror-build.diff bind-dyndb-ldap-8.0/debian/patches/fix-werror-build.diff --- bind-dyndb-ldap-8.0/debian/patches/fix-werror-build.diff 1970-01-01 01:00:00.000000000 +0100 +++ bind-dyndb-ldap-8.0/debian/patches/fix-werror-build.diff 2016-02-19 11:53:19.000000000 +0100 @@ -0,0 +1,13 @@ +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -102,7 +102,7 @@ AC_ARG_ENABLE([werror], + ) + + if test "x$WERROR" = xyes; then +- WERROR=-Werror ++ WERROR="-Werror -Wno-error=date-time" + else + WERROR= + fi diff -Nru bind-dyndb-ldap-8.0/debian/patches/series bind-dyndb-ldap-8.0/debian/patches/series --- bind-dyndb-ldap-8.0/debian/patches/series 2015-12-09 09:13:53.000000000 +0100 +++ bind-dyndb-ldap-8.0/debian/patches/series 2016-02-19 11:50:45.000000000 +0100 @@ -1,2 +1,3 @@ workaround-missing-headers.patch fix-keytab-path.diff +fix-werror-build.diff diff -Nru bind-dyndb-ldap-8.0/debian/patches/workaround-missing-headers.patch bind-dyndb-ldap-8.0/debian/patches/workaround-missing-headers.patch --- bind-dyndb-ldap-8.0/debian/patches/workaround-missing-headers.patch 2015-12-09 09:13:53.000000000 +0100 +++ bind-dyndb-ldap-8.0/debian/patches/workaround-missing-headers.patch 2016-02-19 11:49:17.000000000 +0100 @@ -7,11 +7,13 @@ Bug-Debian: http://bugs.debian.org/740225 Forwarded: not-needed +Index: b/src/dns/forward.h +=================================================================== --- /dev/null +++ b/src/dns/forward.h -@@ -0,0 +1,133 @@ +@@ -0,0 +1,146 @@ +/* -+ * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") ++ * Copyright (C) 2004-2007, 2009, 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000, 2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and/or distribute this software for any @@ -41,8 +43,16 @@ + +ISC_LANG_BEGINDECLS + ++struct dns_forwarder { ++ isc_sockaddr_t addr; ++ isc_dscp_t dscp; ++ ISC_LINK(dns_forwarder_t) link; ++}; ++ ++typedef ISC_LIST(struct dns_forwarder) dns_forwarderlist_t; ++ +struct dns_forwarders { -+ isc_sockaddrlist_t addrs; ++ dns_forwarderlist_t fwdrs; + dns_fwdpolicy_t fwdpolicy; +}; + @@ -61,17 +71,22 @@ + */ + +isc_result_t ++dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, dns_name_t *name, ++ dns_forwarderlist_t *fwdrs, dns_fwdpolicy_t policy); ++isc_result_t +dns_fwdtable_add(dns_fwdtable_t *fwdtable, dns_name_t *name, + isc_sockaddrlist_t *addrs, dns_fwdpolicy_t policy); +/*%< + * Adds an entry to the forwarding table. The entry associates + * a domain with a list of forwarders and a forwarding policy. The -+ * addrs list is copied if not empty, so the caller should free its copy. ++ * addrs/fwdrs list is copied if not empty, so the caller should free ++ * its copy. + * + * Requires: + * \li fwdtable is a valid forwarding table. + * \li name is a valid name -+ * \li addrs is a valid list of sockaddrs, which may be empty. ++ * \li addrs/fwdrs is a valid list of isc_sockaddr/dns_forwarder ++ * structures, which may be empty. + * + * Returns: + * \li #ISC_R_SUCCESS @@ -143,6 +158,8 @@ +ISC_LANG_ENDDECLS + +#endif /* DNS_FORWARD_H */ +Index: b/src/isc/errno2result.h +=================================================================== --- /dev/null +++ b/src/isc/errno2result.h @@ -0,0 +1,41 @@ @@ -187,11 +204,13 @@ +ISC_LANG_ENDDECLS + +#endif /* UNIX_ERRNO2RESULT_H */ +Index: b/src/dns/update.h +=================================================================== --- /dev/null +++ b/src/dns/update.h -@@ -0,0 +1,64 @@ +@@ -0,0 +1,70 @@ +/* -+ * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") ++ * Copyright (C) 2011, 2015 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above @@ -251,9 +270,17 @@ + dns_dbversion_t *oldver, dns_dbversion_t *newver, + dns_diff_t *diff, isc_uint32_t sigvalidityinterval); + ++isc_result_t ++dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, ++ dns_dbversion_t *oldver, dns_dbversion_t *newver, ++ dns_diff_t *diff, isc_uint32_t sigvalidityinterval, ++ dns_update_state_t **state); ++ +ISC_LANG_ENDDECLS + +#endif /* DNS_UPDATE_H */ +Index: b/configure.ac +=================================================================== --- a/configure.ac +++ b/configure.ac @@ -91,21 +91,6 @@ int main(void) {
