From 0a77ed9bc399df525285fb505fd185bfde4ce2cd Mon Sep 17 00:00:00 2001 From: "Paul C. Martin" Date: Thu, 12 Dec 2024 19:49:24 -0500 Subject: [PATCH 1/2] Fix ZLIB Download This resolves the zlib download error saltstack/relenv#142 1.2.13 does not exist on zlib.net or sourceforge, but it does exist on github. --- relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config | 2 +- relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config | 2 +- relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config | 2 +- relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config b/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config index 75b137b0..3b53cff5 100644 --- a/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config @@ -759,7 +759,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config b/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config index 3e30aa32..b840084d 100644 --- a/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config @@ -761,7 +761,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config b/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config index 2396e670..34e77830 100644 --- a/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config @@ -760,7 +760,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config b/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config index 80b64b69..378efd28 100644 --- a/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config @@ -762,7 +762,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" From 809e2d19e39b23e31532491502ba4e7bf2d14330 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 28 Feb 2025 03:03:56 -0700 Subject: [PATCH 2/2] keep backup mirrors --- relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config | 2 +- relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config | 2 +- relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config | 2 +- relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config b/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config index 3b53cff5..ffd43142 100644 --- a/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/aarch64/aarch64-linux-gnu-ct-ng.config @@ -759,7 +759,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/ https://www.zlib.net/ https://www.zlib.net/fossils/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config b/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config index b840084d..4f51dbc5 100644 --- a/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/aarch64/x86_64-linux-gnu-ct-ng.config @@ -761,7 +761,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/ https://www.zlib.net/ https://www.zlib.net/fossils/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config b/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config index 34e77830..5396025d 100644 --- a/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/x86_64/aarch64-linux-gnu-ct-ng.config @@ -760,7 +760,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/ https://www.zlib.net/ https://www.zlib.net/fossils/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" diff --git a/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config b/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config index 378efd28..98e9b281 100644 --- a/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config +++ b/relenv/_toolchain/x86_64/x86_64-linux-gnu-ct-ng.config @@ -762,7 +762,7 @@ CT_ZLIB_SRC_RELEASE=y CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_V_1_2_12=y CT_ZLIB_VERSION="1.2.13" -CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/" +CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION}/ https://www.zlib.net/ https://www.zlib.net/fossils/" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"