mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
python3: upgrade 3.13.1 -> 3.13.2
Release notes: https://docs.python.org/release/3.13.2/whatsnew/changelog.html#python-3-13-2 Solves CVE-2025-0938, CVE-2024-12254 and 3 other vulnerabilities without CVE number assigment. Remove patch which is included in new release. (From OE-Core rev: 4b91478d47db319af847a45b7d57bb7223da55f8) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0bf496f24b
commit
7013a9ed06
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 9ec3a71..f7d5382 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2606,6 +2606,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@@ -2578,6 +2578,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
|
||||
|
||||
@@ -34,7 +34,7 @@ diff --git a/Modules/_ssl.c b/Modules/_ssl.c
|
||||
index b6b5ebf094c..e5b8bf21002 100644
|
||||
--- a/Modules/_ssl.c
|
||||
+++ b/Modules/_ssl.c
|
||||
@@ -122,7 +122,7 @@ static void _PySSLFixErrno(void) {
|
||||
@@ -121,7 +121,7 @@ static void _PySSLFixErrno(void) {
|
||||
|
||||
/* Include generated data (error codes) */
|
||||
#if (OPENSSL_VERSION_NUMBER >= 0x30100000L)
|
||||
|
||||
@@ -17,7 +17,7 @@ diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
|
||||
index f8e1c7d..0882526 100644
|
||||
--- a/Lib/sysconfig/__init__.py
|
||||
+++ b/Lib/sysconfig/__init__.py
|
||||
@@ -481,6 +481,11 @@ def _init_config_vars():
|
||||
@@ -494,6 +494,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 5dae370..23eb971 100644
|
||||
--- a/Lib/test/_test_multiprocessing.py
|
||||
+++ b/Lib/test/_test_multiprocessing.py
|
||||
@@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase):
|
||||
@@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase):
|
||||
close_queue(q)
|
||||
|
||||
@support.requires_resource('walltime')
|
||||
@@ -34,7 +34,7 @@ index 5dae370..23eb971 100644
|
||||
def test_many_processes(self):
|
||||
if self.TYPE == 'threads':
|
||||
self.skipTest('test not appropriate for {}'.format(self.TYPE))
|
||||
@@ -2083,6 +2084,7 @@ class _TestBarrier(BaseTestCase):
|
||||
@@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase):
|
||||
except threading.BrokenBarrierError:
|
||||
results.append(True)
|
||||
|
||||
@@ -42,7 +42,7 @@ index 5dae370..23eb971 100644
|
||||
def test_timeout(self):
|
||||
"""
|
||||
Test wait(timeout)
|
||||
@@ -5171,6 +5173,7 @@ class TestWait(unittest.TestCase):
|
||||
@@ -5299,6 +5301,7 @@ class TestWait(unittest.TestCase):
|
||||
time.sleep(period)
|
||||
|
||||
@support.requires_resource('walltime')
|
||||
@@ -54,7 +54,7 @@ diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
|
||||
index 293799f..1dbb623 100644
|
||||
--- a/Lib/test/test_time.py
|
||||
+++ b/Lib/test/test_time.py
|
||||
@@ -504,6 +504,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
@@ -548,6 +548,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
@unittest.skipIf(
|
||||
support.is_wasi, "process_time not available on WASI"
|
||||
)
|
||||
@@ -62,7 +62,7 @@ index 293799f..1dbb623 100644
|
||||
def test_process_time(self):
|
||||
# process_time() should not include time spend during a sleep
|
||||
start = time.process_time()
|
||||
@@ -517,6 +518,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
@@ -561,6 +562,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
self.assertTrue(info.monotonic)
|
||||
self.assertFalse(info.adjustable)
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
|
||||
index 1ade492..4e94889 100644
|
||||
--- a/Lib/test/test_sysconfig.py
|
||||
+++ b/Lib/test/test_sysconfig.py
|
||||
@@ -414,7 +414,7 @@ class TestSysConfig(unittest.TestCase):
|
||||
@@ -423,7 +423,7 @@ class TestSysConfig(unittest.TestCase):
|
||||
expected = os.path.normpath(global_path.replace(base, user, 1))
|
||||
# bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
|
||||
# whereas posix_prefix does.
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
From 11e0523eb363b7def4bc64d24a04e88d8670a691 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Viktorin <encukou@gmail.com>
|
||||
Date: Thu, 28 Nov 2024 13:32:30 +0100
|
||||
Subject: [PATCH] ssl: Raise OSError for ERR_LIB_SYS
|
||||
|
||||
From the ERR_raise manpage:
|
||||
|
||||
ERR_LIB_SYS
|
||||
|
||||
This "library code" indicates that a system error is
|
||||
being reported. In this case, the reason code given
|
||||
to `ERR_raise()` and `ERR_raise_data()` *must* be
|
||||
`errno(3)`.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/python/cpython/pull/127361]
|
||||
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
||||
---
|
||||
Modules/_ssl.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
|
||||
index e5b8bf21002..a243ba4b9bc 100644
|
||||
--- a/Modules/_ssl.c
|
||||
+++ b/Modules/_ssl.c
|
||||
@@ -667,6 +667,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno)
|
||||
ERR_GET_REASON(e) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
|
||||
type = state->PySSLCertVerificationErrorObject;
|
||||
}
|
||||
+ if (ERR_GET_LIB(e) == ERR_LIB_SYS) {
|
||||
+ // A system error is being reported; reason is set to errno
|
||||
+ errno = ERR_GET_REASON(e);
|
||||
+ return PyErr_SetFromErrno(PyExc_OSError);
|
||||
+ }
|
||||
p = PY_SSL_ERROR_SYSCALL;
|
||||
}
|
||||
break;
|
||||
@@ -692,6 +697,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno)
|
||||
errstr = "EOF occurred in violation of protocol";
|
||||
}
|
||||
#endif
|
||||
+ if (ERR_GET_LIB(e) == ERR_LIB_SYS) {
|
||||
+ // A system error is being reported; reason is set to errno
|
||||
+ errno = ERR_GET_REASON(e);
|
||||
+ return PyErr_SetFromErrno(PyExc_OSError);
|
||||
+ }
|
||||
break;
|
||||
}
|
||||
default:
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -17,7 +17,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.
|
||||
index 23eb971..b1295b2 100644
|
||||
--- a/Lib/test/_test_multiprocessing.py
|
||||
+++ b/Lib/test/_test_multiprocessing.py
|
||||
@@ -579,6 +579,7 @@ class _TestProcess(BaseTestCase):
|
||||
@@ -585,6 +585,7 @@ class _TestProcess(BaseTestCase):
|
||||
self.assertTrue(type(cpus) is int)
|
||||
self.assertTrue(cpus >= 1)
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
|
||||
index da4bd79..fd9e67d 100644
|
||||
--- a/Lib/test/test_locale.py
|
||||
+++ b/Lib/test/test_locale.py
|
||||
@@ -568,7 +568,7 @@ class TestMiscellaneous(unittest.TestCase):
|
||||
@@ -572,7 +572,7 @@ class TestMiscellaneous(unittest.TestCase):
|
||||
self.skipTest('test needs Turkish locale')
|
||||
loc = locale.getlocale(locale.LC_CTYPE)
|
||||
if verbose:
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
|
||||
index 50e77cb..09b644a 100644
|
||||
--- a/Lib/test/test_readline.py
|
||||
+++ b/Lib/test/test_readline.py
|
||||
@@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest.TestCase):
|
||||
@@ -141,6 +141,7 @@ class TestHistoryManipulation (unittest.TestCase):
|
||||
self.assertEqual(readline.get_history_item(1), "entrée 1")
|
||||
self.assertEqual(readline.get_history_item(2), "entrée 22")
|
||||
|
||||
@@ -28,7 +28,7 @@ index 50e77cb..09b644a 100644
|
||||
def test_write_read_limited_history(self):
|
||||
previous_length = readline.get_history_length()
|
||||
self.addCleanup(readline.set_history_length, previous_length)
|
||||
@@ -374,6 +375,7 @@ readline.write_history_file(history_file)
|
||||
@@ -382,6 +383,7 @@ readline.write_history_file(history_file)
|
||||
self.assertIn(b"done", output)
|
||||
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index be1b9ea..9ec3a71 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2513,7 +2513,7 @@ COMPILEALL_OPTS=-j0
|
||||
@@ -2485,7 +2485,7 @@ COMPILEALL_OPTS=-j0
|
||||
TEST_MODULES=@TEST_MODULES@
|
||||
|
||||
.PHONY: libinstall
|
||||
|
||||
Reference in New Issue
Block a user