08/16: gnu-maintenance: ‘gnu-ftp’ updater excludes GnuPG-hosted packages.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e85cce3431a0d04e9dedbabd4c24c451bb13001e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Nov 26 09:23:04 2024 +0100

    gnu-maintenance: ‘gnu-ftp’ updater excludes GnuPG-hosted packages.
    
    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 @@
        "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 @@ VERSION string to fetch a specific version."
            (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*)))