From ef509da52bd470a12e259b735fa5b1c052f49bc9 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 21 Oct 2025 23:30:19 +0200 Subject: [PATCH] python3: update to version 3.11.4 In this release, there is updated setuptools, so update it as well. Fixes CVEs: - CVE-2025-47273 - CVE-2024-6345 Release notes: https://pythoninsider.blogspot.com/2025/10/python-31212-31114-31019-and-3924-are.html Patch: - 0001-Adjust-library-header-paths-for-cross-compilation.patch comes from buildroot [1], but they removed it as they switched to Python 3.12, however Python 3.11 still supports distutils, but it is marked as deprecated [2] and it will be gone in 3.12. So, don't rebase it this time as this patch does not apply anymore due to this commit [3] and sooner switch to more up-to-date Python3 version. [1] https://redirect.github.com/buildroot/buildroot/commit/b37e4a5f56182c5b8e4ffce433eb652174a19da6 [2] https://peps.python.org/pep-0632/ [3] https://redirect.github.com/pypa/setuptools/commit/88eb8cc66f8762e37ec78913c07ccf3e3dba05e1 Signed-off-by: Josef Schlehofer --- lang/python/python3-version.mk | 6 +-- lang/python/python3/Makefile | 4 +- .../python3/patches-host-setuptools/.gitkeep | 0 ...y-header-paths-for-cross-compilation.patch | 38 ------------------- 4 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 lang/python/python3/patches-host-setuptools/.gitkeep delete mode 100644 lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 4cc337ada2..7f7eddc39a 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -8,12 +8,12 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=11 -PYTHON3_VERSION_MICRO:=13 +PYTHON3_VERSION_MICRO:=14 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) -PYTHON3_SETUPTOOLS_PKG_RELEASE:=2 +PYTHON3_SETUPTOOLS_PKG_RELEASE:=1 PYTHON3_PIP_PKG_RELEASE:=1 -PYTHON3_SETUPTOOLS_VERSION:=65.5.0 +PYTHON3_SETUPTOOLS_VERSION:=79.0.1 PYTHON3_PIP_VERSION:=24.0 diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index b81bb337c8..4e582710b2 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -PKG_HASH:=8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a +PKG_HASH:=8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=Python-2.0.1 0BSD diff --git a/lang/python/python3/patches-host-setuptools/.gitkeep b/lang/python/python3/patches-host-setuptools/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch b/lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch deleted file mode 100644 index 06dbb4318c..0000000000 --- a/lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:33:14 +0100 -Subject: [PATCH] Adjust library/header paths for cross-compilation - -When cross-compiling third-party extensions, the get_python_inc() or -get_python_lib() can be called, to return the path to headers or -libraries. However, they use the sys.prefix of the host Python, which -returns incorrect paths when cross-compiling (paths pointing to host -headers and libraries). - -In order to fix this, we introduce the _python_sysroot, _python_prefix -and _python_exec_prefix variables, that allow to override these -values, and get correct header/library paths when cross-compiling -third-party Python modules. - -Signed-off-by: Thomas Petazzoni -[adapt for setuptools, rename environment variable, use fixed lib path] -Signed-off-by: Jeffery To ---- - Lib/distutils/command/build_ext.py | 5 ++++- - Lib/sysconfig.py | 15 +++++++++++---- - 2 files changed, 15 insertions(+), 5 deletions(-) - ---- a/setuptools/_distutils/command/build_ext.py -+++ b/setuptools/_distutils/command/build_ext.py -@@ -238,7 +238,10 @@ class build_ext(Command): - if sysconfig.get_config_var('Py_ENABLE_SHARED'): - if not sysconfig.python_build: - # building third party extensions -- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if 'STAGING_DIR' in os.environ: -+ libdir = os.environ.get('STAGING_DIR') + '/usr/lib' -+ self.library_dirs.append(libdir) - else: - # building python standard extensions - self.library_dirs.append('.') -- 2.30.2