From patchwork Fri Dec 9 09:09:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45146 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 C7E5727BBEB; Fri, 9 Dec 2022 09:11:26 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9807B27BBE9 for ; Fri, 9 Dec 2022 09:11:24 +0000 (GMT) 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 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 Hi, Tobias Geerinckx-Rice skribis: > (Ugh, this patch is so ugly, all to work around that triplication in > ~/.config/guix/current/share/guix/*.pub… Would it be OK for ‘guix > archive --authorize’ to silently ignore duplicate keys?) Oh, good point. I guess we could change ‘public-keys->acl’ to deduplicate entries. Maybe something along these lines: WDYT? Ludo’. 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 © 2013, 2014, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2016, 2022 Ludovic Courtès ;;; ;;; 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))))) (define %acl-file (string-append %config-directory "/acl"))