From patchwork Sat Jan 20 21:23:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Leo_Nikkil=C3=A4?= X-Patchwork-Id: 59249 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 D6D1E27BBE9; Sat, 20 Jan 2024 21:27:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 1857527BBEB for ; Sat, 20 Jan 2024 21:27:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRIrk-0000bj-VF; Sat, 20 Jan 2024 16:27:00 -0500 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 1rRIrj-0000bQ-H3 for guix-patches@gnu.org; Sat, 20 Jan 2024 16:26:59 -0500 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 1rRIrj-0000Fu-96 for guix-patches@gnu.org; Sat, 20 Jan 2024 16:26:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRIrm-0008SA-1e for guix-patches@gnu.org; Sat, 20 Jan 2024 16:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68620] [PATCH 1/2] gnu: knot-resolver: Re-enable default DNSSEC trust anchors. Resent-From: Leo =?utf-8?q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 21:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68620@debbugs.gnu.org Cc: Leo =?utf-8?q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170578599732434 (code B ref -1); Sat, 20 Jan 2024 21:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jan 2024 21:26:37 +0000 Received: from localhost ([127.0.0.1]:35978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRIrM-0008R3-UZ for submit@debbugs.gnu.org; Sat, 20 Jan 2024 16:26:37 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRIrI-0008Qe-9r for submit@debbugs.gnu.org; Sat, 20 Jan 2024 16:26:35 -0500 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 1rRIr5-00009t-Mf for guix-patches@gnu.org; Sat, 20 Jan 2024 16:26:21 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRIr4-0000As-30 for guix-patches@gnu.org; Sat, 20 Jan 2024 16:26:19 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 9E5175C00AB; Sat, 20 Jan 2024 16:26:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sat, 20 Jan 2024 16:26:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1705785977; x= 1705872377; bh=A1MmHmKukamJyPcTH5lZ0WlxhzewoTJbxKTjUDYfpso=; b=P KmXnKG6yhGkKyA6sNgBkNnqLw/kDJkP5WvuFfgvvyqhzCGAHTjYHpUuYlpKD2Elw RZzQHoqC31i0MXGsblRtokMFplEwUEr+Td0isabXucGDwQKvDzSRXK91u/6nW+Pm DL+AcBcZmOEmIebZ7BdL9s+5YBKSwz92NnRwsY8iJcJism1CvWLGhj2TQ7xlVddU hcnvnqOQYlZZh16oOGBgUWrwGOkhXDweRrjdrrzw+FBkjVND7IEimB4XM5hiN27v zgdVbIkpZxueZsY9xThu20xwuoxiCIQ6WDxv2NwVophY1uMCRl/e8pTPFwriKE/S 5dVLhIU+1ZwCjVDSjfIBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705785977; x= 1705872377; bh=A1MmHmKukamJyPcTH5lZ0WlxhzewoTJbxKTjUDYfpso=; b=s Q/ve8h/K/zGBSDnynoKWsePWj9hlOcUCpC4OQKUr9X3oeroiPI8mzdCBS78AxQV0 ELW2j2/z+cO4vCx5e0ecfao+w+2Ly6hZ566YP3PH1c56+48gqHvDi3Wk2sWzQi6A kBUXsRsouevkG/iRL89yJXjl39x6NMIQKYkT44atUNjuVByWCAfYg5R6tZqyey2W vfC5cBlAEykx3HOCuHrm+uSmG8Jr3qSoSMpGrNdWFU2OUhYPidzP4YhWmzJJNJOS QRBX0p2B1vawf1LzNLQszme53JK2BjfFBnnAPCCIr70YAknbtn2eYPXHNpEMhkll nhbchCBkaQryUUWdljcNQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdekvddgudehtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhi khhkihdrlhgrqeenucggtffrrghtthgvrhhnpeffkeehheefjeejveejheegvedutefgje efvdeihfduffffueeukeeffefhiedufeenucffohhmrghinheplhhurgdrihhnnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhgvlhhloheslh hnihhkkhhirdhlrg X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 20 Jan 2024 16:26:16 -0500 (EST) Date: Sat, 20 Jan 2024 23:23:43 +0200 Message-ID: <20240120212542.17473-2-hello@lnikki.la> 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 Received-SPF: pass client-ip=66.111.4.25; envelope-from=hello@lnikki.la; helo=out1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Reply-to: Leo =?utf-8?q?Nikkil=C3=A4?= X-ACL-Warn: , =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= via From: =?utf-8?q?Leo_Nikkil=C3=A4?= 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 * 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 73a2fac54b..9783e560fa 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -994,15 +994,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"))) @@ -1020,6 +1018,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"))