From 33d0a7adca62d7190093eb0e13c1630bbe162ce4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 10 Oct 2022 15:39:46 +0200 Subject: [PATCH] python3: update to 3.10.7 * fixes CVE-2021-28861 * adjust pip and setuptools versions * refresh patches Signed-off-by: Michal Vasilek (cherry picked from commit e9ddc479f9a77b9d173081bbc57cd805b24942d8) --- lang/python/python3-version.mk | 6 +++--- lang/python/python3/Makefile | 2 +- .../python3/patches/004-do-not-write-bytes-codes.patch | 2 +- ...06-do-not-add-multiarch-paths-when-cross-compiling.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index fe4654726..d8e72df19 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:=10 -PYTHON3_VERSION_MICRO:=5 +PYTHON3_VERSION_MICRO:=7 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) PYTHON3_SETUPTOOLS_PKG_RELEASE:=1 PYTHON3_PIP_PKG_RELEASE:=1 -PYTHON3_SETUPTOOLS_VERSION:=58.1.0 -PYTHON3_PIP_VERSION:=22.0.4 +PYTHON3_SETUPTOOLS_VERSION:=63.2.0 +PYTHON3_PIP_VERSION:=22.2.2 diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 7fbc84aa1..62a7d2a71 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -16,7 +16,7 @@ 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:=8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486 +PKG_HASH:=6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=PSF-2.0 diff --git a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch index c012d0cb4..40b4e5b0c 100644 --- a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch +++ b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch @@ -1,6 +1,6 @@ --- a/Python/initconfig.c +++ b/Python/initconfig.c -@@ -154,7 +154,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo +@@ -163,7 +163,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */ int Py_FrozenFlag = 0; /* Needed by getpath.c */ int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */ diff --git a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch index 18ec0de72..a2bb0fba0 100644 --- a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch +++ b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -832,7 +832,8 @@ class PyBuildExt(build_ext): +@@ -831,7 +831,8 @@ class PyBuildExt(build_ext): # only change this for cross builds for 3.3, issues on Mageia if CROSS_COMPILING: self.add_cross_compiling_paths()