mirror of
https://git.yoctoproject.org/poky
synced 2026-09-25 07:36:23 +02:00
python3: Upgrade 3.13.5 -> 3.13.6
Changelog: https://docs.python.org/3/whatsnew/changelog.html#python-3-13-6-final Handles CVE-2025-8194 and 4 other vulnerabilities without CVE numbers. Refresh patches via devtool. (From OE-Core rev: 55b31ad3cf221dc07ef0ef1bc50c02f7c2e628ef) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
36cf5fc27b
commit
5ca542cadf
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|||||||
index 9ec3a71..f7d5382 100644
|
index 9ec3a71..f7d5382 100644
|
||||||
--- a/Makefile.pre.in
|
--- a/Makefile.pre.in
|
||||||
+++ b/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
||||||
@@ -2578,6 +2578,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
@@ -2585,6 +2585,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
|
||||||
@ # Substitution happens here, as the completely-expanded BINDIR
|
@ # Substitution happens here, as the completely-expanded BINDIR
|
||||||
@ # is not available in configure
|
@ # is not available in configure
|
||||||
sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py
|
sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
|
|||||||
index f8e1c7d..0882526 100644
|
index f8e1c7d..0882526 100644
|
||||||
--- a/Lib/sysconfig/__init__.py
|
--- a/Lib/sysconfig/__init__.py
|
||||||
+++ b/Lib/sysconfig/__init__.py
|
+++ b/Lib/sysconfig/__init__.py
|
||||||
@@ -494,6 +494,11 @@ def _init_config_vars():
|
@@ -501,6 +501,11 @@ def _init_config_vars():
|
||||||
_CONFIG_VARS['VPATH'] = sys._vpath
|
_CONFIG_VARS['VPATH'] = sys._vpath
|
||||||
if os.name == 'posix':
|
if os.name == 'posix':
|
||||||
_init_posix(_CONFIG_VARS)
|
_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
|
index 5dae370..23eb971 100644
|
||||||
--- a/Lib/test/_test_multiprocessing.py
|
--- a/Lib/test/_test_multiprocessing.py
|
||||||
+++ b/Lib/test/_test_multiprocessing.py
|
+++ b/Lib/test/_test_multiprocessing.py
|
||||||
@@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase):
|
@@ -701,6 +701,7 @@ class _TestProcess(BaseTestCase):
|
||||||
close_queue(q)
|
close_queue(q)
|
||||||
|
|
||||||
@support.requires_resource('walltime')
|
@support.requires_resource('walltime')
|
||||||
@@ -34,7 +34,7 @@ index 5dae370..23eb971 100644
|
|||||||
def test_many_processes(self):
|
def test_many_processes(self):
|
||||||
if self.TYPE == 'threads':
|
if self.TYPE == 'threads':
|
||||||
self.skipTest('test not appropriate for {}'.format(self.TYPE))
|
self.skipTest('test not appropriate for {}'.format(self.TYPE))
|
||||||
@@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase):
|
@@ -2232,6 +2233,7 @@ class _TestBarrier(BaseTestCase):
|
||||||
except threading.BrokenBarrierError:
|
except threading.BrokenBarrierError:
|
||||||
results.append(True)
|
results.append(True)
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ index 5dae370..23eb971 100644
|
|||||||
def test_timeout(self):
|
def test_timeout(self):
|
||||||
"""
|
"""
|
||||||
Test wait(timeout)
|
Test wait(timeout)
|
||||||
@@ -5299,6 +5301,7 @@ class TestWait(unittest.TestCase):
|
@@ -5320,6 +5322,7 @@ class TestWait(unittest.TestCase):
|
||||||
time.sleep(period)
|
time.sleep(period)
|
||||||
|
|
||||||
@support.requires_resource('walltime')
|
@support.requires_resource('walltime')
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
|
|||||||
index c5394de..ed17fb6 100644
|
index c5394de..ed17fb6 100644
|
||||||
--- a/Lib/test/test_builtin.py
|
--- a/Lib/test/test_builtin.py
|
||||||
+++ b/Lib/test/test_builtin.py
|
+++ b/Lib/test/test_builtin.py
|
||||||
@@ -2435,6 +2435,7 @@ class PtyTests(unittest.TestCase):
|
@@ -2474,6 +2474,7 @@ class PtyTests(unittest.TestCase):
|
||||||
"byte 0xe9 in position 4: ordinal not in "
|
"byte 0xe9 in position 4: ordinal not in "
|
||||||
"range(128)")
|
"range(128)")
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.
|
|||||||
index 23eb971..b1295b2 100644
|
index 23eb971..b1295b2 100644
|
||||||
--- a/Lib/test/_test_multiprocessing.py
|
--- a/Lib/test/_test_multiprocessing.py
|
||||||
+++ b/Lib/test/_test_multiprocessing.py
|
+++ b/Lib/test/_test_multiprocessing.py
|
||||||
@@ -585,6 +585,7 @@ class _TestProcess(BaseTestCase):
|
@@ -594,6 +594,7 @@ class _TestProcess(BaseTestCase):
|
||||||
self.assertTrue(type(cpus) is int)
|
self.assertTrue(type(cpus) is int)
|
||||||
self.assertTrue(cpus >= 1)
|
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
|
index da4bd79..fd9e67d 100644
|
||||||
--- a/Lib/test/test_locale.py
|
--- a/Lib/test/test_locale.py
|
||||||
+++ b/Lib/test/test_locale.py
|
+++ b/Lib/test/test_locale.py
|
||||||
@@ -572,7 +572,7 @@ class TestMiscellaneous(unittest.TestCase):
|
@@ -576,7 +576,7 @@ class TestMiscellaneous(unittest.TestCase):
|
||||||
self.skipTest('test needs Turkish locale')
|
self.skipTest('test needs Turkish locale')
|
||||||
loc = locale.getlocale(locale.LC_CTYPE)
|
loc = locale.getlocale(locale.LC_CTYPE)
|
||||||
if verbose:
|
if verbose:
|
||||||
|
|||||||
@@ -13,12 +13,14 @@ Upstream-Status: Inappropriate [OE-specific]
|
|||||||
|
|
||||||
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
||||||
---
|
---
|
||||||
Lib/test/test_readline.py | 2 ++
|
Lib/test/test_readline.py | 3 +++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
|
||||||
|
index 537a9fb..ddf0323 100644
|
||||||
--- a/Lib/test/test_readline.py
|
--- a/Lib/test/test_readline.py
|
||||||
+++ b/Lib/test/test_readline.py
|
+++ b/Lib/test/test_readline.py
|
||||||
@@ -70,6 +70,7 @@ class TestHistoryManipulation (unittest.
|
@@ -71,6 +71,7 @@ class TestHistoryManipulation (unittest.TestCase):
|
||||||
|
|
||||||
@unittest.skipUnless(hasattr(readline, "append_history_file"),
|
@unittest.skipUnless(hasattr(readline, "append_history_file"),
|
||||||
"append_history not available")
|
"append_history not available")
|
||||||
@@ -26,7 +28,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
|||||||
def test_write_read_append(self):
|
def test_write_read_append(self):
|
||||||
hfile = tempfile.NamedTemporaryFile(delete=False)
|
hfile = tempfile.NamedTemporaryFile(delete=False)
|
||||||
hfile.close()
|
hfile.close()
|
||||||
@@ -141,6 +142,7 @@ class TestHistoryManipulation (unittest.
|
@@ -142,6 +143,7 @@ class TestHistoryManipulation (unittest.TestCase):
|
||||||
self.assertEqual(readline.get_history_item(1), "entrée 1")
|
self.assertEqual(readline.get_history_item(1), "entrée 1")
|
||||||
self.assertEqual(readline.get_history_item(2), "entrée 22")
|
self.assertEqual(readline.get_history_item(2), "entrée 22")
|
||||||
|
|
||||||
@@ -34,7 +36,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
|
|||||||
def test_write_read_limited_history(self):
|
def test_write_read_limited_history(self):
|
||||||
previous_length = readline.get_history_length()
|
previous_length = readline.get_history_length()
|
||||||
self.addCleanup(readline.set_history_length, previous_length)
|
self.addCleanup(readline.set_history_length, previous_length)
|
||||||
@@ -382,6 +384,7 @@ readline.write_history_file(history_file
|
@@ -390,6 +392,7 @@ readline.write_history_file(history_file)
|
||||||
self.assertIn(b"done", output)
|
self.assertIn(b"done", output)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
|
|||||||
index bed0e6d..36602be 100644
|
index bed0e6d..36602be 100644
|
||||||
--- a/Lib/test/test_ftplib.py
|
--- a/Lib/test/test_ftplib.py
|
||||||
+++ b/Lib/test/test_ftplib.py
|
+++ b/Lib/test/test_ftplib.py
|
||||||
@@ -627,6 +627,7 @@ class TestFTPClass(TestCase):
|
@@ -630,6 +630,7 @@ class TestFTPClass(TestCase):
|
||||||
self.client.storbinary('stor', f, rest=r)
|
self.client.storbinary('stor', f, rest=r)
|
||||||
self.assertEqual(self.server.handler_instance.rest, str(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 be1b9ea..9ec3a71 100644
|
index be1b9ea..9ec3a71 100644
|
||||||
--- a/Makefile.pre.in
|
--- a/Makefile.pre.in
|
||||||
+++ b/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
||||||
@@ -2485,7 +2485,7 @@ COMPILEALL_OPTS=-j0
|
@@ -2492,7 +2492,7 @@ COMPILEALL_OPTS=-j0
|
||||||
TEST_MODULES=@TEST_MODULES@
|
TEST_MODULES=@TEST_MODULES@
|
||||||
|
|
||||||
.PHONY: libinstall
|
.PHONY: libinstall
|
||||||
|
|||||||
@@ -8,12 +8,16 @@ Closes python/importlib_metadata#489
|
|||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/python/importlib_metadata/commit/a65c29adc027b3615154cab73aaedd58a6aa23da]
|
Upstream-Status: Backport [https://github.com/python/importlib_metadata/commit/a65c29adc027b3615154cab73aaedd58a6aa23da]
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||||
|
---
|
||||||
|
Lib/importlib/metadata/__init__.py | 14 +++-
|
||||||
|
Lib/importlib/metadata/_itertools.py | 98 ++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 110 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git i/Lib/importlib/metadata/__init__.py w/Lib/importlib/metadata/__init__.py
|
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
|
||||||
index 8ce62dd864f..085378caabc 100644
|
index 8ce62dd..085378c 100644
|
||||||
--- i/Lib/importlib/metadata/__init__.py
|
--- a/Lib/importlib/metadata/__init__.py
|
||||||
+++ w/Lib/importlib/metadata/__init__.py
|
+++ b/Lib/importlib/metadata/__init__.py
|
||||||
@@ -21,7 +21,7 @@
|
@@ -21,7 +21,7 @@ import collections
|
||||||
from . import _meta
|
from . import _meta
|
||||||
from ._collections import FreezableDefaultDict, Pair
|
from ._collections import FreezableDefaultDict, Pair
|
||||||
from ._functools import method_cache, pass_none
|
from ._functools import method_cache, pass_none
|
||||||
@@ -22,7 +26,7 @@ index 8ce62dd864f..085378caabc 100644
|
|||||||
from ._meta import PackageMetadata, SimplePath
|
from ._meta import PackageMetadata, SimplePath
|
||||||
|
|
||||||
from contextlib import suppress
|
from contextlib import suppress
|
||||||
@@ -404,7 +404,7 @@ def from_name(cls, name: str) -> Distribution:
|
@@ -404,7 +404,7 @@ class Distribution(DeprecatedNonAbstract):
|
||||||
if not name:
|
if not name:
|
||||||
raise ValueError("A distribution name is required.")
|
raise ValueError("A distribution name is required.")
|
||||||
try:
|
try:
|
||||||
@@ -31,7 +35,7 @@ index 8ce62dd864f..085378caabc 100644
|
|||||||
except StopIteration:
|
except StopIteration:
|
||||||
raise PackageNotFoundError(name)
|
raise PackageNotFoundError(name)
|
||||||
|
|
||||||
@@ -428,6 +428,16 @@ def discover(
|
@@ -428,6 +428,16 @@ class Distribution(DeprecatedNonAbstract):
|
||||||
resolver(context) for resolver in cls._discover_resolvers()
|
resolver(context) for resolver in cls._discover_resolvers()
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -48,10 +52,10 @@ index 8ce62dd864f..085378caabc 100644
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def at(path: str | os.PathLike[str]) -> Distribution:
|
def at(path: str | os.PathLike[str]) -> Distribution:
|
||||||
"""Return a Distribution for the indicated metadata path.
|
"""Return a Distribution for the indicated metadata path.
|
||||||
diff --git i/Lib/importlib/metadata/_itertools.py w/Lib/importlib/metadata/_itertools.py
|
diff --git a/Lib/importlib/metadata/_itertools.py b/Lib/importlib/metadata/_itertools.py
|
||||||
index d4ca9b9140e..79d37198ce7 100644
|
index d4ca9b9..79d3719 100644
|
||||||
--- i/Lib/importlib/metadata/_itertools.py
|
--- a/Lib/importlib/metadata/_itertools.py
|
||||||
+++ w/Lib/importlib/metadata/_itertools.py
|
+++ b/Lib/importlib/metadata/_itertools.py
|
||||||
@@ -1,3 +1,4 @@
|
@@ -1,3 +1,4 @@
|
||||||
+from collections import defaultdict, deque
|
+from collections import defaultdict, deque
|
||||||
from itertools import filterfalse
|
from itertools import filterfalse
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ SRC_URI:append:class-native = " \
|
|||||||
file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
|
file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "93e583f243454e6e9e4588ca2c2662206ad961659863277afcdb96801647d640"
|
SRC_URI[sha256sum] = "17ba5508819d8736a14fbfc47d36e184946a877851b2e9c4b6c43acb44a3b104"
|
||||||
|
|
||||||
# exclude pre-releases for both python 2.x and 3.x
|
# exclude pre-releases for both python 2.x and 3.x
|
||||||
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
||||||
Reference in New Issue
Block a user