From be7dcc4467efeaa2f3e82fc46f90ea44fb67b67f Mon Sep 17 00:00:00 2001 From: Zoran Simic Date: Wed, 13 Aug 2025 10:41:15 +0200 Subject: [PATCH 1/2] Use gnu ftp mirror url --- retired/toolchain.py | 4 ++-- src/portable_python/external/xcpython.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/retired/toolchain.py b/retired/toolchain.py index ed7a981..4872cb9 100644 --- a/retired/toolchain.py +++ b/retired/toolchain.py @@ -6,7 +6,7 @@ class Autoconf(ModuleBuilder): @property def url(self): - return f"https://ftp.gnu.org/gnu/autoconf/autoconf-{self.version}.tar.xz" + return f"https://ftpmirror.gnu.org/gnu/autoconf/autoconf-{self.version}.tar.xz" @property def version(self): @@ -23,7 +23,7 @@ class Automake(ModuleBuilder): @property def url(self): - return f"https://ftp.gnu.org/gnu/automake/automake-{self.version}.tar.xz" + return f"https://ftpmirror.gnu.org/gnu/automake/automake-{self.version}.tar.xz" @property def version(self): diff --git a/src/portable_python/external/xcpython.py b/src/portable_python/external/xcpython.py index 5bbf391..b6e2334 100644 --- a/src/portable_python/external/xcpython.py +++ b/src/portable_python/external/xcpython.py @@ -80,7 +80,7 @@ class Gdbm(ModuleBuilder): @property def url(self): - return self.cfg_url(self.version) or f"https://ftp.gnu.org/gnu/gdbm/gdbm-{self.version}.tar.gz" + return self.cfg_url(self.version) or f"https://ftpmirror.gnu.org/gnu/gdbm/gdbm-{self.version}.tar.gz" @property def version(self): @@ -258,7 +258,7 @@ def candidate_modules(cls): @property def url(self): - return self.cfg_url(self.version) or f"https://ftp.gnu.org/gnu/readline/readline-{self.version}.tar.gz" + return self.cfg_url(self.version) or f"http://ftpmirror.gnu.org/gnu/readline/readline-{self.version}.tar.gz" @property def version(self): From cfd1362b169b3ccddaad97f1383457fb3369a731 Mon Sep 17 00:00:00 2001 From: Zoran Simic Date: Wed, 13 Aug 2025 10:57:29 +0200 Subject: [PATCH 2/2] Bumped component versions --- src/portable_python/external/xcpython.py | 10 +++++----- tests/test_failed.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/portable_python/external/xcpython.py b/src/portable_python/external/xcpython.py index b6e2334..d2011ae 100644 --- a/src/portable_python/external/xcpython.py +++ b/src/portable_python/external/xcpython.py @@ -84,7 +84,7 @@ def url(self): @property def version(self): - return self.cfg_version("1.24") + return self.cfg_version("1.26") def c_configure_args(self): if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir): @@ -129,7 +129,7 @@ def url(self): @property def version(self): - return self.cfg_version("3.4.6") + return self.cfg_version("3.4.8") def c_configure_args(self): if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir): @@ -176,7 +176,7 @@ def url(self): def version(self): # See https://endoflife.date/openssl # This default here picks the most conservative longest supported version - return self.cfg_version("3.0.15") + return self.cfg_version("3.0.17") def c_configure_args(self): if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir): @@ -306,7 +306,7 @@ def url(self): @property def version(self): - return self.cfg_version("3.47.0") + return self.cfg_version("3.50.4") def c_configure_args(self): if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir): @@ -373,7 +373,7 @@ def url(self): @property def version(self): - return self.cfg_version("5.6.3") + return self.cfg_version("5.8.1") def c_configure_args(self): if config_args := self.cfg_configure(self.deps_lib_dir, self.deps_lib64_dir): diff --git a/tests/test_failed.py b/tests/test_failed.py index edcb443..80572cd 100644 --- a/tests/test_failed.py +++ b/tests/test_failed.py @@ -7,7 +7,7 @@ def test_build_bogus_platform(cli): def test_failed_build(cli): cli.run("-tmacos-arm64", "build", "3.12.0") assert cli.failed - assert "Error while compiling xz:5.6.3: ForbiddenHttpError" in cli.logged + assert "Error while compiling xz:5.8.1: ForbiddenHttpError" in cli.logged assert "Overall compilation failed:" in cli.logged