mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
python3: upgrade 3.12.9 -> 3.12.11
Drop upstreamed patch and refresh remaining patches. * https://www.python.org/downloads/release/python-31210/ Python 3.12.10 is the latest maintenance release of Python 3.12, and the last full maintenance release. Subsequent releases of 3.12 will be security-fixes only. * https://www.python.org/downloads/release/python-31211/ Security content in this release * gh-135034: [CVE 2024-12718] [CVE 2025-4138] [CVE 2025-4330] [CVE 2025-4435] [CVE 2025-4517] Fixes multiple issues that allowed tarfile extraction filters (filter="data" and filter="tar") to be bypassed using crafted symlinks and hard links. * gh-133767: Fix use-after-free in the “unicode-escape” decoder with a non-“strict” error handler. * gh-128840: Short-circuit the processing of long IPv6 addresses early in ipaddress to prevent excessive memory consumption and a minor denial-of-service. gh-133767 got meawhile CVE-2025-4516 assigned. (From OE-Core rev: 6cca08b2857efd5481e837ecd6bb295cb8a99ee1) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Peter Marko
Steve Sakoman
parent
82e8f8c2e0
commit
c4f82e3fd5
|
|
@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|||
index 2d235d2..1ac2263 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2355,6 +2355,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@@ -2356,6 +2356,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@ # Substitution happens here, as the completely-expanded BINDIR
|
||||
@ # is not available in configure
|
||||
sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
|||
index 6258b68..d59ec6e 100644
|
||||
--- a/Lib/sysconfig.py
|
||||
+++ b/Lib/sysconfig.py
|
||||
@@ -668,6 +668,11 @@ def _init_config_vars():
|
||||
@@ -675,6 +675,11 @@ def _init_config_vars():
|
||||
_CONFIG_VARS['VPATH'] = sys._vpath
|
||||
if os.name == 'posix':
|
||||
_init_posix(_CONFIG_VARS)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.
|
|||
index 3b4415b..1f94dec 100644
|
||||
--- a/Lib/test/_test_multiprocessing.py
|
||||
+++ b/Lib/test/_test_multiprocessing.py
|
||||
@@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase):
|
||||
@@ -692,6 +692,7 @@ class _TestProcess(BaseTestCase):
|
||||
close_queue(q)
|
||||
|
||||
@support.requires_resource('walltime')
|
||||
|
|
@ -34,7 +34,7 @@ index 3b4415b..1f94dec 100644
|
|||
def test_many_processes(self):
|
||||
if self.TYPE == 'threads':
|
||||
self.skipTest('test not appropriate for {}'.format(self.TYPE))
|
||||
@@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase):
|
||||
@@ -2223,6 +2224,7 @@ class _TestBarrier(BaseTestCase):
|
||||
except threading.BrokenBarrierError:
|
||||
results.append(True)
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ index 3b4415b..1f94dec 100644
|
|||
def test_timeout(self):
|
||||
"""
|
||||
Test wait(timeout)
|
||||
@@ -5208,6 +5210,7 @@ class TestWait(unittest.TestCase):
|
||||
@@ -5220,6 +5222,7 @@ class TestWait(unittest.TestCase):
|
||||
time.sleep(period)
|
||||
|
||||
@support.requires_resource('walltime')
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
From 2e2a0c8593a38f2020cc2baeeaa7972eb86773f9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Marko <peter.marko@siemens.com>
|
||||
Date: Sat, 8 Feb 2025 23:57:17 +0100
|
||||
Subject: [PATCH] ctypes: correct gcc check in test
|
||||
|
||||
In case gcc is not available, it will throw exception and test fails.
|
||||
So chatch the exception to skip the test correctly.
|
||||
|
||||
======================================================================
|
||||
ERROR: test_null_dlsym (test.test_ctypes.test_dlerror.TestNullDlsym.test_null_dlsym)
|
||||
----------------------------------------------------------------------
|
||||
Traceback (most recent call last):
|
||||
File "/usr/lib/python3.12/test/test_ctypes/test_dlerror.py", line 61, in test_null_dlsym
|
||||
retcode = subprocess.call(["gcc", "--version"],
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
File "/usr/lib/python3.12/subprocess.py", line 391, in call
|
||||
with Popen(*popenargs, **kwargs) as p:
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
File "/usr/lib/python3.12/subprocess.py", line 1028, in __init__
|
||||
self._execute_child(args, executable, preexec_fn, close_fds,
|
||||
File "/usr/lib/python3.12/subprocess.py", line 1963, in _execute_child
|
||||
raise child_exception_type(errno_num, err_msg, err_filename)
|
||||
FileNotFoundError: [Errno 2] No such file or directory: 'gcc'
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/python/cpython/pull/129872]
|
||||
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
||||
---
|
||||
Lib/test/test_ctypes/test_dlerror.py | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Lib/test/test_ctypes/test_dlerror.py b/Lib/test/test_ctypes/test_dlerror.py
|
||||
index 6bf492399cb..56eb7622b4d 100644
|
||||
--- a/Lib/test/test_ctypes/test_dlerror.py
|
||||
+++ b/Lib/test/test_ctypes/test_dlerror.py
|
||||
@@ -58,11 +58,14 @@ def test_null_dlsym(self):
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
- retcode = subprocess.call(["gcc", "--version"],
|
||||
- stdout=subprocess.DEVNULL,
|
||||
- stderr=subprocess.DEVNULL)
|
||||
- if retcode != 0:
|
||||
+ try:
|
||||
+ retcode = subprocess.call(["gcc", "--version"],
|
||||
+ stdout=subprocess.DEVNULL,
|
||||
+ stderr=subprocess.DEVNULL)
|
||||
+ except:
|
||||
self.skipTest("gcc is missing")
|
||||
+ if retcode != 0:
|
||||
+ self.skipTest("gcc is not working")
|
||||
|
||||
pipe_r, pipe_w = os.pipe()
|
||||
self.addCleanup(os.close, pipe_r)
|
||||
|
|
@ -16,7 +16,7 @@ diff --git a/Lib/tarfile.py b/Lib/tarfile.py
|
|||
index 0a0f31e..4dfb67d 100755
|
||||
--- a/Lib/tarfile.py
|
||||
+++ b/Lib/tarfile.py
|
||||
@@ -2590,7 +2590,8 @@ class TarFile(object):
|
||||
@@ -2685,7 +2685,8 @@ class TarFile(object):
|
||||
os.lchown(targetpath, u, g)
|
||||
else:
|
||||
os.chown(targetpath, u, g)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
|
|||
index c71c568..e41ab5e 100644
|
||||
--- a/Lib/test/test_builtin.py
|
||||
+++ b/Lib/test/test_builtin.py
|
||||
@@ -2352,6 +2352,7 @@ class PtyTests(unittest.TestCase):
|
||||
@@ -2375,6 +2375,7 @@ class PtyTests(unittest.TestCase):
|
||||
# Check stdin/stdout error handler is used when invoking PyOS_Readline()
|
||||
self.check_input_tty("prompté", b"quux\xe9", "ascii")
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
|
|||
index 4c4a449..b8c79a4 100644
|
||||
--- a/Lib/test/test_ftplib.py
|
||||
+++ b/Lib/test/test_ftplib.py
|
||||
@@ -626,6 +626,7 @@ class TestFTPClass(TestCase):
|
||||
@@ -629,6 +629,7 @@ class TestFTPClass(TestCase):
|
||||
self.client.storbinary('stor', f, rest=r)
|
||||
self.assertEqual(self.server.handler_instance.rest, str(r))
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|||
index dce36a5..2d235d2 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2266,7 +2266,7 @@ COMPILEALL_OPTS=-j0
|
||||
@@ -2267,7 +2267,7 @@ COMPILEALL_OPTS=-j0
|
||||
TEST_MODULES=@TEST_MODULES@
|
||||
|
||||
.PHONY: libinstall
|
||||
|
|
|
|||
|
|
@ -34,14 +34,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
|||
file://0001-test_deadlock-skip-problematic-test.patch \
|
||||
file://0001-test_active_children-skip-problematic-test.patch \
|
||||
file://0001-test_readline-skip-limited-history-test.patch \
|
||||
file://0001-ctypes-correct-gcc-check-in-test.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " \
|
||||
file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "7220835d9f90b37c006e9842a8dff4580aaca4318674f947302b8d28f3f81112"
|
||||
SRC_URI[sha256sum] = "c30bb24b7f1e9a19b11b55a546434f74e739bb4c271a3e3a80ff4380d49f7adb"
|
||||
|
||||
# exclude pre-releases for both python 2.x and 3.x
|
||||
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
||||
Loading…
Reference in New Issue
Block a user