mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 21:24:31 +04:00
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]b37e4a5f56[2] https://peps.python.org/pep-0632/ [3]88eb8cc66fSigned-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> (cherry picked from commitef509da52b)
This commit is contained in:
@@ -8,12 +8,12 @@
|
|||||||
# Note: keep in sync with setuptools & pip
|
# Note: keep in sync with setuptools & pip
|
||||||
PYTHON3_VERSION_MAJOR:=3
|
PYTHON3_VERSION_MAJOR:=3
|
||||||
PYTHON3_VERSION_MINOR:=11
|
PYTHON3_VERSION_MINOR:=11
|
||||||
PYTHON3_VERSION_MICRO:=13
|
PYTHON3_VERSION_MICRO:=14
|
||||||
|
|
||||||
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
|
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
|
||||||
|
|
||||||
PYTHON3_SETUPTOOLS_PKG_RELEASE:=2
|
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
|
||||||
PYTHON3_PIP_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
|
PYTHON3_PIP_VERSION:=24.0
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
|
|||||||
|
|
||||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
||||||
PKG_HASH:=8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a
|
PKG_HASH:=8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78
|
||||||
|
|
||||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||||
PKG_LICENSE:=Python-2.0.1 0BSD
|
PKG_LICENSE:=Python-2.0.1 0BSD
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
||||||
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 <thomas.petazzoni@free-electrons.com>
|
|
||||||
[adapt for setuptools, rename environment variable, use fixed lib path]
|
|
||||||
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
|
|
||||||
---
|
|
||||||
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('.')
|
|
||||||
Reference in New Issue
Block a user