main/bind: build correct DLZ for bind-9.14

Closes !322

3 files changed, 94 insertions, 26 deletions

diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index ab4316cddb..d5683a7dbb 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=4.10.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="https://www.samba.org/"
 arch="all"
@@ -45,6 +45,7 @@ depends="
 # note that heimdal is required (over mit krb5) for AD DC functionality
 makedepends="
 	acl-dev
+	bind-dev
 	cups-dev
 	dbus-dev
 	docbook-xsl
@@ -72,11 +73,11 @@ makedepends="
 	"
 source="
 	https://us1.samba.org/samba/ftp/stable/$pkgname-$pkgver.tar.gz
+	bind-9.14.patch
 	getpwent_r.patch
 	musl_uintptr.patch
 	netdb-defines.patch
 	netapp.patch
-	bind-9.12.patch
 	missing-headers.patch
 	musl_rm_unistd_incl.patch
 	$pkgname.initd
@@ -564,11 +565,11 @@ libs() {
 }
 
 sha512sums="14d463dfba36473f4a1d2b306ff2a18c664e1a01bc8077ef62afc6796cf4dd65461d72b519b8df3a777eaf322cb98653b416468d770541cd21fab2383c8dce66  samba-4.10.8.tar.gz
+c48f4533a9612c8534ddcf8531a50a31cc39da0b55a42fa5a4e2a36aa964a79a594215cd0edabd0bea837d493eca3f53341987d5aa4f10d370bf10123b957d1e  bind-9.14.patch
 0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b  getpwent_r.patch
 a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe88c6767d785d5c37e2e9f18a4f9a24f2ee1f5d9650320c556  musl_uintptr.patch
 1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8  netdb-defines.patch
 202667cb0383414d9289cd67574f5e1140c9a0ff63bb82a746a59b2397a00db15654bfb30cb5ec1cd68a097899be0f849d9aab4c0d210152386c9e66c640f0c0  netapp.patch
-27f12c8395be25d9806d232cc30334f2f7c7d175971d2d1944dd886d699e0381a6f222c17e3d7bc087cf7a29bfb3e98cf25ba98f414c4afe0297b9d134a28bd8  bind-9.12.patch
 c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0  missing-headers.patch
 5cda0a07089b99d99f33de74aae89a338954451167f72a9972cc437a7d06d92590c07386fd24e94c72ff34f1dd42494c5d7fcb48ca1823affa8168e83c239067  musl_rm_unistd_incl.patch
 96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44  samba.initd
diff --git a/main/samba/bind-9.12.patch b/main/samba/bind-9.12.patch
deleted file mode 100644
index 1a82231a06..0000000000
--- a/main/samba/bind-9.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/python/samba/provision/sambadns.py
-+++ b/python/samba/provision/sambadns.py
-@@ -943,7 +943,8 @@
-             bind9_9 = ''
-         elif bind_info.upper().find('BIND 9.10') != -1:
-             bind9_10 = ''
--        elif bind_info.upper().find('BIND 9.11') != -1:
-+        elif bind_info.upper().find('BIND 9.11') != -1 \
-+            or bind_info.upper().find('BIND 9.12') != -1:
-             bind9_11 = ''
-         elif bind_info.upper().find('BIND 9.7') != -1:
-             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
---- a/source4/setup/named.conf.dlz
-+++ b/source4/setup/named.conf.dlz
-@@ -19,7 +19,7 @@
-     # For BIND 9.10.x
-     ${BIND9_10} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so";
- 
--    # For BIND 9.11.x
-+    # For BIND 9.11.x, 9.12.x
-     ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
- };
- 
diff --git a/main/samba/bind-9.14.patch b/main/samba/bind-9.14.patch
new file mode 100644
index 0000000000..d368896297
--- /dev/null
+++ b/main/samba/bind-9.14.patch
@@ -0,0 +1,90 @@
+--- a/source4/dns_server/wscript_build.orig
++++ b/source4/dns_server/wscript_build
+@@ -68,6 +68,26 @@
+                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
+ 
++bld.SAMBA_LIBRARY('dlz_bind9_13',
++                  source='dlz_bind9.c',
++                  cflags='-DBIND_VERSION_9_13',
++                  private_library=True,
++                  link_name='modules/bind9/dlz_bind9_13.so',
++                  realname='dlz_bind9_13.so',
++                  install_path='${MODULESDIR}/bind9',
++                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
++                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
++
++bld.SAMBA_LIBRARY('dlz_bind9_14',
++                  source='dlz_bind9.c',
++                  cflags='-DBIND_VERSION_9_14',
++                  private_library=True,
++                  link_name='modules/bind9/dlz_bind9_14.so',
++                  realname='dlz_bind9_14.so',
++                  install_path='${MODULESDIR}/bind9',
++                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
++                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
++
+ bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
+                   source='dlz_bind9.c',
+                   cflags='-DBIND_VERSION_9_8',
+--- a/source4/dns_server/dlz_minimal.h.orig
++++ b/source4/dns_server/dlz_minimal.h
+@@ -31,10 +31,7 @@
+ #elif defined (BIND_VERSION_9_10)
+ # define DLZ_DLOPEN_VERSION 3
+ # define DNS_CLIENTINFO_VERSION 1
+-#elif defined (BIND_VERSION_9_11)
+-# define DLZ_DLOPEN_VERSION 3
+-# define DNS_CLIENTINFO_VERSION 2
+-#elif defined (BIND_VERSION_9_12)
++#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14)
+ # define DLZ_DLOPEN_VERSION 3
+ # define DNS_CLIENTINFO_VERSION 2
+ #else
+--- a/source4/setup/named.conf.dlz.orig
++++ b/source4/setup/named.conf.dlz
+@@ -24,5 +24,11 @@
+ 
+     # For BIND 9.12.x
+     ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
++    
++    # For BIND 9.13.x
++    ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so";
++    
++    # For BIND 9.14.x
++    ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
+ };
+ 
+--- a/python/samba/provision/sambadns.py.orig
++++ b/python/samba/provision/sambadns.py
+@@ -960,6 +960,8 @@
+         bind9_10 = '#'
+         bind9_11 = '#'
+         bind9_12 = '#'
++        bind9_13 = '#'
++        bind9_14 = '#'
+         if bind_info.upper().find('BIND 9.8') != -1:
+             bind9_8 = ''
+         elif bind_info.upper().find('BIND 9.9') != -1:
+@@ -970,6 +972,10 @@
+             bind9_11 = ''
+         elif bind_info.upper().find('BIND 9.12') != -1:
+             bind9_12 = ''
++        elif bind_info.upper().find('BIND 9.13') != -1:
++            bind9_13 = ''
++        elif bind_info.upper().find('BIND 9.14') != -1:
++            bind9_14 = ''
+         elif bind_info.upper().find('BIND 9.7') != -1:
+             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
+         else:
+@@ -981,7 +987,9 @@
+                     "BIND9_9": bind9_9,
+                     "BIND9_10": bind9_10,
+                     "BIND9_11": bind9_11,
+-                    "BIND9_12": bind9_12
++                    "BIND9_12": bind9_12,
++                    "BIND9_13": bind9_13,
++                    "BIND9_14": bind9_14
+ 
+                     })
+