diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-01-23 23:11:11 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-23 23:11:11 +0100 |
commit | 12d8adbfc0f32a1905cfc3aaa2cfff68ee46a333 (patch) | |
tree | 183ae8f3e96ce0ef2961a81d96c27e5e1f2bc36b /gnu/packages/dns.scm | |
parent | bd0f5f24913b52df29f1f26321ed1095d08877b5 (diff) | |
parent | db0e9fe42c419c8c8010dbad6080ed66028c03ec (diff) | |
download | guix-12d8adbfc0f32a1905cfc3aaa2cfff68ee46a333.tar guix-12d8adbfc0f32a1905cfc3aaa2cfff68ee46a333.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/dns.scm')
-rw-r--r-- | gnu/packages/dns.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index e5148d5bc9..7c52722cb6 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -114,7 +114,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.14.9") + (version "9.14.10") (source (origin (method url-fetch) (uri (string-append @@ -122,7 +122,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.gz")) (sha256 (base32 - "0g2ph3hlw86yib8hv13qgkb4i84s9zv22r4k6yqlycm2izamwmr9")))) + "0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs @@ -680,11 +680,16 @@ synthesis, and on-the-fly re-configuration.") "09ffmqx79lv5psr433x4n946njgsn071b9b7161pcb9bmrqz380c")))) (build-system meson-build-system) (arguments - '(#:configure-flags - '("-Dmanaged_ta=disabled" ; we'll manage the DNS root data ourself - "-Ddoc=enabled") + '(#:configure-flags '("-Ddoc=enabled") #:phases (modify-phases %standard-phases + (add-before 'configure 'disable-default-ta + (lambda _ + ;; Disable the default managed root TA, since we don't have + ;; write access to the keyfile and its directory in store. + (substitute* "daemon/lua/sandbox.lua.in" + (("^trust_anchors\\.add_file.*") "")) + #t)) (add-after 'build 'build-doc (lambda _ (invoke "ninja" "doc"))) |