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

(-)net/samba48/Makefile (-2 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=			${SAMBA4_BASENAME}48
4
PORTNAME=			${SAMBA4_BASENAME}48
5
PORTVERSION=			${SAMBA4_VERSION}
5
PORTVERSION=			${SAMBA4_VERSION}
6
PORTREVISION=			0
6
PORTREVISION=			1
7
CATEGORIES?=			net
7
CATEGORIES?=			net
8
MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
8
MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
9
DISTNAME=			${SAMBA4_DISTNAME}
9
DISTNAME=			${SAMBA4_DISTNAME}
Lines 101-107 Link Here
101
OPTIONS_SINGLE_GSSAPI=		GSSAPI_BUILTIN GSSAPI_MIT
101
OPTIONS_SINGLE_GSSAPI=		GSSAPI_BUILTIN GSSAPI_MIT
102
102
103
OPTIONS_RADIO=			DNS ZEROCONF
103
OPTIONS_RADIO=			DNS ZEROCONF
104
OPTIONS_RADIO_DNS=		NSUPDATE BIND911 BIND912
104
OPTIONS_RADIO_DNS=		NSUPDATE BIND911 BIND912 BIND913
105
OPTIONS_RADIO_ZEROCONF=		MDNSRESPONDER AVAHI
105
OPTIONS_RADIO_ZEROCONF=		MDNSRESPONDER AVAHI
106
##############################################################################
106
##############################################################################
107
AD_DC_DESC=			Active Directory Domain Controller
107
AD_DC_DESC=			Active Directory Domain Controller
Lines 127-132 Link Here
127
127
128
BIND911_DESC=			Use Bind 9.11 as AD DC DNS server frontend
128
BIND911_DESC=			Use Bind 9.11 as AD DC DNS server frontend
129
BIND912_DESC=			Use Bind 9.12 as AD DC DNS server frontend
129
BIND912_DESC=			Use Bind 9.12 as AD DC DNS server frontend
130
BIND913_DESC=			Use Bind 9.13 as AD DC DNS server frontend
130
NSUPDATE_DESC=			Use samba NSUPDATE utility for AD DC
131
NSUPDATE_DESC=			Use samba NSUPDATE utility for AD DC
131
##############################################################################
132
##############################################################################
132
# XXX: Unconditional dependencies which can't be switched off(if present in
133
# XXX: Unconditional dependencies which can't be switched off(if present in
Lines 270-275 Link Here
270
##############################################################################
271
##############################################################################
271
BIND911_RUN_DEPENDS=		bind911>=9.11.0.0:dns/bind911
272
BIND911_RUN_DEPENDS=		bind911>=9.11.0.0:dns/bind911
272
BIND912_RUN_DEPENDS=		bind912>=9.12.0.0:dns/bind912
273
BIND912_RUN_DEPENDS=		bind912>=9.12.0.0:dns/bind912
274
BIND913_RUN_DEPENDS=		bind913>=9.13.0.0:dns/bind913
273
NSUPDATE_RUN_DEPENDS=		samba-nsupdate:dns/samba-nsupdate
275
NSUPDATE_RUN_DEPENDS=		samba-nsupdate:dns/samba-nsupdate
274
276
275
AVAHI_CONFIGURE_ENABLE=		avahi
277
AVAHI_CONFIGURE_ENABLE=		avahi
(-)net/samba48/files/patch-python_samba_provision_sambadns.py (-6 / +10 lines)
Lines 1-29 Link Here
1
--- python/samba/provision/sambadns.py.orig	2018-01-17 09:08:39 UTC
1
--- python/samba/provision/sambadns.py.orig	2018-01-17 09:08:39 UTC
2
+++ python/samba/provision/sambadns.py
2
+++ python/samba/provision/sambadns.py
3
@@ -937,6 +937,7 @@ def create_named_conf(paths, realm, dnsd
3
@@ -937,6 +937,8 @@ def create_named_conf(paths, realm, dnsd
4
         bind9_9 = '#'
4
         bind9_9 = '#'
5
         bind9_10 = '#'
5
         bind9_10 = '#'
6
         bind9_11 = '#'
6
         bind9_11 = '#'
7
+        bind9_12 = '#'
7
+        bind9_12 = '#'
8
+        bind9_13 = '#'
8
         if bind_info.upper().find('BIND 9.8') != -1:
9
         if bind_info.upper().find('BIND 9.8') != -1:
9
             bind9_8 = ''
10
             bind9_8 = ''
10
         elif bind_info.upper().find('BIND 9.9') != -1:
11
         elif bind_info.upper().find('BIND 9.9') != -1:
11
@@ -945,6 +946,8 @@ def create_named_conf(paths, realm, dnsd
12
@@ -945,6 +947,10 @@ def create_named_conf(paths, realm, dnsd
12
             bind9_10 = ''
13
             bind9_10 = ''
13
         elif bind_info.upper().find('BIND 9.11') != -1:
14
         elif bind_info.upper().find('BIND 9.11') != -1:
14
             bind9_11 = ''
15
             bind9_11 = ''
15
+        elif bind_info.upper().find('BIND 9.12') != -1:
16
+        elif bind_info.upper().find('BIND 9.12') != -1:
16
+            bind9_12 = ''
17
+            bind9_12 = ''
18
+        elif bind_info.upper().find('BIND 9.13') != -1:
19
+            bind9_13 = ''
17
         elif bind_info.upper().find('BIND 9.7') != -1:
20
         elif bind_info.upper().find('BIND 9.7') != -1:
18
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
21
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
19
         else:
22
         else:
20
@@ -955,7 +958,8 @@ def create_named_conf(paths, realm, dnsd
23
@@ -955,7 +961,9 @@ def create_named_conf(paths, realm, dnsd
21
                     "BIND9_8" : bind9_8,
24
                     "BIND9_8" : bind9_8,
22
                     "BIND9_9" : bind9_9,
25
                     "BIND9_9" : bind9_9,
23
                     "BIND9_10" : bind9_10,
26
                     "BIND9_10" : bind9_10,
24
-                    "BIND9_11" : bind9_11
27
-                    "BIND9_11" : bind9_11
25
+                    "BIND9_11" : bind9_11,
28
+                    "BIND9_11" : bind9_11,
26
+                    "BIND9_12" : bind9_12
29
+                    "BIND9_12" : bind9_12,
30
+                    "BIND9_13" : bind9_13
27
                     })
31
                     })
28
 
32
29
 
33
(-)net/samba48/files/patch-source4__dns_server__dlz_minimal.h (+11 lines)
Line 0 Link Here
1
--- source4/dns_server/dlz_minimal.h.orig	2018-01-14 20:41:58 UTC
2
+++ source4/dns_server/dlz_minimal.h
3
@@ -31,7 +31,7 @@
4
 #elif defined (BIND_VERSION_9_10)
5
 # define DLZ_DLOPEN_VERSION 3
6
 # define DNS_CLIENTINFO_VERSION 1
7
-#elif defined (BIND_VERSION_9_11)
8
+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13)
9
 # define DLZ_DLOPEN_VERSION 3
10
 # define DNS_CLIENTINFO_VERSION 2
11
 #else
(-)net/samba48/files/patch-source4__dns_server__wscript_build (+29 lines)
Line 0 Link Here
1
--- source4/dns_server/wscript_build.orig	2018-01-14 20:41:58 UTC
2
+++ source4/dns_server/wscript_build
3
@@ -58,6 +58,26 @@
4
                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
5
                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
6
 
7
+bld.SAMBA_LIBRARY('dlz_bind9_12',
8
+                  source='dlz_bind9.c',
9
+                  cflags='-DBIND_VERSION_9_12',
10
+                  private_library=True,
11
+                  link_name='modules/bind9/dlz_bind9_12.so',
12
+                  realname='dlz_bind9_12.so',
13
+                  install_path='${MODULESDIR}/bind9',
14
+                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
15
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
16
+
17
+bld.SAMBA_LIBRARY('dlz_bind9_13',
18
+                  source='dlz_bind9.c',
19
+                  cflags='-DBIND_VERSION_9_13',
20
+                  private_library=True,
21
+                  link_name='modules/bind9/dlz_bind9_13.so',
22
+                  realname='dlz_bind9_13.so',
23
+                  install_path='${MODULESDIR}/bind9',
24
+                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
25
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
26
+
27
 bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
28
                   source='dlz_bind9.c',
29
                   cflags='-DBIND_VERSION_9_8',
(-)net/samba48/files/patch-source4_setup_named.conf.dlz (-1 / +4 lines)
Lines 1-11 Link Here
1
--- source4/setup/named.conf.dlz.orig	2018-01-14 22:41:59 UTC
1
--- source4/setup/named.conf.dlz.orig	2018-01-14 22:41:59 UTC
2
+++ source4/setup/named.conf.dlz
2
+++ source4/setup/named.conf.dlz
3
@@ -21,5 +21,8 @@ dlz "AD DNS Zone" {
3
@@ -21,5 +21,11 @@ dlz "AD DNS Zone" {
4
 
4
 
5
     # For BIND 9.11.x
5
     # For BIND 9.11.x
6
     ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
6
     ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
7
+
7
+
8
+    # For BIND 9.12.x
8
+    # For BIND 9.12.x
9
+    ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
9
+    ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
10
+
11
+    # For BIND 9.13.x
12
+    ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so";
10
 };
13
 };
11
 
14
 
(-)net/samba48/pkg-plist (+2 lines)
Lines 296-301 Link Here
296
lib/samba4/private/libxattr-tdb-samba4.so
296
lib/samba4/private/libxattr-tdb-samba4.so
297
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so
297
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so
298
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_11.so
298
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_11.so
299
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_12.so
300
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_13.so
299
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so
301
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so
300
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so
302
%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so
301
%%AD_DC%%lib/shared-modules/gensec/krb5.so
303
%%AD_DC%%lib/shared-modules/gensec/krb5.so

Return to bug 235626