MFH: r531462 r533307

Update Samba 4.10 to the 4.10.14 release.

Security update samba410 to the 4.10.15

Security:	CVE-2020-10700
		CVE-2020-10704

PR:		246721
Approved by:	timur (maintainer)
Approved by:	ports-secteam (joneum)

5 files changed, 252 insertions, 128 deletions

diff --git a/net/samba410/Makefile b/net/samba410/Makefile
index a2752baec7d9..1628bd3396bc 100644
--- a/net/samba410/Makefile
+++ b/net/samba410/Makefile
@@ -24,12 +24,11 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-provision-use-ASCII-quotes.patch:-p1
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.10.13
+SAMBA4_VERSION=			4.10.15
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
 
-.if !defined(SAMBA4_SUBPORT)
 CPE_VENDOR=			samba
 CPE_PRODUCT=			samba
 # Directories
@@ -81,7 +80,7 @@ SUB_LIST+=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
 ##############################################################################
 OPTIONS_SUB=			yes
 
-OPTIONS_DEFINE=			AD_DC ADS CLUSTER CUPS DEBUG DOCS FAM GPGME \
+OPTIONS_DEFINE=			AD_DC ADS CLUSTER CUPS DOCS FAM GPGME \
 				LDAP NTVFS PROFILE QUOTAS SPOTLIGHT SYSLOG UTMP
 # This shouldn't be default in the release
 OPTIONS_DEFINE+=		DEVELOPER MANDOC
@@ -89,7 +88,6 @@ OPTIONS_DEFINE+=		DEVELOPER MANDOC
 
 OPTIONS_DEFINE_amd64=		AESNI
 OPTIONS_DEFAULT_amd64=		AESNI
-OPTIONS_EXCLUDE_powerpc64=	DEBUG
 
 OPTIONS_GROUP=			VFS
 OPTIONS_GROUP_VFS=		FRUIT GLUSTERFS
@@ -100,9 +98,9 @@ OPTIONS_SINGLE_GSSAPI=		GSSAPI_BUILTIN GSSAPI_MIT
 OPTIONS_SINGLE_ZEROCONF=	ZEROCONF_NONE AVAHI MDNSRESPONDER
 
 OPTIONS_RADIO=			DNS
-OPTIONS_RADIO_DNS=		NSUPDATE BIND911
+OPTIONS_RADIO_DNS=		NSUPDATE BIND911 BIND916
 # Make those default options
-OPTIONS_DEFAULT=		AD_DC ADS DEBUG DOCS FAM LDAP \
+OPTIONS_DEFAULT=		AD_DC ADS DOCS FAM LDAP \
 				QUOTAS SYSLOG UTMP PROFILE \
 				FRUIT GSSAPI_BUILTIN AVAHI
 ##############################################################################
@@ -135,11 +133,14 @@ ZEROCONF_NONE_DESC=		Zeroconf support is absent
 
 DNS_DESC=			DNS frontend
 BIND911_DESC=			Use Bind 9.11 as AD DC DNS server frontend
+BIND916_DESC=			Use Bind 9.16 as AD DC DNS server frontend
 NSUPDATE_DESC=			Use samba NSUPDATE utility for AD DC
 ##############################################################################
 # XXX: Unconditional dependencies which can't be switched off(if present in
 # the system)
 
+# Iconv(picked up unconditionaly)
+LIB_DEPENDS+=			libiconv.so:converters/libiconv
 # Readline(sponsored by Python)
 # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency
 LIB_DEPENDS+=			libreadline.so:devel/readline
@@ -174,20 +175,19 @@ SAMBA4_BUNDLED_LDB?=		yes
 # cmocka
 .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
 SAMBA4_BUNDLED_LIBS+=		cmocka
-CONFLICTS+=			cmocka-1.*
+CONFLICTS_INSTALL+=		cmocka-1.*
 PLIST_SUB+=			SAMBA4_BUNDLED_CMOCKA=""
 SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!cmocka
 BUILD_DEPENDS+=			cmocka>=1.1.3:sysutils/cmocka
-RUN_DEPENDS+=			cmocka>=1.1.3:sysutils/cmocka
 PLIST_SUB+=			SAMBA4_BUNDLED_CMOCKA="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA="@comment "
 .endif
 # talloc
 .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
 SAMBA4_BUNDLED_LIBS+=		talloc
-CONFLICTS+=			talloc-* talloc1-*
+CONFLICTS_INSTALL+=		talloc-* talloc1-*
 PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC=""
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC=""
 .else
