From 78d83ced968a46579cff8bfa0b4f462689c46c00 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Thu, 16 Oct 2025 22:40:58 +0200 Subject: [PATCH] python3: upgrade 3.13.7 -> 3.13.9 Drop upstreamed patch and refresh remaining patches. Release information: * https://www.python.org/downloads/release/python-3138/ * 3.13.8 is the eighth maintenance release of 3.13, containing around 200 bugfixes, build improvements and documentation changes since 3.13.7. * https://www.python.org/downloads/release/python-3139/ * This Python 3.13.9, a maintenance release for Python 3.13. * 3.13.9 is an expedited release containing a fix for one specific regression in Python 3.13.8 Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...r-OpenSSL-3.4-and-add-it-to-multissl.patch | 4 ++-- ...est_sysconfig-for-posix_user-purelib.patch | 2 +- ...DEV-portion-of-test_makedev-when-lin.patch | 24 ------------------- ...le.py-correct-the-test-output-format.patch | 2 +- .../{python3_3.13.7.bb => python3_3.13.9.bb} | 3 +-- 5 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch rename meta/recipes-devtools/python/{python3_3.13.7.bb => python3_3.13.9.bb} (99%) 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 075737e7d1..327124e4e3 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 @@ -1441,8 +1441,8 @@ index eae0e0c..fb06f63 100755 +++ b/Tools/ssl/multissltests.py @@ -51,6 +51,7 @@ OPENSSL_RECENT_VERSIONS = [ "3.1.7", - "3.2.3", - "3.3.2", + "3.2.6", + "3.3.5", + "3.4.0", ] 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 ab433d1836..adaca4ff77 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 index 1ade492..4e94889 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -423,7 +423,7 @@ class TestSysConfig(unittest.TestCase): +@@ -430,7 +430,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. diff --git a/meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch b/meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch deleted file mode 100644 index 4390e086d0..0000000000 --- a/meta/recipes-devtools/python/python3/0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2dc5e9f4c82888dbe21bd1eadb4b59b0efa9608c Mon Sep 17 00:00:00 2001 -From: Zachary Ware -Date: Sat, 6 Sep 2025 13:20:12 -0500 -Subject: [PATCH] gh-90548: Skip NODEV portion of test_makedev when linked to musl - -Upstream-Status: Backport [https://github.com/python/cpython/pull/138593] -Signed-off-by: Khem Raj ---- - Lib/test/test_posix.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py -index c9cbe15..bfc1e2b 100644 ---- a/Lib/test/test_posix.py -+++ b/Lib/test/test_posix.py -@@ -757,7 +757,7 @@ class PosixTester(unittest.TestCase): - self.assertRaises((ValueError, OverflowError), posix.makedev, x, minor) - self.assertRaises((ValueError, OverflowError), posix.makedev, major, x) - -- if sys.platform == 'linux': -+ if sys.platform == 'linux' and not support.linked_to_musl(): - NODEV = -1 - self.assertEqual(posix.major(NODEV), NODEV) - self.assertEqual(posix.minor(NODEV), NODEV) 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 3fc3a7e8ce..189246911b 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 index da4bd79..fd9e67d 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py -@@ -502,7 +502,7 @@ class TestRealLocales(unittest.TestCase): +@@ -501,7 +501,7 @@ class TestRealLocales(unittest.TestCase): self.skipTest('test needs Turkish locale') loc = locale.getlocale(locale.LC_CTYPE) if verbose: diff --git a/meta/recipes-devtools/python/python3_3.13.7.bb b/meta/recipes-devtools/python/python3_3.13.9.bb similarity index 99% rename from meta/recipes-devtools/python/python3_3.13.7.bb rename to meta/recipes-devtools/python/python3_3.13.9.bb index c682f1288e..2e114a6c5b 100644 --- a/meta/recipes-devtools/python/python3_3.13.7.bb +++ b/meta/recipes-devtools/python/python3_3.13.9.bb @@ -30,13 +30,12 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_active_children-skip-problematic-test.patch \ file://0001-test_readline-skip-limited-history-test.patch \ file://0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch \ - file://0001-gh-90548-Skip-NODEV-portion-of-test_makedev-when-lin.patch \ " SRC_URI:append:class-native = " \ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ " -SRC_URI[sha256sum] = "5462f9099dfd30e238def83c71d91897d8caa5ff6ebc7a50f14d4802cdaaa79a" +SRC_URI[sha256sum] = "ed5ef34cda36cfa2f3a340f07cac7e7814f91c7f3c411f6d3562323a866c5c66" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" -- 2.47.3