From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 ABhmGKSMSWcNnQAA62LTzQ:P1 (envelope-from ) for ; Fri, 29 Nov 2024 09:43:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id ABhmGKSMSWcNnQAA62LTzQ (envelope-from ) for ; Fri, 29 Nov 2024 10:43:00 +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=tnTSc1Fg; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ZECs73Tm; 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" 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 1503286668 for ; Fri, 29 Nov 2024 10:43:00 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGxWM-0000qU-UT; Fri, 29 Nov 2024 04:42:43 -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 1tGxVo-0000ff-HT for guix-patches@gnu.org; Fri, 29 Nov 2024 04:42: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 1tGxVo-0004Zv-5r; Fri, 29 Nov 2024 04:42: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=tnTSc1FgG6Fx4xxm2WdBZLIqUvd1ql9ZR5B1e6ffoowsb9kgecR3kAlnIw2dKAEXWGXPLv9DiekIvC2m21Wolvoj/Ev+eNVe/+ywrVDdiT+7TrVK3yw8GZQvLZr2yGOCcAXO9ZzPyiku8RukpooHl6RkaAMzDCfNPcW7a+L2mDRGDF6Y3tO+l9lNGf24ikCLRJ4ShSdCYhXdgmarAy543Mkdv9u7SlyAcsReaPrC7UNVpe3YaECNb2o0kKSyvfYrh92UFw5Um3CfkVvnahrpyKL+ZJpt3YZcjl81ZWQkgV2F/xkAXxiIek3SdLLSe0DNjNQJwYt8ngQkdYuGzIrQZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGxVm-0005xA-9t; Fri, 29 Nov 2024 04:42:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74542] [PATCH v2 08/16] 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: Fri, 29 Nov 2024 09:42:06 +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 =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74542-submit@debbugs.gnu.org id=B74542.173287328522696 (code B ref 74542); Fri, 29 Nov 2024 09:42:06 +0000 Received: (at 74542) by debbugs.gnu.org; 29 Nov 2024 09:41:25 +0000 Received: from localhost ([127.0.0.1]:41067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGxV6-0005tt-Fr for submit@debbugs.gnu.org; Fri, 29 Nov 2024 04:41:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGxUk-0005qb-Kh for 74542@debbugs.gnu.org; Fri, 29 Nov 2024 04:41:04 -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 1tGxUe-0003p9-Lm; Fri, 29 Nov 2024 04:40:57 -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=ZECs73Tm8qSsSWgbqG3Q HBDbf0lVe+yFXbs21kpHEI8YH790I/+CAPFdHgnhhzIJPHkAV6YGdyPzu+dbNsA8kxbiKlfWT1LQr ivVtWZVkiXXLwW4MPEnVNY+WqLzq5Lp0wXvZSRAh6vlTqa8D5lthNizsWump4acynJF5jZJyv8cJH mum4P6PK7nW0xuFfGmdb+QnpObJmnxNnrGFGDIElibgTWexB/I9zyxOguUuL3aDh5ZV2ZkRMoeFPE vJp3dhnY9b6NmddfPsuT3MN9/RJmDLmGTFF16RIcfFOQyHq50IYAd5ThqGV8zUr9WbQ3WKYuR+ScV UQiSfctbhRDtPQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 29 Nov 2024 10:40:11 +0100 Message-ID: <226f0e915e1aab981ca6ffabe0216a564531fba0.1732872499.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: 2.16 X-Spam-Score: 2.16 X-Migadu-Queue-Id: 1503286668 X-Migadu-Scanner: mx12.migadu.com X-TUID: cqLrn/N8fRVw 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