@@ -200,7 +200,7 @@ SUB_LIST+=			SAMBA4_BUNDLED_TALLOC="@comment "
 # tevent
 .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
 SAMBA4_BUNDLED_LIBS+=		tevent
-CONFLICTS+=			tevent-* tevent1-*
+CONFLICTS_INSTALL+=		tevent-* tevent1-*
 PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT=""
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT=""
 .else
@@ -213,7 +213,7 @@ SUB_LIST+=			SAMBA4_BUNDLED_TEVENT="@comment "
 # tdb
 .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
 SAMBA4_BUNDLED_LIBS+=		tdb
-CONFLICTS+=			tdb-* tdb1-*
+CONFLICTS_INSTALL+=		tdb-* tdb1-*
 PLIST_SUB+=			SAMBA4_BUNDLED_TDB=""
 SUB_LIST+=			SAMBA4_BUNDLED_TDB=""
 .else
@@ -239,7 +239,7 @@ SUB_LIST+=			SAMBA4_BUNDLED_LDB="@comment "
 SAMBA4_MODULEDIR=		${PREFIX}/lib/shared-modules
 .endif
 
-.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \
+.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes) \
 	|| (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \
 	|| (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \
 	|| (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
@@ -252,7 +252,8 @@ TEST_USES=			python
 TEST_ENV+=			PYTHON="${PYTHON_CMD}" \
 				SHA1SUM=/sbin/sha1 \
 				SHA256SUM=/sbin/sha256 \
-				MD5SUM=/sbin/md5
+				MD5SUM=/sbin/md5 \
+				PYTHONDONTWRITEBYTECODE=1
 TEST_DEPENDS+=			bash:shells/bash \
 				tshark:net/tshark
 ##############################################################################
@@ -296,12 +297,9 @@ MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 MDNSRESPONDER_VARS=		SAMBA4_SERVICES+=mdnsd
 ##############################################################################
 BIND911_RUN_DEPENDS=		bind911>=9.11.0.0:dns/bind911
+BIND916_RUN_DEPENDS=		bind916>=9.16.0.0:dns/bind916
 NSUPDATE_RUN_DEPENDS=		samba-nsupdate:dns/samba-nsupdate
 ##############################################################################
-DEBUG_CONFIGURE_ON=		--verbose --enable-debug
-DEBUG_MAKE_ARGS=		--verbose
-DEBUG_FLAGS=			-g -ggdb3 -O0
-
 MEMORY_DEBUG_IMPLIES=		DEBUG
 MEMORY_DEBUG_CONFIGURE_ENV=	ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`"
 MEMORY_DEBUG_LIB_DEPENDS=	libjemalloc.so.2:devel/jemalloc
@@ -373,15 +371,11 @@ LIBZFS_VARS=			SAMBA4_MODULES+=vfs_zfs_space
 MANDOC_BUILD_DEPENDS=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 				xsltproc:textproc/libxslt
 MANDOC_CONFIGURE_ENV_OFF=	XSLTPROC="true"
-# !SAMBA4_SUBPORT
-.endif
 
 ##############################################################################
 .include <bsd.port.options.mk>
 ##############################################################################
 
-.if !defined(SAMBA4_SUBPORT)
-
 .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
 WANT_EXP_MODULES=		vfs_cacheprime
 .endif
@@ -416,7 +410,9 @@ SUB_LIST+=			SAMBA4_PYTHON="@comment "
 USES+=				python:3.4+
 PLIST_SUB+=			SAMBA4_PYTHON=""
 SUB_LIST+=			SAMBA4_PYTHON=""
+# Don't cache Python modules
 CONFIGURE_ARGS+=		--nopycache
+MAKE_ENV+=			PYTHONDONTWRITEBYTECODE=1
 
 .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
 SAMBA4_BUNDLED_LIBS+=		pytalloc-util
@@ -442,9 +438,6 @@ SAMBA4_BUNDLED_LIBS+=		pyldb pyldb-util
 SAMBA4_BUNDLED_LIBS+=		!pyldb !pyldb-util
 .endif
 # External Python modules
-BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
-RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
-
 BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
 .endif
@@ -465,14 +458,17 @@ CONFIGURE_ARGS+=		--with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|
 .for module in ${SAMBA4_MODULES}
 PLIST_FILES+=			${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so
 .endfor
-# !SAMBA4_SUBPORT
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=		--verbose --enable-debug
+MAKE_ARGS+=			--verbose
+DEBUG_FLAGS?=			-g -ggdb3 -O0
 .endif
 
 ##############################################################################
 .include <bsd.port.pre.mk>
 ##############################################################################
 
-.if !defined(SAMBA4_SUBPORT)
 # Require llvm 4.0 and AMD64
 .if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64"
 CONFIGURE_ARGS+=		--accel-aes=intelaesni
@@ -481,6 +477,7 @@ PLIST_FILES+=			lib/samba4/private/libaesni-intel-samba4.so
 CONFIGURE_ARGS+=		--accel-aes=none
 .endif
 
+
 # Only for 64-bit architectures
 .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe
 .	if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER})
@@ -511,6 +508,7 @@ MAKE_ENV+=			RPCGEN_CPP="${CPP}"
 #.if ${readline_ARGS} == port
 #CFLAGS+=			-D_FUNCTION_DEF
 #.endif
+
 # Make sure that the right version of Python is used by the tools
 # https://bugzilla.samba.org/show_bug.cgi?id=7305
 SHEBANG_FILES=			${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
@@ -545,8 +543,6 @@ post-patch:
 					${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
 				@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
 					${PATCH_WRKSRC}/dynconfig/wscript
-				@${REINPLACE_CMD} -e '1s|/bin/bash|/bin/sh|' \
-					 ${PATCH_WRKSRC}/ctdb/tools/onnode
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
@@ -635,6 +631,12 @@ post-install: post-install-rm-junk post-install-fix-manpages
 .for dir in			auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs
 					${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}"
 .endfor
+.if !defined(WITH_DEBUG)
+				-${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \
+					-type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD}
+				-${FIND} ${STAGEDIR}${PREFIX}/lib -name '*.so*' \
+					-type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD}
+.endif
 
 post-install-FRUIT-off:
 				${RM} ${STAGEDIR}${SAMBA4_MODULEDIR}/vfs/fruit.so
@@ -652,7 +654,4 @@ post-install-CLUSTER-on:
 				${LN} -nfs ../../../../share/ctdb/events/legacy/05.system.script	${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/05.system.script
 				${LN} -nfs ../../../../share/ctdb/events/legacy/01.reclock.script	${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/01.reclock.script
 
-# !SAMBA4_SUBPORT
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/samba410/distinfo b/net/samba410/distinfo
index 4a8943f1bf81..404c298bb833 100644
--- a/net/samba410/distinfo
+++ b/net/samba410/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580085990
-SHA256 (samba-4.10.13.tar.gz) = 49eb6426e97cbf538e416e51ed8535930382512ad2d13d5ffd7f4336aa7faf63
-SIZE (samba-4.10.13.tar.gz) = 18350580
+TIMESTAMP = 1588122967
+SHA256 (samba-4.10.15.tar.gz) = 0b8b62558b62fbb121015f28f40fae0f07522710b6bef77c508b51bb6914ced9
+SIZE (samba-4.10.15.tar.gz) = 18383201
diff --git a/net/samba410/files/patch-bind b/net/samba410/files/patch-bind
new file mode 100644
index 000000000000..48794d5d9b3c
--- /dev/null
+++ b/net/samba410/files/patch-bind
@@ -0,0 +1,215 @@
+--- python/samba/provision/sambadns.py.orig	2020-03-26 08:58:46 UTC
++++ python/samba/provision/sambadns.py
+@@ -27,6 +27,7 @@ import time
+ import ldb
+ from base64 import b64encode
+ import subprocess
++import re
+ import samba
+ from samba.tdb_util import tdb_copy
+ from samba.mdb_util import mdb_copy
+@@ -965,34 +966,35 @@ def create_named_conf(paths, realm, dnsdomain, dns_bac
+                                      stderr=subprocess.STDOUT,
+                                      cwd='.').communicate()[0]
+         bind_info = get_string(bind_info)
+-        bind9_8 = '#'
+-        bind9_9 = '#'
+-        bind9_10 = '#'
+-        bind9_11 = '#'
+-        bind9_12 = '#'
+-        if bind_info.upper().find('BIND 9.8') != -1:
+-            bind9_8 = ''
+-        elif bind_info.upper().find('BIND 9.9') != -1:
+-            bind9_9 = ''
+-        elif bind_info.upper().find('BIND 9.10') != -1:
+-            bind9_10 = ''
+-        elif bind_info.upper().find('BIND 9.11') != -1:
+-            bind9_11 = ''
+-        elif bind_info.upper().find('BIND 9.12') != -1:
+-            bind9_12 = ''
+-        elif bind_info.upper().find('BIND 9.7') != -1:
+-            raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
++        bind9_release = re.search('BIND (9)\.(\d+)\.', bind_info, re.I)
++        if bind9_release:
++            bind9_disabled = ''
++            bind9_version = bind9_release.group(0) + "x"
++            bind9_version_major = int(bind9_release.group(1))
++            bind9_version_minor = int(bind9_release.group(2))
++            if bind9_version_minor == 7:
++                raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
++            elif bind9_version_minor == 8:
++                bind9_dlz_version = "9"
++            else:
++                bind9_dlz_version = "%d_%d" % (bind9_version_major, bind9_version_minor)
+         else:
++            bind9_disabled = '# '
++            bind9_version = "BIND z.y.x"
++            bind9_dlz_version = "z_y"
+             logger.warning("BIND version unknown, please modify %s manually." % paths.namedconf)
++
++        bind9_dlz = (
++            '    # For %s\n'
++            '    %sdatabase "dlopen %s/bind9/dlz_bind%s.so";'
++        ) % (
++            bind9_version, bind9_disabled, samba.param.modules_dir(), bind9_dlz_version
++        )
++
+         setup_file(setup_path("named.conf.dlz"), paths.namedconf, {
+                     "NAMED_CONF": paths.namedconf,
+                     "MODULESDIR": samba.param.modules_dir(),
+-                    "BIND9_8": bind9_8,
+-                    "BIND9_9": bind9_9,
+-                    "BIND9_10": bind9_10,
+-                    "BIND9_11": bind9_11,
+-                    "BIND9_12": bind9_12
+-
++                    "BIND9_DLZ": bind9_dlz
+                     })
+ 
+ 
+--- source4/dns_server/dlz_minimal.h.orig	2019-12-06 10:10:30 UTC
++++ source4/dns_server/dlz_minimal.h
+@@ -23,22 +23,23 @@
+ #ifndef DLZ_MINIMAL_H
+ #define DLZ_MINIMAL_H 1
+ 
+-#if defined (BIND_VERSION_9_8)
+-# define DLZ_DLOPEN_VERSION 1
+-#elif defined (BIND_VERSION_9_9)
+-# define DLZ_DLOPEN_VERSION 2
+-# define DNS_CLIENTINFO_VERSION 1
+-#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)
+-# define DLZ_DLOPEN_VERSION 3
+-# define DNS_CLIENTINFO_VERSION 2
++#if defined (BIND_VERSION)
++# if BIND_VERSION == 908
++#  define DLZ_DLOPEN_VERSION 1
++# elif BIND_VERSION == 909
++#  define DLZ_DLOPEN_VERSION 2
++#  define DNS_CLIENTINFO_VERSION 1
++# elif BIND_VERSION == 910
++#  define DLZ_DLOPEN_VERSION 3
++#  define DNS_CLIENTINFO_VERSION 1
++# elif BIND_VERSION >= 911
++#  define DLZ_DLOPEN_VERSION 3
++#  define DNS_CLIENTINFO_VERSION 2
++# else
++#  error Unsupported BIND version
++# endif
+ #else
+-# error Unsupported BIND version
++# error BIND_VERSION undefined
+ #endif
+ 
+ #if DLZ_DLOPEN_VERSION > 1
+--- source4/dns_server/wscript_build.orig	2019-12-06 10:11:08 UTC
++++ source4/dns_server/wscript_build
+@@ -20,7 +20,7 @@ bld.SAMBA_MODULE('service_dns',
+ # a bind9 dlz module giving access to the Samba DNS SAM
+ bld.SAMBA_LIBRARY('dlz_bind9',
+                   source='dlz_bind9.c',
+-                  cflags='-DBIND_VERSION_9_8',
++                  cflags='-DBIND_VERSION=908',
+                   private_library=True,
+                   link_name='modules/bind9/dlz_bind9.so',
+                   realname='dlz_bind9.so',
+@@ -28,49 +28,21 @@ bld.SAMBA_LIBRARY('dlz_bind9',
+                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
+ 
+-bld.SAMBA_LIBRARY('dlz_bind9_9',
++for bind_version in (909, 910, 911, 912, 914, 916):
++    string_version='%d_%d' % (bind_version//100, bind_version % 100)
++    bld.SAMBA_LIBRARY('dlz_bind%s' % (string_version),
+                   source='dlz_bind9.c',
+-                  cflags='-DBIND_VERSION_9_9',
++                  cflags='-DBIND_VERSION=%d' % bind_version,
+                   private_library=True,
+-                  link_name='modules/bind9/dlz_bind9_9.so',
+-                  realname='dlz_bind9_9.so',
++                  link_name='modules/bind9/dlz_bind%s.so' % (string_version),
++                  realname='dlz_bind%s.so' % (string_version),
+                   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_10',
+-                  source='dlz_bind9.c',
+-                  cflags='-DBIND_VERSION_9_10',
+-                  private_library=True,
+-                  link_name='modules/bind9/dlz_bind9_10.so',
+-                  realname='dlz_bind9_10.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_11',
+-                  source='dlz_bind9.c',
+-                  cflags='-DBIND_VERSION_9_11',
+-                  private_library=True,
+-                  link_name='modules/bind9/dlz_bind9_11.so',
+-                  realname='dlz_bind9_11.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_12',
+-                  source='dlz_bind9.c',
+-                  cflags='-DBIND_VERSION_9_12',
+-                  private_library=True,
+-                  link_name='modules/bind9/dlz_bind9_12.so',
+-                  realname='dlz_bind9_12.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',
++                  cflags='-DBIND_VERSION=908',
+                   private_library=True,
+                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
+--- source4/setup/named.conf.dlz.orig	2019-12-06 10:10:31 UTC
++++ source4/setup/named.conf.dlz
+@@ -7,22 +7,10 @@
+ 
+ #
+ # This configures dynamically loadable zones (DLZ) from AD schema
+-# Uncomment only single database line, depending on your BIND version
+ #
+ dlz "AD DNS Zone" {
+-    # For BIND 9.8.x
+-    ${BIND9_8} database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
+ 
+-    # For BIND 9.9.x
+-    ${BIND9_9} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
++${BIND9_DLZ}
+ 
+-    # For BIND 9.10.x
+-    ${BIND9_10} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so";
+-
+-    # For BIND 9.11.x
+-    ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
+-
+-    # For BIND 9.12.x
+-    ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
+ };
+ 
+--- source4/torture/dns/wscript_build.orig	2020-04-11 03:26:46 UTC
++++ source4/torture/dns/wscript_build
+@@ -5,7 +5,7 @@ if bld.AD_DC_BUILD_IS_ENABLED():
+ 		source='dlz_bind9.c',
+ 		subsystem='smbtorture',
+ 		init_function='torture_bind_dns_init',
+-		cflags='-DBIND_VERSION_9_8',
++		cflags='-DBIND_VERSION=908',
+ 		deps='torture talloc torturemain dlz_bind9_for_torture',
+ 		internal_module=True
+ 		)
diff --git a/net/samba410/files/patch-bind14 b/net/samba410/files/patch-bind14
deleted file mode 100644
index 53029cbcb9f6..000000000000
--- a/net/samba410/files/patch-bind14
+++ /dev/null
@@ -1,91 +0,0 @@
---- source4/dns_server/wscript_build.orig	2019-01-15 10:07:00 UTC
-+++ source4/dns_server/wscript_build
-@@ -68,6 +68,26 @@ bld.SAMBA_LIBRARY('dlz_bind9_12',
-                   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',
---- source4/dns_server/dlz_minimal.h.orig	2019-01-15 10:07:00 UTC
-+++ 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
---- source4/setup/named.conf.dlz.orig	2019-06-22 09:56:57 UTC
-+++ source4/setup/named.conf.dlz
-@@ -24,5 +24,11 @@ dlz "AD DNS Zone" {
-
-     # 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";
- };
- 
---- python/samba/provision/sambadns.py.orig	2019-01-15 10:07:00 UTC
-+++ python/samba/provision/sambadns.py
-@@ -960,6 +960,8 @@ def create_named_conf(paths, realm, dnsd
-         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 @@ def create_named_conf(paths, realm, dnsd
-             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,8 +987,9 @@ def create_named_conf(paths, realm, dnsd
-                     "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
-                     })
- 
- 
diff --git a/net/samba410/pkg-plist b/net/samba410/pkg-plist
index 3163361d8563..a6228c7a4ba3 100644
--- a/net/samba410/pkg-plist
+++ b/net/samba410/pkg-plist
@@ -296,13 +296,13 @@ lib/samba4/private/libutil-tdb-samba4.so
 lib/samba4/private/libwinbind-client-samba4.so
 %%GSSAPI_BUILTIN%%lib/samba4/private/libwind-samba4.so.0
 lib/samba4/private/libxattr-tdb-samba4.so
+%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so
+%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_13.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so
-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so
+%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_16.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/krb5/winbind_krb5_locator.so
 %%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/acl.so
@@ -1002,6 +1002,7 @@ man/man8/winbindd.8.gz
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py
+%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py
 %%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py
 %%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py
 %%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py