From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WDhcHbHFB2Z0nQAAqHPOHw:P1 (envelope-from ) for ; Sat, 30 Mar 2024 08:56:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WDhcHbHFB2Z0nQAAqHPOHw (envelope-from ) for ; Sat, 30 Mar 2024 08:56:33 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=cyberdimension.org header.s=dkim header.b=QV+BVyy+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711785393; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=I5iAhiwJo87AWMPQ9iJMG218nR2cYSFGuwDZzjBXdZU=; b=PA7HEu4vCObIDE2ypUAYl8XO+7x6bp2z/OFZwVaAxLUwI5nUzEbmj/S7Gii83byIaF4wua FfOAV8W3MKXW7IAwRDxfQZsYv6Yd3d6SZ5JoCk75Tyni3Lag6EMztEJcJ3AatFmfiz83HL b++/qo8gNRJzMcKN4vwiZvBm1etjWLkC0xnePva2LV+Gk2kNIMayFyDDCg4z1jUIN7c96q TzattO6ViwxosvtES8zIyNeVvfiW9V+WDiRCRfQ6z5l7xYl9rZHvfGrmQbCw2MLB5HlpTN Bck0bwjxM/FCJDrzMHz+3Lhb/WQBuO37oggvkoNFA/yR/757HaGEapd4jHUSFg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=cyberdimension.org header.s=dkim header.b=QV+BVyy+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711785393; a=rsa-sha256; cv=none; b=JNGFrijJ911rvYPG2Zm4/DG3wtwLFo1YmEEMDk7VTXpJesSp4Y2TZe0nUNpOneXQhcv36W xry7oa2M/uEVNkPo+PHtJh1WlCiPD5ApMF6r21WceyLusnVI+ON9i8tUptd+01CSv+lUbg uxqgDR3OqVYfeyz0fPyjF+dOPF+xKHnRj1HXrJNRNR8UEs2sDpxRN/RTelEas17DIMkOUU bl9pcrk44nUqbOj2n40A/O5kXpoj2kGa4f6Z+7os9wpKu+j10qwmougImhGl/boN0Y88b/ SsODwCY8fKKaMfbMpP7BcjS8i/wwaeuqqv18YeSWhLG4yrNLrOcUJH3YA9pXug== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CFD0B6CF58 for ; Sat, 30 Mar 2024 08:56:32 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: CFD0B6CF58 X-Spam-Score: -3.85 X-Migadu-Spam-Score: -3.85 X-Migadu-Scanner: mx10.migadu.com X-TUID: y6hIdjDl5lD0 * 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 -- 2.41.0