diff -ur net/samba410.orig/Makefile net/samba410/Makefile --- net/samba410.orig/Makefile +++ net/samba410/Makefile @@ -100,7 +100,7 @@ OPTIONS_SINGLE_ZEROCONF= ZEROCONF_NONE AVAHI MDNSRESPONDER OPTIONS_RADIO= DNS -OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND914 +OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND914 BIND916 # Make those default options OPTIONS_DEFAULT= AD_DC ADS DEBUG DOCS FAM LDAP \ QUOTAS SYSLOG UTMP PROFILE \ @@ -136,6 +136,7 @@ DNS_DESC= DNS frontend BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend BIND914_DESC= Use Bind 9.14 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 @@ -298,6 +299,7 @@ ############################################################################## BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 BIND914_RUN_DEPENDS= bind914>=9.14.0.0:dns/bind914 +BIND916_RUN_DEPENDS= bind916>=9.16.0.0:dns/bind916 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate ############################################################################## DEBUG_CONFIGURE_ON= --verbose --enable-debug diff -ur net/samba410.orig/files/patch-bind14 net/samba410/files/patch-bind14 --- net/samba410.orig/files/patch-bind14 +++ net/samba410/files/patch-bind @@ -4,22 +4,22 @@ deps='samba-hostconfig samdb-common gensec popt dnsserver_common', enabled=bld.AD_DC_BUILD_IS_ENABLED()) -+bld.SAMBA_LIBRARY('dlz_bind9_13', ++bld.SAMBA_LIBRARY('dlz_bind9_14', + source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_13', ++ cflags='-DBIND_VERSION_9_14', + private_library=True, -+ link_name='modules/bind9/dlz_bind9_13.so', -+ realname='dlz_bind9_13.so', ++ 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_14', ++bld.SAMBA_LIBRARY('dlz_bind9_16', + source='dlz_bind9.c', -+ cflags='-DBIND_VERSION_9_14', ++ cflags='-DBIND_VERSION_9_16', + private_library=True, -+ link_name='modules/bind9/dlz_bind9_14.so', -+ realname='dlz_bind9_14.so', ++ link_name='modules/bind9/dlz_bind9_16.so', ++ realname='dlz_bind9_16.so', + install_path='${MODULESDIR}/bind9', + deps='samba-hostconfig samdb-common gensec popt dnsserver_common', + enabled=bld.AD_DC_BUILD_IS_ENABLED()) @@ -37,7 +37,7 @@ -# 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) ++#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_14) || defined (BIND_VERSION_9_16) # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 2 #else @@ -48,11 +48,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"; ++ ++ # For BIND 9.16.x ++ ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so"; }; --- python/samba/provision/sambadns.py.orig 2019-01-15 10:07:00 UTC @@ -61,8 +61,8 @@ bind9_10 = '#' bind9_11 = '#' bind9_12 = '#' -+ bind9_13 = '#' + bind9_14 = '#' ++ bind9_16 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: @@ -70,10 +70,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.16') != -1: ++ bind9_16 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: @@ -84,8 +84,8 @@ - "BIND9_12": bind9_12 - + "BIND9_12" : bind9_12, -+ "BIND9_13" : bind9_13, -+ "BIND9_14" : bind9_14 ++ "BIND9_14" : bind9_14, ++ "BIND9_16" : bind9_16 }) diff -ur net/samba410.orig/pkg-plist net/samba410/pkg-plist --- net/samba410.orig/pkg-plist +++ net/samba410/pkg-plist @@ -299,8 +299,8 @@ %%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_16.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so