From patchwork Wed Jan 24 00:00:00 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: 59352 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 9945827BBE2; Wed, 24 Jan 2024 00:01:17 +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 A3E4C27BBEA for ; Wed, 24 Jan 2024 00:01:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSQhW-00047U-Eo; Tue, 23 Jan 2024 19:01:06 -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 1rSQhO-00046b-UT for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -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 1rSQhN-0006vS-QY for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSQhS-0007gM-G6 for guix-patches@gnu.org; Tue, 23 Jan 2024 19:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH v2 1/3] gnu: Add trisquel-keyring. References: In-Reply-To: Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Jan 2024 00:01: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, Efraim Flashner Cc: Denis 'GNUtoo' Carikli Received: via spool by 68555-submit@debbugs.gnu.org id=B68555.170605442529463 (code B ref 68555); Wed, 24 Jan 2024 00:01:02 +0000 Received: (at 68555) by debbugs.gnu.org; 24 Jan 2024 00:00:25 +0000 Received: from localhost ([127.0.0.1]:44139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgq-0007f9-HV for submit@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:24 -0500 Received: from cyberdimension.org ([80.67.179.20]:44046 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgl-0007ej-QZ for 68555@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:22 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 9cf79588; Wed, 24 Jan 2024 00:00:12 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 3155d9f9; Wed, 24 Jan 2024 00:00:12 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 24 Jan 2024 01:00:00 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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 --- ChangeLog since v1: - Remove (accidental adding of) pureos-keyring. --- gnu/packages/debian.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) base-commit: b3e0a973bca6fe5de7356f3d70c4b7d468b0a759 diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index de43182172..bd6baffa2f 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,29 @@ (define-public debian-ports-archive-keyring ;; "The keys in the keyrings don't fall under any copyright." (license license:public-domain))) +(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 24 00:00:01 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: 59353 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 AE47A27BBEA; Wed, 24 Jan 2024 00:01:39 +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 2A3A227BBE2 for ; Wed, 24 Jan 2024 00:01:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSQhV-000479-7F; Tue, 23 Jan 2024 19:01:05 -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 1rSQhO-00046d-Um for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -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 1rSQhO-0006vT-2Q for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSQhS-0007gU-VK for guix-patches@gnu.org; Tue, 23 Jan 2024 19:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH v2 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, 24 Jan 2024 00:01: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, Efraim Flashner Cc: Denis 'GNUtoo' Carikli Received: via spool by 68555-submit@debbugs.gnu.org id=B68555.170605442929475 (code B ref 68555); Wed, 24 Jan 2024 00:01:02 +0000 Received: (at 68555) by debbugs.gnu.org; 24 Jan 2024 00:00:29 +0000 Received: from localhost ([127.0.0.1]:44141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgu-0007fK-Tu for submit@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:29 -0500 Received: from cyberdimension.org ([80.67.179.20]:44046 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgp-0007ej-25 for 68555@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:23 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id eae826be; Wed, 24 Jan 2024 00:00:13 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 509af9e4; Wed, 24 Jan 2024 00:00:13 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 24 Jan 2024 01:00:01 +0100 Message-ID: <0e085f567ff240e981a2e8a6b80c15ce4b486c29.1706054193.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 --- ChangeLog since v1: no changes. --- gnu/packages/debian.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index bd6baffa2f..33c39e809e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -233,6 +233,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") "")) @@ -245,6 +246,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"))) @@ -252,6 +258,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 @@ -276,6 +284,7 @@ (define-public debootstrap #:tests? #f)) ; no tests (inputs (list debian-archive-keyring + trisquel-keyring ubuntu-keyring bash-minimal dpkg From patchwork Wed Jan 24 00:00:02 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: 59351 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 4253127BBE9; Wed, 24 Jan 2024 00:01:17 +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 8F4CF27BBE2 for ; Wed, 24 Jan 2024 00:01:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSQhU-000475-V6; Tue, 23 Jan 2024 19:01:05 -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 1rSQhO-00046c-Ui for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -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 1rSQhO-0006vU-I4 for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSQhT-0007gb-Er for guix-patches@gnu.org; Tue, 23 Jan 2024 19:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH v2 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, 24 Jan 2024 00:01:03 +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, Efraim Flashner Cc: Denis 'GNUtoo' Carikli Received: via spool by 68555-submit@debbugs.gnu.org id=B68555.170605442929482 (code B ref 68555); Wed, 24 Jan 2024 00:01:03 +0000 Received: (at 68555) by debbugs.gnu.org; 24 Jan 2024 00:00:29 +0000 Received: from localhost ([127.0.0.1]:44143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgv-0007fM-Bw for submit@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:29 -0500 Received: from [2001:910:1314:ffff::1] (port=41042 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgp-0007em-Ta for 68555@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:24 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id b090287d; Wed, 24 Jan 2024 00:00:15 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 8aabacd7; Wed, 24 Jan 2024 00:00:14 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 24 Jan 2024 01:00:02 +0100 Message-ID: <849cb86147a238c990aaf9c341b09137492977eb.1706054193.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 --- ChangeLog since V1: no changes. --- 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 33c39e809e..1715b963a9 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -289,7 +289,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))