mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
python3: upgrade 3.12.8 -> 3.12.9
Release notes: https://docs.python.org/release/3.12.9/whatsnew/changelog.html#python-3-12-9 Solves CVE-2025-0938, CVE-2024-12254 and 3 other vulnerabilities without CVE number assigment. Add a patch to fix failure of a new test. (From OE-Core rev: cb0187ed2962e4c140c4f59ce08f94b18b05004c) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Peter Marko
committed by
Steve Sakoman
Steve Sakoman
parent
27ef7bc694
commit
61e2aebcb5
@@ -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
|
||||
@@ -2354,6 +2354,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||
@@ -2355,6 +2355,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
|
||||
|
||||
@@ -54,7 +54,7 @@ diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
|
||||
index 9463add..4e0f39d 100644
|
||||
--- a/Lib/test/test_time.py
|
||||
+++ b/Lib/test/test_time.py
|
||||
@@ -527,6 +527,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
@@ -536,6 +536,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
@unittest.skipIf(
|
||||
support.is_wasi, "process_time not available on WASI"
|
||||
)
|
||||
@@ -62,7 +62,7 @@ index 9463add..4e0f39d 100644
|
||||
def test_process_time(self):
|
||||
# process_time() should not include time spend during a sleep
|
||||
start = time.process_time()
|
||||
@@ -540,6 +541,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
@@ -549,6 +550,7 @@ class TimeTestCase(unittest.TestCase):
|
||||
self.assertTrue(info.monotonic)
|
||||
self.assertFalse(info.adjustable)
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
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)
|
||||
@@ -73,7 +73,7 @@ index 9270b5f..955daad 100644
|
||||
*clang*)
|
||||
# Any changes made here should be reflected in the GCC+Darwin case below
|
||||
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
|
||||
@@ -2158,7 +2159,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS])
|
||||
@@ -2179,7 +2180,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS])
|
||||
# compiler and platform. BASECFLAGS tweaks need to be made even if the
|
||||
# user set OPT.
|
||||
|
||||
@@ -82,7 +82,7 @@ index 9270b5f..955daad 100644
|
||||
*clang*)
|
||||
cc_is_clang=1
|
||||
;;
|
||||
@@ -2430,7 +2431,7 @@ yes)
|
||||
@@ -2451,7 +2452,7 @@ yes)
|
||||
|
||||
# ICC doesn't recognize the option, but only emits a warning
|
||||
## XXX does it emit an unused result warning and can it be disabled?
|
||||
@@ -91,7 +91,7 @@ index 9270b5f..955daad 100644
|
||||
[*icc*], [ac_cv_disable_unused_result_warning=no]
|
||||
[PY_CHECK_CC_WARNING([disable], [unused-result])])
|
||||
AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes],
|
||||
@@ -2676,7 +2677,7 @@ yes)
|
||||
@@ -2697,7 +2698,7 @@ yes)
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -100,7 +100,7 @@ index 9270b5f..955daad 100644
|
||||
*mpicc*)
|
||||
CFLAGS_NODIST="$CFLAGS_NODIST"
|
||||
;;
|
||||
@@ -3511,7 +3512,7 @@ then
|
||||
@@ -3532,7 +3533,7 @@ then
|
||||
then
|
||||
LINKFORSHARED="-Wl,--export-dynamic"
|
||||
fi;;
|
||||
@@ -109,7 +109,7 @@ index 9270b5f..955daad 100644
|
||||
*gcc*)
|
||||
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
||||
then
|
||||
@@ -6832,7 +6833,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then
|
||||
@@ -6853,7 +6854,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then
|
||||
# Some versions of gcc miscompile inline asm:
|
||||
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
|
||||
# http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
|
||||
index fab124a..291dd48 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 fab124a..291dd48 100644
|
||||
def test_write_read_limited_history(self):
|
||||
previous_length = readline.get_history_length()
|
||||
self.addCleanup(readline.set_history_length, previous_length)
|
||||
@@ -371,6 +372,7 @@ readline.write_history_file(history_file)
|
||||
@@ -379,6 +380,7 @@ readline.write_history_file(history_file)
|
||||
self.assertIn(b"done", output)
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index 6e465a4..13c4835 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -6537,12 +6537,6 @@ AS_VAR_IF([have_panel], [no], [
|
||||
@@ -6558,12 +6558,6 @@ AS_VAR_IF([have_panel], [no], [
|
||||
AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)])
|
||||
])
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -2265,7 +2265,7 @@ COMPILEALL_OPTS=-j0
|
||||
@@ -2266,7 +2266,7 @@ COMPILEALL_OPTS=-j0
|
||||
TEST_MODULES=@TEST_MODULES@
|
||||
|
||||
.PHONY: libinstall
|
||||
|
||||
@@ -34,13 +34,14 @@ 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] = "c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e"
|
||||
SRC_URI[sha256sum] = "7220835d9f90b37c006e9842a8dff4580aaca4318674f947302b8d28f3f81112"
|
||||
|
||||
# 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