kiwi/klara-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ?

Browse Source
This commit is contained in:
Xavier Beaudouin
2026-03-10 07:53:55 +01:00
parent 402ae5a76c
commit 9ba4be7db6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/samba423/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
View File

@@ -25,7 +25,7 @@ index 404b346a885..8e5a8ba5f25 100644
import uuid import uuid
import shutil import shutil
import time import time
@@ -1010,52 +1011,37 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): @@ -1008,52 +1009,36 @@
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
cwd='.').communicate()[0] cwd='.').communicate()[0]
bind_info = get_string(bind_info) bind_info = get_string(bind_info)
@@ -51,7 +51,8 @@ index 404b346a885..8e5a8ba5f25 100644
- bind9_14 = '' - bind9_14 = ''
- elif bind_info.upper().find('BIND 9.16') != -1: - elif bind_info.upper().find('BIND 9.16') != -1:
- bind9_16 = '' - bind9_16 = ''
- elif bind_info.upper().find('BIND 9.18') != -1: - elif bind_info.upper().find('BIND 9.18') != -1 \
- or bind_info.upper().find('BIND 9.20') != -1:
- bind9_18 = '' - bind9_18 = ''
- elif bind_info.upper().find('BIND 9.7') != -1: - elif bind_info.upper().find('BIND 9.7') != -1:
- raise ProvisioningError("DLZ option incompatible with BIND 9.7.") - raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
@@ -61,6 +62,7 @@ index 404b346a885..8e5a8ba5f25 100644
- raise ProvisioningError("Only stable/esv releases of BIND are supported.") - raise ProvisioningError("Only stable/esv releases of BIND are supported.")
- elif bind_info.upper().find('BIND_9.17') != -1: - elif bind_info.upper().find('BIND_9.17') != -1:
- raise ProvisioningError("Only stable/esv releases of BIND are supported.") - raise ProvisioningError("Only stable/esv releases of BIND are supported.")
- else:
+ bind9_release = re.search('BIND (9)\.(\d+)\.', bind_info, re.I) + bind9_release = re.search('BIND (9)\.(\d+)\.', bind_info, re.I)
+ if bind9_release: + if bind9_release:
+ bind9_disabled = '' + bind9_disabled = ''
@@ -75,7 +77,7 @@ index 404b346a885..8e5a8ba5f25 100644
+ raise ProvisioningError("Only stable/esv releases of BIND are supported.") + raise ProvisioningError("Only stable/esv releases of BIND are supported.")
+ else: + else:
+ bind9_dlz_version = "%d_%d" % (bind9_version_major, bind9_version_minor) + bind9_dlz_version = "%d_%d" % (bind9_version_major, bind9_version_minor)
else: + else:
+ bind9_disabled = '# ' + bind9_disabled = '# '
+ bind9_version = "BIND z.y.x" + bind9_version = "BIND z.y.x"
+ bind9_dlz_version = "z_y" + bind9_dlz_version = "z_y"
@@ -98,12 +100,9 @@ index 404b346a885..8e5a8ba5f25 100644
- "BIND9_14": bind9_14, - "BIND9_14": bind9_14,
- "BIND9_16": bind9_16, - "BIND9_16": bind9_16,
- "BIND9_18": bind9_18 - "BIND9_18": bind9_18
- })
+ "BIND9_DLZ": bind9_dlz + "BIND9_DLZ": bind9_dlz
+ }) })
def create_named_txt(path, realm, dnsdomain, dnsname, binddns_dir,
diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index b7e36e7f8e6..bbdb616deb2 100644 index b7e36e7f8e6..bbdb616deb2 100644
--- a/source4/dns_server/dlz_minimal.h --- a/source4/dns_server/dlz_minimal.h