From b35fb7e8f90d37bc3dac9e0eeaf3faff14ce2655 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 22 Feb 2021 21:58:19 +0800 Subject: [PATCH] python3: Update to 3.9.2, refresh patches Includes fixes for: * CVE-2021-3177 - ctypes: Buffer overflow in PyCArg_repr * CVE-2021-23336 - urllib parse_qsl(): Web cache poisoning - semicolon as a query args separator Signed-off-by: Jeffery To (cherry picked from commit 6d9005d5ac63d5a3092577fdd4f085f00d1f5fdd) --- lang/python/python3-version.mk | 2 +- lang/python/python3/Makefile | 4 ++-- lang/python/python3/patches/016-adjust-config-paths.patch | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 73299ca983..a8b765ffbe 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -8,7 +8,7 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=9 -PYTHON3_VERSION_MICRO:=1 +PYTHON3_VERSION_MICRO:=2 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 241b84602b..a32674d770 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:=991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff +PKG_HASH:=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d PKG_MAINTAINER:=Alexandru Ardelean , Jeffery To PKG_LICENSE:=Python/2.0 diff --git a/lang/python/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch index 8215892857..04c6225c35 100644 --- a/lang/python/python3/patches/016-adjust-config-paths.patch +++ b/lang/python/python3/patches/016-adjust-config-paths.patch @@ -10,7 +10,7 @@ global _config_vars --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -342,6 +342,7 @@ def get_makefile_filename(): +@@ -352,6 +352,7 @@ def get_makefile_filename(): def _get_sysconfigdata_name(): @@ -49,7 +49,7 @@ fi elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 -@@ -15441,7 +15441,7 @@ fi +@@ -15435,7 +15435,7 @@ fi @@ -69,7 +69,7 @@ fi elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) -@@ -4833,7 +4833,7 @@ fi], +@@ -4828,7 +4828,7 @@ fi], dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) -- 2.30.2