mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
python3: upgrade 3.10.4 -> 3.10.7
Security and bug fixes. Drop patch for gh-92036 which was merged in 3.10.5 Refresh 0017-setup.py-do-not-report-missing-dependencies-for-disa.pathc Fixes: * CVE-2020-10735 https://nvd.nist.gov/vuln/detail/CVE-2020-10735 * CVE-2021-28861 https://nvd.nist.gov/vuln/detail/CVE-2021-28861 * CVE-2018-25032 https://nvd.nist.gov/vuln/detail/CVE-2018-25032 For a list of changes see: https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-7-final https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-6-final https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-6-final (From OE-Core rev: 3efae85283b19fa1b30af7fed7fa89d7a50337db) 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
committed by
Richard Purdie
Richard Purdie
parent
855084fcbb
commit
6a3c365332
@@ -1,54 +0,0 @@
|
||||
From 178a238f25ab8aff7689d7a09d66dc1583ecd6cb Mon Sep 17 00:00:00 2001
|
||||
From: "Miss Islington (bot)"
|
||||
<31488909+miss-islington@users.noreply.github.com>
|
||||
Date: Wed, 4 May 2022 03:23:29 -0700
|
||||
Subject: [PATCH 01/40] gh-92036: Fix gc_fini_untrack() (GH-92037)
|
||||
|
||||
Fix a crash in subinterpreters related to the garbage collector. When
|
||||
a subinterpreter is deleted, untrack all objects tracked by its GC.
|
||||
To prevent a crash in deallocator functions expecting objects to be
|
||||
tracked by the GC, leak a strong reference to these objects on
|
||||
purpose, so they are never deleted and their deallocator functions
|
||||
are not called.
|
||||
(cherry picked from commit 14243369b5f80613628a565c224bba7fb3fcacd8)
|
||||
|
||||
Co-authored-by: Victor Stinner <vstinner@python.org>
|
||||
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
.../2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst | 5 +++++
|
||||
Modules/gcmodule.c | 6 ++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst
|
||||
|
||||
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst b/Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst
|
||||
new file mode 100644
|
||||
index 0000000000..78094c5e4f
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst
|
||||
@@ -0,0 +1,5 @@
|
||||
+Fix a crash in subinterpreters related to the garbage collector. When a
|
||||
+subinterpreter is deleted, untrack all objects tracked by its GC. To prevent a
|
||||
+crash in deallocator functions expecting objects to be tracked by the GC, leak
|
||||
+a strong reference to these objects on purpose, so they are never deleted and
|
||||
+their deallocator functions are not called. Patch by Victor Stinner.
|
||||
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
|
||||
index 805a159d53..43ae6fa98b 100644
|
||||
--- a/Modules/gcmodule.c
|
||||
+++ b/Modules/gcmodule.c
|
||||
@@ -2170,6 +2170,12 @@ gc_fini_untrack(PyGC_Head *list)
|
||||
for (gc = GC_NEXT(list); gc != list; gc = GC_NEXT(list)) {
|
||||
PyObject *op = FROM_GC(gc);
|
||||
_PyObject_GC_UNTRACK(op);
|
||||
+ // gh-92036: If a deallocator function expect the object to be tracked
|
||||
+ // by the GC (ex: func_dealloc()), it can crash if called on an object
|
||||
+ // which is no longer tracked by the GC. Leak one strong reference on
|
||||
+ // purpose so the object is never deleted and its deallocator is not
|
||||
+ // called.
|
||||
+ Py_INCREF(op);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -12,16 +12,18 @@ Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
|
||||
Refresh for 3.10.7:
|
||||
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
|
||||
|
||||
---
|
||||
setup.py | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 2be4738..62f0e18 100644
|
||||
index 85a2b26357..7605347bf5 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -517,6 +517,14 @@ class PyBuildExt(build_ext):
|
||||
@@ -517,6 +517,14 @@ def print_three_column(lst):
|
||||
print("%-*s %-*s %-*s" % (longest, e, longest, f,
|
||||
longest, g))
|
||||
|
||||
@@ -35,4 +37,4 @@ index 2be4738..62f0e18 100644
|
||||
+
|
||||
if self.missing:
|
||||
print()
|
||||
print("Python build finished successfully!")
|
||||
print("The necessary bits to build these optional modules were not "
|
||||
|
||||
@@ -35,7 +35,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
||||
file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \
|
||||
file://deterministic_imports.patch \
|
||||
file://0001-Avoid-shebang-overflow-on-python-config.py.patch \
|
||||
file://0001-gh-92036-Fix-gc_fini_untrack-GH-92037.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " \
|
||||
@@ -44,7 +43,7 @@ SRC_URI:append:class-native = " \
|
||||
file://12-distutils-prefix-is-inside-staging-area.patch \
|
||||
file://0001-Don-t-search-system-for-headers-libraries.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19"
|
||||
SRC_URI[sha256sum] = "6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48"
|
||||
|
||||
# exclude pre-releases for both python 2.x and 3.x
|
||||
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
||||
Reference in New Issue
Block a user