From patchwork Wed Nov 11 11:21:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 103736 Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.49]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7277.1794396076585071833 for ; Wed, 11 Nov 2026 03:21:17 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=Hmw/s4UE; spf=pass (domain: est.tech, ip: 40.107.130.49, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lyJa9TtI9oby/c2/lijZiQrl9D4FD1E771Y1+C7k7HHuDwfTSQW935M5rOn6Ac7+oRhdWNT3h/cFr/WNipdzrdOJQ2YjJSiNxz8NsLE4KYXGV76eJ8UPPtSQ5ndufLJgjVEqyDWzUbsrF2dUj3Wfk4i9Lo9s9nL+jSAOZFzuObNsxSriU+dAwY4S2OtRrqz83FA9InRYCzzu19VIJbKn8Zvuk2atMx0zXS8i0+eRAn74rgj8CXXeBZRp1W/O7x+KkIwzZqfeL404t+bUih1pgyeeDSMq3p1BOsZJGXtTCCssQGIkoJlXFcXX4tIuzRCi+Y39sOd8zV9NyktWrhijrA== 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=ycV1FjAlnSArmvkY54b1coU3gHBeshwGi/iwWJSxpVA=; b=dOXF8p24xAr3/0BWewHqBqaDzIdNDWoOxVK3FG/2AmMhjZaXAhlYCao8+mEvpj95dbobbaGALZ2P3KgpNZLuPJyDtpfBA9czYjUJCqd/GzFVMGfQJq7NOsmy4aX9/JmXMW6ixaA3Nm0/tgcAqZCfReuWgQQ9GuSJKrTDC3DtR5sEfPha7Lnbr4CiE0UuRpaZKvixd4dwHquVVDp+QgSCRfc48KOBh2CWxO/E8VjWdHzaNX9kESZoxUVdWWiWzZYX9B9xZErmL3pZ2/zqR+p+pdfdSZff9htx31lcvZS1em5LDYb/lWVWtGHqWsgMSiy5yAwNgJ/7pUinkpieWflQng== 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=ycV1FjAlnSArmvkY54b1coU3gHBeshwGi/iwWJSxpVA=; b=Hmw/s4UEn5ECfPHahuUTCCcz9SJWf4LyrLEuvGbiUW8Kfo61SCcfL7exqEt+uJT/BkJdVkoOL91AgWx0OjpjgiX06v7iPhh/ntJ6glqSEtazWxX6QBMrlnYq9h4kNIY0RCcKDKyZMMjBWNdGE3283aoQ4bZrd2dkwoVbGixPyovvWoNTs60+hW8HVzBu2Pn7tfuV9HUmn4oxuy3U20OzAIIh0knWEhwj89pe+GcYiZmen/xXI+G2RAWXqPQMb/HcSIudDCGuqpArJ9obCcLohRNGpHw25Do9XDf7AgOXCrvoEMZEHri9S1PJMjWgW+pli4nTi1+zDjcrSklYDsWqew== 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 VI6PPF8FD414EA2.EURP189.PROD.OUTLOOK.COM (2603:10a6:808:1::1a0) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.8; Wed, 11 Nov 2026 11:21:09 +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.0615.007; Wed, 11 Nov 2026 11:21:09 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [PATCH v8] python3: Upgrade 3.14.10 -> 3.15.2 Date: Wed, 11 Nov 2026 12:21:07 +0100 Message-ID: <20261111112107.85927-1-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) X-ClientProxiedBy: LO4P123CA0021.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:151::8) 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_|VI6PPF8FD414EA2:EE_ X-MS-Office365-Filtering-Correlation-Id: 664ee0a7-0b26-418d-dae0-08df3fe5e270 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|366016|1800799024|260925022911599003|260925021911599003|260925021311599003|261026140227099003|5023799004|11063799006|56012099006|261022113327099003|261022105027099003|261022075727099003|261021123027099003|261021130227099003|261021121427099003|261026130827099003|261026135527099003|261021133027099003|261022115727099003|261026121527099003|261009223027099003|261028144727099003|261021135927099003|261009223327099003|261102123227099003|10067099003|261009220027099003|261009221227099003|12006099003|25016099003|261009221727099003|18002099003|29003799003|6133799003|3023799007; X-Microsoft-Antispam-Message-Info: r1BvbaZn1JL8jg5sJ+us0INfpmchgi7/Eu44vnkiGxPtBBKoLF8zXXh+3HIsgHEDjyxzUhnfDb8iVGEtUiKtLtzrB1wkOe7cNpRXlw6VoPGnoflrrZe6uaVlsc9pCuPkNytBWdTzjfXLo7x9unoBlIOcDCar2ZA8z84ffgSsLmJAqCjKdKfp8QMq6UDj/oGUi/zm7BW88w2L7w7yPBFCNUwNiN3FudgFwVneHb2/dN1xvB63iY8TmAVKQNFtGppUSjA7+OmhYvK1niAQTQdXcnrLOXrVxQ6VWvQ9D3v+ntpOyenlMFqK1UWChs46kmpMJZ8vke+0nOPaIRuAlweFTkkV6mwYrbuD/KGDb3ueX6tALklXzzA8nUllfW01vUbMqOtVzkufyP7o1AysRp0elAcYtGFdAmkZ7i69MRCxpOvL+0bI3mVT7un7TA9SkA1apJDIo5JcO3pRiGfUlKk+lERCJiFI41tFKdpjWRkGSMNNIdmFOc2ge77fbBhBl/XXSaS6ClbdIhVRU2rDZgqIC2VgKU+pFExxDLG+6MxrXwnVDsczuYmAnoB+QOjZJAKo1GTILNW7Eoa3UmznQr0ScGIVruJO7Flx7AXpc3nnfJ1UlTMeIPrEz6sttIdYpd7F 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)(23010399003)(376014)(366016)(1800799024)(260925022911599003)(260925021911599003)(260925021311599003)(261026140227099003)(5023799004)(11063799006)(56012099006)(261022113327099003)(261022105027099003)(261022075727099003)(261021123027099003)(261021130227099003)(261021121427099003)(261026130827099003)(261026135527099003)(261021133027099003)(261022115727099003)(261026121527099003)(261009223027099003)(261028144727099003)(261021135927099003)(261009223327099003)(261102123227099003)(10067099003)(261009220027099003)(261009221227099003)(12006099003)(25016099003)(261009221727099003)(18002099003)(29003799003)(6133799003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1oBhAslyVwnq4pEeddHXupqm8cw1dTVlLeCnmfGEtxA/WjV7ic/d7MvBuIZq0CD8JEaAr0ajWl8hq51f5tT0K7estiK0EqTPgZc02vYJfnz2N6CWpFf/bIetM5q0846B/fOMZiUlIua0pcr44u2s6UOb84R3BoRNJ+txTebtArsG86VcCnh5+tYmm9qqjZAp0Q5D+cx5AFkX4Yxz1Y6XJJzZV9wXnvLtQYuieNstk5Hhio3K/QofSnLGEKm4ZoLivpLCqNCho+PtyPkyRn15nX/DCyPsXkJr8N1wZ+kCs+EOaQ0zlPNMr5TcjkA368Qy4nK6p2zKieX0KoXdOlVDyUZtc+OaxCJwPkiOhtVa+MzPRiicL92iZFUHg9JWwj/o49Wsi/2if7KacfsG1NGXLoRLHMoeIN7YE10cVPGCarFUE197CAgXk12IIkPkgPkKjNcMACaAG2BoIWhJEGotEx6jgiIM6L7/0dZDeZ/Pf6dNvr+r5t+Jqw1R7mmLbwd1+2xuhO4492iK+6NTSogxMddxLsMWYNJFl7V/QJCPxqR+eGK1KKoF7vH8AG8NQ0twEDzWXSWpduIshL5vTibZ42vZO0I1gQ3iYEQ5A/o69//WojLOciPHQIO/49aZwJMQc0pv/Zxx34XtmANIGvirDLJLGtlRjD+HKE2PS54yGQOg8h6+o9R81dQc0VjHggQMUf+MdJTRP+6ci6Sh3pdrWX3D+mq5gZI1BvZe8W0HZIpXdUuWfTVoEb688gw2oHx+GRoOnajOeuKRgUYC82ATM67uLk6xhMqNu4OCY6LxOLZ3K8yBezJ5+DBG+DAkqYau5am7woja/suaH+CmeaEdzVcb0wwP8Rk8QQ0kdiH4RAqBd6m8x5OQ42OP3zf2wi0hOZxCYyApFDApFh7w9hfSaxPfS67qYdxTbBvKNw8RHLAdEMgffdJkl2RDzbztilyWJJEhcdHeuxYWJaX9ac2EA52EfbqEnssB5bH+FEM7IVrpVEiIPASWfXXaUNk9AplCR74vAVabRI83T4EAneNX6xKpB4X8kdYrjQTHe4MoaNdE7EXyrucbBVcqcWiAEk00Vr7jmLBZurqiwn7G8yLhE+54TihYtSSYF5Wxy10mz79hjRnjg90Kd9JVprszaMr/6oOz59Y2irWf33/3GRuihseZREUtkJt/EDhaWrVSaR7v2Uk1ydfyw6UoYCzWscM0uILjiovEYmvhpotLL34JrJ3ly31qiv8yPCPVt+0uOGGLzbjMqfOX0A9PlRajl10QU73MyrR+RNcNv7ShdNP3IKU/gRVzbY3K+EdbD5aU3381QSbcE0jYn67adptsiryFj7C5HdQ7BD/0PyBwm466+Vt5mPbvDZJhsvgsY8U4YfHsGRQeAVzmCB29MoEy3ITKbUx+aR8peNEf/azbDVkastQ8ZOeluRCwgdYKwKRJlBz5L+MvCiekZxv9vWX3uL4CUdW58jmGf/b+BPs24z3bognuGDhD8vy2OyC9DTFtzmxvPxSInRhXHklK8T9HmSVAOtZX7EWZcbyy3j71V6B94tITNJBWc/BDpRjosT5NOFRqUiJcY/PjGNf5Rpt3XlGxOXItEFkCChLDfcigRodcq1mg/BBt2tVrQUbVGG0GL/Ol5BZ5HIJLvQP+oGl0J27tq/xbyFeGCYP+hyBDMlwPmfTUHnwOdbWgbcDYuvPYiEFXIWlgsKq+fAZwOgomfq8++NfiDe+qMzGQpmg/vUv/LDL4drU0M6brwC7vK2dYyKE= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 664ee0a7-0b26-418d-dae0-08df3fe5e270 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2026 11:21:09.1231 (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: J9JEsVZEJl2DM1zebkDrvLNFaOcoUjgOWw3abw69Z+7Pa56cPkyxin/JvgLmpcM1GrKkjMJtDf2iT2yGbKGktIiQw4VXmupsQQk2iFIzCxA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI6PPF8FD414EA2 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 ; Wed, 11 Nov 2026 11:21:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/250015 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-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.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 v7: - Fix manifest cache - Cache is generated on top of https://lists.openembedded.org/g/openembedded-core/message/249924 meta/classes-recipe/python3-dir.bbclass | 2 +- ...on-t-run-the-build-Python-with-RUNSH.patch | 205 ++++++++++++++ ...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 +- ...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 | 69 +++-- .../python/python3/valid-dists.patch | 164 ----------- .../{python3_3.14.10.bb => python3_3.15.2.bb} | 12 +- 18 files changed, 339 insertions(+), 740 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0001-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.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 3eb0dea9b2..b26621f365 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-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.patch b/meta/recipes-devtools/python/python3/0001-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.patch new file mode 100644 index 0000000000..727073ab30 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.patch @@ -0,0 +1,205 @@ +From 23c52794850d45001fb56351d0f4309c7b5d7bcb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ahmed=20Semih=20=C3=96zmekik?= +Date: Mon, 9 Nov 2026 18:13:53 +0300 +Subject: [PATCH] [3.15] gh-160924: Don't run the build Python with RUNSHARED + when cross-compiling (GH-161321) (#161659) + +When cross-compiling, `PYTHON_FOR_BUILD` uses the interpreter specified +by `--with-build-python`. With `--enable-shared`, running it with +`RUNSHARED` adds the target build directory to `LD_LIBRARY_PATH`. A +shared build Python can then load the target's `libpython` instead of +its own, failing if the target uses an incompatible libc or architecture. + +Introduce `RUNSHARED_FOR_BUILD`, set to `$(RUNSHARED)` for native builds +and empty for cross builds, and use it for `PYTHON_FOR_BUILD` invocations +during building and installation. + +Leave `RUNSHARED` unchanged for PGO profiling (gh-141926) and +`TESTPYTHON`, which uses `HOSTRUNNER` to launch the target interpreter. + +(cherry picked from commit 72718034979bf81a39817b76bfed53838982bddf) + +Upstream-Status: Backport [https://github.com/python/cpython/commit/23c52794850d45001fb56351d0f4309c7b5d7bcb] + +Signed-off-by: Jaipaul Cheernam +--- + Makefile.pre.in | 23 ++++++++++--------- + ...-11-04-15-00-00.gh-issue-160924.WQgVVh.rst | 3 +++ + configure | 6 +++++ + configure.ac | 5 ++++ + 4 files changed, 26 insertions(+), 11 deletions(-) + create mode 100644 Misc/NEWS.d/next/Build/2026-11-04-15-00-00.gh-issue-160924.WQgVVh.rst + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index b5d31640ec0..5ab9a055a20 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -226,6 +226,7 @@ LIPO_INTEL64_FLAGS=@LIPO_INTEL64_FLAGS@ + + # Environment to run shared python without installed libraries + RUNSHARED= @RUNSHARED@ ++RUNSHARED_FOR_BUILD= @RUNSHARED_FOR_BUILD@ + + # ensurepip options + ENSUREPIP= @ENSUREPIP@ +@@ -1010,7 +1011,7 @@ $(BUILDPYTHON): Programs/python.o $(LINK_PYTHON_DEPS) + $(LINKCC) $(PY_CORE_EXE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS) + + platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform + + # Create build directory and generate the sysconfig build-time data there. + # pybuilddir.txt contains the name of the build dir and is used for +@@ -1021,7 +1022,7 @@ platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt + # or removed in case of failure. + pybuilddir.txt: $(PYTHON_FOR_BUILD_DEPS) + @echo "none" > ./pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -X pathconfig_warnings=0 -m sysconfig --generate-posix-vars ;\ ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) -S -X pathconfig_warnings=0 -m sysconfig --generate-posix-vars ;\ + if test $$? -ne 0 ; then \ + echo "generate-posix-vars failed" ; \ + rm -f ./pybuilddir.txt ; \ +@@ -1029,7 +1030,7 @@ pybuilddir.txt: $(PYTHON_FOR_BUILD_DEPS) + fi + + build-details.json: pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/generate-build-details.py `cat pybuilddir.txt`/build-details.json ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/generate-build-details.py `cat pybuilddir.txt`/build-details.json + + # Build static library + $(LIBRARY): $(LIBRARY_OBJS) +@@ -1637,11 +1638,11 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt + .PHONY: checksharedmods + checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) + @if [ -n "@MISSING_STDLIB_CONFIG@" ]; then \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info --with-missing-stdlib-config="@MISSING_STDLIB_CONFIG@"; \ ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info --with-missing-stdlib-config="@MISSING_STDLIB_CONFIG@"; \ + else \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info; \ ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info; \ + fi +- @$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py ++ @$(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py + + .PHONY: rundsymutil + rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) +@@ -2448,7 +2449,7 @@ install: @FRAMEWORKINSTALLFIRST@ @INSTALLTARGETS@ @FRAMEWORKINSTALLLAST@ + upgrade) ensurepip="--upgrade" ;; \ + install|*) ensurepip="" ;; \ + esac; \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) -m ensurepip \ + $$ensurepip --root=$(DESTDIR)/ ; \ + fi + +@@ -2459,7 +2460,7 @@ altinstall: commoninstall + upgrade) ensurepip="--altinstall --upgrade" ;; \ + install|*) ensurepip="--altinstall" ;; \ + esac; \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ ++ $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) -m ensurepip \ + $$ensurepip --root=$(DESTDIR)/ ; \ + fi + +@@ -2925,12 +2926,12 @@ libinstall: all $(srcdir)/Modules/xxmodule.c + patch --force --reject-file "$(abs_builddir)/app-store-compliance.rej" --strip 2 --directory "$(DESTDIR)$(LIBDEST)" --input "$(abs_srcdir)/$(APP_STORE_COMPLIANCE_PATCH)" || true ; \ + fi + @ # Build PYC files for the 3 optimization levels (0, 1, 2) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED_FOR_BUILD) \ + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ + -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \ + -x 'bad_coding|badsyntax|site-packages' \ + $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED_FOR_BUILD) \ + $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ + -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ + -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +@@ -3147,7 +3148,7 @@ frameworkinstallunversionedstructure: $(LDLIBRARY) + rm -rf $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/include; \ + fi + $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR) +- sed 's/%VERSION%/'"`$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Info.plist ++ sed 's/%VERSION%/'"`$(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Info.plist + $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY) + $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBDIR) + $(LN) -fs "../$(LDLIBRARY)" "$(DESTDIR)$(prefix)/lib/libpython$(LDVERSION).dylib" +diff --git a/Misc/NEWS.d/next/Build/2026-11-04-15-00-00.gh-issue-160924.WQgVVh.rst b/Misc/NEWS.d/next/Build/2026-11-04-15-00-00.gh-issue-160924.WQgVVh.rst +new file mode 100644 +index 00000000000..2817321dc7e +--- /dev/null ++++ b/Misc/NEWS.d/next/Build/2026-11-04-15-00-00.gh-issue-160924.WQgVVh.rst +@@ -0,0 +1,3 @@ ++Fix cross-compilation failures with ``--enable-shared`` caused by the ++build Python loading the target's ``libpython`` through the shared-library ++search path (such as musl from glibc). +diff --git a/configure b/configure +index dfafbf56835..c7fb08214e1 100755 +--- a/configure ++++ b/configure +@@ -1029,6 +1029,7 @@ CONFIG_ARGS + SOVERSION + VERSION + PYTHON_FOR_REGEN ++RUNSHARED_FOR_BUILD + PYTHON_FOR_BUILD_DEPS + FREEZE_MODULE_DEPS + FREEZE_MODULE +@@ -3832,6 +3833,9 @@ then : + FREEZE_MODULE='$(FREEZE_MODULE_BOOTSTRAP)' + FREEZE_MODULE_DEPS='$(FREEZE_MODULE_BOOTSTRAP_DEPS)' + PYTHON_FOR_BUILD_DEPS='' ++ # The build Python is a separate interpreter. RUNSHARED would make it ++ # load the in-tree libpython, which may need a different libc. ++ RUNSHARED_FOR_BUILD='' + + else case e in #( + e) +@@ -3840,6 +3844,7 @@ else case e in #( + FREEZE_MODULE='$(PYTHON_FOR_FREEZE) $(srcdir)/Programs/_freeze_module.py' + FREEZE_MODULE_DEPS="_bootstrap_python \$(srcdir)/Programs/_freeze_module.py" + PYTHON_FOR_BUILD_DEPS='$(BUILDPYTHON)' ++ RUNSHARED_FOR_BUILD='$(RUNSHARED)' + + ;; + esac +@@ -3850,6 +3855,7 @@ fi + + + ++ + for ac_prog in python$PACKAGE_VERSION python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 python3 python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +diff --git a/configure.ac b/configure.ac +index 8a74fd8a9bf..625ccd166e3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -194,6 +194,9 @@ AS_VAR_IF([cross_compiling], [yes], + FREEZE_MODULE='$(FREEZE_MODULE_BOOTSTRAP)' + FREEZE_MODULE_DEPS='$(FREEZE_MODULE_BOOTSTRAP_DEPS)' + PYTHON_FOR_BUILD_DEPS='' ++ # The build Python is a separate interpreter. RUNSHARED would make it ++ # load the in-tree libpython, which may need a different libc. ++ RUNSHARED_FOR_BUILD='' + ], + [ + dnl internal build tools also depend on Programs/_freeze_module and _bootstrap_python. +@@ -202,6 +205,7 @@ AS_VAR_IF([cross_compiling], [yes], + FREEZE_MODULE='$(PYTHON_FOR_FREEZE) $(srcdir)/Programs/_freeze_module.py' + FREEZE_MODULE_DEPS="_bootstrap_python \$(srcdir)/Programs/_freeze_module.py" + PYTHON_FOR_BUILD_DEPS='$(BUILDPYTHON)' ++ RUNSHARED_FOR_BUILD='$(RUNSHARED)' + ] + ) + AC_SUBST([FREEZE_MODULE_BOOTSTRAP]) +@@ -209,6 +213,7 @@ AC_SUBST([FREEZE_MODULE_BOOTSTRAP_DEPS]) + AC_SUBST([FREEZE_MODULE]) + AC_SUBST([FREEZE_MODULE_DEPS]) + AC_SUBST([PYTHON_FOR_BUILD_DEPS]) ++AC_SUBST([RUNSHARED_FOR_BUILD]) + + AC_CHECK_PROGS([PYTHON_FOR_REGEN], + [python$PACKAGE_VERSION python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 python3 python], 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 79fee9803f..f5acfb789c 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 532adfe69a..322de292ce 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 580d38a403..ce2efd431c 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 d3f46c372a..dd5a87cd54 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 0864f23926..6cc7ae187e 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-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 37f55de65c..0000000000 --- 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 0000000000..581dad9b2e --- /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 525a2ca700..e504325592 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 7807827d9a..e24d6b63b1 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 a60d082e2f..12d87168ca 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 1b9a7fc942..0000000000 --- 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 59742290e8..0000000000 --- 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 7167d5b4e8..83ed34d986 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 50fdf5d0ea..c7817662e3 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": [] }, @@ -165,11 +165,10 @@ "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", @@ -178,7 +177,7 @@ }, "core": { "summary": "Python interpreter and core modules", - "rdepends": ["compression"], + "rdepends": [], "files": [ "${bindir}/python${PYTHON_MAJMIN}", "${bindir}/python${PYTHON_MAJMIN}.real", @@ -195,13 +194,14 @@ "${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", "${libdir}/python${PYTHON_MAJMIN}/_pyrepl/pager.py", "${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.py", - "${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py", "${libdir}/python${PYTHON_MAJMIN}/_sysconfig_vars*.json", + "${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py", "${libdir}/python${PYTHON_MAJMIN}/_weakrefset.py", "${libdir}/python${PYTHON_MAJMIN}/abc.py", "${libdir}/python${PYTHON_MAJMIN}/annotationlib.py", @@ -214,6 +214,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", @@ -253,11 +258,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", @@ -283,6 +291,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", @@ -331,6 +341,7 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_colorize.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_compression.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_markupbase.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_missing_stdlib_info.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_opcode_metadata.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_py_warnings.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sitebuiltins.*.pyc", @@ -408,6 +419,11 @@ "${libdir}/python${PYTHON_MAJMIN}/_pyrepl/__pycache__/pager.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/collections/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/collections/__pycache__/abc.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/compression/__pycache__", + "${libdir}/python${PYTHON_MAJMIN}/compression/_common/__pycache__", + "${libdir}/python${PYTHON_MAJMIN}/compression/_common/__pycache__/_streams.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/compression/zstd/__pycache__", + "${libdir}/python${PYTHON_MAJMIN}/compression/zstd/__pycache__/_zstdfile.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/encodings/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/encodings/__pycache__/aliases.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/encodings/__pycache__/latin_1.*.pyc", @@ -420,6 +436,8 @@ "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__/_abc.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__/_local.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__/_os.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__/types.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_casefix.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_compiler.*.pyc", @@ -439,6 +457,7 @@ "${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", @@ -451,6 +470,7 @@ "ctypes": { "summary": "Python C types support", "rdepends": [ + "compression", "core", "io", "math" @@ -482,8 +502,7 @@ "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", @@ -505,7 +524,15 @@ "debugger": { "summary": "Python debugger", "rdepends": [ + "asyncio", + "compression", "core", + "io", + "json", + "logging", + "math", + "netclient", + "numbers", "pprint", "shell", "stringold" @@ -554,9 +581,17 @@ "doctest": { "summary": "Python framework for running examples in docstrings", "rdepends": [ + "asyncio", + "compression", "core", "debugger", "difflib", + "io", + "json", + "logging", + "math", + "netclient", + "numbers", "pprint", "shell", "stringold", @@ -603,9 +638,7 @@ "rdepends": [ "core" ], - "files": [ - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/fcntl.*.so" - ], + "files": [], "cached": [] }, "gdbm": { @@ -654,6 +687,7 @@ "io": { "summary": "Python low-level I/O", "rdepends": [ + "compression", "core", "math", "netclient" @@ -818,10 +852,12 @@ "multiprocessing": { "summary": "Python multiprocessing support", "rdepends": [ + "compression", "core", "crypt", "ctypes", "io", + "json", "math", "mmap", "netclient", @@ -895,7 +931,6 @@ "${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" ], @@ -969,6 +1004,8 @@ "${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": [ @@ -1004,8 +1041,7 @@ "shell": { "summary": "Python shell-like functionality", "rdepends": [ - "core", - "stringold" + "core" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/cmd.py", @@ -1150,8 +1186,10 @@ "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": [ @@ -1202,7 +1240,8 @@ "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" 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 7fe18254e5..0000000000 --- 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 c50c4d4bab..51a1a63a87 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-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.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"