mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-30 04:52:27 +01:00
91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
--- 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
|
|
|
|
})
|
|
|