Attachment #211839 for bug #244317

View | Details | Raw Unified | Return to bug 244317
Collapse All | Expand All




OPTIONS_SINGLE_ZEROCONF=	ZEROCONF_NONE AVAHI MDNSRESPONDER

OPTIONS_RADIO=			DNS
OPTIONS_RADIO_DNS=		NSUPDATE BIND911 BIND914 BIND916
# Make those default options
OPTIONS_DEFAULT=		AD_DC ADS DEBUG DOCS FAM LDAP \
				QUOTAS SYSLOG UTMP PROFILE \

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

##############################################################################
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




                   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_16',
+                  source='dlz_bind9.c',
+                  cflags='-DBIND_VERSION_9_16',
+                  private_library=True,
+                  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())

-# 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_14) || defined (BIND_VERSION_9_16)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
 #else

     # 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

         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:

             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:

-                    "BIND9_12": bind9_12
-
+                    "BIND9_12" : bind9_12,
+                    "BIND9_14" : bind9_14,
+                    "BIND9_16" : bind9_16
                     })
 
 

Lines 299-306 Link Here

(-)net/samba410/pkg-plist (-1 / +1 lines)
299	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so	299	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so
300	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so	300	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so
301	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so	301	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so
302	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_13.so
303	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so	302	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so
		303	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_16.so
304	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so	304	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so
305	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so	305	%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so
306	%%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so	306	%%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so

Return to bug 244317

Lines 100-106 Link Here

(-)net/samba410/Makefile (-1 / +3 lines)
100	OPTIONS_SINGLE_ZEROCONF= ZEROCONF_NONE AVAHI MDNSRESPONDER	100	OPTIONS_SINGLE_ZEROCONF= ZEROCONF_NONE AVAHI MDNSRESPONDER
101		101
102	OPTIONS_RADIO= DNS	102	OPTIONS_RADIO= DNS
103	OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND914	103	OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND914 BIND916
104	# Make those default options	104	# Make those default options
105	OPTIONS_DEFAULT= AD_DC ADS DEBUG DOCS FAM LDAP \	105	OPTIONS_DEFAULT= AD_DC ADS DEBUG DOCS FAM LDAP \
106	QUOTAS SYSLOG UTMP PROFILE \	106	QUOTAS SYSLOG UTMP PROFILE \
Lines 136-141 Link Here
136	DNS_DESC= DNS frontend	136	DNS_DESC= DNS frontend
137	BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend	137	BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend
138	BIND914_DESC= Use Bind 9.14 as AD DC DNS server frontend	138	BIND914_DESC= Use Bind 9.14 as AD DC DNS server frontend
		139	BIND916_DESC= Use Bind 9.16 as AD DC DNS server frontend
139	NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC	140	NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC
140	##############################################################################	141	##############################################################################
141	# XXX: Unconditional dependencies which can't be switched off(if present in	142	# XXX: Unconditional dependencies which can't be switched off(if present in
Lines 298-303 Link Here
298	##############################################################################	299	##############################################################################
299	BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911	300	BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911
300	BIND914_RUN_DEPENDS= bind914>=9.14.0.0:dns/bind914	301	BIND914_RUN_DEPENDS= bind914>=9.14.0.0:dns/bind914
		302	BIND916_RUN_DEPENDS= bind916>=9.16.0.0:dns/bind916
301	NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate	303	NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate
302	##############################################################################	304	##############################################################################
303	DEBUG_CONFIGURE_ON= --verbose --enable-debug	305	DEBUG_CONFIGURE_ON= --verbose --enable-debug

Lines 4-25 Link Here

