diff options
| author | Peter Marko <peter.marko@siemens.com> | 2025-02-08 23:10:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-11 11:44:19 +0000 |
| commit | 7013a9ed06676072d435b31ece2ca8818c926106 (patch) | |
| tree | e8cd5d65e438b52d929ea55a4b1139bb042768af /meta/recipes-devtools/python/python3 | |
| parent | 0bf496f24b4b994cff87ee73977ce6acd9cd8d45 (diff) | |
| download | poky-7013a9ed06676072d435b31ece2ca8818c926106.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-devtools/python/python3')
10 files changed, 14 insertions, 65 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch index d2246327f2..81a613c151 100644 --- a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch +++ b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch | |||
| @@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in | |||
| 19 | index 9ec3a71..f7d5382 100644 | 19 | index 9ec3a71..f7d5382 100644 |
| 20 | --- a/Makefile.pre.in | 20 | --- a/Makefile.pre.in |
| 21 | +++ b/Makefile.pre.in | 21 | +++ b/Makefile.pre.in |
| 22 | @@ -2606,6 +2606,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh | 22 | @@ -2578,6 +2578,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh |
| 23 | @ # Substitution happens here, as the completely-expanded BINDIR | 23 | @ # Substitution happens here, as the completely-expanded BINDIR |
| 24 | @ # is not available in configure | 24 | @ # is not available in configure |
| 25 | sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py | 25 | sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py |
diff --git a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch index d8ad803d50..075737e7d1 100644 --- a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch +++ b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch | |||
| @@ -34,7 +34,7 @@ diff --git a/Modules/_ssl.c b/Modules/_ssl.c | |||
| 34 | index b6b5ebf094c..e5b8bf21002 100644 | 34 | index b6b5ebf094c..e5b8bf21002 100644 |
| 35 | --- a/Modules/_ssl.c | 35 | --- a/Modules/_ssl.c |
| 36 | +++ b/Modules/_ssl.c | 36 | +++ b/Modules/_ssl.c |
| 37 | @@ -122,7 +122,7 @@ static void _PySSLFixErrno(void) { | 37 | @@ -121,7 +121,7 @@ static void _PySSLFixErrno(void) { |
| 38 | 38 | ||
| 39 | /* Include generated data (error codes) */ | 39 | /* Include generated data (error codes) */ |
| 40 | #if (OPENSSL_VERSION_NUMBER >= 0x30100000L) | 40 | #if (OPENSSL_VERSION_NUMBER >= 0x30100000L) |
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index 45094481a8..ca72ebc899 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch | |||
| @@ -17,7 +17,7 @@ diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py | |||
| 17 | index f8e1c7d..0882526 100644 | 17 | index f8e1c7d..0882526 100644 |
| 18 | --- a/Lib/sysconfig/__init__.py | 18 | --- a/Lib/sysconfig/__init__.py |
| 19 | +++ b/Lib/sysconfig/__init__.py | 19 | +++ b/Lib/sysconfig/__init__.py |
| 20 | @@ -481,6 +481,11 @@ def _init_config_vars(): | 20 | @@ -494,6 +494,11 @@ def _init_config_vars(): |
| 21 | _CONFIG_VARS['VPATH'] = sys._vpath | 21 | _CONFIG_VARS['VPATH'] = sys._vpath |
| 22 | if os.name == 'posix': | 22 | if os.name == 'posix': |
| 23 | _init_posix(_CONFIG_VARS) | 23 | _init_posix(_CONFIG_VARS) |
diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch index 230e847d2b..c8537db1fd 100644 --- a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch | |||
| @@ -26,7 +26,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing. | |||
| 26 | index 5dae370..23eb971 100644 | 26 | index 5dae370..23eb971 100644 |
| 27 | --- a/Lib/test/_test_multiprocessing.py | 27 | --- a/Lib/test/_test_multiprocessing.py |
| 28 | +++ b/Lib/test/_test_multiprocessing.py | 28 | +++ b/Lib/test/_test_multiprocessing.py |
| 29 | @@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase): | 29 | @@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase): |
| 30 | close_queue(q) | 30 | close_queue(q) |
| 31 | 31 | ||
| 32 | @support.requires_resource('walltime') | 32 | @support.requires_resource('walltime') |
| @@ -34,7 +34,7 @@ index 5dae370..23eb971 100644 | |||
| 34 | def test_many_processes(self): | 34 | def test_many_processes(self): |
| 35 | if self.TYPE == 'threads': | 35 | if self.TYPE == 'threads': |
| 36 | self.skipTest('test not appropriate for {}'.format(self.TYPE)) | 36 | self.skipTest('test not appropriate for {}'.format(self.TYPE)) |
| 37 | @@ -2083,6 +2084,7 @@ class _TestBarrier(BaseTestCase): | 37 | @@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase): |
| 38 | except threading.BrokenBarrierError: | 38 | except threading.BrokenBarrierError: |
| 39 | results.append(True) | 39 | results.append(True) |
| 40 | 40 | ||
| @@ -42,7 +42,7 @@ index 5dae370..23eb971 100644 | |||
| 42 | def test_timeout(self): | 42 | def test_timeout(self): |
| 43 | """ | 43 | """ |
| 44 | Test wait(timeout) | 44 | Test wait(timeout) |
| 45 | @@ -5171,6 +5173,7 @@ class TestWait(unittest.TestCase): | 45 | @@ -5299,6 +5301,7 @@ class TestWait(unittest.TestCase): |
| 46 | time.sleep(period) | 46 | time.sleep(period) |
| 47 | 47 | ||
| 48 | @support.requires_resource('walltime') | 48 | @support.requires_resource('walltime') |
| @@ -54,7 +54,7 @@ diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py | |||
| 54 | index 293799f..1dbb623 100644 | 54 | index 293799f..1dbb623 100644 |
| 55 | --- a/Lib/test/test_time.py | 55 | --- a/Lib/test/test_time.py |
| 56 | +++ b/Lib/test/test_time.py | 56 | +++ b/Lib/test/test_time.py |
| 57 | @@ -504,6 +504,7 @@ class TimeTestCase(unittest.TestCase): | 57 | @@ -548,6 +548,7 @@ class TimeTestCase(unittest.TestCase): |
| 58 | @unittest.skipIf( | 58 | @unittest.skipIf( |
| 59 | support.is_wasi, "process_time not available on WASI" | 59 | support.is_wasi, "process_time not available on WASI" |
| 60 | ) | 60 | ) |
| @@ -62,7 +62,7 @@ index 293799f..1dbb623 100644 | |||
| 62 | def test_process_time(self): | 62 | def test_process_time(self): |
| 63 | # process_time() should not include time spend during a sleep | 63 | # process_time() should not include time spend during a sleep |
| 64 | start = time.process_time() | 64 | start = time.process_time() |
| 65 | @@ -517,6 +518,7 @@ class TimeTestCase(unittest.TestCase): | 65 | @@ -561,6 +562,7 @@ class TimeTestCase(unittest.TestCase): |
| 66 | self.assertTrue(info.monotonic) | 66 | self.assertTrue(info.monotonic) |
| 67 | self.assertFalse(info.adjustable) | 67 | self.assertFalse(info.adjustable) |
| 68 | 68 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch index b967a36e49..ab433d1836 100644 --- a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch | |||
| @@ -25,7 +25,7 @@ diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py | |||
| 25 | index 1ade492..4e94889 100644 | 25 | index 1ade492..4e94889 100644 |
| 26 | --- a/Lib/test/test_sysconfig.py | 26 | --- a/Lib/test/test_sysconfig.py |
| 27 | +++ b/Lib/test/test_sysconfig.py | 27 | +++ b/Lib/test/test_sysconfig.py |
| 28 | @@ -414,7 +414,7 @@ class TestSysConfig(unittest.TestCase): | 28 | @@ -423,7 +423,7 @@ class TestSysConfig(unittest.TestCase): |
| 29 | expected = os.path.normpath(global_path.replace(base, user, 1)) | 29 | expected = os.path.normpath(global_path.replace(base, user, 1)) |
| 30 | # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, | 30 | # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, |
| 31 | # whereas posix_prefix does. | 31 | # whereas posix_prefix does. |
diff --git a/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch b/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch deleted file mode 100644 index 18e0f208c7..0000000000 --- a/meta/recipes-devtools/python/python3/0001-ssl-Raise-OSError-for-ERR_LIB_SYS.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From 11e0523eb363b7def4bc64d24a04e88d8670a691 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Petr Viktorin <encukou@gmail.com> | ||
| 3 | Date: Thu, 28 Nov 2024 13:32:30 +0100 | ||
| 4 | Subject: [PATCH] ssl: Raise OSError for ERR_LIB_SYS | ||
| 5 | |||
| 6 | From the ERR_raise manpage: | ||
| 7 | |||
| 8 | ERR_LIB_SYS | ||
| 9 | |||
| 10 | This "library code" indicates that a system error is | ||
| 11 | being reported. In this case, the reason code given | ||
| 12 | to `ERR_raise()` and `ERR_raise_data()` *must* be | ||
| 13 | `errno(3)`. | ||
| 14 | |||
| 15 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/127361] | ||
| 16 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 17 | --- | ||
| 18 | Modules/_ssl.c | 10 ++++++++++ | ||
| 19 | 1 file changed, 10 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/Modules/_ssl.c b/Modules/_ssl.c | ||
| 22 | index e5b8bf21002..a243ba4b9bc 100644 | ||
| 23 | --- a/Modules/_ssl.c | ||
| 24 | +++ b/Modules/_ssl.c | ||
| 25 | @@ -667,6 +667,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) | ||
| 26 | ERR_GET_REASON(e) == SSL_R_CERTIFICATE_VERIFY_FAILED) { | ||
| 27 | type = state->PySSLCertVerificationErrorObject; | ||
| 28 | } | ||
| 29 | + if (ERR_GET_LIB(e) == ERR_LIB_SYS) { | ||
| 30 | + // A system error is being reported; reason is set to errno | ||
| 31 | + errno = ERR_GET_REASON(e); | ||
| 32 | + return PyErr_SetFromErrno(PyExc_OSError); | ||
| 33 | + } | ||
| 34 | p = PY_SSL_ERROR_SYSCALL; | ||
| 35 | } | ||
| 36 | break; | ||
| 37 | @@ -692,6 +697,11 @@ PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) | ||
| 38 | errstr = "EOF occurred in violation of protocol"; | ||
| 39 | } | ||
| 40 | #endif | ||
| 41 | + if (ERR_GET_LIB(e) == ERR_LIB_SYS) { | ||
| 42 | + // A system error is being reported; reason is set to errno | ||
| 43 | + errno = ERR_GET_REASON(e); | ||
| 44 | + return PyErr_SetFromErrno(PyExc_OSError); | ||
| 45 | + } | ||
| 46 | break; | ||
| 47 | } | ||
| 48 | default: | ||
| 49 | -- | ||
| 50 | 2.30.2 | ||
| 51 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch index 7749fcbe7d..5f60c60b5b 100644 --- a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch | |||
| @@ -17,7 +17,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing. | |||
| 17 | index 23eb971..b1295b2 100644 | 17 | index 23eb971..b1295b2 100644 |
| 18 | --- a/Lib/test/_test_multiprocessing.py | 18 | --- a/Lib/test/_test_multiprocessing.py |
| 19 | +++ b/Lib/test/_test_multiprocessing.py | 19 | +++ b/Lib/test/_test_multiprocessing.py |
| 20 | @@ -579,6 +579,7 @@ class _TestProcess(BaseTestCase): | 20 | @@ -585,6 +585,7 @@ class _TestProcess(BaseTestCase): |
| 21 | self.assertTrue(type(cpus) is int) | 21 | self.assertTrue(type(cpus) is int) |
| 22 | self.assertTrue(cpus >= 1) | 22 | self.assertTrue(cpus >= 1) |
| 23 | 23 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch index 7f03cf105f..2cca004b57 100644 --- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch +++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch | |||
| @@ -34,7 +34,7 @@ diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py | |||
| 34 | index da4bd79..fd9e67d 100644 | 34 | index da4bd79..fd9e67d 100644 |
| 35 | --- a/Lib/test/test_locale.py | 35 | --- a/Lib/test/test_locale.py |
| 36 | +++ b/Lib/test/test_locale.py | 36 | +++ b/Lib/test/test_locale.py |
| 37 | @@ -568,7 +568,7 @@ class TestMiscellaneous(unittest.TestCase): | 37 | @@ -572,7 +572,7 @@ class TestMiscellaneous(unittest.TestCase): |
| 38 | self.skipTest('test needs Turkish locale') | 38 | self.skipTest('test needs Turkish locale') |
| 39 | loc = locale.getlocale(locale.LC_CTYPE) | 39 | loc = locale.getlocale(locale.LC_CTYPE) |
| 40 | if verbose: | 40 | if verbose: |
diff --git a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch index d63c73e334..337e69cce0 100644 --- a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch | |||
| @@ -20,7 +20,7 @@ diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py | |||
| 20 | index 50e77cb..09b644a 100644 | 20 | index 50e77cb..09b644a 100644 |
| 21 | --- a/Lib/test/test_readline.py | 21 | --- a/Lib/test/test_readline.py |
| 22 | +++ b/Lib/test/test_readline.py | 22 | +++ b/Lib/test/test_readline.py |
| 23 | @@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest.TestCase): | 23 | @@ -141,6 +141,7 @@ class TestHistoryManipulation (unittest.TestCase): |
| 24 | self.assertEqual(readline.get_history_item(1), "entrée 1") | 24 | self.assertEqual(readline.get_history_item(1), "entrée 1") |
| 25 | self.assertEqual(readline.get_history_item(2), "entrée 22") | 25 | self.assertEqual(readline.get_history_item(2), "entrée 22") |
| 26 | 26 | ||
| @@ -28,7 +28,7 @@ index 50e77cb..09b644a 100644 | |||
| 28 | def test_write_read_limited_history(self): | 28 | def test_write_read_limited_history(self): |
| 29 | previous_length = readline.get_history_length() | 29 | previous_length = readline.get_history_length() |
| 30 | self.addCleanup(readline.set_history_length, previous_length) | 30 | self.addCleanup(readline.set_history_length, previous_length) |
| 31 | @@ -374,6 +375,7 @@ readline.write_history_file(history_file) | 31 | @@ -382,6 +383,7 @@ readline.write_history_file(history_file) |
| 32 | self.assertIn(b"done", output) | 32 | self.assertIn(b"done", output) |
| 33 | 33 | ||
| 34 | 34 | ||
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index f63c230747..b115a6fa65 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch | |||
| @@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in | |||
| 20 | index be1b9ea..9ec3a71 100644 | 20 | index be1b9ea..9ec3a71 100644 |
| 21 | --- a/Makefile.pre.in | 21 | --- a/Makefile.pre.in |
| 22 | +++ b/Makefile.pre.in | 22 | +++ b/Makefile.pre.in |
| 23 | @@ -2513,7 +2513,7 @@ COMPILEALL_OPTS=-j0 | 23 | @@ -2485,7 +2485,7 @@ COMPILEALL_OPTS=-j0 |
| 24 | TEST_MODULES=@TEST_MODULES@ | 24 | TEST_MODULES=@TEST_MODULES@ |
| 25 | 25 | ||
| 26 | .PHONY: libinstall | 26 | .PHONY: libinstall |
