[Pkg-freeipa-devel] [Git][freeipa-team/bind-dyndb-ldap][master] 2 commits: support-bind-9.16.11.diff: Fix build against bind9 9.16.11 and .11. (Closes: #981100)

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / bind-dyndb-ldap


Commits:
259340c9 by Timo Aaltonen at 2021-02-15T12:47:04+02:00
support-bind-9.16.11.diff: Fix build against bind9 9.16.11 and .11. (Closes: #981100)

- - - - -
d521e822 by Timo Aaltonen at 2021-02-15T12:47:13+02:00
releasing package bind-dyndb-ldap version 11.6-2

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/support-bind-9.16.11.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+bind-dyndb-ldap (11.6-2) unstable; urgency=medium
+
+  * support-bind-9.16.11.diff: Fix build against bind9 9.16.11 and .11.
+    (Closes: #981100)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 15 Feb 2021 12:47:06 +0200
+
 bind-dyndb-ldap (11.6-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 fix-keytab-path.diff
 fix-werror-build.diff
 support-9.16.9.diff
+support-bind-9.16.11.diff


=====================================
debian/patches/support-bind-9.16.11.diff
=====================================
@@ -0,0 +1,46 @@
+diff --git a/src/ldap_helper.c b/src/ldap_helper.c
+index a81a9d2..3b4ae5c 100644
+--- a/src/ldap_helper.c
++++ b/src/ldap_helper.c
+@@ -1792,10 +1792,17 @@ zone_master_reconfigure_nsec3param(settings_set_t *zone_settings,
+ 			  dns_rdatatype_nsec3param, origin, nsec3p_str,
+ 			  &nsec3p_rdata));
+ 	CHECK(dns_rdata_tostruct(nsec3p_rdata, &nsec3p_rr, NULL));
++#if LIBDNS_VERSION_MAJOR > 1609
++	CHECK(dns_zone_setnsec3param(secure, nsec3p_rr.hash, nsec3p_rr.flags,
++				     nsec3p_rr.iterations,
++				     nsec3p_rr.salt_length, nsec3p_rr.salt,
++				     true, false));
++#else
+ 	CHECK(dns_zone_setnsec3param(secure, nsec3p_rr.hash, nsec3p_rr.flags,
+ 				     nsec3p_rr.iterations,
+ 				     nsec3p_rr.salt_length, nsec3p_rr.salt,
+ 				     true));
++#endif
+ 
+ cleanup:
+ 	if (nsec3p_rdata != NULL) {
+diff --git a/src/zone.c b/src/zone.c
+index d0b71b1..7ce1769 100644
+--- a/src/zone.c
++++ b/src/zone.c
+@@ -17,6 +17,7 @@
+ #include <dns/zone.h>
+ 
+ #include "util.h"
++#include "config.h"
+ 
+ /**
+  * Write given diff to zone journal. Journal will be created
+@@ -61,7 +62,11 @@ zone_soaserial_updatetuple(dns_updatemethod_t method, dns_difftuple_t *soa_tuple
+ 	REQUIRE(soa_tuple->rdata.type == dns_rdatatype_soa);
+ 
+ 	serial = dns_soa_getserial(&soa_tuple->rdata);
++#if LIBDNS_VERSION_MAJOR >= 1611
++	serial = dns_update_soaserial(serial, method, NULL);
++#else
+ 	serial = dns_update_soaserial(serial, method);
++#endif
+ 	dns_soa_setserial(serial, &soa_tuple->rdata);
+ 	if (new_serial != NULL)
+ 		*new_serial = serial;



View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/c6367a93a4fbf411b33b026345055e07710ae680...d521e822257f9887778825bae613b9c336e61386

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/c6367a93a4fbf411b33b026345055e07710ae680...d521e822257f9887778825bae613b9c336e61386
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20210215/a6a24fd6/attachment-0001.html>