From patchwork Tue Apr 23 16:12:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dale Mellor X-Patchwork-Id: 63318 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 91B8127BBE9; Tue, 23 Apr 2024 17:14:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C996027BBE2 for ; Tue, 23 Apr 2024 17:14:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzImS-0002qu-4e; Tue, 23 Apr 2024 12:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzImK-0002oS-10 for guix-patches@gnu.org; Tue, 23 Apr 2024 12:13:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzImI-0005rl-1r for guix-patches@gnu.org; Tue, 23 Apr 2024 12:13:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzImY-0001k1-4r for guix-patches@gnu.org; Tue, 23 Apr 2024 12:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68621] [PATCH v2 1/4] gnu: knot-resolver: Re-enable default DNSSEC trust anchors. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Apr 2024 16:14:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68621 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68621@debbugs.gnu.org Cc: hello@lnikki.la X-Debbugs-Original-Cc: Leo =?utf-8?q?Nikkil=C3=A4?= , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17138888256359 (code B ref -1); Tue, 23 Apr 2024 16:14:09 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2024 16:13:45 +0000 Received: from localhost ([127.0.0.1]:53038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzIm6-0001e0-Ij for submit@debbugs.gnu.org; Tue, 23 Apr 2024 12:13:44 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzIm3-0001d6-UJ for submit@debbugs.gnu.org; Tue, 23 Apr 2024 12:13:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzIlh-0002mK-HR for guix-patches@gnu.org; Tue, 23 Apr 2024 12:13:17 -0400 Received: from [195.15.247.228] (helo=rdmp.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzIlf-0005ik-ML for guix-patches@gnu.org; Tue, 23 Apr 2024 12:13:17 -0400 Received: from [127.0.0.1] (helo=localhost.localdomain) by rdmp.org with esmtp (Exim 4.96.1) (envelope-from ) id 1rzIlb-00047D-2z; Tue, 23 Apr 2024 16:13:12 +0000 From: Dale Mellor Date: Tue, 23 Apr 2024 17:12:23 +0100 Message-ID: <20240423161226.973140-1-guix-devel-0brg6a@rdmp.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240120212542.17473-1-hello@lnikki.la> References: <20240120212542.17473-1-hello@lnikki.la> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 195.15.247.228 (failed) Received-SPF: pass client-ip=195.15.247.228; envelope-from=guix-devel-0brg6a@rdmp.org; helo=rdmp.org X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Leo Nikkilä * gnu/packages/dns.scm (knot-resolver) [#:configure-flags]: Configure root keys and managed TA. [#:phases] Remove `'disable-default-ta', add `'install-root-keys'. --- gnu/packages/dns.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 36d3eb8b7e..947a6e89ba 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -995,15 +995,13 @@ (define-public knot-resolver (build-system meson-build-system) (outputs '("out" "doc")) (arguments - '(#:configure-flags '("-Ddoc=enabled") + `(#:configure-flags + '("-Ddoc=enabled" + "-Dinstall_root_keys=disabled" ; installed manually outside store + "-Dkeyfile_default=/var/cache/knot-resolver/root.keys" + "-Dmanaged_ta=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.*") "")))) (add-after 'build 'build-doc (lambda _ (invoke "ninja" "doc"))) @@ -1021,6 +1019,14 @@ (define-public knot-resolver '("doc/knot-resolver/examples" "doc/knot-resolver/html" "info"))))) + (add-after 'install 'install-root-keys + (lambda* (#:key outputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") + "/etc/knot-resolver"))) + (mkdir-p dir) + (install-file (string-append "../knot-resolver-" ,version + "/etc/root.keys") + dir)))) (add-after 'install 'wrap-binary (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))