From 900fff77cd718fe2d55f52d26816a234f9b80156 Mon Sep 17 00:00:00 2001 From: Robert Maaskant Date: Mon, 14 Apr 2025 12:26:30 +0200 Subject: [PATCH] Use gnu_mirror_path for GNU packages (#50034) --- var/spack/repos/builtin/packages/acct/package.py | 4 ++-- var/spack/repos/builtin/packages/freeipmi/package.py | 4 ++-- var/spack/repos/builtin/packages/gprofng-gui/package.py | 4 ++-- var/spack/repos/builtin/packages/grep/package.py | 4 ++-- var/spack/repos/builtin/packages/gzip/package.py | 4 ++-- var/spack/repos/builtin/packages/libmicrohttpd/package.py | 4 ++-- var/spack/repos/builtin/packages/libtasn1/package.py | 4 ++-- var/spack/repos/builtin/packages/termcap/package.py | 4 ++-- var/spack/repos/builtin/packages/which/package.py | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/var/spack/repos/builtin/packages/acct/package.py b/var/spack/repos/builtin/packages/acct/package.py index 2eb3775142c..4b63ee9ffcd 100644 --- a/var/spack/repos/builtin/packages/acct/package.py +++ b/var/spack/repos/builtin/packages/acct/package.py @@ -5,11 +5,11 @@ from spack.package import * -class Acct(AutotoolsPackage): +class Acct(AutotoolsPackage, GNUMirrorPackage): """Utilities for monitoring process activities.""" homepage = "https://www.gnu.org/software/acct" - url = "https://ftp.gnu.org/gnu/acct/acct-6.6.4.tar.gz" + gnu_mirror_path = "acct/acct-6.6.4.tar.gz" license("GPL-3.0-or-later") diff --git a/var/spack/repos/builtin/packages/freeipmi/package.py b/var/spack/repos/builtin/packages/freeipmi/package.py index 7e06cd54c5d..72309168dd9 100644 --- a/var/spack/repos/builtin/packages/freeipmi/package.py +++ b/var/spack/repos/builtin/packages/freeipmi/package.py @@ -6,7 +6,7 @@ from spack.package import * -class Freeipmi(AutotoolsPackage): +class Freeipmi(AutotoolsPackage, GNUMirrorPackage): """FreeIPMI provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification. The IPMI specification defines a set of interfaces for platform management and is implemented by a number vendors for system @@ -19,7 +19,7 @@ class Freeipmi(AutotoolsPackage): info.""" homepage = "https://www.gnu.org/software/freeipmi/" - url = "https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.4.tar.gz" + gnu_mirror_path = "freeipmi/freeipmi-1.6.4.tar.gz" license("GPL-3.0-or-later") diff --git a/var/spack/repos/builtin/packages/gprofng-gui/package.py b/var/spack/repos/builtin/packages/gprofng-gui/package.py index 27eb3ef0793..fbf84c18449 100644 --- a/var/spack/repos/builtin/packages/gprofng-gui/package.py +++ b/var/spack/repos/builtin/packages/gprofng-gui/package.py @@ -6,11 +6,11 @@ from spack.package import * -class GprofngGui(AutotoolsPackage): +class GprofngGui(AutotoolsPackage, GNUMirrorPackage): """A graphical environment to analyze the performance data generated by the gprofng""" homepage = "https://sourceware.org/binutils/wiki/gprofng" - url = "https://ftp.gnu.org/gnu/gprofng-gui/gprofng-gui-1.1.tar.gz" + gnu_mirror_path = "gprofng-gui/gprofng-gui-1.1.tar.gz" git = "https://git.savannah.gnu.org/git/gprofng-gui.git" maintainers("pramodk") diff --git a/var/spack/repos/builtin/packages/grep/package.py b/var/spack/repos/builtin/packages/grep/package.py index 8129f7c331a..150b78e0310 100644 --- a/var/spack/repos/builtin/packages/grep/package.py +++ b/var/spack/repos/builtin/packages/grep/package.py @@ -5,12 +5,12 @@ from spack.package import * -class Grep(AutotoolsPackage): +class Grep(AutotoolsPackage, GNUMirrorPackage): """Grep searches one or more input files for lines containing a match to a specified pattern""" homepage = "https://www.gnu.org/software/grep/" - url = "https://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz" + gnu_mirror_path = "grep/grep-3.3.tar.xz" license("GPL-3.0-or-later") diff --git a/var/spack/repos/builtin/packages/gzip/package.py b/var/spack/repos/builtin/packages/gzip/package.py index ab283c83933..ffd8cfa14cf 100644 --- a/var/spack/repos/builtin/packages/gzip/package.py +++ b/var/spack/repos/builtin/packages/gzip/package.py @@ -4,12 +4,12 @@ from spack.package import * -class Gzip(AutotoolsPackage): +class Gzip(AutotoolsPackage, GNUMirrorPackage): """GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU project.""" homepage = "https://www.gnu.org/software/gzip/" - url = "https://ftp.gnu.org/gnu/gzip/gzip-1.10.tar.gz" + gnu_mirror_path = "gzip/gzip-1.10.tar.gz" license("GPL-3.0-or-later") diff --git a/var/spack/repos/builtin/packages/libmicrohttpd/package.py b/var/spack/repos/builtin/packages/libmicrohttpd/package.py index 9c2e651ae88..acd8d977d9d 100644 --- a/var/spack/repos/builtin/packages/libmicrohttpd/package.py +++ b/var/spack/repos/builtin/packages/libmicrohttpd/package.py @@ -5,13 +5,13 @@ from spack.package import * -class Libmicrohttpd(AutotoolsPackage): +class Libmicrohttpd(AutotoolsPackage, GNUMirrorPackage): """GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. """ homepage = "https://www.gnu.org/software/libmicrohttpd/" - url = "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.71.tar.gz" + gnu_mirror_path = "libmicrohttpd/libmicrohttpd-0.9.71.tar.gz" maintainers("hainest") diff --git a/var/spack/repos/builtin/packages/libtasn1/package.py b/var/spack/repos/builtin/packages/libtasn1/package.py index 283b5089728..4ef4e854d2c 100644 --- a/var/spack/repos/builtin/packages/libtasn1/package.py +++ b/var/spack/repos/builtin/packages/libtasn1/package.py @@ -5,11 +5,11 @@ from spack.package import * -class Libtasn1(Package): +class Libtasn1(Package, GNUMirrorPackage): """ASN.1 structure parser library.""" homepage = "https://www.gnu.org/software/libtasn1/" - url = "https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.13.tar.gz" + gnu_mirror_path = "libtasn1/libtasn1-4.13.tar.gz" license("LGPL-2.1-or-later") diff --git a/var/spack/repos/builtin/packages/termcap/package.py b/var/spack/repos/builtin/packages/termcap/package.py index 5e4f36d4909..4b63d94df40 100644 --- a/var/spack/repos/builtin/packages/termcap/package.py +++ b/var/spack/repos/builtin/packages/termcap/package.py @@ -5,13 +5,13 @@ from spack.package import * -class Termcap(AutotoolsPackage): +class Termcap(AutotoolsPackage, GNUMirrorPackage): """This is the GNU termcap library, a library of C functions that enable programs to send control strings to terminals in a way independent of the terminal type.""" homepage = "https://www.gnu.org/software/termutils/manual/termcap-1.3/html_mono/termcap.html" - url = "https://ftp.gnu.org/gnu/termcap/termcap-1.3.1.tar.gz" + gnu_mirror_path = "termcap/termcap-1.3.1.tar.gz" license("GPL-2.0-or-later") diff --git a/var/spack/repos/builtin/packages/which/package.py b/var/spack/repos/builtin/packages/which/package.py index ffe807bbb36..b88178ca2d0 100644 --- a/var/spack/repos/builtin/packages/which/package.py +++ b/var/spack/repos/builtin/packages/which/package.py @@ -6,12 +6,12 @@ from spack.package import * -class Which(AutotoolsPackage): +class Which(AutotoolsPackage, GNUMirrorPackage): """GNU which - is a utility that is used to find which executable (or alias or shell function) is executed when entered on the shell prompt.""" homepage = "https://savannah.gnu.org/projects/which/" - url = "https://ftp.gnu.org/gnu/which/which-2.21.tar.gz" + gnu_mirror_path = "which/which-2.21.tar.gz" license("GPL-3.0")