From patchwork Thu Oct 29 21:06:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 102412 Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.42]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.2507.1793308006453945072 for ; Thu, 29 Oct 2026 14:06:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=soG8YGGb; spf=pass (domain: est.tech, ip: 40.107.130.42, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xW1jytVnQW82PuHbuei+ySCfgOdiFbe9jj8EouyxBP37ypNED0B2wxPV/UIK15PxbcDH/6sTrDsFWAEsxVvJG+V6L0WwbHasSqMEdgbZCli9MinVjXMFhHYANGnmHReE5V0g/ynTZ6khhqqTbOZI3gh5cot+cDkTTM0FwQI6gBB++t2rAW/mYqMCu/hMFDsSEwtISRE8NU7wXlkraZf0pe4RKWd+WH/85m8ESQC1FAJq/rFCH+etqlFBBbd3zyRrv1v/wEO1Nq17o3QdGyVXIVZngZtHaQMzHZHalRA2tk0JVfPCr9L1Pfo5s48lSZqZ3q/l6X91km2C9WCGeeg4Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ex84KnNSRotG4b+lkZq3eUZ3livbznUwAvbsdrrQwgk=; b=jeQxq0nTogbgZgV7SKUL7VXpy0m2COCplhvJyLWIovA3cLlK20nVYJs5mrYcAZpkB3GxPRW4wqYJnlND+REcxSb8YYWXR0PUtW+4Tp0x26uwH6nZuvAOdbRhL5qc2WuCcPyOjyuLW2XOHV/q7bzLNaOSciu8dL6z8IKPxhw/HsBiCGuqrysMgEusFMCYEvOd4TNYoNEG69X1RY6KXaeJlEP8+PYz21/bZ03KAAu7dm0/LrUPqfSbK8CGcOjvteond6GyD2veulbxpyCKUKXnZ23RBSq2wacYiYWnMoWuHOPBFrApDzJ8me/NhVjFaHik7K1tyrnFxrwL5fJHQzztqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ex84KnNSRotG4b+lkZq3eUZ3livbznUwAvbsdrrQwgk=; b=soG8YGGbVl8h2JS2+/OTEuiHbrIX5YL5EIcENevmQJMYbIM//JzjNQ0j+JBfwoql6MUqZKrti852E5DVw69OspvctWlVX3KC+6D6Is/D5eOOBNH6TOOZnAjRrMiem8VMN2SKprpOdAFXQgZFIGyyIjT1P/f0y17oqQhdQ5iXNMlUFgFJjZI8BgUgNntK+DjPSNcfhM6OCrw4QJOIpkftpXo8miwjRGSh4ey8x7Gk492JjrMo3q/z6RGWTbo0cLdMY0QLToZwBmCtJmBf0pCO/gB53ljz3ibfUXuxid+zqwC/YjkdFA+ctmuc8GjHaglwxmyViWG1jceIKShm0jBy6g== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by GVXP189MB2127.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.8; Thu, 29 Oct 2026 21:06:39 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0569.008; Thu, 29 Oct 2026 21:06:39 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 1/2] python3-maturin: Add support for python 3.15.2 Date: Thu, 29 Oct 2026 22:06:35 +0100 Message-ID: <20261029210636.16016-2-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261029210636.16016-1-jaipaul.cheernam@est.tech> References: <20261012090030.95901-2-jaipaul.cheernam@est.tech> <20261029210636.16016-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P123CA0469.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a8::6) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|GVXP189MB2127:EE_ X-MS-Office365-Filtering-Correlation-Id: 440947d7-3368-4f70-40c6-08df360086a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|23010399003|1800799024|6133799003|22082099003|18002099003|56012099006|11063799006|4143699003|10067099003|261028144727099003|261022105027099003|261021123027099003|261021121427099003|261009223027099003|261026140227099003; X-Microsoft-Antispam-Message-Info: DtEsLR3pw6Kaut5HvkZSeOjUAgytMG6jvcUSSagQOA3JtznbPOWLcddyNlkCEiuyRVEnBriXqKNB2vcQyLHPfghlyeqAURFmGac16xezAG++vY0WSGk0d/BnoLftZRNturkuu4cHvmv5J3iDE93yAaVfeTiMtTOl2AeOjgRPJndNxqopo/yBtQ5XmSlrs8eGWYvAxXKX9YohMZ5f1D3qYUDuHwnCm+d1cZvPmoMYkUUV4+vFMvzuBFOl6p4Qs2IPiI6usAuGqUA0ImHYl67kGvdXjP02MbmB9KEuSdlXPzbZ4/c2QhUlZQ3h5DxBGIy5w/iKqGNGDy98oGw8viAQZpmww+dE5Fbf6FryWafrDUHui2EtFzDOBB5ZZRIIU3zVipO/w0oWA4lFijCJdv/RDc1fCV1qKSUDqcytWK2adExd8/u2Hry2rWkUJKOh1nOgFDCcXWUik9zkuco8EFmrz0FP09Q2LWyWkG7OHvtiRJPInA66J0DTxcCwnnSgerAU0Kk1PncXBPKkn8zpsUCxDVqk6A5q24qJzGMDHYHn3+JvGLzarPkviPt0WLAuhngrVvmI7FKE5UE7oMo6xNiAGbQKtnSoIKcEDkDXz7K9qaLYSDy9Z2+NwOg/LICsMMlIspVucsAtdqvYkgTYVviqNInJb/WCum6hcFRo2QFgD6g= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(23010399003)(1800799024)(6133799003)(22082099003)(18002099003)(56012099006)(11063799006)(4143699003)(10067099003)(261028144727099003)(261022105027099003)(261021123027099003)(261021121427099003)(261009223027099003)(261026140227099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FKmrfjKu13EwsLkp8f7yo2RkSgUfSatyh5UrErlPsz/MdMJRsuKNiVgPCKg7Dcc4lSL9AtEujtYYL5ShaHQAFDsp097RH377EwaE+VPIpAz2+OITgLsa6aRqVzMN4IEv811ojsbAHugE9Bj+xtKJqun022ATrBgjRE2gMolbOSIONBfEhbmtb1GQ2eltETg1ZSAfuU/H+3aGxyJWP+5nBtwdKkIhcYLd3keWgnv7VKjbkrb8FRNGZ6sUaACY1GF61yzM4+NcVJ7krPjjtyPMJfzetf630TzudAg0DioXQF/wweTGKAlZqoqqv5xstfxKwT0tMUX1P9vK9j93lrvhvCHY3P+2mQ5IzLvcKnnSmbaOG2teQXAtMok8lqOHFc+82lQuit47t6g5FbOWmkTJs64aNmNRIwkWGoe04rJpLWrpundZUwmbRTVO8DlXh14YUEJ5MuxBL0GU23L/4o9vsTYaLiIKr8elyd2iqjqW0AlCqNtSN7DzncU4Q4rQH/Sc5+iXTw+psH0oAoEhYWaZQrD/o3w3Ab+lpi0iKxQyrPCGdy9GItKfLKIaGfapirA4yphiOLm0MKtwpHELwkB6t9nem/+FHqvr6bd6o3OuOCy6wHRE7CJp4Tu/vTl8ZsZNYipPhwHopmNVSWkIpQfMRP5NisL/qlaRs44CGUAD7D9eUh/2x18IUnxX96HNm5ax6QsVsrF9wQ5Ydbf7asCRYB3LgrQsiqVWGGNPeELckyp4JtygBMVrXKpTpUGSCvxSXJ1wF15YFvMqy2Ancabu+02JxnjxaMBvB4MMdFyizwB/6qjmQ29pxWH/awzE1x64zK2K/HW0yPPIEsPVcxxNgiCLzHNs6YuznkxhuF3hiNU+Qpkmbhy24D+MAj3fY/TfV5IaSQYh7D98R0jj8BG9Ji0VExI4+Jmw0p93VUGVWpvZ6sX0/K6JrQz3ZODOqhsllC6xPmzQ1mxHKfgbQMdxts/0gbDVwDlGfu1+6Ii755CrSg233PUS+bzR3v5wS3EhlcDn25Y5+ds7s5GhYx/J1FUyMi5uqWqN5NRPzG1m8KA148JQe4lmXYh2lBAFSIJD3Pi6b5P3cRpdVI0Ma5ze7jyi8N31NAqx5bHN5AXit7MY3QMtvkVpTPKf0vH/SBKaZUaojZhiG6MNXbSWY9wm0JDU4cpGHNkxMqn3eN8eXiF/+NAb7sWNLsMoIkzvcnKBxILlc+wwOx2eshB6EdAyFSaqxwPjWwajGDUqg0+a/ZViy39YkPYVWcVhhRFIyYesXz3fW9Kk/X/44Fi8j8hNZprDA42Eu6ezE1e8cptr6e094P46ClV8T3D52/+2hF4IUCaLFFR6nt46jzJaL3hMd8i2IefimF51rbWGQfUP0LVanbuSkUJcFpIaNy/fvE9r/qUjtkUuADszK7HBjbITacDJdk5RWrWl8nfFzJDycYIQfLxBzw/LdoOBWdw0mF78BZaiBx00qyx0+ai98mr6DA8NTmL5/FfgxGu/JoaQW8BeK75fOJgesDBehMtMy90VVRGyPGO53rU3O544nHDNm8g3JcwBsJhzI9f6sYS4y8JLn2u1J3rSHrFVfvL0T3VXn/4oST2zTCj5EAaAwFWfsF447sN60TKxOSsoAk8DPu4tHpOilEVSOLGF98zNrOhQ6c89pbBKnwRcKpEQcpjnhyAz9jU8PlMw77kl1oBXbVaqgRWvr5E+L2ogE3Luw+F95jc7hkCgIwo1rUpNvUmaqw== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 440947d7-3368-4f70-40c6-08df360086a2 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2026 21:06:39.7585 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GfONTknRCYHSNj0i2noF7QSfPP5s6B5kPC8G3dL/Mq3B6Z8fkQT76u436O4xDFvFKrdORKUCelwSQHAKGElicNVrfUd96THCJNZ1KnWDZGo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXP189MB2127 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Thu, 29 Oct 2026 21:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/248972 Backport the upstream fix which raises the maximum Python version to 3.15 and PyPy to 3.12 Signed-off-by: Jaipaul Cheernam --- ...1-Update-maximum-Python-PyPy-version.patch | 99 +++++++++++++++++++ .../python/python3-maturin_1.15.0.bb | 4 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python/python3-maturin/0001-Update-maximum-Python-PyPy-version.patch diff --git a/meta/recipes-devtools/python/python3-maturin/0001-Update-maximum-Python-PyPy-version.patch b/meta/recipes-devtools/python/python3-maturin/0001-Update-maximum-Python-PyPy-version.patch new file mode 100644 index 00000000000..1c78bced287 --- /dev/null +++ b/meta/recipes-devtools/python/python3-maturin/0001-Update-maximum-Python-PyPy-version.patch @@ -0,0 +1,99 @@ +From 713a7088e1ca9f1fe71efd670826d6b77470c24d Mon Sep 17 00:00:00 2001 +From: messense +Date: Thu, 29 Oct 2026 21:46:23 +0800 +Subject: [PATCH] Update maximum Python & PyPy version + +Upstream-Status: Backport [https://github.com/PyO3/maturin/commit/3bec0a32ae2b67ad4fac0194f762f44141e51473] +Signed-off-by: Jaipaul Cheernam +--- + src/python_interpreter/discovery.rs | 12 ++++++++++++ + src/python_interpreter/mod.rs | 4 ++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/python_interpreter/discovery.rs b/src/python_interpreter/discovery.rs +index e4bcb73..47548aa 100644 +--- a/src/python_interpreter/discovery.rs ++++ b/src/python_interpreter/discovery.rs +@@ -708,10 +708,12 @@ mod tests { + "CPython 3.12", + "CPython 3.13", + "CPython 3.14", ++ "CPython 3.15", + "PyPy 3.8", + "PyPy 3.9", + "PyPy 3.10", + "PyPy 3.11", ++ "PyPy 3.12", + ] + "#]]; + expected.assert_debug_eq(&pythons); +@@ -740,10 +742,13 @@ mod tests { + "CPython 3.12", + "CPython 3.13", + "CPython 3.14", ++ "CPython 3.15", + "CPython 3.14t", ++ "CPython 3.15t", + "PyPy 3.9", + "PyPy 3.10", + "PyPy 3.11", ++ "PyPy 3.12", + ] + "#]]; + expected.assert_debug_eq(&pythons); +@@ -765,10 +770,12 @@ mod tests { + "CPython 3.12", + "CPython 3.13", + "CPython 3.14", ++ "CPython 3.15", + "PyPy 3.8", + "PyPy 3.9", + "PyPy 3.10", + "PyPy 3.11", ++ "PyPy 3.12", + ] + "#]]; + expected.assert_debug_eq(&pythons); +@@ -788,8 +795,10 @@ mod tests { + "CPython 3.12", + "CPython 3.13", + "CPython 3.14", ++ "CPython 3.15", + "PyPy 3.10", + "PyPy 3.11", ++ "PyPy 3.12", + ] + "#]]; + expected.assert_debug_eq(&pythons); +@@ -817,10 +826,13 @@ mod tests { + "CPython 3.12", + "CPython 3.13", + "CPython 3.14", ++ "CPython 3.15", + "CPython 3.14t", ++ "CPython 3.15t", + "PyPy 3.9", + "PyPy 3.10", + "PyPy 3.11", ++ "PyPy 3.12", + ] + "#]]; + expected.assert_debug_eq(&pythons); +diff --git a/src/python_interpreter/mod.rs b/src/python_interpreter/mod.rs +index dca016f..9dcdaf8 100644 +--- a/src/python_interpreter/mod.rs ++++ b/src/python_interpreter/mod.rs +@@ -23,11 +23,11 @@ pub const MINIMUM_PYTHON_MINOR: usize = 7; + /// Minimum supported PyPy minor version. + pub const MINIMUM_PYPY_MINOR: usize = 8; + /// Be liberal here to include preview versions +-pub const MAXIMUM_PYTHON_MINOR: usize = 14; ++pub const MAXIMUM_PYTHON_MINOR: usize = 15; + /// Minimum supported version for free-threaded CPython + pub const FREE_THREADED_MINIMUM_PYTHON_MINOR: usize = 14; + /// Maximum supported PyPy minor version. +-pub const MAXIMUM_PYPY_MINOR: usize = 11; ++pub const MAXIMUM_PYPY_MINOR: usize = 12; + + /// The kind of Python interpreter (CPython, PyPy, or GraalPy). + #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, serde::Deserialize, clap::ValueEnum)] diff --git a/meta/recipes-devtools/python/python3-maturin_1.15.0.bb b/meta/recipes-devtools/python/python3-maturin_1.15.0.bb index a29e29bda9e..e8c0b6a6ad1 100644 --- a/meta/recipes-devtools/python/python3-maturin_1.15.0.bb +++ b/meta/recipes-devtools/python/python3-maturin_1.15.0.bb @@ -5,7 +5,9 @@ LICENSE = "Apache-2.0 OR MIT" LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" -SRC_URI += "file://0001-Cargo.lock-Update-rustix-to-1.1.5.patch" +SRC_URI += "file://0001-Cargo.lock-Update-rustix-to-1.1.5.patch \ + file://0001-Update-maximum-Python-PyPy-version.patch \ + " SRC_URI[sha256sum] = "94b26cc8e8aba61a5f2099715fe640e18c5f678e9a500408b38761263954228a" From patchwork Thu Oct 29 21:06:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 102413 Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.42]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.2507.1793308006453945072 for ; Thu, 29 Oct 2026 14:06:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=vX7VteLx; spf=pass (domain: est.tech, ip: 40.107.130.42, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mo3+Cw1d5oJRMmUP8S9bVm+ymSmiSHAzAhQ3d454CpG9vFmbjLnjZykWbzc89a5oypIpzYIUYdlDw//Qhn0jO4ONGc/o2EVmd/h7nEy+/UcpZR9LTqX9awL/Vp3IYQOS2sv5GF1NDySLD4b6jxL7tsQWKfsrYco7/W0Kv9YpjsZpsCfJEMFgPp7zq153WwlUQLe2dEZxu/Z15+zq0/UcemiL81etf/KcW13tTBEy7+CXHuBfkugG/t39cKw/d9eO1fmNmUyr9LWSSPm+2rGutiN9JVnie2N5YprtGD7SEWwLJcehqMJATEH3IbpcAPitz+p9iR8F6Scqn7ZAvXtAwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=01ExUfShUiTctEyFhcgxCrEdgTnplIaE3L+jUcaIhGM=; b=d2VABZ63xuLSOLxSJ1TUFSr2DdgJGIu5m9NT8ZPN7rsrgYcjwagQfbcuxV2S37Z1uGFSduDbQUDx5xqRYwHWX4Ae2Ce9dQetnPLNbbTl/dyfgivrlLx1eARJjnonq6MNtxM/4IjYwEfbq9TV5A89jpTQOUcTLd9D0cujLcSI1Bhgh5CB99F5xbjgZYhIYDq5fksfJytoPslAHXuAb9KMQ/YbnWw0NMYqZMoBOC3c8XX1S25Xvb3CaovXZzdzJ6SrNWNyS4WzTGmfY3s/ueERKOdhkT44+2+qWIigpkYLEaBC9RpGL2SznZ3cThj4IjuyiAdO8EchsUOwcp9hKC6Wxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=01ExUfShUiTctEyFhcgxCrEdgTnplIaE3L+jUcaIhGM=; b=vX7VteLx1DuKOwmKFo4C7UlMJAXLX7XBhn1vWz0HrYml68mK3+cennmKnyp8T4G17ECOKIDVebxOAL99MNYEdM554dC6sHO9F8IP1qpkF1b6wUjCTNBoX6LJBJ72oH9k435eq/m5J9VWL7ABAvC08KnFWKrLyXZeJ684pBf3kEEvGC3zeMeaBNU5rAmYDIPoJB3HbkAJemDClxbmwxrkm95Ajx419mqEGZ1Fvul5RXXRQ8GsWUJh2m3n/dfgIsj9tMYjMlxZ+SyDs+TkIDSKhO8mgj2L31gWo3KkRmH/KAwfXwu+lEGRt+Dv+G+OX6ZjKyC1qmw5x5OzQLXVDUJYjQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by GVXP189MB2127.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.8; Thu, 29 Oct 2026 21:06:41 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0569.008; Thu, 29 Oct 2026 21:06:41 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 2/2] python3: Upgrade 3.14.10 -> 3.15.2 Date: Thu, 29 Oct 2026 22:06:36 +0100 Message-ID: <20261029210636.16016-3-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261029210636.16016-1-jaipaul.cheernam@est.tech> References: <20261012090030.95901-2-jaipaul.cheernam@est.tech> <20261029210636.16016-1-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P123CA0142.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:193::21) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|GVXP189MB2127:EE_ X-MS-Office365-Filtering-Correlation-Id: 827e10ca-fbd0-450b-70f1-08df3600877a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|23010399003|1800799024|6133799003|29003799003|22082099003|18002099003|25016099003|12006099003|3023799007|56012099006|11063799006|5023799004|4143699003|261022113327099003|10067099003|261028144727099003|261022105027099003|261021130227099003|261021135927099003|261022075727099003|261021123027099003|261021121427099003|261021133027099003|261026121527099003|261009221727099003|261009221227099003|261009223327099003|261009220027099003|261009223027099003|261026130827099003|261026135527099003|261022115727099003|261026140227099003|260925021311599003|260925022911599003|260925021911599003; X-Microsoft-Antispam-Message-Info: kEDggKT4I3zFMlCi6VWlsAUfkA72+ogvW4TwsGTmvj9mceM0BPjG9veMbcYmX0d4l2Ixs4TJ8aVP0p9NQRoQ6+8VJ+nn5PY6klOCEU/pqgw/wc9upAQ1u5vd5436qmC3kxbhDlGq+b4aJu3A7IfUiVJuvYTF9jV+OIAWE0LraD+38xfrNnxEGQYDOSJdCw80jRQca1J8lm3dZvNNe2aI1d9Z9/rAUpqK0ri19WdFLnQ3C/hVo7k+Tz5qIXitABZlJLC2CLOZtkL/yKZ0sl8VAK/L02FiWJNH3QSYNA0eVstKp6K+5egGOlqLmUZ3DBojvl1tNcIBFRSC6iddTJ3bRZ3FnmCkWm0DcQ0V7Cc6ProiYQlXp64IcvNImX9UFSeMwnxjit1K96WE4633SP1rV3GYNK0rRn3yxXZ6nTHB+SqEH74/DiTCCtd3YP2drvxGHJR7PzceLUmNkFXXIPtVbZubwi70rJniDtskhC4GlUzd2c4imV9OWf8c6yJT/d4UBP3xwyG1r4qbZcdfJhKNat0Qr/crekCcm0iT5hyTf5IaxzMXCh4hIFZctzxL/QJnxManM0b/VAMe4UBluKUwMGmM3ndyUeRC1ajkmh5umFpZIPkxC6J7AeuRa5nS+aHy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(23010399003)(1800799024)(6133799003)(29003799003)(22082099003)(18002099003)(25016099003)(12006099003)(3023799007)(56012099006)(11063799006)(5023799004)(4143699003)(261022113327099003)(10067099003)(261028144727099003)(261022105027099003)(261021130227099003)(261021135927099003)(261022075727099003)(261021123027099003)(261021121427099003)(261021133027099003)(261026121527099003)(261009221727099003)(261009221227099003)(261009223327099003)(261009220027099003)(261009223027099003)(261026130827099003)(261026135527099003)(261022115727099003)(261026140227099003)(260925021311599003)(260925022911599003)(260925021911599003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p9rIIUdNOevEGCopFUI2jECN4vi37SfthwvsxVG3c1H/N7PMZo4EQdrAgdkXpJ8sqqBtMkJtfaxZp5NtWQEIEFQWo65AL79aKMWa9uijkdhXpFqpmzTW7wRshKwU0LCVogie95PwsWsn4fPXF+i5L4TCOfL+bI32xYgJ4Ql8PW66hOo/IZRDK6foj5wzgC/DuwHLWoJHs3TsalHy8LA4rA6AKJ7U0cCbYwTcPC2PGqyHrX4R5rG6mq7i5QAJP/mMaXk9OHmokX0sY31o468sIkWDPdfhSg7OdEnZ7Vskz5n5PjfKCm/4U72y1Vm6NkGWFqXb625POJGbFtBMHFT9VdFfpmweqBDVaCR7BT08X5/Tl1mKWsKinQWu/+0RXIvdxK2LypNBte99QCP7BmtWAkwA3pq02LNVau7Z5zEomHm3ImmO9VFnv4IB+duOY42hTkctdJ6n1Vul56a69o7lXiz+/wGIjW8OJDqQU2m1NIcH77YXkqJJgWcoDlrlXGUxwCzbK2SUyTTLzwrZeRa/rOqLH7w2K7jK08oaG9nnfJiGMt1REWN+wK/+2rKln0AmVB38H6xvL3lj6qgHtJh4Z/NH/NgG+opEpNKURALoKc+yfk61R+RcwRJGPM5KQARabuFl7JCEL9XWoA/a/tnuntvKay9wtZpZDWgPaU9vB+mvSwBgeBAnqvXl3Gva607LLHhTdxsqNkPmKCUixhqhCNuShn2KMG3fmeJMYYSCjKD3s161/56sjFQSURwVBV5T71DrGa08enDoRyNH0DAedZ4Ey1e71Pfo1qHIFsk9M+2sX5QSVJI9JmW1ObFcKEeV7bdgOdXhl02hxM8PqOGTMZmojAa+mM8qdAq4NVsjoHVE9cDc6WzKhJ6oF4neyaYeIN1vInVVMyKwK1fnaIepwu2KiD3sdzmWsuiwRcGVxHM5lE5ed9isJ2/Vk00A57lEelozFj3DML4ZtljQPLQ9QrWTIR1bvKt/G4kwO7OzWsAwFBGM/oHW9wwEhDbIhtM55IQ8gQ3tcw2c+eTqPUiWfT38NI5ylAqRsyRI8DE0IFZPEh5LZ8QD2Lb3rbfpJ3yv46lVSuFSj7GeP3nAxuXd1v+p4joWJWE6zo8PVtraJu9StzPctRFg51VnII/R1b9k33YtvvKmp7MCaZGEYveD+Nvh1tQBOICaR264gqV5uLQgj+INH/MmKd2udM7U17uiP4Hb8MAn8aZcwuvr5Xy3PSNvGrrJVS3Z4oWpg18kalMYVwrAC2+eI8vR+zB2owgTQEUB4l71OGu3of0DM6ATBv8okq66HQxEkCIpG8ANudDBUbu7ni4GUACI7HfPEHeYM+8d1wMMMAyhjjkY9dqJMhIberwrF+/WYmfRaYO7xFNXZTjzF2L2xwZnt2ZZYYSvGMuIZRrm+4pxJ/yo1xyEAt7QGyefqe2G9wJM7bAbV9+T7iuYrjBb8Ah8H8q62D/T1CPbnPAlNpuCP4icEB90x5dy6mWPRuYKlBw5tN9vlHa2JIwzBgZT0AQjD/2fFmcwhKH13RrvnPTDR35yzLDrCDbkDVW1Rcp09i4Hazp+ltSe0dXbNzygeqAVVBavsCU0hnvDcXZiuIsiZFoe8vKhq4aaFsWXLp6HVxJhxVOBsUqyc0WqfXQnTXNEFduwXnjFPguCaIMBf3rGEP24+6xb3tTjhMLsfTcZ2Ds7qhiidgwQtzRteicQJOkMOQ4+zzPHJaEjY9+vs+29CYbKi6nrmA== X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 827e10ca-fbd0-450b-70f1-08df3600877a X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2026 21:06:41.2520 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ihl2pIxYyx//jaRtFMLBbMJg5/NaxIKuGTlAdzXJQOpGxWMjT9H4Wcy44pzqJMtbuqaqxrSqIbkH7Yt7JZTXJqP6ExxIpKznlBX63h46Iyo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXP189MB2127 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Thu, 29 Oct 2026 21:06:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/248974 ReleaseNotes: https://docs.python.org/3/whatsnew/changelog.html#python-3-15-2-final - Drop patches which are part of upstream release - 0001-gh-146207-Add-support-for-OpenSSL-4.0.0.patch - 0002-gh-148292-Update-_ssl._SSLSocket-for-OpenSSL-4.patch - 0003-gh-148292-Remove-shutdown-test-in-test_ssl.test_got_eof.patch - valid-dists.patch - Add --without-system-libmpdec as EXTRA_OECONF configure option (--with-system-libmpdec is needed new package mpdecimal [1]) - Bump PYTHON_BASEVERSION to 3.15 in python3-dir.bbclass - Update python3-manifest - Refresh existing patches - Add two fixes needed for the new release - 0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch - 0001-configure-clear-RUNSHARED-when-cross-compiling.patch Verification: - Built python3 for glibc and musl - verified ptest for all 34 python3 packages which supports ptest [1] https://github.com/python/cpython/issues/115119 Signed-off-by: Jaipaul Cheernam --- Changes since v2: - Drop mpdecimal new package and add --without-system-libmpdec - Add patch for maturin failure - verified ptest on all 34 python3 packages - Verified with glibc and musl as well Changes since v1: - Update python3-manifest meta/classes-recipe/python3-dir.bbclass | 2 +- ...shebang-overflow-on-python-config.py.patch | 6 +- ...e-stdin-I-O-errors-same-way-as-maste.patch | 2 +- ...-use-prefix-value-from-build-configu.patch | 6 +- ...-qemu-wrapper-when-gathering-profile.patch | 6 +- ...est_sysconfig-for-posix_user-purelib.patch | 6 +- ...clear-RUNSHARED-when-cross-compiling.patch | 46 ++++ ...146207-Add-support-for-OpenSSL-4.0.0.patch | 254 ------------------ ...st_is_python_process_non_python_subp.patch | 50 ++++ .../0001-prefer-valid-entrypoints.patch | 6 +- ...g.py-use-platlibdir-also-for-purelib.patch | 4 +- ...le.py-correct-the-test-output-format.patch | 6 +- ...Update-_ssl._SSLSocket-for-OpenSSL-4.patch | 234 ---------------- ...utdown-test-in-test_ssl.test_got_eof.patch | 41 --- .../python/python3/makerace.patch | 6 +- .../python/python3/python3-manifest.json | 199 +++++--------- .../python/python3/valid-dists.patch | 164 ----------- .../{python3_3.14.10.bb => python3_3.15.2.bb} | 12 +- 18 files changed, 199 insertions(+), 851 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0001-configure-clear-RUNSHARED-when-cross-compiling.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-gh-146207-Add-support-for-OpenSSL-4.0.0.patch create mode 100644 meta/recipes-devtools/python/python3/0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch delete mode 100644 meta/recipes-devtools/python/python3/0002-gh-148292-Update-_ssl._SSLSocket-for-OpenSSL-4.patch delete mode 100644 meta/recipes-devtools/python/python3/0003-gh-148292-Remove-shutdown-test-in-test_ssl.test_got_eof.patch delete mode 100644 meta/recipes-devtools/python/python3/valid-dists.patch rename meta/recipes-devtools/python/{python3_3.14.10.bb => python3_3.15.2.bb} (98%) diff --git a/meta/classes-recipe/python3-dir.bbclass b/meta/classes-recipe/python3-dir.bbclass index 3eb0dea9b2e..b26621f3652 100644 --- a/meta/classes-recipe/python3-dir.bbclass +++ b/meta/classes-recipe/python3-dir.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -PYTHON_BASEVERSION = "3.14" +PYTHON_BASEVERSION = "3.15" PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3" 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 79fee9803fe..f5acfb789c0 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 @@ -1,4 +1,4 @@ -From 3f2df0e1fce8c7425998dade00d084f1b101a982 Mon Sep 17 00:00:00 2001 +From c7712b4345e16786ee237427537b83787022c733 Mon Sep 17 00:00:00 2001 From: Paulo Neves Date: Tue, 7 Jun 2022 16:16:41 +0200 Subject: [PATCH] Avoid shebang overflow on python-config.py @@ -16,10 +16,10 @@ Upstream-Status: Denied [distribution] 1 file changed, 2 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e946018..345ed29 100644 +index a1d59e4..26a90e6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2844,6 +2844,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh +@@ -2938,6 +2938,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 diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch index 532adfe69a9..322de292ce4 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch @@ -1,4 +1,4 @@ -From 9cd44429215352eb2753e0fd8e25fef24f714006 Mon Sep 17 00:00:00 2001 +From 1e6d7f34c558ed05f7d35f4a2b86f079318fb6be Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 16 Sep 2021 16:35:37 +0200 Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O 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 580d38a4031..ce2efd431c5 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 @@ -1,4 +1,4 @@ -From b5aad6a9b6c5add7a85861aed8aa030c1ad3d52f Mon Sep 17 00:00:00 2001 +From 7338a6821cdc4e7cab17ca255e484bf19b4b3670 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 17 Nov 2023 14:26:32 +0100 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration @@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 0a8bcc0..a2341f2 100644 +index 924401c..0ff84f7 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -539,12 +539,12 @@ def _init_config_vars(): +@@ -537,12 +537,12 @@ def _init_config_vars(): _CONFIG_VARS['py_version'] = _PY_VERSION _CONFIG_VARS['py_version_short'] = _PY_VERSION_SHORT _CONFIG_VARS['py_version_nodot'] = _PY_VERSION_SHORT_NO_DOT diff --git a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch index d3f46c372a6..dd5a87cd541 100644 --- a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch +++ b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch @@ -1,4 +1,4 @@ -From d6f77e3a934616d1f6c083b7144c50a32e08b70a Mon Sep 17 00:00:00 2001 +From 61b446b8554b91b93f8ae40c654abf9d8a77145d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 30 Jan 2019 12:41:04 +0100 Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data @@ -15,10 +15,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 526d500..a7e536d 100644 +index 95fefcc..24ca285 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -864,8 +864,7 @@ profile-run-stamp: +@@ -879,8 +879,7 @@ profile-run-stamp: # enabled. $(MAKE) profile-gen-stamp # Next, run the profile task to generate the profile information. 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 0864f23926a..6cc7ae187e6 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 @@ -1,4 +1,4 @@ -From c608cb4b3c8c31f1aa25ad1264ff58733fb99769 Mon Sep 17 00:00:00 2001 +From f1e23d641d6edb5bb82cd24272b7b1f8c42c64dd Mon Sep 17 00:00:00 2001 From: Wentao Zhang Date: Mon, 20 Mar 2023 13:39:52 +0800 Subject: [PATCH] Update test_sysconfig for posix_user purelib @@ -22,10 +22,10 @@ Signed-off-by: Wentao Zhang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 1fe4b68..383142a 100644 +index ce3a3c6..4eb65fb 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -435,7 +435,7 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): +@@ -432,7 +432,7 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): 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-configure-clear-RUNSHARED-when-cross-compiling.patch b/meta/recipes-devtools/python/python3/0001-configure-clear-RUNSHARED-when-cross-compiling.patch new file mode 100644 index 00000000000..f5f09e81ee9 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-configure-clear-RUNSHARED-when-cross-compiling.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jaipaul Cheernam +Date: Tue, 27 Oct 2026 10:00:00 +0000 +Subject: [PATCH] configure: clear RUNSHARED when cross compiling + +Since 3.15 the checksharedmods target runs the host build python with the +target LD_LIBRARY_PATH, which breaks musl cross builds (host cannot load +libc.so). Clear RUNSHARED for cross builds as before. + +Upstream-Status: Submitted [https://github.com/python/cpython/issues/160924] +Signed-off-by: Jaipaul Cheernam +--- + configure | 4 ++++ + configure.ac | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/configure b/configure +index 6f7ff1b..9702135 100755 +--- a/configure ++++ b/configure +@@ -7867,6 +7867,10 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5 + printf "%s\n" "$LDLIBRARY" >&6; } + ++if test "$cross_compiling" = yes; then ++ RUNSHARED= ++fi ++ + # HOSTRUNNER - Program to run CPython for the host platform + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking HOSTRUNNER" >&5 + printf %s "checking HOSTRUNNER... " >&6; } +diff --git a/configure.ac b/configure.ac +index 9923805..9e86057 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1670,6 +1670,10 @@ else # shared is disabled + fi + AC_MSG_RESULT([$LDLIBRARY]) + ++if test "$cross_compiling" = yes; then ++ RUNSHARED= ++fi ++ + # HOSTRUNNER - Program to run CPython for the host platform + AC_MSG_CHECKING([HOSTRUNNER]) + if test -z "$HOSTRUNNER" diff --git a/meta/recipes-devtools/python/python3/0001-gh-146207-Add-support-for-OpenSSL-4.0.0.patch b/meta/recipes-devtools/python/python3/0001-gh-146207-Add-support-for-OpenSSL-4.0.0.patch deleted file mode 100644 index 37f55de65c2..00000000000 --- a/meta/recipes-devtools/python/python3/0001-gh-146207-Add-support-for-OpenSSL-4.0.0.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 3364e7e62fa24d0e19133fb0f90b1c24ef1110c5 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Wed, 25 Mar 2026 07:44:47 +0100 -Subject: [PATCH] gh-146207: Add support for OpenSSL 4.0.0 alpha1 (#146217) - -OpenSSL 4.0.0 alpha1 removed these functions: - -* SSLv3_method() -* TLSv1_method() -* TLSv1_1_method() -* TLSv1_2_method() - -Other changes: - -* Update test_openssl_version(). -* Update multissltests.py for OpenSSL 4. -* Add const qualifier to fix compiler warnings. - -Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> -Signed-off-by: Victor Stinner - -Upstream-Status: Backport [https://github.com/python/cpython/commit/3364e7e62fa24d0e19133fb0f90b1c24ef1110c5] -Signed-off-by: Jaipaul Cheernam ---- - Lib/test/test_ssl.py | 52 ++++++++++++++++++++------------------ - Modules/_ssl.c | 27 ++++++++++++++++---- - Modules/_ssl/cert.c | 3 ++- - Tools/ssl/multissltests.py | 7 ++++- - 4 files changed, 58 insertions(+), 31 deletions(-) - -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py -index dc795c6bd8a..61355927296 100644 ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -439,7 +439,7 @@ class BasicSocketTests(unittest.TestCase): - ssl.OP_NO_COMPRESSION - self.assertEqual(ssl.HAS_SNI, True) - self.assertEqual(ssl.HAS_ECDH, True) -- self.assertEqual(ssl.HAS_TLSv1_2, True) -+ self.assertIsInstance(ssl.HAS_TLSv1_2, bool) - self.assertEqual(ssl.HAS_TLSv1_3, True) - ssl.OP_NO_SSLv2 - ssl.OP_NO_SSLv3 -@@ -630,11 +630,11 @@ class BasicSocketTests(unittest.TestCase): - # Some sanity checks follow - # >= 1.1.1 - self.assertGreaterEqual(n, 0x10101000) -- # < 4.0 -- self.assertLess(n, 0x40000000) -+ # < 5.0 -+ self.assertLess(n, 0x50000000) - major, minor, fix, patch, status = t - self.assertGreaterEqual(major, 1) -- self.assertLess(major, 4) -+ self.assertLess(major, 5) - self.assertGreaterEqual(minor, 0) - self.assertLess(minor, 256) - self.assertGreaterEqual(fix, 0) -@@ -700,12 +700,14 @@ class BasicSocketTests(unittest.TestCase): - ssl.OP_NO_TLSv1_2, - ssl.OP_NO_TLSv1_3 - ] -- protocols = [ -- ssl.PROTOCOL_TLSv1, -- ssl.PROTOCOL_TLSv1_1, -- ssl.PROTOCOL_TLSv1_2, -- ssl.PROTOCOL_TLS -- ] -+ protocols = [] -+ if hasattr(ssl, 'PROTOCOL_TLSv1'): -+ protocols.append(ssl.PROTOCOL_TLSv1) -+ if hasattr(ssl, 'PROTOCOL_TLSv1_1'): -+ protocols.append(ssl.PROTOCOL_TLSv1_1) -+ if hasattr(ssl, 'PROTOCOL_TLSv1_2'): -+ protocols.append(ssl.PROTOCOL_TLSv1_2) -+ protocols.append(ssl.PROTOCOL_TLS) - versions = [ - ssl.TLSVersion.SSLv3, - ssl.TLSVersion.TLSv1, -@@ -1199,6 +1201,7 @@ class ContextTests(unittest.TestCase): - ssl.TLSVersion.TLSv1, - ssl.TLSVersion.TLSv1_1, - ssl.TLSVersion.TLSv1_2, -+ ssl.TLSVersion.TLSv1_3, - ssl.TLSVersion.SSLv3, - } - ) -@@ -1212,7 +1215,7 @@ class ContextTests(unittest.TestCase): - with self.assertRaises(ValueError): - ctx.minimum_version = 42 - -- if has_tls_protocol(ssl.PROTOCOL_TLSv1_1): -+ if has_tls_protocol('PROTOCOL_TLSv1_1'): - ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1) - - self.assertIn( -@@ -1764,23 +1767,24 @@ class ContextTests(unittest.TestCase): - self.assertFalse(ctx.check_hostname) - self._assert_context_options(ctx) - -- if has_tls_protocol(ssl.PROTOCOL_TLSv1): -+ if has_tls_protocol('PROTOCOL_TLSv1'): - with warnings_helper.check_warnings(): - ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1) - self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1) - self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) - self._assert_context_options(ctx) - -- with warnings_helper.check_warnings(): -- ctx = ssl._create_stdlib_context( -- ssl.PROTOCOL_TLSv1_2, -- cert_reqs=ssl.CERT_REQUIRED, -- check_hostname=True -- ) -- self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1_2) -- self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) -- self.assertTrue(ctx.check_hostname) -- self._assert_context_options(ctx) -+ if has_tls_protocol('PROTOCOL_TLSv1_2'): -+ with warnings_helper.check_warnings(): -+ ctx = ssl._create_stdlib_context( -+ ssl.PROTOCOL_TLSv1_2, -+ cert_reqs=ssl.CERT_REQUIRED, -+ check_hostname=True -+ ) -+ self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1_2) -+ self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) -+ self.assertTrue(ctx.check_hostname) -+ self._assert_context_options(ctx) - - ctx = ssl._create_stdlib_context(purpose=ssl.Purpose.CLIENT_AUTH) - self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLS_SERVER) -@@ -3908,10 +3912,10 @@ class ThreadedTests(unittest.TestCase): - client_options=ssl.OP_NO_TLSv1_2) - - try_protocol_combo(ssl.PROTOCOL_TLS, ssl.PROTOCOL_TLSv1_2, 'TLSv1.2') -- if has_tls_protocol(ssl.PROTOCOL_TLSv1): -+ if has_tls_protocol('PROTOCOL_TLSv1'): - try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False) - try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False) -- if has_tls_protocol(ssl.PROTOCOL_TLSv1_1): -+ if has_tls_protocol('PROTOCOL_TLSv1_1'): - try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False) - try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False) - -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index b45295b4c0c..6f75af86113 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -136,6 +136,17 @@ static void _PySSLFixErrno(void) { - #error Unsupported OpenSSL version - #endif - -+#if (OPENSSL_VERSION_NUMBER >= 0x40000000L) -+# define OPENSSL_NO_SSL3 -+# define OPENSSL_NO_TLS1 -+# define OPENSSL_NO_TLS1_1 -+# define OPENSSL_NO_TLS1_2 -+# define OPENSSL_NO_SSL3_METHOD -+# define OPENSSL_NO_TLS1_METHOD -+# define OPENSSL_NO_TLS1_1_METHOD -+# define OPENSSL_NO_TLS1_2_METHOD -+#endif -+ - /* OpenSSL API 1.1.0+ does not include version methods */ - #ifndef OPENSSL_NO_SSL3_METHOD - extern const SSL_METHOD *SSLv3_method(void); -@@ -1137,7 +1148,7 @@ _asn1obj2py(_sslmodulestate *state, const ASN1_OBJECT *name, int no_name) - - static PyObject * - _create_tuple_for_attribute(_sslmodulestate *state, -- ASN1_OBJECT *name, ASN1_STRING *value) -+ const ASN1_OBJECT *name, const ASN1_STRING *value) - { - Py_ssize_t buflen; - PyObject *pyattr; -@@ -1166,16 +1177,16 @@ _create_tuple_for_attribute(_sslmodulestate *state, - } - - static PyObject * --_create_tuple_for_X509_NAME (_sslmodulestate *state, X509_NAME *xname) -+_create_tuple_for_X509_NAME(_sslmodulestate *state, const X509_NAME *xname) - { - PyObject *dn = NULL; /* tuple which represents the "distinguished name" */ - PyObject *rdn = NULL; /* tuple to hold a "relative distinguished name" */ - PyObject *rdnt; - PyObject *attr = NULL; /* tuple to hold an attribute */ - int entry_count = X509_NAME_entry_count(xname); -- X509_NAME_ENTRY *entry; -- ASN1_OBJECT *name; -- ASN1_STRING *value; -+ const X509_NAME_ENTRY *entry; -+ const ASN1_OBJECT *name; -+ const ASN1_STRING *value; - int index_counter; - int rdn_level = -1; - int retcode; -@@ -6599,9 +6610,15 @@ sslmodule_init_constants(PyObject *m) - ADD_INT_CONST("PROTOCOL_TLS", PY_SSL_VERSION_TLS); - ADD_INT_CONST("PROTOCOL_TLS_CLIENT", PY_SSL_VERSION_TLS_CLIENT); - ADD_INT_CONST("PROTOCOL_TLS_SERVER", PY_SSL_VERSION_TLS_SERVER); -+#ifndef OPENSSL_NO_TLS1 - ADD_INT_CONST("PROTOCOL_TLSv1", PY_SSL_VERSION_TLS1); -+#endif -+#ifndef OPENSSL_NO_TLS1_1 - ADD_INT_CONST("PROTOCOL_TLSv1_1", PY_SSL_VERSION_TLS1_1); -+#endif -+#ifndef OPENSSL_NO_TLS1_2 - ADD_INT_CONST("PROTOCOL_TLSv1_2", PY_SSL_VERSION_TLS1_2); -+#endif - - #define ADD_OPTION(NAME, VALUE) if (sslmodule_add_option(m, NAME, (VALUE)) < 0) return -1 - -diff --git a/Modules/_ssl/cert.c b/Modules/_ssl/cert.c -index f2e7be89668..061b0fb3171 100644 ---- a/Modules/_ssl/cert.c -+++ b/Modules/_ssl/cert.c -@@ -128,7 +128,8 @@ _ssl_Certificate_get_info_impl(PySSLCertificate *self) - } - - static PyObject* --_x509name_print(_sslmodulestate *state, X509_NAME *name, int indent, unsigned long flags) -+_x509name_print(_sslmodulestate *state, const X509_NAME *name, -+ int indent, unsigned long flags) - { - PyObject *res; - BIO *biobuf; -diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py -index 3b4507c6771..48207e5330f 100755 ---- a/Tools/ssl/multissltests.py -+++ b/Tools/ssl/multissltests.py -@@ -422,9 +422,11 @@ class BuildOpenSSL(AbstractBuilder): - def _post_install(self): - if self.version.startswith("3."): - self._post_install_3xx() -+ elif self.version.startswith("4."): -+ self._post_install_4xx() - - def _build_src(self, config_args=()): -- if self.version.startswith("3."): -+ if self.version.startswith(("3.", "4.")): - config_args += ("enable-fips",) - super()._build_src(config_args) - -@@ -440,6 +442,9 @@ class BuildOpenSSL(AbstractBuilder): - lib64 = self.lib_dir + "64" - os.symlink(lib64, self.lib_dir) - -+ def _post_install_4xx(self): -+ self._post_install_3xx() -+ - @property - def short_version(self): - """Short version for OpenSSL download URL""" diff --git a/meta/recipes-devtools/python/python3/0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch b/meta/recipes-devtools/python/python3/0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch new file mode 100644 index 00000000000..581dad9b2ee --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch @@ -0,0 +1,50 @@ +From 1db73a72041cdbbeb4ddef01595f25129a8138f7 Mon Sep 17 00:00:00 2001 +From: Tom Greenslade +Date: Thu, 29 Oct 2026 14:17:40 +0000 +Subject: [PATCH] gh-160881: Fix test_is_python_process_non_python_subprocess + with multicall sleep + +_wait_for_process_exec() waited for /proc/{pid}/exe to be named "sleep", +which never happens when sleep is a multicall binary (BusyBox on Alpine, +coreutils-single on RHEL UBI9). Wait instead until the child's executable +differs from the parent's, which means the child has called exec(). + +Co-Authored-By: Claude Opus 5.5 + +Upstream-Status: Submitted [https://github.com/python/cpython/pull/160901] +Signed-off-by: Jaipaul Cheernam +--- + .../test_sampling_profiler/test_children.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/Lib/test/test_profiling/test_sampling_profiler/test_children.py b/Lib/test/test_profiling/test_sampling_profiler/test_children.py +index 4b27c6dbb1896c1..9a8d529c4b82444 100644 +--- a/Lib/test/test_profiling/test_sampling_profiler/test_children.py ++++ b/Lib/test/test_profiling/test_sampling_profiler/test_children.py +@@ -85,12 +85,14 @@ def reader(): + return result[0] + + +-def _wait_for_process_exec(proc, name, timeout): ++def _wait_for_process_exec(proc, timeout): + # Wait until a child process calls exec() to replace the forked process +- # executable. Raise AssertionError on timeout. ++ # executable. Don't check the executable name: it can be a multicall ++ # binary such as /bin/busybox. Raise AssertionError on timeout. ++ parent_exe = os.readlink("/proc/self/exe") + for _ in sleeping_retry(timeout, max_delay=0.1): + exe = os.readlink(f"/proc/{proc.pid}/exe") +- if os.path.basename(exe) == name: ++ if exe != parent_exe: + break + + +@@ -625,7 +627,7 @@ def test_is_python_process_non_python_subprocess(self): + ) + + try: +- _wait_for_process_exec(proc, "sleep", SHORT_TIMEOUT) ++ _wait_for_process_exec(proc, SHORT_TIMEOUT) + + self.assertFalse( + is_python_process(proc.pid), diff --git a/meta/recipes-devtools/python/python3/0001-prefer-valid-entrypoints.patch b/meta/recipes-devtools/python/python3/0001-prefer-valid-entrypoints.patch index 525a2ca7000..e5043255928 100644 --- a/meta/recipes-devtools/python/python3/0001-prefer-valid-entrypoints.patch +++ b/meta/recipes-devtools/python/python3/0001-prefer-valid-entrypoints.patch @@ -1,4 +1,4 @@ -From 8d7fcf04c6513841c7985e64b746b1ef5de0c426 Mon Sep 17 00:00:00 2001 +From 57c51c6746c1efdae1654df443c5d23351b2d131 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 17 Apr 2026 16:53:42 +0100 Subject: [PATCH] prefer valid entrypoints @@ -16,10 +16,10 @@ Signed-off-by: Ross Burton 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py -index 085378c..ff5cae4 100644 +index 32f4b7d..705f245 100644 --- a/Lib/importlib/metadata/__init__.py +++ b/Lib/importlib/metadata/__init__.py -@@ -1016,7 +1016,7 @@ def entry_points(**params) -> EntryPoints: +@@ -1120,7 +1120,7 @@ def entry_points(**params) -> EntryPoints: :return: EntryPoints for all installed packages. """ eps = itertools.chain.from_iterable( diff --git a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch index 7807827d9aa..e24d6b63b16 100644 --- a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch @@ -1,4 +1,4 @@ -From c10d1b295a9fb93836830cce441da3f22e5c7cd7 Mon Sep 17 00:00:00 2001 +From 07c5b43f29e93825e1c0b0fcebf40dc5971d438f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 12 Sep 2021 21:44:36 +0200 Subject: [PATCH] sysconfig.py: use platlibdir also for purelib @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index faf8273..0a8bcc0 100644 +index b931551..924401c 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -29,7 +29,7 @@ _INSTALL_SCHEMES = { 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 a60d082e2f4..12d87168ca5 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 @@ -1,4 +1,4 @@ -From f0ac5b479b99bfb7f5e937a941b31a596f4caafc Mon Sep 17 00:00:00 2001 +From c8d8b7aaf96faa50d8bf20c59ed31e7c6a8d698c Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 5 Aug 2019 15:57:39 +0800 Subject: [PATCH] test_locale.py: correct the test output format @@ -31,10 +31,10 @@ Signed-off-by: Mingli Yu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py -index f918435..1910a43 100644 +index a06c600..38b91d0 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py -@@ -499,7 +499,7 @@ class TestRealLocales(unittest.TestCase): +@@ -500,7 +500,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/0002-gh-148292-Update-_ssl._SSLSocket-for-OpenSSL-4.patch b/meta/recipes-devtools/python/python3/0002-gh-148292-Update-_ssl._SSLSocket-for-OpenSSL-4.patch deleted file mode 100644 index 1b9a7fc9422..00000000000 --- a/meta/recipes-devtools/python/python3/0002-gh-148292-Update-_ssl._SSLSocket-for-OpenSSL-4.patch +++ /dev/null @@ -1,234 +0,0 @@ -From 3c2a3014af7d73cc34f2498f60fdf863d9bc7c6c Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Mon, 4 May 2026 13:52:57 +0200 -Subject: [PATCH] gh-148292: Update _ssl._SSLSocket for OpenSSL 4 (#149102) - -The _SSLSocket object now remembers if it gets an EOF error. In this -case, read(), sendfile(), write() and do_handshake method calls fail -with SSLEOFError without calling the underlying OpenSSL function. - -Co-authored-by: Gregory P. Smith -(cherry picked from commit 7b7fa3f9bf3d7cdf3eb669d02b386e05b39c402a) - -Upstream-Status: Backport [https://github.com/python/cpython/commit/3c2a3014af7d] - -Note: This is from the unmerged CPython PR #149783 which backports -OpenSSL 4.0 support to the 3.14 branch. Upstream deferred merging -until after Python 3.15.1 is released. - -Signed-off-by: Jaipaul Cheernam ---- - Lib/test/test_ssl.py | 82 +++++++++++++++++++ - ...-04-28-17-47-55.gh-issue-148292.oIq3ml.rst | 7 ++ - Modules/_ssl.c | 42 ++++++++++ - 3 files changed, 131 insertions(+) - create mode 100644 Misc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst - -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py -index 965dbc36f096499..03d9e3f9e5e96b5 100644 ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -3039,6 +3039,36 @@ class ThreadedEchoServer(threading.Thread): - def stop(self): - self.active = False - -+class TestEOFServer(threading.Thread): -+ def __init__(self): -+ super().__init__() -+ self.listening = threading.Event() -+ self.address = None -+ -+ def run(self): -+ context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) -+ context.load_cert_chain(CERTFILE) -+ server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -+ with server_sock: -+ server_sock.settimeout(support.SHORT_TIMEOUT) -+ server_sock.bind((HOST, 0)) -+ server_sock.listen(5) -+ -+ self.address = server_sock.getsockname() -+ self.listening.set() -+ -+ sock, addr = server_sock.accept() -+ sslconn = context.wrap_socket(sock, server_side=True) -+ with sslconn: -+ request = b'' -+ while chunk := sslconn.recv(1024): -+ request += chunk -+ if b'\n' in chunk: -+ break -+ -+ sslconn.sendall(b'server\n') -+ sslconn.shutdown(socket.SHUT_WR) -+ - class AsyncoreEchoServer(threading.Thread): - - # this one's based on asyncore.dispatcher -@@ -5079,6 +5109,58 @@ class ThreadedTests(unittest.TestCase): - if cm.exc_value is not None: - raise cm.exc_value - -+ def test_got_eof(self): -+ # gh-148292: Test that _ssl._SSLSocket behaves the same on all OpenSSL -+ # versions on calling methods after EOF (after the first SSLEOFError). -+ -+ server = TestEOFServer() -+ server.start() -+ if not server.listening.wait(support.SHORT_TIMEOUT): -+ raise RuntimeError("server took too long") -+ self.addCleanup(server.join) -+ -+ context = ssl.create_default_context(cafile=CERTFILE) -+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -+ sock.settimeout(support.SHORT_TIMEOUT) -+ sock.connect(server.address) -+ sslsock = context.wrap_socket(sock, server_hostname='localhost') -+ with sslsock: -+ sslsock.sendall(b'client\n') -+ # test the _ssl._SSLSocket object, not ssl.SSLSocket -+ sslobj = sslsock._sslobj -+ -+ data = sslobj.read(1024) -+ self.assertEqual(data, b'server\n') -+ -+ # The second read gets EOF error and sets got_eof_error to 1 -+ with self.assertRaises(ssl.SSLEOFError): -+ sslobj.read(1024) -+ -+ # Following read(), sendfile(), write() and do_handshake() calls -+ # must raise SSLEOFError -+ with self.assertRaises(ssl.SSLEOFError): -+ # The _SSLSocket remembers the previous EOF error -+ # and raises again SSLEOFError -+ sslobj.read(1024) -+ if hasattr(sslobj, 'sendfile'): -+ with open(__file__, "rb") as fp: -+ with self.assertRaises(ssl.SSLEOFError): -+ sslobj.sendfile(fp.fileno(), 0, 1) -+ with self.assertRaises(ssl.SSLEOFError): -+ sslobj.write(b'client2\n') -+ with self.assertRaises(ssl.SSLEOFError): -+ sslsock.do_handshake() -+ -+ self.assertEqual(sslsock.pending(), 0) -+ try: -+ sslsock.shutdown(socket.SHUT_WR) -+ except OSError as exc: -+ self.assertEqual(exc.errno, errno.ENOTCONN) -+ else: -+ # On Windows and on OpenSSL 1.1.1, shutdown() doesn't -+ # raise an error -+ pass -+ - - @unittest.skipUnless(has_tls_version('TLSv1_3') and ssl.HAS_PHA, - "Test needs TLS 1.3 PHA") -diff --git a/Misc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst b/Misc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst -new file mode 100644 -index 000000000000000..e1f308df5a678e6 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst -@@ -0,0 +1,7 @@ -+:mod:`ssl`: Update :class:`ssl.SSLSocket` and :class:`ssl.SSLObject` for -+OpenSSL 4. The classes now remember if they get a :exc:`ssl.SSLEOFError`. In this -+case, following :meth:`~ssl.SSLSocket.read`, :meth:`!sendfile`, -+:meth:`~ssl.SSLSocket.write`, and :meth:`~ssl.SSLSocket.do_handshake` calls -+raise :exc:`ssl.SSLEOFError` without calling the underlying OpenSSL function. -+Thanks to that, :class:`ssl.SSLSocket` behaves the same on all OpenSSL versions -+on EOF. Patch by Victor Stinner. -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index 1603d0ffd559559..376df32b7cb4bd6 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -352,6 +352,16 @@ typedef struct { - * and shutdown methods check for chained exceptions. - */ - PyObject *exc; -+ // gh-148292: If non-zero, read(), sendfile(), write() and do_handshake() -+ // methods raise SSLEOFError without calling the underlying OpenSSL -+ // function. Set to 1 on PY_SSL_ERROR_EOF error. -+ // -+ // On OpenSSL 4, if SSL_read_ex() fails with -+ // SSL_R_UNEXPECTED_EOF_WHILE_READING, the following SSL_read_ex() call -+ // fails with a generic protocol error (ERR_peek_last_error() returns 0). -+ // Use got_eof_error to have the same behavior on OpenSSL 4 and newer and -+ // on OpenSSL 3 and older. -+ int got_eof_error; - } PySSLSocket; - - #define PySSLSocket_CAST(op) ((PySSLSocket *)(op)) -@@ -499,6 +509,10 @@ fill_and_set_sslerror(_sslmodulestate *state, - PyObject *init_value, *msg, *key; - PyUnicodeWriter *writer = NULL; - -+ if (ssl_errno == PY_SSL_ERROR_EOF && sslsock != NULL) { -+ sslsock->got_eof_error = 1; -+ } -+ - if (errcode != 0) { - int lib, reason; - -@@ -654,6 +668,18 @@ PySSL_ChainExceptions(PySSLSocket *sslsock) { - return -1; - } - -+ -+static void -+set_eof_error(PySSLSocket *sslsock) -+{ -+ _sslmodulestate *state = get_state_sock(sslsock); -+ fill_and_set_sslerror(state, sslsock, state->PySSLEOFErrorObject, -+ PY_SSL_ERROR_EOF, -+ "EOF occurred in violation of protocol", -+ __LINE__, 0); -+} -+ -+ - static PyObject * - PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno) - { -@@ -901,6 +927,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, - self->server_hostname = NULL; - self->err = err; - self->exc = NULL; -+ self->got_eof_error = 0; - - /* Make sure the SSL error state is initialized */ - ERR_clear_error(); -@@ -1043,6 +1070,11 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self) - BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking); - } - -+ if (self->got_eof_error) { -+ set_eof_error(self); -+ goto error; -+ } -+ - timeout = GET_SOCKET_TIMEOUT(sock); - has_timeout = (timeout > 0); - if (has_timeout) { -@@ -2514,6 +2546,11 @@ _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b) - BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking); - } - -+ if (self->got_eof_error) { -+ set_eof_error(self); -+ goto error; -+ } -+ - timeout = GET_SOCKET_TIMEOUT(sock); - has_timeout = (timeout > 0); - if (has_timeout) { -@@ -2654,6 +2691,11 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len, - Py_INCREF(sock); - } - -+ if (self->got_eof_error) { -+ set_eof_error(self); -+ goto error; -+ } -+ - if (!group_right_1) { - dest = PyBytes_FromStringAndSize(NULL, len); - if (dest == NULL) diff --git a/meta/recipes-devtools/python/python3/0003-gh-148292-Remove-shutdown-test-in-test_ssl.test_got_eof.patch b/meta/recipes-devtools/python/python3/0003-gh-148292-Remove-shutdown-test-in-test_ssl.test_got_eof.patch deleted file mode 100644 index 59742290e8b..00000000000 --- a/meta/recipes-devtools/python/python3/0003-gh-148292-Remove-shutdown-test-in-test_ssl.test_got_eof.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 81911909bc439d6de8ce6a173b0691b3c58e9e1a Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Mon, 4 May 2026 16:20:25 +0200 -Subject: [PATCH] gh-148292: Remove shutdown() test in test_ssl.test_got_eof() - (#149366) - -The shutdown() behavior depends too much on the operating system and -it's unrelated to the got_eof_error change. - -(cherry picked from commit 1e21cf6fee3830012e458c0fe5dbc6fcd45ace92) - -Upstream-Status: Backport [https://github.com/python/cpython/commit/81911909bc43] - -Note: This is from the unmerged CPython PR #149783 which backports -OpenSSL 4.0 support to the 3.14 branch. Upstream deferred merging -until after Python 3.15.1 is released. - -Signed-off-by: Jaipaul Cheernam ---- - Lib/test/test_ssl.py | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py -index 03d9e3f9e5e96b5..6445f122b4272be 100644 ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -5152,14 +5152,6 @@ class ThreadedTests(unittest.TestCase): - sslsock.do_handshake() - - self.assertEqual(sslsock.pending(), 0) -- try: -- sslsock.shutdown(socket.SHUT_WR) -- except OSError as exc: -- self.assertEqual(exc.errno, errno.ENOTCONN) -- else: -- # On Windows and on OpenSSL 1.1.1, shutdown() doesn't -- # raise an error -- pass - - - @unittest.skipUnless(has_tls_version('TLSv1_3') and ssl.HAS_PHA, diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index 7167d5b4e82..83ed34d9863 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch @@ -1,4 +1,4 @@ -From b41557f570ff4451c477669d6ca5bfacabe21c66 Mon Sep 17 00:00:00 2001 +From be6588c8090edae5379f14dd76f146d383b25e50 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race @@ -17,10 +17,10 @@ Signed-off-by: Richard Purdie 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index a7e536d..e946018 100644 +index 24ca285..a1d59e4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2750,7 +2750,7 @@ COMPILEALL_OPTS=-j0 +@@ -2844,7 +2844,7 @@ COMPILEALL_OPTS=-j0 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 008d41e5654..2605beb2ccc 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -117,7 +117,7 @@ "${libdir}/python${PYTHON_MAJMIN}/asyncio", "${libdir}/python${PYTHON_MAJMIN}/concurrent", "${libdir}/python${PYTHON_MAJMIN}/concurrent/futures", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_asyncio.*.so" + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_remote_debugging.*.so" ], "cached": [] }, @@ -129,9 +129,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/wave.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/wave.*.pyc" - ] + "cached": [] }, "codecs": { "summary": "Python codec", @@ -153,11 +151,7 @@ "${libdir}/python${PYTHON_MAJMIN}/filecmp.py", "${libdir}/python${PYTHON_MAJMIN}/py_compile.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/compileall.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/filecmp.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/py_compile.*.pyc" - ] + "cached": [] }, "compression": { "summary": "Python high-level compression support", @@ -165,20 +159,16 @@ "core" ], "files": [ + "${libdir}/python${PYTHON_MAJMIN}/compression/", "${libdir}/python${PYTHON_MAJMIN}/gzip.py", "${libdir}/python${PYTHON_MAJMIN}/tarfile.py", - "${libdir}/python${PYTHON_MAJMIN}/zipfile/", - "${libdir}/python${PYTHON_MAJMIN}/compression/", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_zstd.*.so" + "${libdir}/python${PYTHON_MAJMIN}/zipfile/" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/gzip.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tarfile.*.pyc" - ] + "cached": [] }, "core": { "summary": "Python interpreter and core modules", - "rdepends": ["compression"], + "rdepends": [], "files": [ "${bindir}/python${PYTHON_MAJMIN}", "${bindir}/python${PYTHON_MAJMIN}.real", @@ -195,6 +185,7 @@ "${libdir}/python${PYTHON_MAJMIN}/_colorize.py", "${libdir}/python${PYTHON_MAJMIN}/_compression.py", "${libdir}/python${PYTHON_MAJMIN}/_markupbase.py", + "${libdir}/python${PYTHON_MAJMIN}/_missing_stdlib_info.py", "${libdir}/python${PYTHON_MAJMIN}/_opcode_metadata.py", "${libdir}/python${PYTHON_MAJMIN}/_py_warnings.py", "${libdir}/python${PYTHON_MAJMIN}/_pyrepl", @@ -213,6 +204,11 @@ "${libdir}/python${PYTHON_MAJMIN}/codeop.py", "${libdir}/python${PYTHON_MAJMIN}/collections", "${libdir}/python${PYTHON_MAJMIN}/collections/abc.py", + "${libdir}/python${PYTHON_MAJMIN}/compression", + "${libdir}/python${PYTHON_MAJMIN}/compression/_common", + "${libdir}/python${PYTHON_MAJMIN}/compression/_common/_streams.py", + "${libdir}/python${PYTHON_MAJMIN}/compression/zstd", + "${libdir}/python${PYTHON_MAJMIN}/compression/zstd/_zstdfile.py", "${libdir}/python${PYTHON_MAJMIN}/configparser.py", "${libdir}/python${PYTHON_MAJMIN}/contextlib.py", "${libdir}/python${PYTHON_MAJMIN}/copy.py", @@ -252,11 +248,14 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_bz2.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_csv.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_heapq.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_interpreters.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_lzma.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_math_integer.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_opcode.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_posixsubprocess.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_struct.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_typing.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_zstd.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/array.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/binascii.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/fcntl.*.so", @@ -282,6 +281,8 @@ "${libdir}/python${PYTHON_MAJMIN}/pathlib.py", "${libdir}/python${PYTHON_MAJMIN}/pathlib/_abc.py", "${libdir}/python${PYTHON_MAJMIN}/pathlib/_local.py", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/_os.py", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/types.py", "${libdir}/python${PYTHON_MAJMIN}/pkgutil.py", "${libdir}/python${PYTHON_MAJMIN}/platform.py", "${libdir}/python${PYTHON_MAJMIN}/posixpath.py", @@ -437,18 +438,18 @@ "${libdir}/python${PYTHON_MAJMIN}/hashlib.py", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_blake2.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_hashlib.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_hmac.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_md5.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha1.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha2.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha3.*.so" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/hashlib.*.pyc" - ] + "cached": [] }, "ctypes": { "summary": "Python C types support", "rdepends": [ + "compression", "core", "io", "math" @@ -480,14 +481,9 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/_strptime.py", "${libdir}/python${PYTHON_MAJMIN}/calendar.py", - "${libdir}/python${PYTHON_MAJMIN}/datetime.py", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_datetime.*.so" + "${libdir}/python${PYTHON_MAJMIN}/datetime.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_strptime.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/calendar.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/datetime.*.pyc" - ] + "cached": [] }, "db": { "summary": "Python file-based database support", @@ -503,7 +499,15 @@ "debugger": { "summary": "Python debugger", "rdepends": [ + "asyncio", + "compression", "core", + "io", + "json", + "logging", + "math", + "netclient", + "numbers", "pprint", "shell", "stringold" @@ -512,10 +516,7 @@ "${libdir}/python${PYTHON_MAJMIN}/bdb.py", "${libdir}/python${PYTHON_MAJMIN}/pdb.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/bdb.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pdb.*.pyc" - ] + "cached": [] }, "dev": { "cached": [], @@ -545,16 +546,22 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/difflib.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/difflib.*.pyc" - ] + "cached": [] }, "doctest": { "summary": "Python framework for running examples in docstrings", "rdepends": [ + "asyncio", + "compression", "core", "debugger", "difflib", + "io", + "json", + "logging", + "math", + "netclient", + "numbers", "pprint", "shell", "stringold", @@ -563,9 +570,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/doctest.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/doctest.*.pyc" - ] + "cached": [] }, "email": { "summary": "Python email support", @@ -582,9 +587,7 @@ "${libdir}/python${PYTHON_MAJMIN}/email", "${libdir}/python${PYTHON_MAJMIN}/imaplib.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/imaplib.*.pyc" - ] + "cached": [] }, "ensurepip": { "summary": "Support for bootstrapping the pip installer", @@ -601,9 +604,7 @@ "rdepends": [ "core" ], - "files": [ - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/fcntl.*.so" - ], + "files": [], "cached": [] }, "gdbm": { @@ -645,13 +646,12 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/colorsys.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/colorsys.*.pyc" - ] + "cached": [] }, "io": { "summary": "Python low-level I/O", "rdepends": [ + "compression", "core", "math", "netclient" @@ -665,12 +665,7 @@ "${libdir}/python${PYTHON_MAJMIN}/ssl.py", "${libdir}/python${PYTHON_MAJMIN}/tempfile.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_pyio.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/socket.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ssl.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tempfile.*.pyc" - ] + "cached": [] }, "json": { "summary": "Python JSON support", @@ -713,9 +708,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/mailbox.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/mailbox.*.pyc" - ] + "cached": [] }, "math": { "summary": "Python math support", @@ -727,9 +720,7 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/cmath.*.so", "${libdir}/python${PYTHON_MAJMIN}/random.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/random.*.pyc" - ] + "cached": [] }, "mime": { "summary": "Python MIME handling APIs", @@ -739,9 +730,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/quopri.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/quopri.*.pyc" - ] + "cached": [] }, "mmap": { "summary": "Python memory-mapped file support", @@ -816,10 +805,12 @@ "multiprocessing": { "summary": "Python multiprocessing support", "rdepends": [ + "compression", "core", "crypt", "ctypes", "io", + "json", "math", "mmap", "netclient", @@ -859,16 +850,7 @@ "${libdir}/python${PYTHON_MAJMIN}/urllib", "${libdir}/python${PYTHON_MAJMIN}/uuid.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/base64.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ftplib.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/hmac.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/mimetypes.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/poplib.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/secrets.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/smtplib.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/uuid.*.pyc" - ] + "cached": [] }, "netserver": { "summary": "Python Internet Protocol servers", @@ -879,9 +861,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/socketserver.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/socketserver.*.pyc" - ] + "cached": [] }, "numbers": { "summary": "Python number APIs", @@ -893,17 +873,10 @@ "${libdir}/python${PYTHON_MAJMIN}/contextvars.py", "${libdir}/python${PYTHON_MAJMIN}/decimal.py", "${libdir}/python${PYTHON_MAJMIN}/fractions.py", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_contextvars.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_decimal.*.so", "${libdir}/python${PYTHON_MAJMIN}/numbers.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_pydecimal.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/contextvars.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/decimal.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/fractions.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/numbers.*.pyc" - ] + "cached": [] }, "pickle": { "summary": "Python serialisation/persistence support", @@ -917,12 +890,7 @@ "${libdir}/python${PYTHON_MAJMIN}/pickletools.py", "${libdir}/python${PYTHON_MAJMIN}/shelve.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_compat_pickle.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pickle.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pickletools.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shelve.*.pyc" - ] + "cached": [] }, "pkgutil": { "summary": "Python package extension utility support", @@ -942,9 +910,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/plistlib.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/plistlib.*.pyc" - ] + "cached": [] }, "pprint": { "summary": "Python pretty-print support", @@ -954,9 +920,7 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/pprint.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pprint.*.pyc" - ] + "cached": [] }, "profile": { "summary": "Python basic performance profiling support", @@ -967,13 +931,11 @@ "${libdir}/python${PYTHON_MAJMIN}/cProfile.py", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_lsprof.*.so", "${libdir}/python${PYTHON_MAJMIN}/profile.py", + "${libdir}/python${PYTHON_MAJMIN}/profiling", + "${libdir}/python${PYTHON_MAJMIN}/profiling/tracing", "${libdir}/python${PYTHON_MAJMIN}/pstats.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cProfile.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/profile.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pstats.*.pyc" - ] + "cached": [] }, "pydoc": { "summary": "Python interactive help support", @@ -985,9 +947,7 @@ "${libdir}/python${PYTHON_MAJMIN}/pydoc.py", "${libdir}/python${PYTHON_MAJMIN}/pydoc_data" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pydoc.*.pyc" - ] + "cached": [] }, "resource": { "summary": "Python resource control interface", @@ -1002,17 +962,13 @@ "shell": { "summary": "Python shell-like functionality", "rdepends": [ - "core", - "stringold" + "core" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/cmd.py", "${libdir}/python${PYTHON_MAJMIN}/shlex.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cmd.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shlex.*.pyc" - ] + "cached": [] }, "sqlite3": { "summary": "Python Sqlite3 database support", @@ -1037,9 +993,7 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_statistics.*.so", "${libdir}/python${PYTHON_MAJMIN}/statistics.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/statistics.*.pyc" - ] + "cached": [] }, "stringold": { "summary": "Common string operations", @@ -1072,10 +1026,7 @@ "${libdir}/python${PYTHON_MAJMIN}/pty.py", "${libdir}/python${PYTHON_MAJMIN}/tty.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pty.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tty.*.pyc" - ] + "cached": [] }, "threading": { "summary": "Python threading & synchronization support", @@ -1087,10 +1038,7 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_queue.*.so", "${libdir}/python${PYTHON_MAJMIN}/queue.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_threading_local.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/queue.*.pyc" - ] + "cached": [] }, "tkinter": { "summary": "Python Tcl/Tk bindings", @@ -1141,15 +1089,15 @@ "files": [ "${libdir}/python${PYTHON_MAJMIN}/getpass.py" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/getpass.*.pyc" - ] + "cached": [] }, "venv": { "summary": "Provides support for creating lightweight virtual environments with their own site directories, optionally isolated from system site directories.", "rdepends": [ + "compression", "core", "logging", + "shell", "stringold" ], "files": [ @@ -1200,11 +1148,10 @@ "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/zipapp.py" + "${libdir}/python${PYTHON_MAJMIN}/zipapp.py", + "${libdir}/python${PYTHON_MAJMIN}/zipfile" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/zipapp.*.pyc" - ] + "cached": [] }, "zoneinfo": { "summary": "IANA time zone support", diff --git a/meta/recipes-devtools/python/python3/valid-dists.patch b/meta/recipes-devtools/python/python3/valid-dists.patch deleted file mode 100644 index 7fe18254e50..00000000000 --- a/meta/recipes-devtools/python/python3/valid-dists.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 66874ce1a9f21b4b00dc85919734d58e6243ca29 Mon Sep 17 00:00:00 2001 -From: "Jason R. Coombs" -Date: Tue, 23 Jul 2024 08:36:16 -0400 -Subject: [PATCH] Prioritize valid dists to invalid dists when retrieving by - name. - -Closes python/importlib_metadata#489 - -Upstream-Status: Backport [https://github.com/python/importlib_metadata/commit/a65c29adc027b3615154cab73aaedd58a6aa23da] -Signed-off-by: Ross Burton ---- - Lib/importlib/metadata/__init__.py | 14 +++- - Lib/importlib/metadata/_itertools.py | 98 ++++++++++++++++++++++++++++ - 2 files changed, 110 insertions(+), 2 deletions(-) - -diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py -index 8ce62dd..085378c 100644 ---- a/Lib/importlib/metadata/__init__.py -+++ b/Lib/importlib/metadata/__init__.py -@@ -21,7 +21,7 @@ import collections - from . import _meta - from ._collections import FreezableDefaultDict, Pair - from ._functools import method_cache, pass_none --from ._itertools import always_iterable, unique_everseen -+from ._itertools import always_iterable, bucket, unique_everseen - from ._meta import PackageMetadata, SimplePath - - from contextlib import suppress -@@ -404,7 +404,7 @@ class Distribution(DeprecatedNonAbstract): - if not name: - raise ValueError("A distribution name is required.") - try: -- return next(iter(cls.discover(name=name))) -+ return next(iter(cls._prefer_valid(cls.discover(name=name)))) - except StopIteration: - raise PackageNotFoundError(name) - -@@ -428,6 +428,16 @@ class Distribution(DeprecatedNonAbstract): - resolver(context) for resolver in cls._discover_resolvers() - ) - -+ @staticmethod -+ def _prefer_valid(dists: Iterable[Distribution]) -> Iterable[Distribution]: -+ """ -+ Prefer (move to the front) distributions that have metadata. -+ -+ Ref python/importlib_resources#489. -+ """ -+ buckets = bucket(dists, lambda dist: bool(dist.metadata)) -+ return itertools.chain(buckets[True], buckets[False]) -+ - @staticmethod - def at(path: str | os.PathLike[str]) -> Distribution: - """Return a Distribution for the indicated metadata path. -diff --git a/Lib/importlib/metadata/_itertools.py b/Lib/importlib/metadata/_itertools.py -index d4ca9b9..79d3719 100644 ---- a/Lib/importlib/metadata/_itertools.py -+++ b/Lib/importlib/metadata/_itertools.py -@@ -1,3 +1,4 @@ -+from collections import defaultdict, deque - from itertools import filterfalse - - -@@ -71,3 +72,100 @@ def always_iterable(obj, base_type=(str, bytes)): - return iter(obj) - except TypeError: - return iter((obj,)) -+ -+ -+# Copied from more_itertools 10.3 -+class bucket: -+ """Wrap *iterable* and return an object that buckets the iterable into -+ child iterables based on a *key* function. -+ -+ >>> iterable = ['a1', 'b1', 'c1', 'a2', 'b2', 'c2', 'b3'] -+ >>> s = bucket(iterable, key=lambda x: x[0]) # Bucket by 1st character -+ >>> sorted(list(s)) # Get the keys -+ ['a', 'b', 'c'] -+ >>> a_iterable = s['a'] -+ >>> next(a_iterable) -+ 'a1' -+ >>> next(a_iterable) -+ 'a2' -+ >>> list(s['b']) -+ ['b1', 'b2', 'b3'] -+ -+ The original iterable will be advanced and its items will be cached until -+ they are used by the child iterables. This may require significant storage. -+ -+ By default, attempting to select a bucket to which no items belong will -+ exhaust the iterable and cache all values. -+ If you specify a *validator* function, selected buckets will instead be -+ checked against it. -+ -+ >>> from itertools import count -+ >>> it = count(1, 2) # Infinite sequence of odd numbers -+ >>> key = lambda x: x % 10 # Bucket by last digit -+ >>> validator = lambda x: x in {1, 3, 5, 7, 9} # Odd digits only -+ >>> s = bucket(it, key=key, validator=validator) -+ >>> 2 in s -+ False -+ >>> list(s[2]) -+ [] -+ -+ """ -+ -+ def __init__(self, iterable, key, validator=None): -+ self._it = iter(iterable) -+ self._key = key -+ self._cache = defaultdict(deque) -+ self._validator = validator or (lambda x: True) -+ -+ def __contains__(self, value): -+ if not self._validator(value): -+ return False -+ -+ try: -+ item = next(self[value]) -+ except StopIteration: -+ return False -+ else: -+ self._cache[value].appendleft(item) -+ -+ return True -+ -+ def _get_values(self, value): -+ """ -+ Helper to yield items from the parent iterator that match *value*. -+ Items that don't match are stored in the local cache as they -+ are encountered. -+ """ -+ while True: -+ # If we've cached some items that match the target value, emit -+ # the first one and evict it from the cache. -+ if self._cache[value]: -+ yield self._cache[value].popleft() -+ # Otherwise we need to advance the parent iterator to search for -+ # a matching item, caching the rest. -+ else: -+ while True: -+ try: -+ item = next(self._it) -+ except StopIteration: -+ return -+ item_value = self._key(item) -+ if item_value == value: -+ yield item -+ break -+ elif self._validator(item_value): -+ self._cache[item_value].append(item) -+ -+ def __iter__(self): -+ for item in self._it: -+ item_value = self._key(item) -+ if self._validator(item_value): -+ self._cache[item_value].append(item) -+ -+ yield from self._cache.keys() -+ -+ def __getitem__(self, value): -+ if not self._validator(value): -+ return iter(()) -+ -+ return self._get_values(value) diff --git a/meta/recipes-devtools/python/python3_3.14.10.bb b/meta/recipes-devtools/python/python3_3.15.2.bb similarity index 98% rename from meta/recipes-devtools/python/python3_3.14.10.bb rename to meta/recipes-devtools/python/python3_3.15.2.bb index b062b4e7c50..0ead68b7497 100644 --- a/meta/recipes-devtools/python/python3_3.14.10.bb +++ b/meta/recipes-devtools/python/python3_3.15.2.bb @@ -18,19 +18,17 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://makerace.patch \ file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \ file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \ - file://valid-dists.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ file://0001-Update-test_sysconfig-for-posix_user-purelib.patch \ file://0001-prefer-valid-entrypoints.patch \ - file://0001-gh-146207-Add-support-for-OpenSSL-4.0.0.patch \ - file://0002-gh-148292-Update-_ssl._SSLSocket-for-OpenSSL-4.patch \ - file://0003-gh-148292-Remove-shutdown-test-in-test_ssl.test_got_eof.patch \ + file://0001-configure-clear-RUNSHARED-when-cross-compiling.patch \ + file://0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch \ " SRC_URI:append:class-native = " \ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ " -SRC_URI[sha256sum] = "de414a57119abef52784d8993e341d53aed635fc2b05c2607d9f98a2c5b72032" +SRC_URI[sha256sum] = "8b5536d280142ecf6cdfe15d12a21ba1c65e300bbf7b28a8d0cdb849575797de" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" @@ -41,7 +39,7 @@ inherit upstream-stable-release-point CVE_PRODUCT = "python:python python_software_foundation:python cpython" -PYTHON_MAJMIN = "3.14" +PYTHON_MAJMIN = "3.15" S = "${UNPACKDIR}/Python-${PV}" @@ -75,7 +73,7 @@ DEPENDS = "\ DEPENDS:append:class-target = " python3-native" DEPENDS:append:class-nativesdk = " python3-native" -EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib} --with-system-expat" +EXTRA_OECONF = " --without-ensurepip --enable-shared --with-platlibdir=${baselib} --with-system-expat --without-system-libmpdec" EXTRA_OECONF:append:class-native = " --bindir=${bindir}/${PN}" EXTRA_OECONF:append:class-target = " --with-build-python=nativepython3 PLATFORM_TRIPLET=${HOST_ARCH}-${HOST_OS}" EXTRA_OECONF:append:class-nativesdk = " --with-build-python=nativepython3"