From patchwork Wed Jan 17 23:29:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 59076 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 7FE1E27BBEA; Wed, 17 Jan 2024 23:31:51 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 BFD1C27BBE2 for ; Wed, 17 Jan 2024 23:31:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQFNQ-0005E7-6r; Wed, 17 Jan 2024 18:31:20 -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 1rQFN6-0005CL-KX for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:06 -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 1rQFN6-0004Uv-CF for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQFN7-0005AX-Jf for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH 1/3] gnu: Add trisquel-keyring. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 23:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68555@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 68555-submit@debbugs.gnu.org id=B68555.170553421916233 (code B ref 68555); Wed, 17 Jan 2024 23:31:01 +0000 Received: (at 68555) by debbugs.gnu.org; 17 Jan 2024 23:30:19 +0000 Received: from localhost ([127.0.0.1]:53931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFMQ-0004Bw-RW for submit@debbugs.gnu.org; Wed, 17 Jan 2024 18:30:19 -0500 Received: from cyberdimension.org ([80.67.179.20]:42886 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFML-0003mS-1V for 68555@debbugs.gnu.org; Wed, 17 Jan 2024 18:30:17 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 0b4619a7; Wed, 17 Jan 2024 23:30:09 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id e2facc6b; Wed, 17 Jan 2024 23:30:09 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Thu, 18 Jan 2024 00:29:53 +0100 Message-ID: <77e75c87e83ba6951c6a977f014af4ead5700831.1705531484.git.GNUtoo@cyberdimension.org> 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 (trisquel-keyring): New variable. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/debian.scm | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index de43182172..4e398f619c 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018, 2020-2024 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages debian) #:use-module (guix git-download) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages autotools) @@ -146,6 +148,54 @@ (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") + (version "2022.10.19") + (source (origin + (method url-fetch) + (uri (string-append + "http://archive.trisquel.info/trisquel/" + "pool/main/t/trisquel-keyring/trisquel-keyring_" + version ".tar.gz")) + (sha256 + (base32 + "1qkqm3wb945i2izm47xni21hi3ad807bvl106r2mnwdxnjs4ij08")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("keyrings/trisquel-archive-keyring.gpg" + "share/keyrings/")))) + (home-page "http://archive.trisquel.info/trisquel/pool/main/t/trisquel-keyring") + (synopsis "GnuPG archive keys of the Trisquel archive") + (description "The Trisquel distribution signs its packages. This package +contains the archive keys used for that.") + (license license:gpl2+))) ;; see debian/copyright + (define-public ubuntu-keyring (package (name "ubuntu-keyring") From patchwork Wed Jan 17 23:29:54 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: 59075 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 B201927BBEA; Wed, 17 Jan 2024 23:31:47 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 2F6BF27BBE9 for ; Wed, 17 Jan 2024 23:31:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQFNP-0005E6-R1; Wed, 17 Jan 2024 18:31:19 -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 1rQFN7-0005CN-Dv for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:06 -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 1rQFN7-0004VA-5n for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQFN8-0005Bj-D9 for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH 2/3] gnu: debootstrap: use trisquel-keyring. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 23:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68555@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 68555-submit@debbugs.gnu.org id=B68555.170553422717256 (code B ref 68555); Wed, 17 Jan 2024 23:31:02 +0000 Received: (at 68555) by debbugs.gnu.org; 17 Jan 2024 23:30:27 +0000 Received: from localhost ([127.0.0.1]:53935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFMY-0004U5-P8 for submit@debbugs.gnu.org; Wed, 17 Jan 2024 18:30:27 -0500 Received: from [2001:910:1314:ffff::1] (port=52826 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFMO-0003rx-Ka for 68555@debbugs.gnu.org; Wed, 17 Jan 2024 18:30:18 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 10ce6104; Wed, 17 Jan 2024 23:30:10 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 6f7492c5; Wed, 17 Jan 2024 23:30:09 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Thu, 18 Jan 2024 00:29:54 +0100 Message-ID: <61c613f39c63f4e8fb381ffbb4639bd27103a011.1705531484.git.GNUtoo@cyberdimension.org> 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 trisquel-keyring. [inputs]: Add trisquel-keyring. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/debian.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 4e398f619c..7c2d7fedfb 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")) + (trisquel #$(this-package-input "trisquel-keyring")) (ubuntu #$(this-package-input "ubuntu-keyring"))) (substitute* "Makefile" (("/usr") "")) @@ -270,6 +271,11 @@ (define-public debootstrap (("/usr") debian)) (substitute* "scripts/gutsy" (("/usr") ubuntu)) + (substitute* "scripts/robur" + (("/usr/share/keyrings/trisquel-archive-keyring.gpg") + (string-append + trisquel + "/share/keyrings/trisquel-archive-keyring.gpg"))) (substitute* "debootstrap" (("=/usr") (string-append "=" #$output)) (("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg"))) @@ -277,6 +283,8 @@ (define-public debootstrap (substitute* (find-files "scripts") (("keyring.*(debian-archive-keyring.gpg)"_ keyring) (string-append "keyring " debian "/share/keyrings/" keyring)) + (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring) + (string-append "keyring " trisquel "/share/keyrings/" keyring)) (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring) (string-append "keyring " ubuntu "/share/keyrings/" keyring))) ;; Ensure PATH works both in guix and within the debian chroot @@ -301,6 +309,7 @@ (define-public debootstrap #:tests? #f)) ; no tests (inputs (list debian-archive-keyring + trisquel-keyring ubuntu-keyring bash-minimal dpkg From patchwork Wed Jan 17 23:29:55 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: 59077 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 9ADE827BBE9; Wed, 17 Jan 2024 23:32:00 +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.9 required=5.0 tests=BAYES_00,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 4DCE527BBE2 for ; Wed, 17 Jan 2024 23:31:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQFNQ-0005ET-EQ; Wed, 17 Jan 2024 18:31:20 -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 1rQFN7-0005CM-7J for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:06 -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 1rQFN6-0004V4-VA for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQFN8-0005B8-0U for guix-patches@gnu.org; Wed, 17 Jan 2024 18:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH 3/3] gnu: debootstrap: Add zstd dependency. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 23:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68555@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 68555-submit@debbugs.gnu.org id=B68555.170553422316857 (code B ref 68555); Wed, 17 Jan 2024 23:31:01 +0000 Received: (at 68555) by debbugs.gnu.org; 17 Jan 2024 23:30:23 +0000 Received: from localhost ([127.0.0.1]:53933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFMV-0004NI-Bh for submit@debbugs.gnu.org; Wed, 17 Jan 2024 18:30:23 -0500 Received: from cyberdimension.org ([80.67.179.20]:42886 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFMP-0003mS-Ol for 68555@debbugs.gnu.org; Wed, 17 Jan 2024 18:30:18 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id f96bcfd7; Wed, 17 Jan 2024 23:30:11 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 82588a36; Wed, 17 Jan 2024 23:30:10 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Thu, 18 Jan 2024 00:29:55 +0100 Message-ID: <2423d497b550a88f820038acc2943e00134082d1.1705531484.git.GNUtoo@cyberdimension.org> 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 Without that fix, the following command: # debootstrap aramo aramo-root http://archive.trisquel.info/trisquel fails with this error: I: Chosen extractor for .deb packages: dpkg-deb I: Extracting base-files... E: Tried to extract package, but tar failed. Exit... And if we run the falling command manually: # sudo dpkg-deb --fsys-tarfile [...]/cache/apt/archives/base-files[...].deb it shows that zstd is missing (from the PATH): dpkg-deb (subprocess): unable to execute decompressing archive 'var/cache/apt/archives/base-files[...].deb' (size=60544) member 'data.tar' (zstd): No such file or directory * gnu/packages/debian.scm (debootstrap): [inputs]: Add zstd. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: If24c80c70c9ec3e6ea88a38a30324fee3c0641fe --- gnu/packages/debian.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 7c2d7fedfb..4aa432abfa 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -314,7 +314,9 @@ (define-public debootstrap bash-minimal dpkg tzdata - + ;; Needed by dpkg-deb in extract_dpkg_deb_data for at least + ;; Trisquel 11 (aramo). + zstd ;; Called at run-time from various places, needs to be in PATH. gnupg wget))