From patchwork Sat Mar 30 07:55:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 62368 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 DDB9627BBE2; Sat, 30 Mar 2024 07:56:34 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 962FE27BBEA for ; Sat, 30 Mar 2024 07:56:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqTZM-0008Pd-Ns; Sat, 30 Mar 2024 03:56: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 1rqTZJ-0008PA-Om for guix-patches@gnu.org; Sat, 30 Mar 2024 03:56:01 -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 1rqTZJ-0005cT-B2 for guix-patches@gnu.org; Sat, 30 Mar 2024 03:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqTZK-0005W1-21 for guix-patches@gnu.org; Sat, 30 Mar 2024 03:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70081] [PATCH 1/2] gnu: Add pureos-archive-keyring. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 07:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70081@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 70081-submit@debbugs.gnu.org id=B70081.171178533121090 (code B ref 70081); Sat, 30 Mar 2024 07:56:02 +0000 Received: (at 70081) by debbugs.gnu.org; 30 Mar 2024 07:55:31 +0000 Received: from localhost ([127.0.0.1]:43860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqTYp-0005U6-7y for submit@debbugs.gnu.org; Sat, 30 Mar 2024 03:55:31 -0400 Received: from cyberdimension.org ([79.143.250.36]:57474 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqTYj-0005Tm-7y for 70081@debbugs.gnu.org; Sat, 30 Mar 2024 03:55:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=5bZ/AEtFojt43Lt qaas99NvDbB4fF07n5IihOaDkoM8=; h=references:in-reply-to:date:subject: cc:to:from; d=cyberdimension.org; b=VtMzciRghe9l5WUileKKJbng7JAHr3qiFK J+yzp422Fs49RLnO1X8s04AnATyHuZeGeDsVY4JQTwbMvZenDjM8GUriFaJg2b8Rv8yU8Q LhpCMbLdSwRkmsWDpUl9YRp/KcKdYsQvIj+PcFZ341c6Y981ZPStXOjq7XuRzQnWejNYh9 2+qlnG0H9Xj1Kmte5HMjohFMnmbImUc4uMM79/7MC0gTubFRXngFXuwCn63dGLoesvIiI3 vp1hoPiRIX9+/d45Kzs50GmHA7RVyuQg0HSm/oo16g/ygF24oaQ/Ww5jSRKvDXtXc1bTBY BKLQTsa8ut6Ezvq0NZbpI0KQ9niA== Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 493f7bfe; Sat, 30 Mar 2024 07:55:21 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Sat, 30 Mar 2024 08:55:05 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/debian.scm (pureos-archive-keyring): New variable. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I80af4b15c7fe20dd40358d4f676a89903060bf07 --- gnu/packages/debian.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 1715b963a9..4aa432abfa 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -148,6 +148,31 @@ (define-public debian-ports-archive-keyring ;; "The keys in the keyrings don't fall under any copyright." (license license:public-domain))) +(define-public pureos-archive-keyring + (package + (name "pureos-archive-keyring") + (version "2021.11.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://repo.puri.sm/pureos/pool/main/p/pureos-archive-keyring/" + "pureos-archive-keyring_" version ".tar.xz")) + (sha256 + (base32 + "1a0d084a98bycyhbw531646rbivvlfkdk6ldshl5dy6fvzmbci0d")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("keyrings/pureos-archive-keyring.gpg" + "share/keyrings/") + ("keyrings/pureos-archive-removed-keys.gpg" + "share/keyrings/")))) + (home-page "https://source.puri.sm/pureos/core/pureos-archive-keyring") + (synopsis "GnuPG archive keys of the Pureos archive") + (description "The Pureos distribution signs its packages. This package +contains the archive keys used for that.") + (license (list license:public-domain ;; the keys + license:gpl2+)))) ;; see debian/copyright + (define-public trisquel-keyring (package (name "trisquel-keyring") From patchwork Sat Mar 30 07:55:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 62369 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 D0AA527BBE2; Sat, 30 Mar 2024 07:56:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,TVD_SPACE_RATIO, 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 868EC27BBE9 for ; Sat, 30 Mar 2024 07:56:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqTZM-0008Pe-Nj; Sat, 30 Mar 2024 03:56: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 1rqTZK-0008PI-1Y for guix-patches@gnu.org; Sat, 30 Mar 2024 03:56:02 -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 1rqTZJ-0005cy-IX for guix-patches@gnu.org; Sat, 30 Mar 2024 03:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqTZK-0005W9-H2 for guix-patches@gnu.org; Sat, 30 Mar 2024 03:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70081] [PATCH 2/2] gnu: debootstrap: Use pureos-archive-keyring. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 07:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70081@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 70081-submit@debbugs.gnu.org id=B70081.171178533521104 (code B ref 70081); Sat, 30 Mar 2024 07:56:02 +0000 Received: (at 70081) by debbugs.gnu.org; 30 Mar 2024 07:55:35 +0000 Received: from localhost ([127.0.0.1]:43862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqTYs-0005UJ-JX for submit@debbugs.gnu.org; Sat, 30 Mar 2024 03:55:35 -0400 Received: from cyberdimension.org ([79.143.250.36]:57474 helo=localhost) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqTYn-0005Tm-S8 for 70081@debbugs.gnu.org; Sat, 30 Mar 2024 03:55:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=EMYsurESrIODs5s hEab6wm8B5cauDU8iPJeWk8124GM=; h=references:in-reply-to:date:subject: cc:to:from; d=cyberdimension.org; b=QV+BVyy+7owFbL8UndXFUBgSXYZvOnRYH3 Ab7JFFcJk/PBGAsiNYVoDECNZy6fwrIII6+IUiOx+z/yYVFjAcVh98Izcdtv2iN2UokHBR qw+w3zFe5lI5Tv3BaurmuZ9NTbRn35Db2yJjfYXBJp/xRjT4k8+6qknU3woL9cJFj3xtza fCxCFjfuF1mosH6HRNKC2V5J5aBEko5uBabKoLqf6TeeUY1+MzQOb4iL6HdiyYNZiqwaRz R9Za0pNE8tEzV4X1VKToA4a1v7IADo14FDmSWzm0wQHDiHignyIo1jVHO885oyX7CyAlr+ eqaZFfZ46UkiSq3ZPgbs/mL4TcnQ== Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 75675df4; Sat, 30 Mar 2024 07:55:22 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Sat, 30 Mar 2024 08:55:06 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/debian.scm (debootstrap): [arguments]: In 'patch-source' phase, use pureos-archive-keyring. [inputs]: Add pureos-archive-keyring. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I8bf0a7db50c66dcf3541e5c7244350ff9523d921 --- gnu/packages/debian.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 4aa432abfa..a88fb04feb 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -258,6 +258,7 @@ (define-public debootstrap (add-after 'unpack 'patch-source (lambda* (#:key inputs outputs #:allow-other-keys) (let ((debian #$(this-package-input "debian-archive-keyring")) + (pureos #$(this-package-input "pureos-archive-keyring")) (trisquel #$(this-package-input "trisquel-keyring")) (ubuntu #$(this-package-input "ubuntu-keyring"))) (substitute* "Makefile" @@ -271,6 +272,11 @@ (define-public debootstrap (("/usr") debian)) (substitute* "scripts/gutsy" (("/usr") ubuntu)) + (substitute* "scripts/amber" + (("/usr/share/keyrings/pureos-archive-keyring.gpg") + (string-append + pureos + "/share/keyrings/pureos-archive-keyring.gpg"))) (substitute* "scripts/robur" (("/usr/share/keyrings/trisquel-archive-keyring.gpg") (string-append @@ -283,6 +289,8 @@ (define-public debootstrap (substitute* (find-files "scripts") (("keyring.*(debian-archive-keyring.gpg)"_ keyring) (string-append "keyring " debian "/share/keyrings/" keyring)) + (("keyring.*(pureos-archive-keyring.gpg)" _ keyring) + (string-append "keyring " pureos "/share/keyrings/" keyring)) (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring) (string-append "keyring " trisquel "/share/keyrings/" keyring)) (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring) @@ -309,6 +317,7 @@ (define-public debootstrap #:tests? #f)) ; no tests (inputs (list debian-archive-keyring + pureos-archive-keyring trisquel-keyring ubuntu-keyring bash-minimal