1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00

python3: upgrade 3.8.12 -> 3.8.13

Security and bug fixes (including upgrades for security and bug fixes to
bundled components).

For changes see:
https://docs.python.org/release/3.8.13/whatsnew/changelog.html#python-3-8-13-final

CVE: CVE-2022-26488

License-Update: Add 2022 to copyright years

* Update bpo-36852 patch to apply after change in 3.8.13

(From OE-Core rev: bcad36b6d34b3176dc313ed6af99897cc442bf2b)

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling
2022-03-20 13:36:28 -07:00
committed by Richard Purdie
parent 95bdd2e6f8
commit c625f6524d
2 changed files with 26 additions and 22 deletions
@@ -14,17 +14,21 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
%% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch %% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
Updated to apply after dea270a2a80214de22afadaaca2043d0d782eb7d
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
--- ---
configure.ac | 175 +++++++-------------------------------------------- configure.ac | 175 +++++++--------------------------------------------
1 file changed, 21 insertions(+), 154 deletions(-) 1 file changed, 21 insertions(+), 154 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ede710e..bc81b0b 100644 index de83332dd3..16b02d0798 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -710,160 +710,27 @@ fi @@ -719,160 +719,27 @@ then
MULTIARCH=$($CC --print-multiarch 2>/dev/null) fi
AC_SUBST(MULTIARCH)
-AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
-cat >> conftest.c <<EOF -cat >> conftest.c <<EOF
@@ -185,25 +189,25 @@ index ede710e..bc81b0b 100644
+## Need to handle macos, vxworks and hurd special (?) :-/ +## Need to handle macos, vxworks and hurd special (?) :-/
+case ${target_os} in +case ${target_os} in
+ darwin*) + darwin*)
+ PLATFORM_TRIPLET=darwin + PLATFORM_TRIPLET=darwin
+ ;; + ;;
+ hurd*) + hurd*)
+ PLATFORM_TRIPLET=i386-gnu + PLATFORM_TRIPLET=i386-gnu
+ ;; + ;;
+ vxworks*) + vxworks*)
+ PLATFORM_TRIPLET=vxworks + PLATFORM_TRIPLET=vxworks
+ ;; + ;;
+ *) + *)
+ if test "${target_cpu}" != "i686"; then + if test "${target_cpu}" != "i686"; then
+ PLATFORM_TRIPLET=${target_cpu}-${target_os} + PLATFORM_TRIPLET=${target_cpu}-${target_os}
+ else + else
+ PLATFORM_TRIPLET=i386-${target_os} + PLATFORM_TRIPLET=i386-${target_os}
+ fi + fi
+ ;; + ;;
+esac +esac
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then if test x$PLATFORM_TRIPLET != xdarwin; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-- --
2.24.1 2.32.0
@@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly
LICENSE = "PSF-2.0 & BSD-0-Clause" LICENSE = "PSF-2.0 & BSD-0-Clause"
SECTION = "devel/python" SECTION = "devel/python"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c22d2438294c784731bf9dd224a467b7" LIC_FILES_CHKSUM = "file://LICENSE;md5=c84eccf626bb6fde43e6ea5e28d8feb5"
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://run-ptest \ file://run-ptest \
@@ -42,8 +42,8 @@ SRC_URI_append_class-native = " \
file://0001-Don-t-search-system-for-headers-libraries.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \
" "
SRC_URI[md5sum] = "9dd8f82e586b776383c82e27923f8795" SRC_URI[md5sum] = "c4b7100dcaace9d33ab1fda9a3a038d6"
SRC_URI[sha256sum] = "b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea" SRC_URI[sha256sum] = "6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57"
# exclude pre-releases for both python 2.x and 3.x # exclude pre-releases for both python 2.x and 3.x
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"