From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id CAoAAr37kmMnHAEAbAwnHQ (envelope-from ) for ; Fri, 09 Dec 2022 10:11:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uGMVAb37kmOnagEAG6o9tA (envelope-from ) for ; Fri, 09 Dec 2022 10:11:25 +0100 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 C5E914313E for ; Fri, 9 Dec 2022 10:11:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3ZPM-0006PF-4H; Fri, 09 Dec 2022 04:11:04 -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 1p3ZPK-0006Oy-Gr for guix-patches@gnu.org; Fri, 09 Dec 2022 04:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3ZPK-0004SU-5k for guix-patches@gnu.org; Fri, 09 Dec 2022 04:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3ZPJ-00050y-Le for guix-patches@gnu.org; Fri, 09 Dec 2022 04:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50892] bug#59781: [version 1.4.0rc1] install.sh script should authorize bordeaux Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Dec 2022 09:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50892 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Cc: 59781@debbugs.gnu.org, 50892@debbugs.gnu.org Received: via spool by 50892-submit@debbugs.gnu.org id=B50892.167057701019250 (code B ref 50892); Fri, 09 Dec 2022 09:11:01 +0000 Received: (at 50892) by debbugs.gnu.org; 9 Dec 2022 09:10:10 +0000 Received: from localhost ([127.0.0.1]:34741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3ZOT-00050P-JM for submit@debbugs.gnu.org; Fri, 09 Dec 2022 04:10:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3ZOR-00050C-DH; Fri, 09 Dec 2022 04:10:08 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3ZOL-0003xG-L2; Fri, 09 Dec 2022 04:10:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=vvuBnpnSHgR5ZpYUu1FMVBOSNVxZC8Kpo1OUhoDQwCI=; b=SiPNqyqx4iaWLmhpIlhW hXxDAhq+rbPdYqbtGN1Fdld79IgL/JCZAgq4JNlcy6cpp73fqNpGVmn1RL8VZQvIMIY7fu+XMIhNG wToFFJUEAB9eG4BIvj9hVAy55GyGphnncEzK1psDvNXsAuIi0NUTru2tEeRTC4NEKiLfLMXyw/mai +Lri/t3gg761KhelAMIV6BhYZkVCqt6UX+evhZs8pYyGHJuNH2UEZhS8NswiRYJnFVhgmE+8ff4/6 7DtG11wP8DBX8uLoOxi+0X9lpW9iYxSfae1FOJDZRq8SkEdQqz+fusuZ7S/jqpf9C4zb3S+MUec5Y Lmwf6ldf0E56gw==; Received: from [193.50.110.137] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3ZOL-0005Tg-6q; Fri, 09 Dec 2022 04:10:01 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210929154310.25788-1-me@tobias.gr> <87tui31g2y.fsf@nckx> <87edtaf7sz.fsf_-_@gnu.org> <87ililzhx8.fsf@nckx> Date: Fri, 09 Dec 2022 10:09:58 +0100 In-Reply-To: <87ililzhx8.fsf@nckx> (Tobias Geerinckx-Rice's message of "Thu, 08 Dec 2022 22:42:59 +0100") Message-ID: <87359paqop.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670577084; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=vvuBnpnSHgR5ZpYUu1FMVBOSNVxZC8Kpo1OUhoDQwCI=; b=sucNkhL7qpe0jwG/FpdKc5eWGwrXiIcv3P227cjWlc6IkdprwKgz13sM/kivgXLPLMFWLK u4QMkJiVsgp/wIpaXUT+/nuNNYMOMsBmcIiv40GC0A9J4PKqUhSJdBXxCR/OxkYMtsnGEn jox7gQlBJ3lvEPzHXPGKb9kPxuoJovkZ5oxm7kV3bQLRZysfbVbnxe5ST8hIhn1of3lMPb fvfJYXVs9wamw9nmFXg13LM2t7GwqlMcl1YJy1gz1tmXa85XacqMtOXb/c3YIs+b3H2biE u90El8eFhjzEpljJmcCnUtJOux8uqWEOUTmLmfgS5qYlRZJn529bPMB28YNjRg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670577084; a=rsa-sha256; cv=none; b=QEezCph2grWSTmZ5R286jqtW8KXwn/pEMDQrvPJzVyetWgXK8YOFn/E+mpwoeXJnP+T+Kx 8EkArmRFO4hTV7aY8lMny07lqWhrQacUQywoEZ9HucWafYtSjBqOWs14LTZ582jIZ2F2oi zaQmJwq6EFiubWsUevXrqrjFLW2PyhHP26tjcXWH39Bfgk7nk6ydPa+SoLyQPj52uAUjUS LO4NqFTZaVQ8uEE1gmInXZoTdOt0HubfF1a2ji0zXHvE2mlNs4D4Jhbv3Rbpa4jo6RMR86 5Ldhwy3vpCNr5Rx1/BWrNFOJI4qaLOdmUnSnFTFYqDEBD85FgrkXqSJKbOiUbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=SiPNqyqx; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -2.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=SiPNqyqx; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: C5E914313E X-Spam-Score: -2.25 X-Migadu-Scanner: scn1.migadu.com X-TUID: bN5mXpU98DBj --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Tobias Geerinckx-Rice skribis: > (Ugh, this patch is so ugly, all to work around that triplication in > ~/.config/guix/current/share/guix/*.pub=E2=80=A6 Would it be OK for =E2= =80=98guix > archive --authorize=E2=80=99 to silently ignore duplicate keys?) Oh, good point. I guess we could change =E2=80=98public-keys->acl=E2=80=99= to deduplicate entries. Maybe something along these lines: --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/guix/pki.scm b/guix/pki.scm index 6326e065e9..c5b2fb9634 100644 --- a/guix/pki.scm +++ b/guix/pki.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2013, 2014, 2016 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2013, 2014, 2016, 2022 Ludovic Court=C3=A8s ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ (define-module (guix pki) #:use-module (gcrypt pk-crypto) #:use-module ((guix utils) #:select (with-atomic-file-output)) #:use-module ((guix build utils) #:select (mkdir-p)) + #:autoload (srfi srfi-1) (delete-duplicates) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) #:use-module (ice-9 binary-ports) @@ -61,9 +62,10 @@ (define (public-keys->acl keys) ;; want to have name certificates and to use subject names instead of ;; complete keys. `(acl ,@(map (lambda (key) - `(entry ,(canonical-sexp->sexp key) + `(entry ,key (tag (guix import)))) - keys))) + (delete-duplicates + (map canonical-sexp->sexp keys))))) =20 (define %acl-file (string-append %config-directory "/acl")) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 DQpXRFlUPw0KDQpMdWRv4oCZLg0K --=-=-=--