(-)net/samba410/files/patch-bind (-17 / +17 lines)
4	deps='samba-hostconfig samdb-common gensec popt dnsserver_common',	4	deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
5	enabled=bld.AD_DC_BUILD_IS_ENABLED())	5	enabled=bld.AD_DC_BUILD_IS_ENABLED())
6		6
7	+bld.SAMBA_LIBRARY('dlz_bind9_13',	7	+bld.SAMBA_LIBRARY('dlz_bind9_14',
8	+ source='dlz_bind9.c',	8	+ source='dlz_bind9.c',
9	+ cflags='-DBIND_VERSION_9_13',	9	+ cflags='-DBIND_VERSION_9_14',
10	+ private_library=True,	10	+ private_library=True,
11	+ link_name='modules/bind9/dlz_bind9_13.so',	11	+ link_name='modules/bind9/dlz_bind9_14.so',
12	+ realname='dlz_bind9_13.so',	12	+ realname='dlz_bind9_14.so',
13	+ install_path='${MODULESDIR}/bind9',	13	+ install_path='${MODULESDIR}/bind9',
14	+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',	14	+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
15	+ enabled=bld.AD_DC_BUILD_IS_ENABLED())	15	+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
16	+	16	+
17	+bld.SAMBA_LIBRARY('dlz_bind9_14',	17	+bld.SAMBA_LIBRARY('dlz_bind9_16',
18	+ source='dlz_bind9.c',	18	+ source='dlz_bind9.c',
19	+ cflags='-DBIND_VERSION_9_14',	19	+ cflags='-DBIND_VERSION_9_16',
20	+ private_library=True,	20	+ private_library=True,
21	+ link_name='modules/bind9/dlz_bind9_14.so',	21	+ link_name='modules/bind9/dlz_bind9_16.so',
22	+ realname='dlz_bind9_14.so',	22	+ realname='dlz_bind9_16.so',
23	+ install_path='${MODULESDIR}/bind9',	23	+ install_path='${MODULESDIR}/bind9',
24	+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',	24	+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
25	+ enabled=bld.AD_DC_BUILD_IS_ENABLED())	25	+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
Lines 37-43 Link Here
37	-# define DLZ_DLOPEN_VERSION 3	37	-# define DLZ_DLOPEN_VERSION 3
38	-# define DNS_CLIENTINFO_VERSION 2	38	-# define DNS_CLIENTINFO_VERSION 2
39	-#elif defined (BIND_VERSION_9_12)	39	-#elif defined (BIND_VERSION_9_12)
40	+#elif defined (BIND_VERSION_9_11) \|\| defined (BIND_VERSION_9_12) \|\| defined (BIND_VERSION_9_13) \|\| defined (BIND_VERSION_9_14)	40	+#elif defined (BIND_VERSION_9_11) \|\| defined (BIND_VERSION_9_12) \|\| defined (BIND_VERSION_9_14) \|\| defined (BIND_VERSION_9_16)
41	# define DLZ_DLOPEN_VERSION 3	41	# define DLZ_DLOPEN_VERSION 3
42	# define DNS_CLIENTINFO_VERSION 2	42	# define DNS_CLIENTINFO_VERSION 2
43	#else	43	#else
Lines 48-58 Link Here
48	# For BIND 9.12.x	48	# For BIND 9.12.x
49	${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";	49	${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
50	+	50	+
51	+ # For BIND 9.13.x
52	+ ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so";
53	+
54	+ # For BIND 9.14.x	51	+ # For BIND 9.14.x
55	+ ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";	52	+ ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
		53	+
		54	+ # For BIND 9.16.x
		55	+ ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so";
56	};	56	};
57		57
58	--- python/samba/provision/sambadns.py.orig 2019-01-15 10:07:00 UTC	58	--- python/samba/provision/sambadns.py.orig 2019-01-15 10:07:00 UTC
Lines 61-68 Link Here
61	bind9_10 = '#'	61	bind9_10 = '#'
62	bind9_11 = '#'	62	bind9_11 = '#'
63	bind9_12 = '#'	63	bind9_12 = '#'
64	+ bind9_13 = '#'
65	+ bind9_14 = '#'	64	+ bind9_14 = '#'
		65	+ bind9_16 = '#'
66	if bind_info.upper().find('BIND 9.8') != -1:	66	if bind_info.upper().find('BIND 9.8') != -1:
67	bind9_8 = ''	67	bind9_8 = ''
68	elif bind_info.upper().find('BIND 9.9') != -1:	68	elif bind_info.upper().find('BIND 9.9') != -1:
Lines 70-79 Link Here
70	bind9_11 = ''	70	bind9_11 = ''
71	elif bind_info.upper().find('BIND 9.12') != -1:	71	elif bind_info.upper().find('BIND 9.12') != -1:
72	bind9_12 = ''	72	bind9_12 = ''
73	+ elif bind_info.upper().find('BIND 9.13') != -1:
74	+ bind9_13 = ''
75	+ elif bind_info.upper().find('BIND 9.14') != -1:	73	+ elif bind_info.upper().find('BIND 9.14') != -1:
76	+ bind9_14 = ''	74	+ bind9_14 = ''
		75	+ elif bind_info.upper().find('BIND 9.16') != -1:
		76	+ bind9_16 = ''
77	elif bind_info.upper().find('BIND 9.7') != -1:	77	elif bind_info.upper().find('BIND 9.7') != -1:
78	raise ProvisioningError("DLZ option incompatible with BIND 9.7.")	78	raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
79	else:	79	else:
Lines 84-91 Link Here
84	- "BIND9_12": bind9_12	84	- "BIND9_12": bind9_12
85	-	85	-
86	+ "BIND9_12" : bind9_12,	86	+ "BIND9_12" : bind9_12,
87	+ "BIND9_13" : bind9_13,	87	+ "BIND9_14" : bind9_14,
88	+ "BIND9_14" : bind9_14	88	+ "BIND9_16" : bind9_16
89	})	89	})
90		90
91		91