Merge ~lvoytek/ubuntu/+source/bind-dyndb-ldap:MRE-jammy-9.18.18 into ubuntu/+source/bind-dyndb-ldap:ubuntu/jammy-devel

[Lena Voytek]

Fix required for bind9 update to 9.18.18 in jammy

bind9 has to be built in proposed before this update is added to proposed itself - https://code.launchpad.net/~lvoytek/ubuntu/+source/bind9/+git/bind9/+merge/451683

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/bind9-mre

[Andreas Hasenack (ahasenack)]

Security released an USN[1] for bind9 and will rebuild src:bind-dyndb-ldap in the security pocket. Once that happens and is published, this MP should be rebased on that, and released with the upcoming bind9 MRE.

1. https://ubuntu.com/security/notices/USN-6390-1

[Andreas Hasenack (ahasenack)]

Security published the no-change rebuild corresponding to their bind9 security update, so this now needs rebasing.

[Lena Voytek (lvoytek)]

Rebased onto security rebuild

[Andreas Hasenack (ahasenack)]

Just ran the tests locally for jammy with the up-to-date ppa builds, all good. The ppa run also just finished for jammy, also green results for both bind-dyndb-ldap and bind9.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, lvoytek
Uploaders: ahasenack
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Uploaded with rich history:

Uploading bind-dyndb-ldap_11.9-5ubuntu0.22.04.4.dsc
Uploading bind-dyndb-ldap_11.9-5ubuntu0.22.04.4.debian.tar.xz
Uploading bind-dyndb-ldap_11.9-5ubuntu0.22.04.4_source.buildinfo
Uploading bind-dyndb-ldap_11.9-5ubuntu0.22.04.4_source.changes

diff --git a/debian/changelog b/debian/changelog
index 8612f13..b5d78f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bind-dyndb-ldap (11.9-5ubuntu0.22.04.4) jammy; urgency=medium
+
+  * d/p/remove-rpz_attach.patch: Remove rpz_attach to fix build failure against
+    bind9 9.18.13+ (LP: #2028413)
+
+ -- Lena Voytek <[e-mail]>  Thu, 21 Sep 2023 07:26:59 -0700
+
 bind-dyndb-ldap (11.9-5ubuntu0.22.04.3) jammy-security; urgency=medium
 
   * No-change rebuild for bind9 security update.
diff --git a/debian/patches/remove-rpz_attach.patch b/debian/patches/remove-rpz_attach.patch
 new file mode 100644
index 0000000..9e3cec0
--- /dev/null
+++ b/debian/patches/remove-rpz_attach.patch
@@ -0,0 +1,52 @@
+Description: Remove rpz_attach to fix build failure.
+ rpz_attach is no longer provided by bind9, and bind-dyndb-ldap upstream
+ removed the function since it would never be called anyway. As of 9.18.13
+ building against bind9 with this function causes a build failure. Remove
+ it by backporting the relevant upstream commit. Note that the changes are
+ smaller here because
+ https://pagure.io/bind-dyndb-ldap/c/5f37344d076f8cbd93a1842814b97763c3decc9a
+ was never added, and its changes were reverted by this upstream commit.
+Author: Petr Menšík <[e-mail]>
+Origin: backport, https://pagure.io/bind-dyndb-ldap/c/1be57227a9727c6dce501a4bfa8e9eef35ba95d5
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bind-dyndb-ldap/+bug/2028413
+Forwarded: not-needed
+Last-Update: 2023-09-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/ldap_driver.c
++++ b/src/ldap_driver.c
+@@ -804,22 +804,6 @@
+ 
+ 	dns_db_rpz_attach(ldapdb->rbtdb, rpzs, rpz_num);
+ }
+-#else
+-void
+-rpz_attach(dns_db_t *db, void *void_rpzs, uint8_t rpz_num)
+-{
+-	ldapdb_t *ldapdb = (ldapdb_t *) db;
+-	dns_rpz_zones_t *rpzs = (dns_rpz_zones_t *) void_rpzs;
+-	isc_result_t result;
+-
+-	REQUIRE(VALID_LDAPDB(ldapdb));
+-
+-	rpzs->zones[rpz_num]->db_registered = true;
+-	result = dns_db_updatenotify_register(ldapdb->rbtdb,
+-					      dns_rpz_dbupdate_callback,
+-					      rpzs->zones[rpz_num]);
+-	REQUIRE(result == ISC_R_SUCCESS);
+-}
+ #endif
+ 
+ /*
+@@ -966,7 +950,11 @@
+ 	resigned,
+ 	isdnssec,
+ 	getrrsetstats,
++#if LIBDNS_VERSION_MAJOR < 1600
+ 	rpz_attach,
++#else
++	NULL,
++#endif
+ 	NULL, /* rpz_ready */
+ 	findnodeext,
+ 	findext,
diff --git a/debian/patches/series b/debian/patches/series
index b28129a..9f87f54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-dns_db_allrdatasets.patch
 fix-include.patch
 fix-isc-error.patch
 make-dscp-optional.patch
+remove-rpz_attach.patch