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 QA0aESZ9EGO7ugAAbAwnHQ (envelope-from ) for ; Thu, 01 Sep 2022 11:36:38 +0200 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 iNA8ECZ9EGPixwAAG6o9tA (envelope-from ) for ; Thu, 01 Sep 2022 11:36:38 +0200 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 E95D33D5BC for ; Thu, 1 Sep 2022 11:36:37 +0200 (CEST) Received: from localhost ([::1]:59194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTgcm-00042f-OW for larch@yhetil.org; Thu, 01 Sep 2022 05:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTg6I-00045a-1C for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTg6H-0005dP-NE for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTg6H-0008Pq-I9 for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57515] [PATCH 2/8] gnu-maintenance: Produce mirror:// URIs in latest-ftp-release. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 09:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57515@debbugs.gnu.org Received: via spool by 57515-submit@debbugs.gnu.org id=B57515.166202292332197 (code B ref 57515); Thu, 01 Sep 2022 09:03:01 +0000 Received: (at 57515) by debbugs.gnu.org; 1 Sep 2022 09:02:03 +0000 Received: from localhost ([127.0.0.1]:41186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5J-0008Mc-1u for submit@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:02 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:48464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5G-0008MD-0W for 57515@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:00 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by michel.telenet-ops.be with bizsmtp id EZ1v2800K20ykKC06Z1wpV; Thu, 01 Sep 2022 11:01:56 +0200 From: Maxime Devos Date: Thu, 1 Sep 2022 11:01:49 +0200 Message-Id: <309bbf185a707fee8f98f741aa5a67fdce6cfda0.1662022775.git.maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662022916; bh=xh22UhyedYkV0zVtoEkbC+QgmQtIwk7SHwnFAz9nj14=; h=From:To:Subject:Date:In-Reply-To:References:Reply-To; b=b2benSyhyHsVvkuODUR/jUtu1bN6UpkBbg6geR2DnOK1HjMcVEPwo+6dX7v5vG7l6 oaK6KsLpxWHkeahB4Vf4+ffC5hyg5I7cm92GVwxLb6YO8qTzf9QX2Z37e6yX6f7pMH eEgxFJ3g6C58w8DbY3C8fLCJJCiC6xh5rr4DbCk/AHENuBvREAPYKnLtfV5KtDMRP5 34FeQwJSz3a6aYR8phci9ZKCkPQVAhGQ8Semjg7JpqTKbRvaOUDog0Dv4j9+wAHpe2 ECHDKvxGiRBOGGlZxvNFi7cBi08vJxvZxHvY7e2ek5AaRWWM9V2WMT0pg8yCihtInI zqT4Yn0kpvJFg== 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: , Reply-To: 57515@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662024998; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=xh22UhyedYkV0zVtoEkbC+QgmQtIwk7SHwnFAz9nj14=; b=GR2/VR2YBlouc/cWDHpndUp/ylWO5F8POCRv+yhXGo0+7bYGxlp6XvtAtkGGxB5Y948Uuf fXhiAjAzkGVEfJuegs9rtmcpKpj77wmcTXGAP+p9zgG4tAZ1nQ8EK8CgcKH/utXBkk4ejX uTT+qVqiHCJHl9vpZE541oFyyNHdZLDCNrHZHmT7qO+0uZroB9ezNoQAEd351sTLxcx0u/ WsL9OeLLA1Lk0JzuDNy5s59kUJCs9ii8sXPm2SPTS3m2XtZXezi0qf0O95PfcjZniYEdLy WYaWsp25LA5/8jrayA6MCbBZeVQqPFIHYcHDBQ0uIr4dyRJVHJIVEvrYq4BeRQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662024998; a=rsa-sha256; cv=none; b=eIk5VWL28hVf0s0SGer9xNLHsR9pHZiAZHskyVVcRbddr8LefjgOsVwz7MuictBoqYQ6AI p0SGNxqYQx6X6k0idD++aiCu7yLaLQmxprl3/DYZ9e5qDxD6Uwr0Euie/lIL7p/ncX/AWa Vxdvsfl2ylD8G9aB3Whx/NKEdnD15lNW7WJak3kW0yHeKNAI9EhyBkqOY+aqw0UAlDQuUC zr0TeKcAx5XPOXvrIxqJW3xKhpJu2ps/qLROc13Iafz2xE5lRVd4WbN1/IVwsMX49yfYSC GM356qfw2LeIYb85640up0l8uDkyIY0CcvxCfyIOqqXJUhS4KhF1PAc+lddT6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=b2benSyh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); 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: 7.22 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=b2benSyh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); 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: E95D33D5BC X-Spam-Score: 7.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: j6QJmDoSYWZh Partially fixes: https://issues.guix.gnu.org/57477. As a test, try updating gnupg. Before the patch, a ftp:// URL was produced, now the mirror:// is preserved. * guix/gnu-maintenance.scm (latest-ftp-release)[file->source]{urls,signature-urls}: Call uri-mirror-rewrite on the URLs. --- guix/gnu-maintenance.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 51e8fcd815..84fd087319 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -363,10 +363,12 @@ (define (file->source directory file) (upstream-source (package project) (version (tarball->version file)) - (urls (list url)) + ;; uri-mirror-rewrite: Don't turn nice mirror:// URIs into ftp:// + ;; URLs during "guix refresh -u". + (urls (list (uri-mirror-rewrite url))) (signature-urls (match (file->signature url) (#f #f) - (sig (list sig))))))) + (sig (list (uri-mirror-rewrite sig)))))))) (let loop ((directory directory) (result #f)) -- 2.37.2