From 86e9d938591dee399ecca2e0ceba39f1f3934b04 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 19 Jan 2021 02:54:25 -0600 Subject: [PATCH] libidn2:use http for download (#21001) This is needed since libidn is used to bootstrap curl --- var/spack/repos/builtin/packages/berkeley-db/package.py | 1 + var/spack/repos/builtin/packages/libidn2/package.py | 5 +++-- var/spack/repos/builtin/packages/pkg-config/package.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/berkeley-db/package.py b/var/spack/repos/builtin/packages/berkeley-db/package.py index 04f74a0585..a9affe55e8 100644 --- a/var/spack/repos/builtin/packages/berkeley-db/package.py +++ b/var/spack/repos/builtin/packages/berkeley-db/package.py @@ -8,6 +8,7 @@ class BerkeleyDb(AutotoolsPackage): """Oracle Berkeley DB""" homepage = "https://www.oracle.com/database/technologies/related/berkeleydb.html" + # URL must remain http:// so Spack can bootstrap curl url = "http://download.oracle.com/berkeley-db/db-18.1.40.tar.gz" version("18.1.40", sha256="0cecb2ef0c67b166de93732769abdeba0555086d51de1090df325e18ee8da9c8") diff --git a/var/spack/repos/builtin/packages/libidn2/package.py b/var/spack/repos/builtin/packages/libidn2/package.py index 7b4c817233..240174719b 100644 --- a/var/spack/repos/builtin/packages/libidn2/package.py +++ b/var/spack/repos/builtin/packages/libidn2/package.py @@ -6,13 +6,14 @@ from spack import * -class Libidn2(AutotoolsPackage): +class Libidn2(AutotoolsPackage, GNUMirrorPackage): """Libidn2 is a free software implementation of IDNA2008, Punycode and TR46. Its purpose is to encode and decode internationalized domain names.""" homepage = "https://gitlab.com/libidn/libidn2" - url = "https://ftp.gnu.org/gnu/libidn/libidn2-2.0.5.tar.gz" + # URL must remain http:// so Spack can bootstrap curl + gnu_mirror_path = "libidn/libidn2-2.0.5.tar.gz" version('2.3.0', sha256='e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5') version('2.1.1a', sha256='57666bcf6ecf54230d7bac95c392379561954b57a673903aed4d3336b3048b72') diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index e0cf543555..89950cc7bd 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -11,6 +11,7 @@ class PkgConfig(AutotoolsPackage): and libraries""" homepage = "http://www.freedesktop.org/wiki/Software/pkg-config/" + # URL must remain http:// so Spack can bootstrap curl url = "http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz" version('0.29.2', sha256='6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591')