From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GOfhDwqlRWcVQwEAqHPOHw:P1 (envelope-from ) for ; Tue, 26 Nov 2024 10:38:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GOfhDwqlRWcVQwEAqHPOHw (envelope-from ) for ; Tue, 26 Nov 2024 11:38:02 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=G1mUok7n; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=X89Gu1Mj; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732617481; a=rsa-sha256; cv=none; b=no/20/H+W/2OtGrGovE+Ov/94xmkfOaz4HqygkF/EpouPPv4hVIp/qsS1TekJezfKSxMX/ zoHL8o+qXtmU2IuXupZdId2out96+U9ZGHu/Gnm28L7lgujv3fMz9bqBne/4MN0LsIoA0c VGRi36K+BwV8z+X12POWxfaggcyMPURcP4RMDa653f1u533oV9lCBVwaHt0m/284izak5m Hlod6oxV2loZ/XcdKVhRlO79U1YHv4UARjIyBctmNrBm/bo85+YfH/WTRXLrliqNHIVN+L 27pfx4LKSXFJ2SglDHOsZcGGOCSfJTpgP0Lg/nUXRzqFwBnm44+hJo+W/JJfFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=G1mUok7n; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=X89Gu1Mj; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732617481; 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: 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=s3NlCK5g4EoLnXqtNocOLhHNwSIxIbo8INXA2YVICF4=; b=PghPon9PEWAPleCutTGKVKadNLeoMyNjpeVl3cy3/gazQ0YgYXupi6+5oCKmpitA0Snqsc kzXrk0P8UdW4J6pxIdl3fP3iAThG6gZBSlMEIyNt7U7WH5/uzSRL5/Nlsa2ENpcpdohc0W e3zbRCGZLZqEibICylsUcgexKmumIkSzbsW8nLyD3/oKCJVqcwLYM1ZeP9eLAO6MmgSaMd iiR/KJ6Ln/HkihBfZiRhNNXwFy7HskMar7g+ypSTtdVVmBXi5qAB2uJ2qWHss2C7Et19Pn 9U/7sklWtkqVC72J6jCxdFkgZ9tH75jMc8wFDf7rCAv4UsgUuhVc4LexR4dSYg== 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 E6B511897F for ; Tue, 26 Nov 2024 11:38:01 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tFswb-0005Ke-4K; Tue, 26 Nov 2024 05:37:21 -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 1tFswO-0005In-Cu for guix-patches@gnu.org; Tue, 26 Nov 2024 05:37:08 -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 1tFswO-0000qG-1M; Tue, 26 Nov 2024 05:37:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=s3NlCK5g4EoLnXqtNocOLhHNwSIxIbo8INXA2YVICF4=; b=G1mUok7nQU4xXOHgBR6igrgqGhlSOLltMKQA28RopjW7dreX2ifJWYON0dhcd0k5s8ZCopFEic+kTNDjruKc18mXOyK6XjuLr/zDkCSuv8ddhyXWNVn4RtU0cHv+B9T30Ab5yfZ2VbWiBjJF/CfaxmCDYrBlEiE2m4kxEiChdbfPLY/G6vVJ2bXrOHagONc8CKvsWl0n7YCntoT3Cm8HIOzfufiiYgcUpdVbLElQMVleItSTtIYwqpoPjYwpAG+KTpzKKsGLeTOrDf1pYRvYg2V3RJciIU/quTFrLDoHh5kZM5FJn6zDuvi1NkHI3qN6BspbQoqRLFsO65xsQ0TBRQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tFswL-0002en-P4; Tue, 26 Nov 2024 05:37:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74542] [PATCH 08/11] gnu-maintenance: =?UTF-8?Q?=E2=80=98gnu-ftp=E2=80=99?= updater excludes GnuPG-hosted packages. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 26 Nov 2024 10:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74542@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic Court?s , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic Court?s , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74542-submit@debbugs.gnu.org id=B74542.173261740710102 (code B ref 74542); Tue, 26 Nov 2024 10:37:05 +0000 Received: (at 74542) by debbugs.gnu.org; 26 Nov 2024 10:36:47 +0000 Received: from localhost ([127.0.0.1]:46208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFsw3-0002cn-1R for submit@debbugs.gnu.org; Tue, 26 Nov 2024 05:36:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFsvp-0002as-9B for 74542@debbugs.gnu.org; Tue, 26 Nov 2024 05:36:35 -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 1tFste-00007E-Km; Tue, 26 Nov 2024 05:34:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=s3NlCK5g4EoLnXqtNocOLhHNwSIxIbo8INXA2YVICF4=; b=X89Gu1MjG/saIzuIZUf9 DdfF2susgi0GDgiRaOuoukxIkn8GRA/03wpLasld/2DGpqFkqv7ZdB8FKlCDtEKQ6MLnmv+HtXlws ALg1cgZ6Hk1rCda0Wpbr5iB/NqQp3+EooyG4vFVKDdq6b+kRUawpZOpgW3Sm0eMtAVkzzvyn0ZbNB CABGoWUumtluSNma4wqcCJbkGoS4WFGnNjlf+fY3S+Nri05JglzUNzFQspmbnekC450wmXkY5iwHh bWFCDf19tP5Y1Ufe8H3HrDdDo8LW2gmLLrMNnhaB8VoONeyCjkg71Y0rOZewPKcuIO0cMmUjgjpxY GenRwFXTJ/sqLw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 26 Nov 2024 11:33:47 +0100 Message-ID: <3459c668f8e6ee0b195f4e1ec8eb437dd3c1ec6c.1732615193.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.84 X-Spam-Score: -0.84 X-Migadu-Queue-Id: E6B511897F X-Migadu-Scanner: mx12.migadu.com X-TUID: fGTNVhorttXa Since ftp://ftp.gnupg.org no longer exists, another updater should be used for packages with code fetched from mirror://gnupg. * guix/gnu-maintenance.scm (gnupg-hosted?): New procedure. (%gnu-ftp-updater): Exclude packages that match ‘gnupg-hosted?’. * guix/download.scm (%mirrors): Remove ftp://ftp.gnupg.org. Change-Id: I653877ad843da60281d3a234acc85743bee64856 --- guix/download.scm | 3 +-- guix/gnu-maintenance.scm | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/guix/download.scm b/guix/download.scm index e37c2195ee..d88ad0ee44 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -78,8 +78,7 @@ (define %mirrors "ftp://mirrors.dotsrc.org/gcrypt/" "ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/" "ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/" - "ftp://ftp.ring.gr.jp/pub/net/gnupg/" - "ftp://ftp.gnupg.org/gcrypt/") + "ftp://ftp.ring.gr.jp/pub/net/gnupg/") (gnome "https://download.gnome.org/" "http://ftp.gnome.org/pub/GNOME/") diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 866b960a4a..b612b11c00 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -1025,15 +1025,19 @@ (define %gnu-updater (false-if-networking-error (gnu-hosted? package)))) (import import-gnu-release))) +(define gnupg-hosted? + (url-prefix-predicate "mirror://gnupg/")) + (define %gnu-ftp-updater ;; This is for GNU packages taken from alternate locations, such as - ;; alpha.gnu.org, ftp.gnupg.org, etc. It is obsolescent. + ;; alpha.gnu.org (ftp.gnupg.org is no longer available). It is obsolescent. (upstream-updater (name 'gnu-ftp) (description "Updater for GNU packages only available via FTP") (pred (lambda (package) (false-if-networking-error (and (not (gnu-hosted? package)) + (not (gnupg-hosted? package)) (pure-gnu-package? package))))) (import import-release*))) -- 2.46.0