41 files changed, 2344 insertions, 1188 deletions
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
new file mode 100644
index 0000000000..81a613c151
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch
@@ -0,0 +1,30 @@
+From 6b111a328c1c57b1580d63894b2b5d337316f6d4 Mon Sep 17 00:00:00 2001
+From: Paulo Neves <ptsneves@gmail.com>
+Date: Tue, 7 Jun 2022 16:16:41 +0200
+Subject: [PATCH] Avoid shebang overflow on python-config.py
+The whole native path may be too big, leading to shebang
+overflow. Let's just use the env shebang.
+Denial reason: [1]
+Upstream-Status: Denied [distribution]
+[1] https://github.com/python/cpython/pull/93760#pullrequestreview-1005365737
+---
+ Makefile.pre.in | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 9ec3a71..f7d5382 100644
+--- a/Makefile.pre.in
+++ b/Makefile.pre.in
+@@ -2578,6 +2578,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
+       @ # Otherwise we might get huge shebangs with native paths
+       sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' python-config.py
+        @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
+        LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
+        @ # On Darwin, always use the python version of the script, the shell
diff --git a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch b/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
deleted file mode 100644
index 59592821d7..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 25 Jan 2019 19:04:13 +0100
-Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
- contamination
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/setup.py b/setup.py
-index 20d7f35..ab18ff0 100644
--- a/setup.py
-+++ b/setup.py
-@@ -957,7 +957,6 @@ class PyBuildExt(build_ext):
-                                                      'termcap'):
-                 readline_libs.append('termcap')
-             self.add(Extension('readline', ['readline.c'],
-                               library_dirs=['/usr/lib/termcap'],
-                                extra_link_args=readline_extra_link_args,
-                                libraries=readline_libs))
-         else:
diff --git a/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch b/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
deleted file mode 100644
index 83fd52d87f..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 148861fa16f2aaacd518770f337ea54b5182f981 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 29 Jan 2019 15:03:01 +0100
-Subject: [PATCH] Do not use the shell version of python-config that was
- introduced in 3.4
-Revert instead to the original python version: it has our tweaks and
-outputs directories correctly.
-Upstream-Status: Inappropriate [oe-specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Makefile.pre.in | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2d2e11f..cc19942 100644
--- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1431,12 +1431,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
-        sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
-        @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
-        LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
-       @ # On Darwin, always use the python version of the script, the shell
-       @ # version doesn't use the compiler customizations that are provided
-       @ # in python (_osx_support.py).
-       @if test `uname -s` = Darwin; then \
-               cp python-config.py python-config; \
-       fi
-+       @  # In OpenEmbedded, always use the python version of the script, the shell
-+       @  # version is broken in multiple ways, and doesn't return correct directories
-+       cp python-config.py python-config
- 
- 
- # Install the include files
diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
deleted file mode 100644
index a94fa0a5a9..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9da913bf5f39c6fe737219af7419170574d6fbfb Mon Sep 17 00:00:00 2001
-From: Jeremy Puhlman <jpuhlman@mvista.com>
-Date: Wed, 4 Mar 2020 00:06:42 +0000
-Subject: [PATCH] Don't search system for headers/libraries
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/setup.py b/setup.py
-index a0bf9ea..da099bf 100644
--- a/setup.py
-+++ b/setup.py
-@@ -674,8 +674,8 @@ class PyBuildExt(build_ext):
-             add_dir_to_list(self.compiler.include_dirs,
-                             sysconfig.get_config_var("INCLUDEDIR"))
- 
-        system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
-        system_include_dirs = ['/usr/include']
-+        system_lib_dirs = []
-+        system_include_dirs = []
-         # lib_dirs and inc_dirs are used to search for files;
-         # if a file is found in one of those directories, it can
-         # be assumed that no additional -I,-L directives are needed.
diff --git a/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch
new file mode 100644
index 0000000000..075737e7d1
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Generate-data-for-OpenSSL-3.4-and-add-it-to-multissl.patch
@@ -0,0 +1,1452 @@
+From db5c5763f3e3172f1dd011355b41469770dafc0f Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Thu, 28 Nov 2024 13:29:27 +0100
+Subject: [PATCH] gh-127330: Update for OpenSSL 3.4 & document+improve the
+ update process (GH-127331)
+- Add `git describe` output to headers generated by `make_ssl_data.py`
+  This info is more important than the date when the file was generated.
+  It does mean that the tool now requires a Git checkout of OpenSSL,
+  not for example a release tarball.
+- Regenerate the older file to add the info.
+  To the other older file, add a note about manual edits.
+- Add notes on how to add a new OpenSSL version
+- Add 3.4 error messages and multissl tests
+Upstream-Status: Submitted [https://github.com/python/cpython/commit/db5c5763f3e3172f1dd011355b41469770dafc0f]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ Modules/_ssl.c                             |   2 +-
+ Modules/_ssl_data_111.h                    |   4 +-
+ Modules/_ssl_data_300.h                    |   5 +-
+ Modules/{_ssl_data_31.h => _ssl_data_34.h} | 674 ++++++++++++++++++++-
+ Tools/c-analyzer/cpython/_parser.py        |   4 +-
+ Tools/ssl/make_ssl_data.py                 |  34 +-
+ Tools/ssl/multissltests.py                 |   1 +
+ 7 files changed, 714 insertions(+), 10 deletions(-)
+ rename Modules/{_ssl_data_31.h => _ssl_data_34.h} (92%)
+diff --git a/Modules/_ssl.c b/Modules/_ssl.c
+index b6b5ebf094c..e5b8bf21002 100644
+--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
+@@ -121,7 +121,7 @@ static void _PySSLFixErrno(void) {
+ 
+ /* Include generated data (error codes) */
+ #if (OPENSSL_VERSION_NUMBER >= 0x30100000L)
+-#include "_ssl_data_31.h"
+#include "_ssl_data_34.h"
+ #elif (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+ #include "_ssl_data_300.h"
+ #elif (OPENSSL_VERSION_NUMBER >= 0x10101000L)
+diff --git a/Modules/_ssl_data_111.h b/Modules/_ssl_data_111.h
+index 093c786e6a2..061fac2bd58 100644
+--- a/Modules/_ssl_data_111.h
+++ b/Modules/_ssl_data_111.h
+@@ -1,4 +1,6 @@
+-/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T02:58:04.081473 */
+/* File generated by Tools/ssl/make_ssl_data.py */
+/* Generated on 2024-11-27T12:48:46.194048+00:00 */
+/* Generated from Git commit OpenSSL_1_1_1w-0-ge04bd3433f */
+ static struct py_ssl_library_code library_codes[] = {
+ #ifdef ERR_LIB_ASN1
+     {"ASN1", ERR_LIB_ASN1},
+diff --git a/Modules/_ssl_data_300.h b/Modules/_ssl_data_300.h
+index dc66731f6b6..b687ce43c77 100644
+--- a/Modules/_ssl_data_300.h
+++ b/Modules/_ssl_data_300.h
+@@ -1,4 +1,7 @@
+-/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T03:03:52.163218 */
+/* File generated by Tools/ssl/make_ssl_data.py */
+/* Generated on 2023-06-01T03:03:52.163218 */
+/* Manually edited to add definitions from 1.1.1 (GH-105174) */
+
+ static struct py_ssl_library_code library_codes[] = {
+ #ifdef ERR_LIB_ASN1
+     {"ASN1", ERR_LIB_ASN1},
+diff --git a/Modules/_ssl_data_31.h b/Modules/_ssl_data_34.h
+similarity index 92%
+rename from Modules/_ssl_data_31.h
+rename to Modules/_ssl_data_34.h
+index c589c501f4e..d4af3e1c1fa 100644
+--- a/Modules/_ssl_data_31.h
+++ b/Modules/_ssl_data_34.h
+@@ -1,4 +1,6 @@
+-/* File generated by Tools/ssl/make_ssl_data.py *//* Generated on 2023-06-01T03:04:00.275280 */
+/* File generated by Tools/ssl/make_ssl_data.py */
+/* Generated on 2024-11-27T12:35:52.276767+00:00 */
+/* Generated from Git commit openssl-3.4.0-0-g98acb6b028 */
+ static struct py_ssl_library_code library_codes[] = {
+ #ifdef ERR_LIB_ASN1
+     {"ASN1", ERR_LIB_ASN1},
+@@ -300,6 +302,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"FIRST_NUM_TOO_LARGE", 13, 122},
+   #endif
+  #ifdef ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT
+    {"GENERALIZEDTIME_IS_TOO_SHORT", ERR_LIB_ASN1, ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT},
+  #else
+    {"GENERALIZEDTIME_IS_TOO_SHORT", 13, 232},
+  #endif
+   #ifdef ASN1_R_HEADER_TOO_LONG
+     {"HEADER_TOO_LONG", ERR_LIB_ASN1, ASN1_R_HEADER_TOO_LONG},
+   #else
+@@ -730,6 +737,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_TYPE", 13, 196},
+   #endif
+  #ifdef ASN1_R_UTCTIME_IS_TOO_SHORT
+    {"UTCTIME_IS_TOO_SHORT", ERR_LIB_ASN1, ASN1_R_UTCTIME_IS_TOO_SHORT},
+  #else
+    {"UTCTIME_IS_TOO_SHORT", 13, 233},
+  #endif
+   #ifdef ASN1_R_WRONG_INTEGER_TYPE
+     {"WRONG_INTEGER_TYPE", ERR_LIB_ASN1, ASN1_R_WRONG_INTEGER_TYPE},
+   #else
+@@ -845,6 +857,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"LISTEN_V6_ONLY", 32, 136},
+   #endif
+  #ifdef BIO_R_LOCAL_ADDR_NOT_AVAILABLE
+    {"LOCAL_ADDR_NOT_AVAILABLE", ERR_LIB_BIO, BIO_R_LOCAL_ADDR_NOT_AVAILABLE},
+  #else
+    {"LOCAL_ADDR_NOT_AVAILABLE", 32, 111},
+  #endif
+   #ifdef BIO_R_LOOKUP_RETURNED_NOTHING
+     {"LOOKUP_RETURNED_NOTHING", ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING},
+   #else
+@@ -860,6 +877,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NBIO_CONNECT_ERROR", 32, 110},
+   #endif
+  #ifdef BIO_R_NON_FATAL
+    {"NON_FATAL", ERR_LIB_BIO, BIO_R_NON_FATAL},
+  #else
+    {"NON_FATAL", 32, 112},
+  #endif
+   #ifdef BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED
+     {"NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED", ERR_LIB_BIO, BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED},
+   #else
+@@ -880,6 +902,26 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NO_SUCH_FILE", 32, 128},
+   #endif
+  #ifdef BIO_R_PEER_ADDR_NOT_AVAILABLE
+    {"PEER_ADDR_NOT_AVAILABLE", ERR_LIB_BIO, BIO_R_PEER_ADDR_NOT_AVAILABLE},
+  #else
+    {"PEER_ADDR_NOT_AVAILABLE", 32, 114},
+  #endif
+  #ifdef BIO_R_PORT_MISMATCH
+    {"PORT_MISMATCH", ERR_LIB_BIO, BIO_R_PORT_MISMATCH},
+  #else
+    {"PORT_MISMATCH", 32, 150},
+  #endif
+  #ifdef BIO_R_TFO_DISABLED
+    {"TFO_DISABLED", ERR_LIB_BIO, BIO_R_TFO_DISABLED},
+  #else
+    {"TFO_DISABLED", 32, 106},
+  #endif
+  #ifdef BIO_R_TFO_NO_KERNEL_SUPPORT
+    {"TFO_NO_KERNEL_SUPPORT", ERR_LIB_BIO, BIO_R_TFO_NO_KERNEL_SUPPORT},
+  #else
+    {"TFO_NO_KERNEL_SUPPORT", 32, 108},
+  #endif
+   #ifdef BIO_R_TRANSFER_ERROR
+     {"TRANSFER_ERROR", ERR_LIB_BIO, BIO_R_TRANSFER_ERROR},
+   #else
+@@ -920,6 +962,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNABLE_TO_REUSEADDR", 32, 139},
+   #endif
+  #ifdef BIO_R_UNABLE_TO_TFO
+    {"UNABLE_TO_TFO", ERR_LIB_BIO, BIO_R_UNABLE_TO_TFO},
+  #else
+    {"UNABLE_TO_TFO", 32, 109},
+  #endif
+   #ifdef BIO_R_UNAVAILABLE_IP_FAMILY
+     {"UNAVAILABLE_IP_FAMILY", ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY},
+   #else
+@@ -1230,6 +1277,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"ERROR_VALIDATING_SIGNATURE", 58, 171},
+   #endif
+  #ifdef CMP_R_EXPECTED_POLLREQ
+    {"EXPECTED_POLLREQ", ERR_LIB_CMP, CMP_R_EXPECTED_POLLREQ},
+  #else
+    {"EXPECTED_POLLREQ", 58, 104},
+  #endif
+   #ifdef CMP_R_FAILED_BUILDING_OWN_CHAIN
+     {"FAILED_BUILDING_OWN_CHAIN", ERR_LIB_CMP, CMP_R_FAILED_BUILDING_OWN_CHAIN},
+   #else
+@@ -1250,16 +1302,51 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"FAIL_INFO_OUT_OF_RANGE", 58, 129},
+   #endif
+  #ifdef CMP_R_GENERATE_CERTREQTEMPLATE
+    {"GENERATE_CERTREQTEMPLATE", ERR_LIB_CMP, CMP_R_GENERATE_CERTREQTEMPLATE},
+  #else
+    {"GENERATE_CERTREQTEMPLATE", 58, 197},
+  #endif
+  #ifdef CMP_R_GENERATE_CRLSTATUS
+    {"GENERATE_CRLSTATUS", ERR_LIB_CMP, CMP_R_GENERATE_CRLSTATUS},
+  #else
+    {"GENERATE_CRLSTATUS", 58, 198},
+  #endif
+  #ifdef CMP_R_GETTING_GENP
+    {"GETTING_GENP", ERR_LIB_CMP, CMP_R_GETTING_GENP},
+  #else
+    {"GETTING_GENP", 58, 192},
+  #endif
+  #ifdef CMP_R_GET_ITAV
+    {"GET_ITAV", ERR_LIB_CMP, CMP_R_GET_ITAV},
+  #else
+    {"GET_ITAV", 58, 199},
+  #endif
+   #ifdef CMP_R_INVALID_ARGS
+     {"INVALID_ARGS", ERR_LIB_CMP, CMP_R_INVALID_ARGS},
+   #else
+     {"INVALID_ARGS", 58, 100},
+   #endif
+  #ifdef CMP_R_INVALID_GENP
+    {"INVALID_GENP", ERR_LIB_CMP, CMP_R_INVALID_GENP},
+  #else
+    {"INVALID_GENP", 58, 193},
+  #endif
+  #ifdef CMP_R_INVALID_KEYSPEC
+    {"INVALID_KEYSPEC", ERR_LIB_CMP, CMP_R_INVALID_KEYSPEC},
+  #else
+    {"INVALID_KEYSPEC", 58, 202},
+  #endif
+   #ifdef CMP_R_INVALID_OPTION
+     {"INVALID_OPTION", ERR_LIB_CMP, CMP_R_INVALID_OPTION},
+   #else
+     {"INVALID_OPTION", 58, 174},
+   #endif
+  #ifdef CMP_R_INVALID_ROOTCAKEYUPDATE
+    {"INVALID_ROOTCAKEYUPDATE", ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE},
+  #else
+    {"INVALID_ROOTCAKEYUPDATE", 58, 195},
+  #endif
+   #ifdef CMP_R_MISSING_CERTID
+     {"MISSING_CERTID", ERR_LIB_CMP, CMP_R_MISSING_CERTID},
+   #else
+@@ -1425,6 +1512,21 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TRANSFER_ERROR", 58, 159},
+   #endif
+  #ifdef CMP_R_UNCLEAN_CTX
+    {"UNCLEAN_CTX", ERR_LIB_CMP, CMP_R_UNCLEAN_CTX},
+  #else
+    {"UNCLEAN_CTX", 58, 191},
+  #endif
+  #ifdef CMP_R_UNEXPECTED_CERTPROFILE
+    {"UNEXPECTED_CERTPROFILE", ERR_LIB_CMP, CMP_R_UNEXPECTED_CERTPROFILE},
+  #else
+    {"UNEXPECTED_CERTPROFILE", 58, 196},
+  #endif
+  #ifdef CMP_R_UNEXPECTED_CRLSTATUSLIST
+    {"UNEXPECTED_CRLSTATUSLIST", ERR_LIB_CMP, CMP_R_UNEXPECTED_CRLSTATUSLIST},
+  #else
+    {"UNEXPECTED_CRLSTATUSLIST", 58, 201},
+  #endif
+   #ifdef CMP_R_UNEXPECTED_PKIBODY
+     {"UNEXPECTED_PKIBODY", ERR_LIB_CMP, CMP_R_UNEXPECTED_PKIBODY},
+   #else
+@@ -1435,11 +1537,21 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNEXPECTED_PKISTATUS", 58, 185},
+   #endif
+  #ifdef CMP_R_UNEXPECTED_POLLREQ
+    {"UNEXPECTED_POLLREQ", ERR_LIB_CMP, CMP_R_UNEXPECTED_POLLREQ},
+  #else
+    {"UNEXPECTED_POLLREQ", 58, 105},
+  #endif
+   #ifdef CMP_R_UNEXPECTED_PVNO
+     {"UNEXPECTED_PVNO", ERR_LIB_CMP, CMP_R_UNEXPECTED_PVNO},
+   #else
+     {"UNEXPECTED_PVNO", 58, 153},
+   #endif
+  #ifdef CMP_R_UNEXPECTED_SENDER
+    {"UNEXPECTED_SENDER", ERR_LIB_CMP, CMP_R_UNEXPECTED_SENDER},
+  #else
+    {"UNEXPECTED_SENDER", 58, 106},
+  #endif
+   #ifdef CMP_R_UNKNOWN_ALGORITHM_ID
+     {"UNKNOWN_ALGORITHM_ID", ERR_LIB_CMP, CMP_R_UNKNOWN_ALGORITHM_ID},
+   #else
+@@ -1450,6 +1562,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNKNOWN_CERT_TYPE", 58, 135},
+   #endif
+  #ifdef CMP_R_UNKNOWN_CRL_ISSUER
+    {"UNKNOWN_CRL_ISSUER", ERR_LIB_CMP, CMP_R_UNKNOWN_CRL_ISSUER},
+  #else
+    {"UNKNOWN_CRL_ISSUER", 58, 200},
+  #endif
+   #ifdef CMP_R_UNKNOWN_PKISTATUS
+     {"UNKNOWN_PKISTATUS", ERR_LIB_CMP, CMP_R_UNKNOWN_PKISTATUS},
+   #else
+@@ -1465,6 +1582,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_KEY_TYPE", 58, 137},
+   #endif
+  #ifdef CMP_R_UNSUPPORTED_PKIBODY
+    {"UNSUPPORTED_PKIBODY", ERR_LIB_CMP, CMP_R_UNSUPPORTED_PKIBODY},
+  #else
+    {"UNSUPPORTED_PKIBODY", 58, 101},
+  #endif
+   #ifdef CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC
+     {"UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC", ERR_LIB_CMP, CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC},
+   #else
+@@ -1825,6 +1947,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NO_SIGNERS", 46, 135},
+   #endif
+  #ifdef CMS_R_OPERATION_UNSUPPORTED
+    {"OPERATION_UNSUPPORTED", ERR_LIB_CMS, CMS_R_OPERATION_UNSUPPORTED},
+  #else
+    {"OPERATION_UNSUPPORTED", 46, 182},
+  #endif
+   #ifdef CMS_R_PEER_KEY_ERROR
+     {"PEER_KEY_ERROR", ERR_LIB_CMS, CMS_R_PEER_KEY_ERROR},
+   #else
+@@ -1960,6 +2087,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_RECIPIENT_TYPE", 46, 154},
+   #endif
+  #ifdef CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM
+    {"UNSUPPORTED_SIGNATURE_ALGORITHM", ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM},
+  #else
+    {"UNSUPPORTED_SIGNATURE_ALGORITHM", 46, 195},
+  #endif
+   #ifdef CMS_R_UNSUPPORTED_TYPE
+     {"UNSUPPORTED_TYPE", ERR_LIB_CMS, CMS_R_UNSUPPORTED_TYPE},
+   #else
+@@ -1985,6 +2117,31 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"WRAP_ERROR", 46, 159},
+   #endif
+  #ifdef COMP_R_BROTLI_DECODE_ERROR
+    {"BROTLI_DECODE_ERROR", ERR_LIB_COMP, COMP_R_BROTLI_DECODE_ERROR},
+  #else
+    {"BROTLI_DECODE_ERROR", 41, 102},
+  #endif
+  #ifdef COMP_R_BROTLI_DEFLATE_ERROR
+    {"BROTLI_DEFLATE_ERROR", ERR_LIB_COMP, COMP_R_BROTLI_DEFLATE_ERROR},
+  #else
+    {"BROTLI_DEFLATE_ERROR", 41, 103},
+  #endif
+  #ifdef COMP_R_BROTLI_ENCODE_ERROR
+    {"BROTLI_ENCODE_ERROR", ERR_LIB_COMP, COMP_R_BROTLI_ENCODE_ERROR},
+  #else
+    {"BROTLI_ENCODE_ERROR", 41, 106},
+  #endif
+  #ifdef COMP_R_BROTLI_INFLATE_ERROR
+    {"BROTLI_INFLATE_ERROR", ERR_LIB_COMP, COMP_R_BROTLI_INFLATE_ERROR},
+  #else
+    {"BROTLI_INFLATE_ERROR", 41, 104},
+  #endif
+  #ifdef COMP_R_BROTLI_NOT_SUPPORTED
+    {"BROTLI_NOT_SUPPORTED", ERR_LIB_COMP, COMP_R_BROTLI_NOT_SUPPORTED},
+  #else
+    {"BROTLI_NOT_SUPPORTED", 41, 105},
+  #endif
+   #ifdef COMP_R_ZLIB_DEFLATE_ERROR
+     {"ZLIB_DEFLATE_ERROR", ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR},
+   #else
+@@ -2000,6 +2157,26 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"ZLIB_NOT_SUPPORTED", 41, 101},
+   #endif
+  #ifdef COMP_R_ZSTD_COMPRESS_ERROR
+    {"ZSTD_COMPRESS_ERROR", ERR_LIB_COMP, COMP_R_ZSTD_COMPRESS_ERROR},
+  #else
+    {"ZSTD_COMPRESS_ERROR", 41, 107},
+  #endif
+  #ifdef COMP_R_ZSTD_DECODE_ERROR
+    {"ZSTD_DECODE_ERROR", ERR_LIB_COMP, COMP_R_ZSTD_DECODE_ERROR},
+  #else
+    {"ZSTD_DECODE_ERROR", 41, 108},
+  #endif
+  #ifdef COMP_R_ZSTD_DECOMPRESS_ERROR
+    {"ZSTD_DECOMPRESS_ERROR", ERR_LIB_COMP, COMP_R_ZSTD_DECOMPRESS_ERROR},
+  #else
+    {"ZSTD_DECOMPRESS_ERROR", 41, 109},
+  #endif
+  #ifdef COMP_R_ZSTD_NOT_SUPPORTED
+    {"ZSTD_NOT_SUPPORTED", ERR_LIB_COMP, COMP_R_ZSTD_NOT_SUPPORTED},
+  #else
+    {"ZSTD_NOT_SUPPORTED", 41, 110},
+  #endif
+   #ifdef CONF_R_ERROR_LOADING_DSO
+     {"ERROR_LOADING_DSO", ERR_LIB_CONF, CONF_R_ERROR_LOADING_DSO},
+   #else
+@@ -2085,6 +2262,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"RECURSIVE_DIRECTORY_INCLUDE", 14, 111},
+   #endif
+  #ifdef CONF_R_RECURSIVE_SECTION_REFERENCE
+    {"RECURSIVE_SECTION_REFERENCE", ERR_LIB_CONF, CONF_R_RECURSIVE_SECTION_REFERENCE},
+  #else
+    {"RECURSIVE_SECTION_REFERENCE", 14, 126},
+  #endif
+   #ifdef CONF_R_RELATIVE_PATH
+     {"RELATIVE_PATH", ERR_LIB_CONF, CONF_R_RELATIVE_PATH},
+   #else
+@@ -2370,6 +2552,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TOO_MANY_BYTES", 15, 113},
+   #endif
+  #ifdef CRYPTO_R_TOO_MANY_NAMES
+    {"TOO_MANY_NAMES", ERR_LIB_CRYPTO, CRYPTO_R_TOO_MANY_NAMES},
+  #else
+    {"TOO_MANY_NAMES", 15, 132},
+  #endif
+   #ifdef CRYPTO_R_TOO_MANY_RECORDS
+     {"TOO_MANY_RECORDS", ERR_LIB_CRYPTO, CRYPTO_R_TOO_MANY_RECORDS},
+   #else
+@@ -2560,6 +2747,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_SECRET", 5, 128},
+   #endif
+  #ifdef DH_R_INVALID_SIZE
+    {"INVALID_SIZE", ERR_LIB_DH, DH_R_INVALID_SIZE},
+  #else
+    {"INVALID_SIZE", 5, 129},
+  #endif
+   #ifdef DH_R_KDF_PARAMETER_ERROR
+     {"KDF_PARAMETER_ERROR", ERR_LIB_DH, DH_R_KDF_PARAMETER_ERROR},
+   #else
+@@ -2610,6 +2802,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"PEER_KEY_ERROR", 5, 111},
+   #endif
+  #ifdef DH_R_Q_TOO_LARGE
+    {"Q_TOO_LARGE", ERR_LIB_DH, DH_R_Q_TOO_LARGE},
+  #else
+    {"Q_TOO_LARGE", 5, 130},
+  #endif
+   #ifdef DH_R_SHARED_INFO_ERROR
+     {"SHARED_INFO_ERROR", ERR_LIB_DH, DH_R_SHARED_INFO_ERROR},
+   #else
+@@ -3545,6 +3742,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"GENERATE_ERROR", 6, 214},
+   #endif
+  #ifdef EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED
+    {"GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED", ERR_LIB_EVP, EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED},
+  #else
+    {"GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED", 6, 229},
+  #endif
+   #ifdef EVP_R_GET_RAW_KEY_FAILED
+     {"GET_RAW_KEY_FAILED", ERR_LIB_EVP, EVP_R_GET_RAW_KEY_FAILED},
+   #else
+@@ -3745,6 +3947,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE", 6, 150},
+   #endif
+  #ifdef EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE
+    {"OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE", ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE},
+  #else
+    {"OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE", 6, 226},
+  #endif
+   #ifdef EVP_R_OUTPUT_WOULD_OVERFLOW
+     {"OUTPUT_WOULD_OVERFLOW", ERR_LIB_EVP, EVP_R_OUTPUT_WOULD_OVERFLOW},
+   #else
+@@ -3795,6 +4002,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SET_DEFAULT_PROPERTY_FAILURE", 6, 209},
+   #endif
+  #ifdef EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE
+    {"SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE", ERR_LIB_EVP, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE},
+  #else
+    {"SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE", 6, 228},
+  #endif
+   #ifdef EVP_R_TOO_MANY_RECORDS
+     {"TOO_MANY_RECORDS", ERR_LIB_EVP, EVP_R_TOO_MANY_RECORDS},
+   #else
+@@ -3825,6 +4037,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNABLE_TO_SET_CALLBACKS", 6, 217},
+   #endif
+  #ifdef EVP_R_UNKNOWN_BITS
+    {"UNKNOWN_BITS", ERR_LIB_EVP, EVP_R_UNKNOWN_BITS},
+  #else
+    {"UNKNOWN_BITS", 6, 166},
+  #endif
+   #ifdef EVP_R_UNKNOWN_CIPHER
+     {"UNKNOWN_CIPHER", ERR_LIB_EVP, EVP_R_UNKNOWN_CIPHER},
+   #else
+@@ -3840,6 +4057,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNKNOWN_KEY_TYPE", 6, 207},
+   #endif
+  #ifdef EVP_R_UNKNOWN_MAX_SIZE
+    {"UNKNOWN_MAX_SIZE", ERR_LIB_EVP, EVP_R_UNKNOWN_MAX_SIZE},
+  #else
+    {"UNKNOWN_MAX_SIZE", 6, 167},
+  #endif
+   #ifdef EVP_R_UNKNOWN_OPTION
+     {"UNKNOWN_OPTION", ERR_LIB_EVP, EVP_R_UNKNOWN_OPTION},
+   #else
+@@ -3850,6 +4072,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNKNOWN_PBE_ALGORITHM", 6, 121},
+   #endif
+  #ifdef EVP_R_UNKNOWN_SECURITY_BITS
+    {"UNKNOWN_SECURITY_BITS", ERR_LIB_EVP, EVP_R_UNKNOWN_SECURITY_BITS},
+  #else
+    {"UNKNOWN_SECURITY_BITS", 6, 168},
+  #endif
+   #ifdef EVP_R_UNSUPPORTED_ALGORITHM
+     {"UNSUPPORTED_ALGORITHM", ERR_LIB_EVP, EVP_R_UNSUPPORTED_ALGORITHM},
+   #else
+@@ -4040,6 +4267,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"RESPONSE_PARSE_ERROR", 61, 104},
+   #endif
+  #ifdef HTTP_R_RESPONSE_TOO_MANY_HDRLINES
+    {"RESPONSE_TOO_MANY_HDRLINES", ERR_LIB_HTTP, HTTP_R_RESPONSE_TOO_MANY_HDRLINES},
+  #else
+    {"RESPONSE_TOO_MANY_HDRLINES", 61, 130},
+  #endif
+   #ifdef HTTP_R_RETRY_TIMEOUT
+     {"RETRY_TIMEOUT", ERR_LIB_HTTP, HTTP_R_RETRY_TIMEOUT},
+   #else
+@@ -4530,6 +4762,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_PUBLIC_KEY_TYPE", 9, 110},
+   #endif
+  #ifdef PKCS12_R_CALLBACK_FAILED
+    {"CALLBACK_FAILED", ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED},
+  #else
+    {"CALLBACK_FAILED", 35, 115},
+  #endif
+   #ifdef PKCS12_R_CANT_PACK_STRUCTURE
+     {"CANT_PACK_STRUCTURE", ERR_LIB_PKCS12, PKCS12_R_CANT_PACK_STRUCTURE},
+   #else
+@@ -4920,6 +5157,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"CIPHER_OPERATION_FAILED", 57, 102},
+   #endif
+  #ifdef PROV_R_COFACTOR_REQUIRED
+    {"COFACTOR_REQUIRED", ERR_LIB_PROV, PROV_R_COFACTOR_REQUIRED},
+  #else
+    {"COFACTOR_REQUIRED", 57, 236},
+  #endif
+   #ifdef PROV_R_DERIVATION_FUNCTION_INIT_FAILED
+     {"DERIVATION_FUNCTION_INIT_FAILED", ERR_LIB_PROV, PROV_R_DERIVATION_FUNCTION_INIT_FAILED},
+   #else
+@@ -4935,6 +5177,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"EMS_NOT_ENABLED", 57, 233},
+   #endif
+  #ifdef PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS
+    {"ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS", ERR_LIB_PROV, PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS},
+  #else
+    {"ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS", 57, 244},
+  #endif
+   #ifdef PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK
+     {"ENTROPY_SOURCE_STRENGTH_TOO_WEAK", ERR_LIB_PROV, PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK},
+   #else
+@@ -4990,6 +5237,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"FAILED_TO_SIGN", 57, 175},
+   #endif
+  #ifdef PROV_R_FINAL_CALL_OUT_OF_ORDER
+    {"FINAL_CALL_OUT_OF_ORDER", ERR_LIB_PROV, PROV_R_FINAL_CALL_OUT_OF_ORDER},
+  #else
+    {"FINAL_CALL_OUT_OF_ORDER", 57, 237},
+  #endif
+   #ifdef PROV_R_FIPS_MODULE_CONDITIONAL_ERROR
+     {"FIPS_MODULE_CONDITIONAL_ERROR", ERR_LIB_PROV, PROV_R_FIPS_MODULE_CONDITIONAL_ERROR},
+   #else
+@@ -5020,6 +5272,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INDICATOR_INTEGRITY_FAILURE", 57, 210},
+   #endif
+  #ifdef PROV_R_INIT_CALL_OUT_OF_ORDER
+    {"INIT_CALL_OUT_OF_ORDER", ERR_LIB_PROV, PROV_R_INIT_CALL_OUT_OF_ORDER},
+  #else
+    {"INIT_CALL_OUT_OF_ORDER", 57, 238},
+  #endif
+   #ifdef PROV_R_INSUFFICIENT_DRBG_STRENGTH
+     {"INSUFFICIENT_DRBG_STRENGTH", ERR_LIB_PROV, PROV_R_INSUFFICIENT_DRBG_STRENGTH},
+   #else
+@@ -5030,6 +5287,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_AAD", 57, 108},
+   #endif
+  #ifdef PROV_R_INVALID_AEAD
+    {"INVALID_AEAD", ERR_LIB_PROV, PROV_R_INVALID_AEAD},
+  #else
+    {"INVALID_AEAD", 57, 231},
+  #endif
+   #ifdef PROV_R_INVALID_CONFIG_DATA
+     {"INVALID_CONFIG_DATA", ERR_LIB_PROV, PROV_R_INVALID_CONFIG_DATA},
+   #else
+@@ -5070,6 +5332,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_DIGEST_SIZE", 57, 218},
+   #endif
+  #ifdef PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION
+    {"INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION", ERR_LIB_PROV, PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION},
+  #else
+    {"INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION", 57, 243},
+  #endif
+   #ifdef PROV_R_INVALID_INPUT_LENGTH
+     {"INVALID_INPUT_LENGTH", ERR_LIB_PROV, PROV_R_INVALID_INPUT_LENGTH},
+   #else
+@@ -5085,6 +5352,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_IV_LENGTH", 57, 109},
+   #endif
+  #ifdef PROV_R_INVALID_KDF
+    {"INVALID_KDF", ERR_LIB_PROV, PROV_R_INVALID_KDF},
+  #else
+    {"INVALID_KDF", 57, 232},
+  #endif
+   #ifdef PROV_R_INVALID_KEY
+     {"INVALID_KEY", ERR_LIB_PROV, PROV_R_INVALID_KEY},
+   #else
+@@ -5100,6 +5372,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_MAC", 57, 151},
+   #endif
+  #ifdef PROV_R_INVALID_MEMORY_SIZE
+    {"INVALID_MEMORY_SIZE", ERR_LIB_PROV, PROV_R_INVALID_MEMORY_SIZE},
+  #else
+    {"INVALID_MEMORY_SIZE", 57, 235},
+  #endif
+   #ifdef PROV_R_INVALID_MGF1_MD
+     {"INVALID_MGF1_MD", ERR_LIB_PROV, PROV_R_INVALID_MGF1_MD},
+   #else
+@@ -5120,6 +5397,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_PADDING_MODE", 57, 168},
+   #endif
+  #ifdef PROV_R_INVALID_PREHASHED_DIGEST_LENGTH
+    {"INVALID_PREHASHED_DIGEST_LENGTH", ERR_LIB_PROV, PROV_R_INVALID_PREHASHED_DIGEST_LENGTH},
+  #else
+    {"INVALID_PREHASHED_DIGEST_LENGTH", 57, 241},
+  #endif
+   #ifdef PROV_R_INVALID_PUBINFO
+     {"INVALID_PUBINFO", ERR_LIB_PROV, PROV_R_INVALID_PUBINFO},
+   #else
+@@ -5155,6 +5437,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_TAG_LENGTH", 57, 118},
+   #endif
+  #ifdef PROV_R_INVALID_THREAD_POOL_SIZE
+    {"INVALID_THREAD_POOL_SIZE", ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE},
+  #else
+    {"INVALID_THREAD_POOL_SIZE", 57, 234},
+  #endif
+   #ifdef PROV_R_INVALID_UKM_LENGTH
+     {"INVALID_UKM_LENGTH", ERR_LIB_PROV, PROV_R_INVALID_UKM_LENGTH},
+   #else
+@@ -5300,6 +5587,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NOT_XOF_OR_INVALID_LENGTH", 57, 113},
+   #endif
+  #ifdef PROV_R_NO_INSTANCE_ALLOWED
+    {"NO_INSTANCE_ALLOWED", ERR_LIB_PROV, PROV_R_NO_INSTANCE_ALLOWED},
+  #else
+    {"NO_INSTANCE_ALLOWED", 57, 242},
+  #endif
+   #ifdef PROV_R_NO_KEY_SET
+     {"NO_KEY_SET", ERR_LIB_PROV, PROV_R_NO_KEY_SET},
+   #else
+@@ -5310,6 +5602,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NO_PARAMETERS_SET", 57, 177},
+   #endif
+  #ifdef PROV_R_ONESHOT_CALL_OUT_OF_ORDER
+    {"ONESHOT_CALL_OUT_OF_ORDER", ERR_LIB_PROV, PROV_R_ONESHOT_CALL_OUT_OF_ORDER},
+  #else
+    {"ONESHOT_CALL_OUT_OF_ORDER", 57, 239},
+  #endif
+   #ifdef PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE
+     {"OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE", ERR_LIB_PROV, PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE},
+   #else
+@@ -5460,6 +5757,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_NUMBER_OF_ROUNDS", 57, 152},
+   #endif
+  #ifdef PROV_R_UPDATE_CALL_OUT_OF_ORDER
+    {"UPDATE_CALL_OUT_OF_ORDER", ERR_LIB_PROV, PROV_R_UPDATE_CALL_OUT_OF_ORDER},
+  #else
+    {"UPDATE_CALL_OUT_OF_ORDER", 57, 240},
+  #endif
+   #ifdef PROV_R_URI_AUTHORITY_UNSUPPORTED
+     {"URI_AUTHORITY_UNSUPPORTED", ERR_LIB_PROV, PROV_R_URI_AUTHORITY_UNSUPPORTED},
+   #else
+@@ -5595,6 +5897,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INTERNAL_ERROR", 36, 113},
+   #endif
+  #ifdef RAND_R_INVALID_PROPERTY_QUERY
+    {"INVALID_PROPERTY_QUERY", ERR_LIB_RAND, RAND_R_INVALID_PROPERTY_QUERY},
+  #else
+    {"INVALID_PROPERTY_QUERY", 36, 137},
+  #endif
+   #ifdef RAND_R_IN_ERROR_STATE
+     {"IN_ERROR_STATE", ERR_LIB_RAND, RAND_R_IN_ERROR_STATE},
+   #else
+@@ -6210,6 +6517,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE", 20, 158},
+   #endif
+  #ifdef SSL_R_BAD_CERTIFICATE
+    {"BAD_CERTIFICATE", ERR_LIB_SSL, SSL_R_BAD_CERTIFICATE},
+  #else
+    {"BAD_CERTIFICATE", 20, 348},
+  #endif
+   #ifdef SSL_R_BAD_CHANGE_CIPHER_SPEC
+     {"BAD_CHANGE_CIPHER_SPEC", ERR_LIB_SSL, SSL_R_BAD_CHANGE_CIPHER_SPEC},
+   #else
+@@ -6220,6 +6532,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"BAD_CIPHER", 20, 186},
+   #endif
+  #ifdef SSL_R_BAD_COMPRESSION_ALGORITHM
+    {"BAD_COMPRESSION_ALGORITHM", ERR_LIB_SSL, SSL_R_BAD_COMPRESSION_ALGORITHM},
+  #else
+    {"BAD_COMPRESSION_ALGORITHM", 20, 326},
+  #endif
+   #ifdef SSL_R_BAD_DATA
+     {"BAD_DATA", ERR_LIB_SSL, SSL_R_BAD_DATA},
+   #else
+@@ -6495,6 +6812,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"CONNECTION_TYPE_NOT_SET", 20, 144},
+   #endif
+  #ifdef SSL_R_CONN_USE_ONLY
+    {"CONN_USE_ONLY", ERR_LIB_SSL, SSL_R_CONN_USE_ONLY},
+  #else
+    {"CONN_USE_ONLY", 20, 356},
+  #endif
+   #ifdef SSL_R_CONTEXT_NOT_DANE_ENABLED
+     {"CONTEXT_NOT_DANE_ENABLED", ERR_LIB_SSL, SSL_R_CONTEXT_NOT_DANE_ENABLED},
+   #else
+@@ -6635,6 +6957,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"EE_KEY_TOO_SMALL", 20, 399},
+   #endif
+  #ifdef SSL_R_EMPTY_RAW_PUBLIC_KEY
+    {"EMPTY_RAW_PUBLIC_KEY", ERR_LIB_SSL, SSL_R_EMPTY_RAW_PUBLIC_KEY},
+  #else
+    {"EMPTY_RAW_PUBLIC_KEY", 20, 349},
+  #endif
+   #ifdef SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST
+     {"EMPTY_SRTP_PROTECTION_PROFILE_LIST", ERR_LIB_SSL, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST},
+   #else
+@@ -6650,6 +6977,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"ERROR_IN_RECEIVED_CIPHER_LIST", 20, 151},
+   #endif
+  #ifdef SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG
+    {"ERROR_IN_SYSTEM_DEFAULT_CONFIG", ERR_LIB_SSL, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG},
+  #else
+    {"ERROR_IN_SYSTEM_DEFAULT_CONFIG", 20, 419},
+  #endif
+   #ifdef SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN
+     {"ERROR_SETTING_TLSA_BASE_DOMAIN", ERR_LIB_SSL, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN},
+   #else
+@@ -6680,11 +7012,26 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"EXT_LENGTH_MISMATCH", 20, 163},
+   #endif
+  #ifdef SSL_R_FAILED_TO_GET_PARAMETER
+    {"FAILED_TO_GET_PARAMETER", ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER},
+  #else
+    {"FAILED_TO_GET_PARAMETER", 20, 316},
+  #endif
+   #ifdef SSL_R_FAILED_TO_INIT_ASYNC
+     {"FAILED_TO_INIT_ASYNC", ERR_LIB_SSL, SSL_R_FAILED_TO_INIT_ASYNC},
+   #else
+     {"FAILED_TO_INIT_ASYNC", 20, 405},
+   #endif
+  #ifdef SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE
+    {"FEATURE_NEGOTIATION_NOT_COMPLETE", ERR_LIB_SSL, SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE},
+  #else
+    {"FEATURE_NEGOTIATION_NOT_COMPLETE", 20, 417},
+  #endif
+  #ifdef SSL_R_FEATURE_NOT_RENEGOTIABLE
+    {"FEATURE_NOT_RENEGOTIABLE", ERR_LIB_SSL, SSL_R_FEATURE_NOT_RENEGOTIABLE},
+  #else
+    {"FEATURE_NOT_RENEGOTIABLE", 20, 413},
+  #endif
+   #ifdef SSL_R_FRAGMENTED_CLIENT_HELLO
+     {"FRAGMENTED_CLIENT_HELLO", ERR_LIB_SSL, SSL_R_FRAGMENTED_CLIENT_HELLO},
+   #else
+@@ -6805,6 +7152,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"INVALID_NULL_CMD_NAME", 20, 385},
+   #endif
+  #ifdef SSL_R_INVALID_RAW_PUBLIC_KEY
+    {"INVALID_RAW_PUBLIC_KEY", ERR_LIB_SSL, SSL_R_INVALID_RAW_PUBLIC_KEY},
+  #else
+    {"INVALID_RAW_PUBLIC_KEY", 20, 350},
+  #endif
+  #ifdef SSL_R_INVALID_RECORD
+    {"INVALID_RECORD", ERR_LIB_SSL, SSL_R_INVALID_RECORD},
+  #else
+    {"INVALID_RECORD", 20, 317},
+  #endif
+   #ifdef SSL_R_INVALID_SEQUENCE_NUMBER
+     {"INVALID_SEQUENCE_NUMBER", ERR_LIB_SSL, SSL_R_INVALID_SEQUENCE_NUMBER},
+   #else
+@@ -6865,6 +7222,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"LIBRARY_HAS_NO_CIPHERS", 20, 161},
+   #endif
+  #ifdef SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED
+    {"MAXIMUM_ENCRYPTED_PKTS_REACHED", ERR_LIB_SSL, SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED},
+  #else
+    {"MAXIMUM_ENCRYPTED_PKTS_REACHED", 20, 395},
+  #endif
+   #ifdef SSL_R_MISSING_DSA_SIGNING_CERT
+     {"MISSING_DSA_SIGNING_CERT", ERR_LIB_SSL, SSL_R_MISSING_DSA_SIGNING_CERT},
+   #else
+@@ -6925,6 +7287,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"MISSING_SUPPORTED_GROUPS_EXTENSION", 20, 209},
+   #endif
+  #ifdef SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION
+    {"MISSING_SUPPORTED_VERSIONS_EXTENSION", ERR_LIB_SSL, SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION},
+  #else
+    {"MISSING_SUPPORTED_VERSIONS_EXTENSION", 20, 420},
+  #endif
+   #ifdef SSL_R_MISSING_TMP_DH_KEY
+     {"MISSING_TMP_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_DH_KEY},
+   #else
+@@ -7065,6 +7432,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NO_SRTP_PROFILES", 20, 359},
+   #endif
+  #ifdef SSL_R_NO_STREAM
+    {"NO_STREAM", ERR_LIB_SSL, SSL_R_NO_STREAM},
+  #else
+    {"NO_STREAM", 20, 355},
+  #endif
+   #ifdef SSL_R_NO_SUITABLE_DIGEST_ALGORITHM
+     {"NO_SUITABLE_DIGEST_ALGORITHM", ERR_LIB_SSL, SSL_R_NO_SUITABLE_DIGEST_ALGORITHM},
+   #else
+@@ -7080,6 +7452,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"NO_SUITABLE_KEY_SHARE", 20, 101},
+   #endif
+  #ifdef SSL_R_NO_SUITABLE_RECORD_LAYER
+    {"NO_SUITABLE_RECORD_LAYER", ERR_LIB_SSL, SSL_R_NO_SUITABLE_RECORD_LAYER},
+  #else
+    {"NO_SUITABLE_RECORD_LAYER", 20, 322},
+  #endif
+   #ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM
+     {"NO_SUITABLE_SIGNATURE_ALGORITHM", ERR_LIB_SSL, SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM},
+   #else
+@@ -7160,6 +7537,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"PIPELINE_FAILURE", 20, 406},
+   #endif
+  #ifdef SSL_R_POLL_REQUEST_NOT_SUPPORTED
+    {"POLL_REQUEST_NOT_SUPPORTED", ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED},
+  #else
+    {"POLL_REQUEST_NOT_SUPPORTED", 20, 418},
+  #endif
+   #ifdef SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR
+     {"POST_HANDSHAKE_AUTH_ENCODING_ERR", ERR_LIB_SSL, SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR},
+   #else
+@@ -7190,6 +7572,21 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"PSK_NO_SERVER_CB", 20, 225},
+   #endif
+  #ifdef SSL_R_QUIC_HANDSHAKE_LAYER_ERROR
+    {"QUIC_HANDSHAKE_LAYER_ERROR", ERR_LIB_SSL, SSL_R_QUIC_HANDSHAKE_LAYER_ERROR},
+  #else
+    {"QUIC_HANDSHAKE_LAYER_ERROR", 20, 393},
+  #endif
+  #ifdef SSL_R_QUIC_NETWORK_ERROR
+    {"QUIC_NETWORK_ERROR", ERR_LIB_SSL, SSL_R_QUIC_NETWORK_ERROR},
+  #else
+    {"QUIC_NETWORK_ERROR", 20, 387},
+  #endif
+  #ifdef SSL_R_QUIC_PROTOCOL_ERROR
+    {"QUIC_PROTOCOL_ERROR", ERR_LIB_SSL, SSL_R_QUIC_PROTOCOL_ERROR},
+  #else
+    {"QUIC_PROTOCOL_ERROR", 20, 382},
+  #endif
+   #ifdef SSL_R_READ_BIO_NOT_SET
+     {"READ_BIO_NOT_SET", ERR_LIB_SSL, SSL_R_READ_BIO_NOT_SET},
+   #else
+@@ -7200,6 +7597,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"READ_TIMEOUT_EXPIRED", 20, 312},
+   #endif
+  #ifdef SSL_R_RECORDS_NOT_RELEASED
+    {"RECORDS_NOT_RELEASED", ERR_LIB_SSL, SSL_R_RECORDS_NOT_RELEASED},
+  #else
+    {"RECORDS_NOT_RELEASED", 20, 321},
+  #endif
+  #ifdef SSL_R_RECORD_LAYER_FAILURE
+    {"RECORD_LAYER_FAILURE", ERR_LIB_SSL, SSL_R_RECORD_LAYER_FAILURE},
+  #else
+    {"RECORD_LAYER_FAILURE", 20, 313},
+  #endif
+   #ifdef SSL_R_RECORD_LENGTH_MISMATCH
+     {"RECORD_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_RECORD_LENGTH_MISMATCH},
+   #else
+@@ -7210,6 +7617,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"RECORD_TOO_SMALL", 20, 298},
+   #endif
+  #ifdef SSL_R_REMOTE_PEER_ADDRESS_NOT_SET
+    {"REMOTE_PEER_ADDRESS_NOT_SET", ERR_LIB_SSL, SSL_R_REMOTE_PEER_ADDRESS_NOT_SET},
+  #else
+    {"REMOTE_PEER_ADDRESS_NOT_SET", 20, 346},
+  #endif
+   #ifdef SSL_R_RENEGOTIATE_EXT_TOO_LONG
+     {"RENEGOTIATE_EXT_TOO_LONG", ERR_LIB_SSL, SSL_R_RENEGOTIATE_EXT_TOO_LONG},
+   #else
+@@ -7255,6 +7667,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SCT_VERIFICATION_FAILED", 20, 208},
+   #endif
+  #ifdef SSL_R_SEQUENCE_CTR_WRAPPED
+    {"SEQUENCE_CTR_WRAPPED", ERR_LIB_SSL, SSL_R_SEQUENCE_CTR_WRAPPED},
+  #else
+    {"SEQUENCE_CTR_WRAPPED", 20, 327},
+  #endif
+   #ifdef SSL_R_SERVERHELLO_TLSEXT
+     {"SERVERHELLO_TLSEXT", ERR_LIB_SSL, SSL_R_SERVERHELLO_TLSEXT},
+   #else
+@@ -7325,6 +7742,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SSLV3_ALERT_BAD_CERTIFICATE", 20, 1042},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_BAD_CERTIFICATE
+    {"SSLV3_ALERT_BAD_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE},
+  #else
+    {"SSLV3_ALERT_BAD_CERTIFICATE", 20, 1042},
+  #endif
+  #ifdef SSL_R_SSLV3_ALERT_BAD_RECORD_MAC
+    {"SSLV3_ALERT_BAD_RECORD_MAC", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC},
+  #else
+    {"SSLV3_ALERT_BAD_RECORD_MAC", 20, 1020},
+  #endif
+   #ifdef SSL_R_SSLV3_ALERT_BAD_RECORD_MAC
+     {"SSLV3_ALERT_BAD_RECORD_MAC", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC},
+   #else
+@@ -7335,11 +7762,26 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SSLV3_ALERT_CERTIFICATE_EXPIRED", 20, 1045},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED
+    {"SSLV3_ALERT_CERTIFICATE_EXPIRED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED},
+  #else
+    {"SSLV3_ALERT_CERTIFICATE_EXPIRED", 20, 1045},
+  #endif
+   #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED
+     {"SSLV3_ALERT_CERTIFICATE_REVOKED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED},
+   #else
+     {"SSLV3_ALERT_CERTIFICATE_REVOKED", 20, 1044},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED
+    {"SSLV3_ALERT_CERTIFICATE_REVOKED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED},
+  #else
+    {"SSLV3_ALERT_CERTIFICATE_REVOKED", 20, 1044},
+  #endif
+  #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN
+    {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN},
+  #else
+    {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", 20, 1046},
+  #endif
+   #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN
+     {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN},
+   #else
+@@ -7350,6 +7792,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SSLV3_ALERT_DECOMPRESSION_FAILURE", 20, 1030},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE
+    {"SSLV3_ALERT_DECOMPRESSION_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE},
+  #else
+    {"SSLV3_ALERT_DECOMPRESSION_FAILURE", 20, 1030},
+  #endif
+  #ifdef SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE
+    {"SSLV3_ALERT_HANDSHAKE_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE},
+  #else
+    {"SSLV3_ALERT_HANDSHAKE_FAILURE", 20, 1040},
+  #endif
+   #ifdef SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE
+     {"SSLV3_ALERT_HANDSHAKE_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE},
+   #else
+@@ -7360,11 +7812,26 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SSLV3_ALERT_ILLEGAL_PARAMETER", 20, 1047},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER
+    {"SSLV3_ALERT_ILLEGAL_PARAMETER", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER},
+  #else
+    {"SSLV3_ALERT_ILLEGAL_PARAMETER", 20, 1047},
+  #endif
+   #ifdef SSL_R_SSLV3_ALERT_NO_CERTIFICATE
+     {"SSLV3_ALERT_NO_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_NO_CERTIFICATE},
+   #else
+     {"SSLV3_ALERT_NO_CERTIFICATE", 20, 1041},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_NO_CERTIFICATE
+    {"SSLV3_ALERT_NO_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_NO_CERTIFICATE},
+  #else
+    {"SSLV3_ALERT_NO_CERTIFICATE", 20, 1041},
+  #endif
+  #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
+    {"SSLV3_ALERT_UNEXPECTED_MESSAGE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE},
+  #else
+    {"SSLV3_ALERT_UNEXPECTED_MESSAGE", 20, 1010},
+  #endif
+   #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
+     {"SSLV3_ALERT_UNEXPECTED_MESSAGE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE},
+   #else
+@@ -7375,6 +7842,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", 20, 1043},
+   #endif
+  #ifdef SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE
+    {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE},
+  #else
+    {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", 20, 1043},
+  #endif
+   #ifdef SSL_R_SSL_COMMAND_SECTION_EMPTY
+     {"SSL_COMMAND_SECTION_EMPTY", ERR_LIB_SSL, SSL_R_SSL_COMMAND_SECTION_EMPTY},
+   #else
+@@ -7450,6 +7922,36 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"STILL_IN_INIT", 20, 121},
+   #endif
+  #ifdef SSL_R_STREAM_COUNT_LIMITED
+    {"STREAM_COUNT_LIMITED", ERR_LIB_SSL, SSL_R_STREAM_COUNT_LIMITED},
+  #else
+    {"STREAM_COUNT_LIMITED", 20, 411},
+  #endif
+  #ifdef SSL_R_STREAM_FINISHED
+    {"STREAM_FINISHED", ERR_LIB_SSL, SSL_R_STREAM_FINISHED},
+  #else
+    {"STREAM_FINISHED", 20, 365},
+  #endif
+  #ifdef SSL_R_STREAM_RECV_ONLY
+    {"STREAM_RECV_ONLY", ERR_LIB_SSL, SSL_R_STREAM_RECV_ONLY},
+  #else
+    {"STREAM_RECV_ONLY", 20, 366},
+  #endif
+  #ifdef SSL_R_STREAM_RESET
+    {"STREAM_RESET", ERR_LIB_SSL, SSL_R_STREAM_RESET},
+  #else
+    {"STREAM_RESET", 20, 375},
+  #endif
+  #ifdef SSL_R_STREAM_SEND_ONLY
+    {"STREAM_SEND_ONLY", ERR_LIB_SSL, SSL_R_STREAM_SEND_ONLY},
+  #else
+    {"STREAM_SEND_ONLY", 20, 379},
+  #endif
+  #ifdef SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED
+    {"TLSV13_ALERT_CERTIFICATE_REQUIRED", ERR_LIB_SSL, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED},
+  #else
+    {"TLSV13_ALERT_CERTIFICATE_REQUIRED", 20, 1116},
+  #endif
+   #ifdef SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED
+     {"TLSV13_ALERT_CERTIFICATE_REQUIRED", ERR_LIB_SSL, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED},
+   #else
+@@ -7460,6 +7962,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV13_ALERT_MISSING_EXTENSION", 20, 1109},
+   #endif
+  #ifdef SSL_R_TLSV13_ALERT_MISSING_EXTENSION
+    {"TLSV13_ALERT_MISSING_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV13_ALERT_MISSING_EXTENSION},
+  #else
+    {"TLSV13_ALERT_MISSING_EXTENSION", 20, 1109},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_ACCESS_DENIED
+    {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_ACCESS_DENIED},
+  #else
+    {"TLSV1_ALERT_ACCESS_DENIED", 20, 1049},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_ACCESS_DENIED
+     {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_ACCESS_DENIED},
+   #else
+@@ -7470,6 +7982,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_ALERT_DECODE_ERROR", 20, 1050},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_DECODE_ERROR
+    {"TLSV1_ALERT_DECODE_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECODE_ERROR},
+  #else
+    {"TLSV1_ALERT_DECODE_ERROR", 20, 1050},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED
+    {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED},
+  #else
+    {"TLSV1_ALERT_DECRYPTION_FAILED", 20, 1021},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED
+     {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED},
+   #else
+@@ -7480,6 +8002,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_ALERT_DECRYPT_ERROR", 20, 1051},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_DECRYPT_ERROR
+    {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPT_ERROR},
+  #else
+    {"TLSV1_ALERT_DECRYPT_ERROR", 20, 1051},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION
+    {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION},
+  #else
+    {"TLSV1_ALERT_EXPORT_RESTRICTION", 20, 1060},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION
+     {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION},
+   #else
+@@ -7490,6 +8022,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", 20, 1086},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK
+    {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK},
+  #else
+    {"TLSV1_ALERT_INAPPROPRIATE_FALLBACK", 20, 1086},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY
+    {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY},
+  #else
+    {"TLSV1_ALERT_INSUFFICIENT_SECURITY", 20, 1071},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY
+     {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY},
+   #else
+@@ -7500,6 +8042,26 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_INTERNAL_ERROR
+    {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INTERNAL_ERROR},
+  #else
+    {"TLSV1_ALERT_INTERNAL_ERROR", 20, 1080},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL
+    {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL},
+  #else
+    {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", 20, 1120},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL
+    {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL},
+  #else
+    {"TLSV1_ALERT_NO_APPLICATION_PROTOCOL", 20, 1120},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION
+    {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION},
+  #else
+    {"TLSV1_ALERT_NO_RENEGOTIATION", 20, 1100},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION
+     {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION},
+   #else
+@@ -7510,21 +8072,56 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_ALERT_PROTOCOL_VERSION", 20, 1070},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_PROTOCOL_VERSION
+    {"TLSV1_ALERT_PROTOCOL_VERSION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION},
+  #else
+    {"TLSV1_ALERT_PROTOCOL_VERSION", 20, 1070},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW
+     {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW},
+   #else
+     {"TLSV1_ALERT_RECORD_OVERFLOW", 20, 1022},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW
+    {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW},
+  #else
+    {"TLSV1_ALERT_RECORD_OVERFLOW", 20, 1022},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_CA
+    {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_CA},
+  #else
+    {"TLSV1_ALERT_UNKNOWN_CA", 20, 1048},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_CA
+     {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_CA},
+   #else
+     {"TLSV1_ALERT_UNKNOWN_CA", 20, 1048},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY
+    {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY},
+  #else
+    {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", 20, 1115},
+  #endif
+  #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY
+    {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY},
+  #else
+    {"TLSV1_ALERT_UNKNOWN_PSK_IDENTITY", 20, 1115},
+  #endif
+   #ifdef SSL_R_TLSV1_ALERT_USER_CANCELLED
+     {"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_USER_CANCELLED},
+   #else
+     {"TLSV1_ALERT_USER_CANCELLED", 20, 1090},
+   #endif
+  #ifdef SSL_R_TLSV1_ALERT_USER_CANCELLED
+    {"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_USER_CANCELLED},
+  #else
+    {"TLSV1_ALERT_USER_CANCELLED", 20, 1090},
+  #endif
+  #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE
+    {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE},
+  #else
+    {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", 20, 1114},
+  #endif
+   #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE
+     {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE},
+   #else
+@@ -7535,6 +8132,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", 20, 1113},
+   #endif
+  #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE
+    {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE},
+  #else
+    {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", 20, 1113},
+  #endif
+  #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE
+    {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE},
+  #else
+    {"TLSV1_CERTIFICATE_UNOBTAINABLE", 20, 1111},
+  #endif
+   #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE
+     {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE},
+   #else
+@@ -7545,6 +8152,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"TLSV1_UNRECOGNIZED_NAME", 20, 1112},
+   #endif
+  #ifdef SSL_R_TLSV1_UNRECOGNIZED_NAME
+    {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, SSL_R_TLSV1_UNRECOGNIZED_NAME},
+  #else
+    {"TLSV1_UNRECOGNIZED_NAME", 20, 1112},
+  #endif
+  #ifdef SSL_R_TLSV1_UNSUPPORTED_EXTENSION
+    {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV1_UNSUPPORTED_EXTENSION},
+  #else
+    {"TLSV1_UNSUPPORTED_EXTENSION", 20, 1110},
+  #endif
+   #ifdef SSL_R_TLSV1_UNSUPPORTED_EXTENSION
+     {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV1_UNSUPPORTED_EXTENSION},
+   #else
+@@ -7665,6 +8282,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNKNOWN_KEY_EXCHANGE_TYPE", 20, 250},
+   #endif
+  #ifdef SSL_R_UNKNOWN_MANDATORY_PARAMETER
+    {"UNKNOWN_MANDATORY_PARAMETER", ERR_LIB_SSL, SSL_R_UNKNOWN_MANDATORY_PARAMETER},
+  #else
+    {"UNKNOWN_MANDATORY_PARAMETER", 20, 323},
+  #endif
+   #ifdef SSL_R_UNKNOWN_PKEY_TYPE
+     {"UNKNOWN_PKEY_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_PKEY_TYPE},
+   #else
+@@ -7700,6 +8322,21 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_COMPRESSION_ALGORITHM", 20, 257},
+   #endif
+  #ifdef SSL_R_UNSUPPORTED_CONFIG_VALUE
+    {"UNSUPPORTED_CONFIG_VALUE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_CONFIG_VALUE},
+  #else
+    {"UNSUPPORTED_CONFIG_VALUE", 20, 414},
+  #endif
+  #ifdef SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS
+    {"UNSUPPORTED_CONFIG_VALUE_CLASS", ERR_LIB_SSL, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS},
+  #else
+    {"UNSUPPORTED_CONFIG_VALUE_CLASS", 20, 415},
+  #endif
+  #ifdef SSL_R_UNSUPPORTED_CONFIG_VALUE_OP
+    {"UNSUPPORTED_CONFIG_VALUE_OP", ERR_LIB_SSL, SSL_R_UNSUPPORTED_CONFIG_VALUE_OP},
+  #else
+    {"UNSUPPORTED_CONFIG_VALUE_OP", 20, 416},
+  #endif
+   #ifdef SSL_R_UNSUPPORTED_ELLIPTIC_CURVE
+     {"UNSUPPORTED_ELLIPTIC_CURVE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE},
+   #else
+@@ -7720,6 +8357,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_STATUS_TYPE", 20, 329},
+   #endif
+  #ifdef SSL_R_UNSUPPORTED_WRITE_FLAG
+    {"UNSUPPORTED_WRITE_FLAG", ERR_LIB_SSL, SSL_R_UNSUPPORTED_WRITE_FLAG},
+  #else
+    {"UNSUPPORTED_WRITE_FLAG", 20, 412},
+  #endif
+   #ifdef SSL_R_USE_SRTP_NOT_NEGOTIATED
+     {"USE_SRTP_NOT_NEGOTIATED", ERR_LIB_SSL, SSL_R_USE_SRTP_NOT_NEGOTIATED},
+   #else
+@@ -7750,6 +8392,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"WRONG_CURVE", 20, 378},
+   #endif
+  #ifdef SSL_R_WRONG_RPK_TYPE
+    {"WRONG_RPK_TYPE", ERR_LIB_SSL, SSL_R_WRONG_RPK_TYPE},
+  #else
+    {"WRONG_RPK_TYPE", 20, 351},
+  #endif
+   #ifdef SSL_R_WRONG_SIGNATURE_LENGTH
+     {"WRONG_SIGNATURE_LENGTH", ERR_LIB_SSL, SSL_R_WRONG_SIGNATURE_LENGTH},
+   #else
+@@ -8055,6 +8702,16 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"BAD_OBJECT", 34, 119},
+   #endif
+  #ifdef X509V3_R_BAD_OPTION
+    {"BAD_OPTION", ERR_LIB_X509V3, X509V3_R_BAD_OPTION},
+  #else
+    {"BAD_OPTION", 34, 170},
+  #endif
+  #ifdef X509V3_R_BAD_VALUE
+    {"BAD_VALUE", ERR_LIB_X509V3, X509V3_R_BAD_VALUE},
+  #else
+    {"BAD_VALUE", 34, 171},
+  #endif
+   #ifdef X509V3_R_BN_DEC2BN_ERROR
+     {"BN_DEC2BN_ERROR", ERR_LIB_X509V3, X509V3_R_BN_DEC2BN_ERROR},
+   #else
+@@ -8370,6 +9027,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNKNOWN_OPTION", 34, 120},
+   #endif
+  #ifdef X509V3_R_UNKNOWN_VALUE
+    {"UNKNOWN_VALUE", ERR_LIB_X509V3, X509V3_R_UNKNOWN_VALUE},
+  #else
+    {"UNKNOWN_VALUE", 34, 172},
+  #endif
+   #ifdef X509V3_R_UNSUPPORTED_OPTION
+     {"UNSUPPORTED_OPTION", ERR_LIB_X509V3, X509V3_R_UNSUPPORTED_OPTION},
+   #else
+@@ -8430,6 +9092,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"CRL_VERIFY_FAILURE", 11, 131},
+   #endif
+  #ifdef X509_R_DUPLICATE_ATTRIBUTE
+    {"DUPLICATE_ATTRIBUTE", ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE},
+  #else
+    {"DUPLICATE_ATTRIBUTE", 11, 140},
+  #endif
+   #ifdef X509_R_ERROR_GETTING_MD_BY_NID
+     {"ERROR_GETTING_MD_BY_NID", ERR_LIB_X509, X509_R_ERROR_GETTING_MD_BY_NID},
+   #else
+@@ -8590,6 +9257,11 @@ static struct py_ssl_error_code error_codes[] = {
+   #else
+     {"UNSUPPORTED_ALGORITHM", 11, 111},
+   #endif
+  #ifdef X509_R_UNSUPPORTED_VERSION
+    {"UNSUPPORTED_VERSION", ERR_LIB_X509, X509_R_UNSUPPORTED_VERSION},
+  #else
+    {"UNSUPPORTED_VERSION", 11, 145},
+  #endif
+   #ifdef X509_R_WRONG_LOOKUP_TYPE
+     {"WRONG_LOOKUP_TYPE", ERR_LIB_X509, X509_R_WRONG_LOOKUP_TYPE},
+   #else
+diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py
+index 21be53e7884..a08b32fa45d 100644
+--- a/Tools/c-analyzer/cpython/_parser.py
+++ b/Tools/c-analyzer/cpython/_parser.py
+@@ -70,9 +70,7 @@ Python/thread_pthread.h
+ Python/thread_pthread_stubs.h
+ 
+ # only huge constants (safe but parsing is slow)
+-Modules/_ssl_data_31.h
+-Modules/_ssl_data_300.h
+-Modules/_ssl_data_111.h
+Modules/_ssl_data_*.h
+ Modules/cjkcodecs/mappings_*.h
+ Modules/unicodedata_db.h
+ Modules/unicodename_db.h
+diff --git a/Tools/ssl/make_ssl_data.py b/Tools/ssl/make_ssl_data.py
+index 9860871..0cd05c7 100755
+--- a/Tools/ssl/make_ssl_data.py
+++ b/Tools/ssl/make_ssl_data.py
+@@ -5,9 +5,28 @@ This script should be called *manually* when we want to upgrade SSLError
+ `library` and `reason` mnemonics to a more recent OpenSSL version.
+ 
+ It takes two arguments:
+-- the path to the OpenSSL source tree (e.g. git checkout)
+- the path to the OpenSSL git checkout
+ - the path to the header file to be generated Modules/_ssl_data_{version}.h
+ - error codes are version specific
+
+The OpenSSL git checkout should be at a specific tag, using commands like:
+    git tag --list 'openssl-*'
+    git switch --detach openssl-3.4.0
+
+
+After generating the definitions, compare the result with newest pre-existing file.
+You can use a command like:
+
+    git diff --no-index Modules/_ssl_data_31.h Modules/_ssl_data_34.h
+
+- If the new version *only* adds new definitions, remove the pre-existing file
+  and adjust the #include in _ssl.c to point to the new version.
+- If the new version removes or renumbers some definitions, keep both files and
+  add a new #include in _ssl.c.
+
+A newly supported OpenSSL version should also be added to:
+- Tools/ssl/multissltests.py
+- .github/workflows/build.yml
+ """
+ 
+ import argparse
+@@ -16,6 +35,7 @@ import operator
+ import os
+ import re
+ import sys
+import subprocess
+ 
+ 
+ parser = argparse.ArgumentParser(
+@@ -118,9 +138,17 @@ def main():
+     # sort by libname, numeric error code
+     args.reasons = sorted(reasons, key=operator.itemgetter(0, 3))
+ 
+    git_describe = subprocess.run(
+        ['git', 'describe', '--long', '--dirty'],
+        cwd=args.srcdir,
+        capture_output=True,
+        encoding='utf-8',
+        check=True,
+        )
+     lines = [
+-        "/* File generated by Tools/ssl/make_ssl_data.py */"
+-        f"/* Generated on {datetime.datetime.utcnow().isoformat()} */"
+        "/* File generated by Tools/ssl/make_ssl_data.py */",
+        f"/* Generated on {datetime.datetime.now(datetime.UTC).isoformat()} */",
+        f"/* Generated from Git commit {git_describe.stdout.strip()} */",
+     ]
+     lines.extend(gen_library_codes(args))
+     lines.append("")
+diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
+index eae0e0c..fb06f63 100755
+--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
+@@ -51,6 +51,7 @@ OPENSSL_RECENT_VERSIONS = [
+     "3.1.7",
+     "3.2.3",
+     "3.3.2",
+    "3.4.0",
+ ]
+ 
+ LIBRESSL_OLD_VERSIONS = [
+-- 
+2.30.2
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
new file mode 100644
index 0000000000..84ad2abb0b
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch
@@ -0,0 +1,46 @@
+From 129ee75863081d9e3418acca3df1e47667f671ad Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+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
+ errors
+reading stdin can throw the same I/O errors as reading from master fd does,
+e.g. when running under Yocto's test harness:
+======================================================================
+ERROR: test_spawn_doesnt_hang (test.test_pty.PtyTest)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/usr/lib/python3.10/test/test_pty.py", line 316, in test_spawn_doesnt_hang
+    pty.spawn([sys.executable, '-c', 'print("hi there")'])
+  File "/usr/lib/python3.10/pty.py", line 181, in spawn
+    _copy(master_fd, master_read, stdin_read)
+  File "/usr/lib/python3.10/pty.py", line 157, in _copy
+    data = stdin_read(STDIN_FILENO)
+  File "/usr/lib/python3.10/pty.py", line 132, in _read
+    return os.read(fd, 1024)
+OSError: [Errno 5] Input/output error
+So let's treat both channels the same.
+Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Lib/pty.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+diff --git a/Lib/pty.py b/Lib/pty.py
+index 1d97994..fa8821b 100644
+--- a/Lib/pty.py
+++ b/Lib/pty.py
+@@ -178,7 +178,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
+             i_buf = i_buf[n:]
+ 
+         if stdin_avail and STDIN_FILENO in rfds:
+-            data = stdin_read(STDIN_FILENO)
+            try:
+                data = stdin_read(STDIN_FILENO)
+            except OSError:
+                data = b""
+             if not data:
+                 stdin_avail = False
+             else:
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
deleted file mode 100644
index 1490cdbb18..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From deeedd1b8799294ab276ab7dbbfdb59c1dacc9a2 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 22 Oct 2020 13:10:34 +0200
-Subject: [PATCH] Lib/sysconfig.py: use libdir values from configuration file
-This allows correctly substituting them for target installs using
-native python.
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Lib/sysconfig.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index bf04ac5..ed0462b 100644
--- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -20,10 +20,10 @@ __all__ = [
- 
- _INSTALL_SCHEMES = {
-     'posix_prefix': {
-        'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}',
-        'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}',
-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
-        'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
-+        'stdlib': '{LIBDEST}',
-+        'platstdlib': '{LIBDEST}',
-+        'purelib': '{LIBDEST}/site-packages',
-+        'platlib': '{LIBDEST}/site-packages',
-         'include':
-             '{installed_base}/include/python{py_version_short}{abiflags}',
-         'platinclude':
-- 
-2.24.0
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
new file mode 100644
index 0000000000..ca72ebc899
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -0,0 +1,31 @@
+From 3f4f3e917950e286d5729ea949ca342995eb3c3e Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 17 Nov 2023 14:26:32 +0100
+Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
+ file
+This allows correctly substituting them for target installs using
+native python.
+Upstream-Status: Inappropriate [oe-core cross builds]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Lib/sysconfig/__init__.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
+index f8e1c7d..0882526 100644
+--- a/Lib/sysconfig/__init__.py
+++ b/Lib/sysconfig/__init__.py
+@@ -494,6 +494,11 @@ def _init_config_vars():
+         _CONFIG_VARS['VPATH'] = sys._vpath
+     if os.name == 'posix':
+         _init_posix(_CONFIG_VARS)
+    _CONFIG_VARS['installed_base'] = _CONFIG_VARS['prefix']
+    _CONFIG_VARS['base'] = _CONFIG_VARS['prefix']
+    _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix']
+    _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix']
+    _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR']
+     if _HAS_USER_BASE:
+         # Setting 'userbase' is done below the call to the
+         # init function to enable using 'get_config_var' in
diff --git a/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
deleted file mode 100644
index b1bceac512..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 16 Jan 2020 12:34:20 +0100
-Subject: [PATCH] Makefile: do not compile .pyc in parallel
-This was found to break reproducibility, and produce strange file ownership
-races.
-The upstream commit introducing the change was:
-https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Makefile.pre.in | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 1241112..5dfdf44 100644
--- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1457,30 +1457,30 @@ libinstall:     build_all $(srcdir)/Modules/xxmodule.c
-        fi
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-               -j0 -d $(LIBDEST) -f \
-+               -d $(LIBDEST) -f \
-                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-                $(DESTDIR)$(LIBDEST)
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
-               -j0 -d $(LIBDEST) -f \
-+               -d $(LIBDEST) -f \
-                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-                $(DESTDIR)$(LIBDEST)
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
-               -j0 -d $(LIBDEST) -f \
-+               -d $(LIBDEST) -f \
-                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-                $(DESTDIR)$(LIBDEST)
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-               -j0 -d $(LIBDEST)/site-packages -f \
-+               -d $(LIBDEST)/site-packages -f \
-                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
-               -j0 -d $(LIBDEST)/site-packages -f \
-+               -d $(LIBDEST)/site-packages -f \
-                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
-               -j0 -d $(LIBDEST)/site-packages -f \
-+               -d $(LIBDEST)/site-packages -f \
-                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
diff --git a/meta/recipes-devtools/python/python3/0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch b/meta/recipes-devtools/python/python3/0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch
deleted file mode 100644
index 237645bc60..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 840fda32c82550259d02a7a56a78a9c05162b1a1 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 8 May 2019 16:10:29 +0800
-Subject: [PATCH] Makefile: fix Issue36464 (parallel build race problem)
-When using make -j with the 'install' target, it's possible for altbininstall
-(which normally creates BINDIR) and libainstall (which doesn't, though it
-installs python-config there) to race, resulting in a failure due to
-attempting to install python-config into a nonexistent BINDIR. Ensure it also
-exists in the libainstall target.
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/13186]
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
- Makefile.pre.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 15f3687..7e9f173 100644
--- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1456,7 +1456,7 @@ LIBPL=            @LIBPL@
- LIBPC=         $(LIBDIR)/pkgconfig
- 
- libainstall:   @DEF_MAKE_RULE@ python-config
-       @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \
-+       @for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \
-        do \
-                if test ! -d $(DESTDIR)$$i; then \
-                        echo "Creating directory $$i"; \
-- 
-2.7.4
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 fa7735ff93..39b62f6f26 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,25 +1,33 @@
-From cf6a9100902484e4d028ee88742dd2487b014a98 Mon Sep 17 00:00:00 2001
+From e7a8a7385f561f214054cf95f0a22bfa064eee0b Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 30 Jan 2019 12:41:04 +0100
 Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Update to remove test_types from the test list, since that fails under
+qemu now.
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
 ---
 Makefile.pre.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a3a02a7..d5503dd 100644
+index 3bd4495f95b..8e8fc60bc76 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -507,8 +507,7 @@ build_all_generate_profile:
+@@ -751,8 +751,7 @@ profile-run-stamp:
-        $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LDFLAGS_NODIST="$(LDFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)"
+        # enabled.
- 
+        $(MAKE) profile-gen-stamp
- run_profile_task:
+        # Next, run the profile task to generate the profile information.
 -       @ # FIXME: can't run for a cross build
-       $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
+-       $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK)
-+       ./pgo-wrapper ./python -m test.regrtest --pgo test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_support || true
+       ./pgo-wrapper ./python -m test.regrtest --pgo test_grammar test_opcodes test_dict
- 
- build_all_merge_profile:
        $(LLVM_PROF_MERGER)
+        # Remove profile generation binary since we are done with it.
+        $(MAKE) clean-retain-profile
+-- 
+2.39.5
diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
new file mode 100644
index 0000000000..c8537db1fd
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
@@ -0,0 +1,72 @@
+From 8828a52ebace98199569404f01174398bcc64a00 Mon Sep 17 00:00:00 2001
+From: Yi Fan Yu <yifan.yu@windriver.com>
+Date: Thu, 1 Apr 2021 13:08:37 -0700
+Subject: [PATCH] Skip failing tests due to load variability on YP AB
+Skip these tests until AB-INT is solved.
+[YOCTO #14296]
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+Skip two additional tests due to suspected load variability failures.
+[YOCTO #15131]
+[YOCTO #15177]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/_test_multiprocessing.py | 3 +++
+ Lib/test/test_time.py             | 2 ++
+ 2 files changed, 5 insertions(+)
+diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
+index 5dae370..23eb971 100644
+--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
+@@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase):
+         close_queue(q)
+ 
+     @support.requires_resource('walltime')
+    @unittest.skip('timing related test, dependent on load')
+     def test_many_processes(self):
+         if self.TYPE == 'threads':
+             self.skipTest('test not appropriate for {}'.format(self.TYPE))
+@@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase):
+         except threading.BrokenBarrierError:
+             results.append(True)
+ 
+    @unittest.skip('timing related test, dependent on load')
+     def test_timeout(self):
+         """
+         Test wait(timeout)
+@@ -5299,6 +5301,7 @@ class TestWait(unittest.TestCase):
+         time.sleep(period)
+ 
+     @support.requires_resource('walltime')
+    @unittest.skip('timing related test, dependent on load')
+     def test_wait_integer(self):
+         from multiprocessing.connection import wait
+ 
+diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
+index 293799f..1dbb623 100644
+--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
+@@ -548,6 +548,7 @@ class TimeTestCase(unittest.TestCase):
+     @unittest.skipIf(
+         support.is_wasi, "process_time not available on WASI"
+     )
+    @unittest.skip('timing related test, dependent on load')
+     def test_process_time(self):
+         # process_time() should not include time spend during a sleep
+         start = time.process_time()
+@@ -561,6 +562,7 @@ class TimeTestCase(unittest.TestCase):
+         self.assertTrue(info.monotonic)
+         self.assertFalse(info.adjustable)
+ 
+    @unittest.skip('timing related test, dependent on load')
+     def test_thread_time(self):
+         if not hasattr(time, 'thread_time'):
+             if sys.platform.startswith(('linux', 'android', 'win')):
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
new file mode 100644
index 0000000000..ab433d1836
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch
@@ -0,0 +1,36 @@
+From 5bf5aa6eae1fa3eed66893e51a1858ab481426b4 Mon Sep 17 00:00:00 2001
+From: Wentao Zhang <wentao.zhang@windriver.com>
+Date: Mon, 20 Mar 2023 13:39:52 +0800
+Subject: [PATCH] Update test_sysconfig for posix_user purelib
+Steps to trigger the failed test:
+Edit local.conf to add something as follows:
+    BASELIB = "lib64"
+    IMAGE_INSTALL:append = " python3-tests".
+bitbake core-image-sato
+runqemu qemux86-64 nographic slirp
+Reproducer:
+    $python3 -m test test_sysconfig
+Update test_sysconfig.test_user_similar() for the posix_user scheme:
+"purelib" doesn't use sys.platlibdir.
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Wentao Zhang <wentao.zhang@windriver.com>
+---
+ Lib/test/test_sysconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
+index 1ade492..4e94889 100644
+--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
+@@ -423,7 +423,7 @@ class TestSysConfig(unittest.TestCase):
+                 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.
+-                if name == 'platlib':
+                if name == 'platlib' or name == 'purelib':
+                     # Replace "/lib64/python3.11/site-packages" suffix
+                     # with "/lib/python3.11/site-packages".
+                     py_version_abi = sysconfig._get_python_version_abi()
diff --git a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch b/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch
deleted file mode 100644
index 793385de91..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9f63e83b1cec872917647b11155edaffe399d103 Mon Sep 17 00:00:00 2001
-From: Inada Naoki <songofacandy@gmail.com>
-Date: Sat, 14 Jul 2018 00:46:11 +0900
-Subject: [PATCH] Use FLAG_REF always for interned strings
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/8226]
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
- Python/marshal.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-diff --git a/Python/marshal.c b/Python/marshal.c
-index c4538bd..2437160 100644
--- a/Python/marshal.c
-+++ b/Python/marshal.c
-@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)
-     if (p->version < 3 || p->hashtable == NULL)
-         return 0; /* not writing object references */
- 
-    /* if it has only one reference, it definitely isn't shared */
-    if (Py_REFCNT(v) == 1)
-+    /* If it has only one reference, it definitely isn't shared.
-+     * But we use TYPE_REF always for interned string, to PYC file stable
-+     * as possible.
-+     */
-+    if (Py_REFCNT(v) == 1 &&
-+            !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) {
-         return 0;
-+    }
- 
-     entry = _Py_hashtable_get_entry(p->hashtable, v);
-     if (entry != NULL) {
diff --git a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
deleted file mode 100644
index c4fae09a5b..0000000000
--- a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 1ad771d86728ee2ed30e202e9768d8d825f96467 Mon Sep 17 00:00:00 2001
-From: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
-Date: Fri, 31 May 2019 15:34:34 +0200
-Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
- float
-When (cross) compiling for softfloat mips, __mips_hard_float will not be
-defined and detection of OS triplet in configure.ac / configure will fail.
-This also has to do with the custom detection of the build triplet. Trying
-to do this in a more autoconf/autotools manner.
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
-Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
-%% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
---
- configure.ac | 175 +++++++--------------------------------------------
- 1 file changed, 21 insertions(+), 154 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index ede710e..bc81b0b 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -710,160 +710,27 @@ fi
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
- AC_SUBST(MULTIARCH)
- 
-AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
-cat >> conftest.c <<EOF
-#undef bfin
-#undef cris
-#undef fr30
-#undef linux
-#undef hppa
-#undef hpux
-#undef i386
-#undef mips
-#undef powerpc
-#undef sparc
-#undef unix
-#if defined(__ANDROID__)
-    # Android is not a multiarch system.
-#elif defined(__linux__)
-# if defined(__x86_64__) && defined(__LP64__)
-        x86_64-linux-gnu
-# elif defined(__x86_64__) && defined(__ILP32__)
-        x86_64-linux-gnux32
-# elif defined(__i386__)
-        i386-linux-gnu
-# elif defined(__aarch64__) && defined(__AARCH64EL__)
-#  if defined(__ILP32__)
-        aarch64_ilp32-linux-gnu
-#  else
-        aarch64-linux-gnu
-#  endif
-# elif defined(__aarch64__) && defined(__AARCH64EB__)
-#  if defined(__ILP32__)
-        aarch64_be_ilp32-linux-gnu
-#  else
-        aarch64_be-linux-gnu
-#  endif
-# elif defined(__alpha__)
-        alpha-linux-gnu
-# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
-#  if defined(__ARMEL__)
-        arm-linux-gnueabihf
-#  else
-        armeb-linux-gnueabihf
-#  endif
-# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
-#  if defined(__ARMEL__)
-        arm-linux-gnueabi
-#  else
-        armeb-linux-gnueabi
-#  endif
-# elif defined(__hppa__)
-        hppa-linux-gnu
-# elif defined(__ia64__)
-        ia64-linux-gnu
-# elif defined(__m68k__) && !defined(__mcoldfire__)
-        m68k-linux-gnu
-# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL)
-#  if _MIPS_SIM == _ABIO32
-        mipsisa32r6el-linux-gnu
-#  elif _MIPS_SIM == _ABIN32
-        mipsisa64r6el-linux-gnuabin32
-#  elif _MIPS_SIM == _ABI64
-        mipsisa64r6el-linux-gnuabi64
-#  else
-#   error unknown platform triplet
-#  endif
-# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6)
-#  if _MIPS_SIM == _ABIO32
-        mipsisa32r6-linux-gnu
-#  elif _MIPS_SIM == _ABIN32
-        mipsisa64r6-linux-gnuabin32
-#  elif _MIPS_SIM == _ABI64
-        mipsisa64r6-linux-gnuabi64
-#  else
-#   error unknown platform triplet
-#  endif
-# elif defined(__mips_hard_float) && defined(_MIPSEL)
-#  if _MIPS_SIM == _ABIO32
-        mipsel-linux-gnu
-#  elif _MIPS_SIM == _ABIN32
-        mips64el-linux-gnuabin32
-#  elif _MIPS_SIM == _ABI64
-        mips64el-linux-gnuabi64
-#  else
-#   error unknown platform triplet
-#  endif
-# elif defined(__mips_hard_float)
-#  if _MIPS_SIM == _ABIO32
-        mips-linux-gnu
-#  elif _MIPS_SIM == _ABIN32
-        mips64-linux-gnuabin32
-#  elif _MIPS_SIM == _ABI64
-        mips64-linux-gnuabi64
-#  else
-#   error unknown platform triplet
-#  endif
-# elif defined(__or1k__)
-        or1k-linux-gnu
-# elif defined(__powerpc__) && defined(__SPE__)
-        powerpc-linux-gnuspe
-# elif defined(__powerpc64__)
-#  if defined(__LITTLE_ENDIAN__)
-        powerpc64le-linux-gnu
-#  else
-        powerpc64-linux-gnu
-#  endif
-# elif defined(__powerpc__)
-        powerpc-linux-gnu
-# elif defined(__s390x__)
-        s390x-linux-gnu
-# elif defined(__s390__)
-        s390-linux-gnu
-# elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
-        sh4-linux-gnu
-# elif defined(__sparc__) && defined(__arch64__)
-        sparc64-linux-gnu
-# elif defined(__sparc__)
-        sparc-linux-gnu
-# elif defined(__riscv)
-#  if __riscv_xlen == 32
-        riscv32-linux-gnu
-#  elif __riscv_xlen == 64
-        riscv64-linux-gnu
-#  else
-#   error unknown platform triplet
-#  endif
-# else
-#   error unknown platform triplet
-# endif
-#elif defined(__FreeBSD_kernel__)
-# if defined(__LP64__)
-        x86_64-kfreebsd-gnu
-# elif defined(__i386__)
-        i386-kfreebsd-gnu
-# else
-#   error unknown platform triplet
-# endif
-#elif defined(__gnu_hurd__)
-        i386-gnu
-#elif defined(__APPLE__)
-        darwin
-#elif defined(__VXWORKS__)
-        vxworks
-#else
-# error unknown platform triplet
-#endif
-
-EOF
-
-if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
-  PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d '       '`
-  AC_MSG_RESULT([$PLATFORM_TRIPLET])
-else
-  AC_MSG_RESULT([none])
-fi
-rm -f conftest.c conftest.out
-+AC_CANONICAL_TARGET
-+## Not using $target to filter out vendor
-+## Need to handle macos, vxworks and hurd special (?) :-/
-+case ${target_os} in
-+     darwin*)
-+       PLATFORM_TRIPLET=darwin
-+       ;;
-+     hurd*)
-+       PLATFORM_TRIPLET=i386-gnu
-+       ;;
-+     vxworks*)
-+       PLATFORM_TRIPLET=vxworks
-+       ;;
-+     *)
-+        if test "${target_cpu}" != "i686"; then
-+               PLATFORM_TRIPLET=${target_cpu}-${target_os}
-+       else
-+               PLATFORM_TRIPLET=i386-${target_os}
-+       fi
-+       ;;
-+esac   
- 
- if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
-   if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
-- 
-2.24.1
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
deleted file mode 100644
index b982691b36..0000000000
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e65bfe22c858872b08366aff49119d4145a77f40 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 31 Jan 2019 16:46:30 +0100
-Subject: [PATCH] distutils/sysconfig: append
- STAGING_LIBDIR/python-sysconfigdata to sys.path
-So that target configuration can be used when running native python
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Lib/distutils/sysconfig.py | 2 ++
- Lib/sysconfig.py           | 2 ++
- 2 files changed, 4 insertions(+)
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index b51629e..2df348c 100644
--- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -438,6 +438,8 @@ def _init_posix():
-         platform=sys.platform,
-         multiarch=getattr(sys.implementation, '_multiarch', ''),
-     ))
-+    if 'STAGING_LIBDIR' in os.environ:
-+        sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata')
-     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
-     build_time_vars = _temp.build_time_vars
-     global _config_vars
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index b2d790b..405273c 100644
--- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -419,6 +419,8 @@ def _init_posix(vars):
-     """Initialize the module as appropriate for POSIX systems."""
-     # _sysconfigdata is generated at build time, see _generate_posix_vars()
-     name = _get_sysconfigdata_name()
-+    if 'STAGING_LIBDIR' in os.environ:
-+        sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata')
-     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
-     build_time_vars = _temp.build_time_vars
-     vars.update(build_time_vars)
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
deleted file mode 100644
index bfddc1ad52..0000000000
--- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 5f9eea2c4f8716830f6c8855a3e10872119fae32 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Mon, 22 Oct 2018 15:19:51 +0800
-Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
-When working path contains "clang"/"gcc"/"icc", it might be part of $CC
-because of the "--sysroot" parameter. That could cause judgement error
-about clang/gcc/icc compilers. e.g.
-When "icc" is containded in working path, below errors are reported when
-compiling python3:
-x86_64-wrs-linux-gcc: error: strict: No such file or directory
-x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model'
-Here use cc_basename to replace CC for checking compiler to avoid such
-kind of issue.
-Upstream-Status: Pending
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
-patch originally from Li Zhou, I just rework it to new version
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
- configure.ac | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index d60f052..e491e24 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h)
- AC_CANONICAL_HOST
- AC_SUBST(build)
- AC_SUBST(host)
-+LT_INIT
- 
- # pybuilddir.txt will be created by --generate-posix-vars in the Makefile
- rm -f pybuilddir.txt
-@@ -689,7 +690,7 @@ AC_MSG_RESULT($with_cxx_main)
- preset_cxx="$CXX"
- if test -z "$CXX"
- then
-        case "$CC" in
-+        case "$cc_basename" in
-         gcc)    AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
-         cc)     AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
-         clang|*/clang)     AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
-@@ -975,7 +976,7 @@ rmdir CaseSensitiveTestDir
- 
- case $ac_sys_system in
- hp*|HP*)
-    case $CC in
-+    case $cc_basename in
-     cc|*/cc) CC="$CC -Ae";;
-     esac;;
- esac
-@@ -1366,7 +1367,7 @@ else
- fi],
- [AC_MSG_RESULT(no)])
- if test "$Py_LTO" = 'true' ; then
-  case $CC in
-+  case $cc_basename in
-     *clang*)
-       AC_SUBST(LLVM_AR)
-       AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
-@@ -1456,7 +1457,7 @@ then
-   fi
- fi
- LLVM_PROF_ERR=no
-case $CC in
-+case $cc_basename in
-   *clang*)
-     # Any changes made here should be reflected in the GCC+Darwin case below
-     PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
-@@ -1517,7 +1518,7 @@ esac
- # compiler and platform.  BASECFLAGS tweaks need to be made even if the
- # user set OPT.
- 
-case $CC in
-+case $cc_basename in
-     *clang*)
-         cc_is_clang=1
-         ;;
-@@ -1653,7 +1654,7 @@ yes)
- 
-     # ICC doesn't recognize the option, but only emits a warning
-     ## XXX does it emit an unused result warning and can it be disabled?
-    case "$CC" in
-+    case "$cc_basename" in
-     *icc*)
-     ac_cv_disable_unused_result_warning=no
-     ;;
-@@ -1993,7 +1994,7 @@ yes)
-     ;;
- esac
- 
-case "$CC" in
-+case "$cc_basename" in
- *icc*)
-     # ICC needs -fp-model strict or floats behave badly
-     CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
-@@ -2765,7 +2766,7 @@ then
-                then
-                        LINKFORSHARED="-Wl,--export-dynamic"
-                fi;;
-       SunOS/5*) case $CC in
-+       SunOS/5*) case $cc_basename in
-                  *gcc*)
-                    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-                    then
-@@ -5507,7 +5508,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
-     # Some versions of gcc miscompile inline asm:
-     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
-     # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
-    case $CC in
-+    case $cc_basename in
-         *gcc*)
-             AC_MSG_CHECKING(for gcc ipa-pure-const bug)
-             saved_cflags="$CFLAGS"
diff --git a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch b/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
deleted file mode 100644
index ea0af02e72..0000000000
--- a/meta/recipes-devtools/python/python3/0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7019ba184b828ed7253750cf409fc5760ef90a54 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 9 Jan 2020 17:44:05 +0100
-Subject: [PATCH] setup.py: pass missing libraries to Extension for
- multiprocessing module
-In the following commit:
-...
-commit e711cafab13efc9c1fe6c5cd75826401445eb585
-Author: Benjamin Peterson <benjamin@python.org>
-Date:   Wed Jun 11 16:44:04 2008 +0000
-    Merged revisions 64104,64117 via svnmerge from
-    svn+ssh://pythondev@svn.python.org/python/trunk
-...
-(see diff in setup.py)
-It assigned libraries for multiprocessing module according
-the host_platform, but not pass it to Extension.
-In glibc, the following commit caused two definition of
-sem_getvalue are different.
-https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524
-(see diff in nptl/sem_getvalue.c for detail)
-`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1
-and `__old_sem_getvalue' is to compat the old version
-sem_getvalue@GLIBC_2.0.
-To build python for embedded Linux systems:
-http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html
-If not explicitly link to library pthread (-lpthread), it will
-load glibc's sem_getvalue randomly at runtime.
-Such as build python on linux x86_64 host and run the python
-on linux x86_32 target. If not link library pthread, it caused
-multiprocessing bounded semaphore could not work correctly.
-...
->>> import multiprocessing
->>> pool_sema = multiprocessing.BoundedSemaphore(value=1)
->>> pool_sema.acquire()
-True
->>> pool_sema.release()
-Traceback (most recent call last):
-  File "<stdin>", line 1, in <module>
-ValueError: semaphore or lock released too many times
-...
-And the semaphore issue also caused multiprocessing.Queue().put() hung.
-Upstream-Status: Pending
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/setup.py b/setup.py
-index ec3f2a4..b0f1541 100644
--- a/setup.py
-+++ b/setup.py
-@@ -1671,7 +1671,7 @@ class PyBuildExt(build_ext):
-                                    libraries=libs,
-                                    include_dirs=["Modules/_multiprocessing"]))
- 
-        self.add(Extension('_multiprocessing', multiprocessing_srcs,
-+        self.add(Extension('_multiprocessing', multiprocessing_srcs, libraries=['pthread'],
-                            include_dirs=["Modules/_multiprocessing"]))
- 
-     def detect_uuid(self):
diff --git a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch
new file mode 100644
index 0000000000..ea103bc834
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch
@@ -0,0 +1,29 @@
+From c5bdd39f8ebc4e6c58a47d7e424eac028eddb4ff Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Fri, 15 Sep 2023 08:48:33 -0400
+Subject: [PATCH] skip no_stdout_fileno test due to load variability
+Skip test_input_no_stdout_fileno so that it doesn't fail on systems
+under heavy load.
+Upstream-Status: Inappropriate [OE-Specific]
+[YOCTO #15210]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/test_builtin.py | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
+index c5394de..ed17fb6 100644
+--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
+@@ -2435,6 +2435,7 @@ class PtyTests(unittest.TestCase):
+                          "byte 0xe9 in position 4: ordinal not in "
+                          "range(128)")
+ 
+    @unittest.skip("Test may fail under heavy load")
+     def test_input_no_stdout_fileno(self):
+         # Issue #24402: If stdin is the original terminal but stdout.fileno()
+         # fails, do not use the original stdout file descriptor
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
new file mode 100644
index 0000000000..b9c68a98d7
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch
@@ -0,0 +1,27 @@
+From bbcb17dc1ed283f41c8cd94d39f70898f0c45583 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Sun, 12 Sep 2021 21:44:36 +0200
+Subject: [PATCH] sysconfig.py: use platlibdir also for purelib
+This is needed in multilib configurations where hardcoding 'lib'
+is not correct.
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ Lib/sysconfig/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
+index 80aef34..f8e1c7d 100644
+--- a/Lib/sysconfig/__init__.py
+++ b/Lib/sysconfig/__init__.py
+@@ -29,7 +29,7 @@ _INSTALL_SCHEMES = {
+     'posix_prefix': {
+         'stdlib': '{installed_base}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
+         'platstdlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
+-        'purelib': '{base}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+        'purelib': '{base}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+         'include':
+             '{installed_base}/include/{implementation_lower}{py_version_short}{abiflags}',
diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch
new file mode 100644
index 0000000000..5f60c60b5b
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch
@@ -0,0 +1,27 @@
+From 540765b148d942a2339affa6c0d11445e9d0f26c Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Thu, 13 Jun 2024 10:54:31 -0400
+Subject: [PATCH] test_active_children: skip problematic test
+This test is failing in some tests on the Autobuilder. Since it's of a
+similar nature to other failing/hanging tests, disable it for now.
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/_test_multiprocessing.py | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
+index 23eb971..b1295b2 100644
+--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
+@@ -585,6 +585,7 @@ class _TestProcess(BaseTestCase):
+         self.assertTrue(type(cpus) is int)
+         self.assertTrue(cpus >= 1)
+ 
+    @unittest.skip("skipping problematic test")
+     def test_active_children(self):
+         self.assertEqual(type(self.active_children()), list)
+ 
diff --git a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch
new file mode 100644
index 0000000000..68e277d662
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch
@@ -0,0 +1,33 @@
+From 0e9d0c58e77ef540d9601ce84a1aa79d9ce6ee9b Mon Sep 17 00:00:00 2001
+From: Tim Orling <timothy.t.orling@intel.com>
+Date: Fri, 18 Jun 2021 11:56:50 -0700
+Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk
+These tests need full packagegroup-core-buildessential, the
+easiest way to dynamically check for that is looking for
+'tools-sdk' in IMAGE_FEATURES.
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
+---
+ Lib/test/test_ctypes/test_find.py | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/Lib/test/test_ctypes/test_find.py b/Lib/test/test_ctypes/test_find.py
+index 85b2861..b033203 100644
+--- a/Lib/test/test_ctypes/test_find.py
+++ b/Lib/test/test_ctypes/test_find.py
+@@ -116,10 +116,12 @@ class FindLibraryLinux(unittest.TestCase):
+                 # LD_LIBRARY_PATH)
+                 self.assertEqual(find_library(libname), 'lib%s.so' % libname)
+ 
+    @unittest.skip("Needs IMAGE_FEATURE += \"tools-sdk\"")
+     def test_find_library_with_gcc(self):
+         with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None):
+             self.assertNotEqual(find_library('c'), None)
+ 
+    @unittest.skip("Needs IMAGE_FEATURE += \"tools-sdk\"")
+     def test_find_library_with_ld(self):
+         with unittest.mock.patch("ctypes.util._findSoname_ldconfig", lambda *args: None), \
+              unittest.mock.patch("ctypes.util._findLib_gcc", lambda *args: None):
diff --git a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch
new file mode 100644
index 0000000000..3336e2913a
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch
@@ -0,0 +1,27 @@
+From 5a44f74549b32395109342e9299510c32db71068 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Wed, 12 Jun 2024 10:29:03 -0400
+Subject: [PATCH] test_deadlock: skip problematic test
+This test hangs frequently when run on the Autobuilder. Disable it in
+testing until the cause can be determined.
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/test_concurrent_futures/test_deadlock.py | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py
+index 3c30c45..008d6c0 100644
+--- a/Lib/test/test_concurrent_futures/test_deadlock.py
+++ b/Lib/test/test_concurrent_futures/test_deadlock.py
+@@ -90,6 +90,7 @@ class ErrorAtUnpickle(object):
+         return _raise_error_ignore_stderr, (UnpicklingError, )
+ 
+ 
+@unittest.skip("skipping problematic test")
+ class ExecutorDeadlockTest:
+     TIMEOUT = support.LONG_TIMEOUT
+ 
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 35b7e0c480..2cca004b57 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 b94995e0c694ec9561efec0d1a59b323340e6105 Mon Sep 17 00:00:00 2001
+From c1f3cf625c0f011060ddaa2a4096f6aa13dd1ee6 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Mon, 5 Aug 2019 15:57:39 +0800
 Subject: [PATCH] test_locale.py: correct the test output format
@@ -23,24 +23,23 @@ Before this patch:
 Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132]
+Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org>
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
 Lib/test/test_locale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
-index e2c2178..558d63c 100644
+index da4bd79..fd9e67d 100644
 --- a/Lib/test/test_locale.py
 +++ b/Lib/test/test_locale.py
-@@ -527,7 +527,7 @@ class TestMiscellaneous(unittest.TestCase):
+@@ -572,7 +572,7 @@ class TestMiscellaneous(unittest.TestCase):
             self.skipTest('test needs Turkish locale')
         loc = locale.getlocale(locale.LC_CTYPE)
         if verbose:
 -            print('testing with %a' % (loc,), end=' ', flush=True)
 +            print('testing with %a...' % (loc,), end=' ', flush=True)
-         locale.setlocale(locale.LC_CTYPE, loc)
+         try:
-         self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE))
+             locale.setlocale(locale.LC_CTYPE, loc)
- 
+         except locale.Error as exc:
-- 
-2.7.4
diff --git a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch
new file mode 100644
index 0000000000..862a7f5ea7
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch
@@ -0,0 +1,44 @@
+From 1a0a145261ba4f97aaff3c0c656ac2e0ad9695a8 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Tue, 13 Aug 2024 11:07:05 -0400
+Subject: [PATCH] test_readline: skip limited history test
+This test was added recently and is failing on the ptest image when
+using the default PACKAGECONFIG settings (i.e. with editline instead of
+readline).. Disable it until the proper fix is determined.
+A bug has been opened upstream: https://github.com/python/cpython/issues/123018
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/test_readline.py | 2 ++
+ 1 file changed, 2 insertions(+)
+--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
+@@ -70,6 +70,7 @@ class TestHistoryManipulation (unittest.
+ 
+     @unittest.skipUnless(hasattr(readline, "append_history_file"),
+                          "append_history not available")
+    @unittest.skip("Skipping problematic test")
+     def test_write_read_append(self):
+         hfile = tempfile.NamedTemporaryFile(delete=False)
+         hfile.close()
+@@ -141,6 +142,7 @@ class TestHistoryManipulation (unittest.
+         self.assertEqual(readline.get_history_item(1), "entrée 1")
+         self.assertEqual(readline.get_history_item(2), "entrée 22")
+ 
+    @unittest.skip("Skipping problematic test")
+     def test_write_read_limited_history(self):
+         previous_length = readline.get_history_length()
+         self.addCleanup(readline.set_history_length, previous_length)
+@@ -382,6 +384,7 @@ readline.write_history_file(history_file
+         self.assertIn(b"done", output)
+ 
+ 
+    @unittest.skip("Skipping problematic test")
+     def test_write_read_limited_history(self):
+         previous_length = readline.get_history_length()
+         self.addCleanup(readline.set_history_length, previous_length)
diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch
new file mode 100644
index 0000000000..4e284de613
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch
@@ -0,0 +1,43 @@
+From b678363156b5d40e09c1d138840180e3ddc7d20b Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Wed, 8 May 2024 11:58:09 -0400
+Subject: [PATCH] test_shutdown: skip problematic test
+This test hangs frequently when run on the Autobuilder. Disable it in
+testing until the cause can be determined.
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/test_concurrent_futures/test_shutdown.py | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py
+index 7a4065a..6b878a4 100644
+--- a/Lib/test/test_concurrent_futures/test_shutdown.py
+++ b/Lib/test/test_concurrent_futures/test_shutdown.py
+@@ -20,6 +20,7 @@ def sleep_and_print(t, msg):
+     sys.stdout.flush()
+ 
+ 
+@unittest.skip("skipping problematic test")
+ class ExecutorShutdownTest:
+     def test_run_after_shutdown(self):
+         self.executor.shutdown()
+@@ -156,6 +157,7 @@ class ExecutorShutdownTest:
+             signal.signal(signal.SIGALRM, old_handler)
+ 
+ 
+@unittest.skip("skipping problematic test")
+ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase):
+     def test_threads_terminate(self):
+         def acquire_lock(lock):
+@@ -252,6 +254,7 @@ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase
+         self.assertIn(out.strip(), [b"apple", b""])
+ 
+ 
+@unittest.skip("skipping problematic test")
+ class ProcessPoolShutdownTest(ExecutorShutdownTest):
+     def test_processes_terminate(self):
+         def acquire_lock(lock):
diff --git a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch
new file mode 100644
index 0000000000..b4f873fd72
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch
@@ -0,0 +1,29 @@
+From 9f252a691cd335341938489da32d6e2d4620d8ca Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <tgamblin@baylibre.com>
+Date: Fri, 6 Oct 2023 10:59:44 -0400
+Subject: [PATCH] test_storlines: skip due to load variability
+This is yet another test that intermittently fails on the Yocto AB when
+a worker is under heavy load, so skip it during testing.
+Upstream-Status: Inappropriate [OE-Specific]
+[YOCTO #14933]
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
+---
+ Lib/test/test_ftplib.py | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
+index bed0e6d..36602be 100644
+--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
+@@ -627,6 +627,7 @@ class TestFTPClass(TestCase):
+             self.client.storbinary('stor', f, rest=r)
+             self.assertEqual(self.server.handler_instance.rest, str(r))
+ 
+    @unittest.skip('timing related test, dependent on load')
+     def test_storlines(self):
+         data = RETR_DATA.replace('\r\n', '\n').encode(self.client.encoding)
+         f = io.BytesIO(data)
diff --git a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
deleted file mode 100644
index 5c620361da..0000000000
--- a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 7 Oct 2019 13:22:14 +0200
-Subject: [PATCH] setup.py: do not report missing dependencies for disabled
- modules
-Reporting those missing dependencies is misleading as the modules would not
-have been built anyway. This particularly matters in oe-core's automated
-build completeness checker which relies on the report.
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- setup.py | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/setup.py b/setup.py
-index 7691258..ec3f2a4 100644
--- a/setup.py
-+++ b/setup.py
-@@ -408,6 +408,10 @@ class PyBuildExt(build_ext):
-                 print("%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                               longest, g))
- 
-+        # There is no need to report missing module dependencies,
-+        # if the modules have been disabled in the first place.
-+        self.missing = list(set(self.missing) - set(mods_disabled))
-+
-         if self.missing:
-             print()
-             print("Python build finished successfully!")
diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch
deleted file mode 100644
index e04a91605c..0000000000
--- a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Sun, 16 Feb 2020 17:50:25 +0100
-Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from
- the host
-This leads to host contamination, and particularly can cause
-curses modules to fail at runtime if the host curses is configured
-differently to native curses (observed on current OpenSuse Tumbleweed
-as dnf failures).
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- configure.ac | 6 ------
- setup.py     | 2 --
- 2 files changed, 8 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 915f475..c911011 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -4828,12 +4828,6 @@ then
-   [Define if you have struct stat.st_mtimensec])
- fi
- 
-# first curses header check
-ac_save_cppflags="$CPPFLAGS"
-if test "$cross_compiling" = no; then
-  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-fi
-
- AC_CHECK_HEADERS(curses.h ncurses.h)
- 
- # On Solaris, term.h requires curses.h
-diff --git a/setup.py b/setup.py
-index b0f1541..7208cd0 100644
--- a/setup.py
-+++ b/setup.py
-@@ -973,8 +973,6 @@ class PyBuildExt(build_ext):
-         panel_library = 'panel'
-         if curses_library == 'ncursesw':
-             curses_defines.append(('HAVE_NCURSESW', '1'))
-            if not CROSS_COMPILING:
-                curses_includes.append('/usr/include/ncursesw')
-             # Bug 1464056: If _curses.so links with ncursesw,
-             # _curses_panel.so must link with panelw.
-             panel_library = 'panelw'
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
deleted file mode 100644
index 5a39cf8933..0000000000
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c52fa7948ef109db1132fdc1aee0b68f8d767b4e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 14 May 2013 15:00:26 -0700
-Subject: [PATCH 1/2] python3: Add target and native recipes
-Upstream-Status: Inappropriate [embedded specific]
-02/2015 Rebased for Python 3.4.2
-The proper prefix is inside our staging area.
-Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-Signed-off-by: Phil Blundell <philb@gnu.org>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
---
- Lib/distutils/sysconfig.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 4774e12..ccf7d58 100644
--- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -95,7 +95,9 @@ def get_python_inc(plat_specific=0, prefix=None):
-     If 'prefix' is supplied, use it instead of sys.base_prefix or
-     sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
-     """
-    if prefix is None:
-+    if prefix is None and os.environ.get('STAGING_INCDIR', ""):
-+        prefix = os.environ['STAGING_INCDIR'].rstrip('include')
-+    elif prefix is None:
-         prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
-     if os.name == "posix":
-         if python_build:
-@@ -138,7 +140,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
-     If 'prefix' is supplied, use it instead of sys.base_prefix or
-     sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
-     """
-    if prefix is None:
-+    if os.environ.get('STAGING_LIBDIR', ""):
-+        lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
-+    else:
-+        lib_basename = "lib"
-+    if prefix is None and os.environ.get('STAGING_LIBDIR', ""):
-+        prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
-+    elif prefix is None:
-         if standard_lib:
-             prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
-         else:
-@@ -152,7 +160,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
-         else:
-             # Pure Python
-             libdir = "lib"
-        libpython = os.path.join(prefix, libdir,
-+        libpython = os.path.join(prefix, lib_basename,
-                                  "python" + get_python_version())
-         if standard_lib:
-             return libpython
-- 
-2.24.0
diff --git a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
deleted file mode 100644
index 184540e794..0000000000
--- a/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ba7202700578d435b07cfdfb7b57e83185752800 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei@gherzan.ro>
-Date: Mon, 28 Jan 2019 15:57:54 +0000
-Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet
- integrated in yocto so we skip the check for this module. Avoid a warning by
- not adding this module to missing variable.
-Upstream-Status: Inappropriate [distribution]
-Also simply disable the tk module since its not in DEPENDS.
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/setup.py b/setup.py
-index ab18ff0..7691258 100644
--- a/setup.py
-+++ b/setup.py
-@@ -1706,8 +1706,8 @@ class PyBuildExt(build_ext):
-         self.detect_decimal()
-         self.detect_ctypes()
-         self.detect_multiprocessing()
-        if not self.detect_tkinter():
-            self.missing.append('_tkinter')
-+#        if not self.detect_tkinter():
-+#            self.missing.append('_tkinter')
-         self.detect_uuid()
- 
- ##         # Uncomment these lines if you want to play with xxmodule.c
diff --git a/meta/recipes-devtools/python/python3/cgi_py.patch b/meta/recipes-devtools/python/python3/cgi_py.patch
deleted file mode 100644
index 6c4ba54320..0000000000
--- a/meta/recipes-devtools/python/python3/cgi_py.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 62336285cba38017b35cb761c03f0c7e80a671a3 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@windriver.com>
-Date: Wed, 21 Sep 2011 20:55:33 -0500
-Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment
-Upstream-Status: Inappropriate [distribution]
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
- Lib/cgi.py | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-diff --git a/Lib/cgi.py b/Lib/cgi.py
-index 8cf6687..094c7b4 100755
--- a/Lib/cgi.py
-+++ b/Lib/cgi.py
-@@ -1,13 +1,4 @@
-#! /usr/local/bin/python
-
-# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
-# intentionally NOT "/usr/bin/env python".  On many systems
-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
-# scripts, and /usr/local/bin is the default directory where Python is
-# installed, so /usr/bin/env would be unable to find python.  Granted,
-# binary installations by Linux vendors often install Python in
-# /usr/bin.  So let those vendors patch cgi.py to match their choice
-# of installation.
-+#! /usr/bin/env python
- 
- """Support module for CGI (Common Gateway Interface) scripts.
- 
diff --git a/meta/recipes-devtools/python/python3/create_manifest3.py b/meta/recipes-devtools/python/python3/create_manifest3.py
index 4da02a2991..288d5ede3a 100644
--- a/meta/recipes-devtools/python/python3/create_manifest3.py
+++ b/meta/recipes-devtools/python/python3/create_manifest3.py
@@ -1,7 +1,7 @@
 # This script is used as a bitbake task to create a new python manifest
 # $ bitbake python -c create_manifest
 #
-# Our goal is to keep python-core as small as posible and add other python
+# Our goal is to keep python-core as small as possible and add other python
 # packages only when the user needs them, hence why we split upstream python
 # into several packages.
 #
@@ -36,7 +36,7 @@
 # Tha method to handle cached files does not work when a module includes a folder which
 # itself contains the pycache folder, gladly this is almost never the case.
 #
-# Author: Alejandro Enedino Hernandez Samaniego "aehs29" <aehs29 at gmail dot com>
+# Author: Alejandro Enedino Hernandez Samaniego <alejandro at enedino dot org>
 import sys
@@ -45,6 +45,11 @@ import json
 import os
 import collections
+if '-d' in sys.argv:
+    debugFlag = '-d'
+else:
+    debugFlag = ''
 # Get python version from ${PYTHON_MAJMIN}
 pyversion = str(sys.argv[1])
@@ -84,6 +89,12 @@ def prepend_comments(comments, json_manifest):
        manifest.seek(0, 0)
        manifest.write(comments + json_contents)
+def print_indent(msg, offset):
+    for l in msg.splitlines():
+        msg = ' ' * offset + l
+        print(msg)
 # Read existing JSON manifest
 with open('python3-manifest.json') as manifest:
    # The JSON format doesn't allow comments so we hack the call to keep the comments using a marker
@@ -99,7 +110,7 @@ with open('python3-manifest.json') as manifest:
 # Not exactly the same so it should not be a function
 #
-print ('Getting dependencies for package: core')
+print_indent('Getting dependencies for package: core', 0)
 # This special call gets the core dependencies and
@@ -109,7 +120,7 @@ print ('Getting dependencies for package: core')
 # on the new core package, they will still find them
 # even when checking the old_manifest
-output = subprocess.check_output([sys.executable, 'get_module_deps3.py', 'python-core-package']).decode('utf8')
+output = subprocess.check_output([sys.executable, 'get_module_deps3.py', 'python-core-package', '%s' % debugFlag]).decode('utf8')
 for coredep in output.split():
    coredep = coredep.replace(pyversion,'${PYTHON_MAJMIN}')
    if isCached(coredep):
@@ -149,17 +160,16 @@ for filedep in old_manifest['core']['files']:
    # Get actual module name , shouldnt be affected by libdir/bindir, etc.
    pymodule = os.path.splitext(os.path.basename(os.path.normpath(filedep)))[0]
    # We now know that were dealing with a python module, so we can import it
    # and check what its dependencies are.
    # We launch a separate task for each module for deterministic behavior.
    # Each module will only import what is necessary for it to work in specific.
    # The output of each task will contain each module's dependencies
-    print ('Getting dependencies for module: %s' % pymodule)
+    print_indent('Getting dependencies for module: %s' % pymodule, 2)
-    output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule]).decode('utf8')
+    output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule, '%s' % debugFlag]).decode('utf8')
-    print ('The following dependencies were found for module %s:\n' % pymodule)
+    print_indent('The following dependencies were found for module %s:\n' % pymodule, 4)
-    print (output)
+    print_indent(output, 6)
    for pymodule_dep in output.split():
@@ -178,12 +188,13 @@ for filedep in old_manifest['core']['files']:
 # all others will use this a base.
+print('\n\nChecking for directories...\n')
 # To improve the script speed, we check which packages contain directories
 # since we will be looping through (only) those later.
 for pypkg in old_manifest:
    for filedep in old_manifest[pypkg]['files']:
        if isFolder(filedep):
-            print ('%s is a folder' % filedep)
+            print_indent('%s is a directory' % filedep, 2)
            if pypkg not in hasfolders:
                hasfolders.append(pypkg)
            if filedep not in allfolders:
@@ -221,14 +232,14 @@ for pypkg in old_manifest:
    print('\n')
    print('--------------------------')
-    print ('Handling package %s' % pypkg)
+    print('Handling package %s' % pypkg)
    print('--------------------------')
    # Handle special cases, we assume that when they were manually added 
    # to the manifest we knew what we were doing.
    special_packages = ['misc', 'modules', 'dev', 'tests']
    if pypkg in special_packages or 'staticdev' in pypkg:
-        print('Passing %s package directly' % pypkg)
+        print_indent('Passing %s package directly' % pypkg, 2)
        new_manifest[pypkg] = old_manifest[pypkg]
        continue
@@ -259,7 +270,7 @@ for pypkg in old_manifest:
        # Get actual module name , shouldnt be affected by libdir/bindir, etc.
        # We need to check if the imported module comes from another (e.g. sqlite3.dump)
-        path,pymodule = os.path.split(filedep)
+        path, pymodule = os.path.split(filedep)
        path = os.path.basename(path)
        pymodule = os.path.splitext(os.path.basename(pymodule))[0]
@@ -279,10 +290,10 @@ for pypkg in old_manifest:
        # Each module will only import what is necessary for it to work in specific.
        # The output of each task will contain each module's dependencies
-        print ('\nGetting dependencies for module: %s' % pymodule)
+        print_indent('\nGetting dependencies for module: %s' % pymodule, 2)
-        output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule]).decode('utf8')
+        output = subprocess.check_output([sys.executable, 'get_module_deps3.py', '%s' % pymodule, '%s' % debugFlag]).decode('utf8')
-        print ('The following dependencies were found for module %s:\n' % pymodule)
+        print_indent('The following dependencies were found for module %s:\n' % pymodule, 4)
-        print (output)
+        print_indent(output, 6)
        reportFILES = []
        reportRDEPS = []
@@ -325,7 +336,7 @@ for pypkg in old_manifest:
                            # print('Checking folder %s on package %s' % (pymodule_dep,pypkg_with_folder))
                            for folder_dep in old_manifest[pypkg_with_folder]['files'] or folder_dep in old_manifest[pypkg_with_folder]['cached']:
                                if folder_dep == folder:
-                                    print ('%s folder found in %s' % (folder, pypkg_with_folder))
+                                    print ('%s directory found in %s' % (folder, pypkg_with_folder))
                                    folderFound = True
                                    if pypkg_with_folder not in new_manifest[pypkg]['rdepends'] and pypkg_with_folder != pypkg:
                                        new_manifest[pypkg]['rdepends'].append(pypkg_with_folder)
@@ -424,7 +435,7 @@ prepend_comments(comments,'python3-manifest.json.new')
 if (repeated):
    error_msg = '\n\nERROR:\n'
-    error_msg += 'The following files are repeated (contained in more than one package),\n'
+    error_msg += 'The following files were found in more than one package),\n'
    error_msg += 'this is likely to happen when new files are introduced after an upgrade,\n'
    error_msg += 'please check which package should get it,\n modify the manifest accordingly and re-run the create_manifest task:\n'
    error_msg += '\n'.join(repeated)
diff --git a/meta/recipes-devtools/python/python3/crosspythonpath.patch b/meta/recipes-devtools/python/python3/crosspythonpath.patch
deleted file mode 100644
index d789ab57d4..0000000000
--- a/meta/recipes-devtools/python/python3/crosspythonpath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-configure.ac: add CROSSPYTHONPATH into PYTHONPATH for PYTHON_FOR_BUILD
-When building x86->x86 the system will try to execute .so and related items
-from the default PYTHONPATH.  This will fail if the target CPU contains
-instructions that the host CPU does not have, add CROSSPYTHONPATH
-into PYTHONPATH so we can prepend the list to find correct libs.
-Upstream-Status: Inappropriate [OE-Core integration specific]
-Credits-to: Mark Hatle <mark.hatle@windriver.com>
-Credits-to: Jackie Huang <jackie.huang@windriver.com>
-Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
-diff --git a/configure.ac b/configure.ac
-index 4ab19a6..7036a53 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ if test "$cross_compiling" = yes; then
-            AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
-        fi
-         AC_MSG_RESULT($interp)
-       PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
-+       PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
-     fi
- elif test "$cross_compiling" = maybe; then
-     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
diff --git a/meta/recipes-devtools/python/python3/get_module_deps3.py b/meta/recipes-devtools/python/python3/get_module_deps3.py
index 6806f23172..8e432b49af 100644
--- a/meta/recipes-devtools/python/python3/get_module_deps3.py
+++ b/meta/recipes-devtools/python/python3/get_module_deps3.py
@@ -3,14 +3,18 @@
 # them out, the output of this execution will have all dependencies
 # for a specific module, which will be parsed an dealt on create_manifest.py
 #
-# Author: Alejandro Enedino Hernandez Samaniego "aehs29" <aehs29@gmail.com>
+# Author: Alejandro Enedino Hernandez Samaniego <alejandro at enedino dot org>
-# We can get a log per module, for all the dependencies that were found, but its messy.
-debug=False
 import sys
 import os
+# We can get a log per module, for all the dependencies that were found, but its messy.
+if '-d' in sys.argv:
+    debug = True
+else:
+    debug = False
 # We can get a list of the modules which are currently required to run python
 # so we run python-core and get its modules, we then import what we need
 # and check what modules are currently running, if we substract them from the
@@ -19,16 +23,16 @@ import os
 # We use importlib to achieve this, so we also need to know what modules importlib needs
 import importlib
-core_deps=set(sys.modules)
+core_deps = set(sys.modules)
 def fix_path(dep_path):
    import os
    # We DONT want the path on our HOST system
-    pivot='recipe-sysroot-native'
+    pivot = 'recipe-sysroot-native'
-    dep_path=dep_path[dep_path.find(pivot)+len(pivot):]
+    dep_path = dep_path[dep_path.find(pivot)+len(pivot):]
    if '/usr/bin' in dep_path:
-        dep_path = dep_path.replace('/usr/bin''${bindir}')
+        dep_path = dep_path.replace('/usr/bin','${bindir}')
    # Handle multilib, is there a better way?
    if '/usr/lib32' in dep_path:
@@ -46,13 +50,13 @@ def fix_path(dep_path):
 # Module to import was passed as an argument
 current_module =  str(sys.argv[1]).rstrip()
-if(debug==True):
+if debug == True:
-    log = open('log_%s' % current_module,'w')
+    log = open('temp/log_%s' % current_module.strip('.*'),'w')
    log.write('Module %s generated the following dependencies:\n' % current_module)
 try:
    m = importlib.import_module(current_module)
    # handle python packages which may not include all modules in the __init__
-    if os.path.basename(m.__file__) == "__init__.py":
+    if hasattr(m, '__file__') and os.path.basename(m.__file__) == "__init__.py":
        modulepath = os.path.dirname(m.__file__)
        for i in os.listdir(modulepath):
            if i.startswith("_") or not(i.endswith(".py")):
@@ -63,13 +67,13 @@ try:
            except:
                pass # ignore all import or other exceptions raised during import
 except ImportError as e:
-    if (debug==True):
+    if debug == True:
-        log.write('Module was not found')
+        log.write('Module was not found\n')
    pass
 # Get current module dependencies, dif will contain a list of specific deps for this module
-module_deps=set(sys.modules)
+module_deps = set(sys.modules)
 # We handle the core package (1st pass on create_manifest.py) as a special case
 if current_module == 'python-core-package':
@@ -81,14 +85,18 @@ else:
 # Check where each dependency came from
 for item in dif:
-    dep_path=''
+    # Main module returns script filename, __main matches mp_main__ as well
+    if 'main__' in item:
+        continue
+    dep_path = ''
    try:
-        if (debug==True):
+        if debug == True:
-            log.write('Calling: sys.modules[' + '%s' % item + '].__file__\n')
+            log.write('\nCalling: sys.modules[' + '%s' % item + '].__file__\n')
        dep_path = sys.modules['%s' % item].__file__
    except AttributeError as e:
        # Deals with thread (builtin module) not having __file__ attribute
-        if debug==True:
+        if debug == True:
            log.write(item + ' ')
            log.write(str(e))
            log.write('\n')
@@ -96,11 +104,16 @@ for item in dif:
    except NameError as e:
        # Deals with NameError: name 'dep_path' is not defined
        # because module is not found (wasn't compiled?), e.g. bddsm
-        if (debug==True):
+        if debug == True:
            log.write(item+' ') 
            log.write(str(e))                                              
        pass
+    if dep_path == '':
+        continue
+    if debug == True:
+        log.write('Dependency path found:\n%s\n' % dep_path)
    # Site-customize is a special case since we (OpenEmbedded) put it there manually
    if 'sitecustomize' in dep_path:
        dep_path = '${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py'
@@ -111,52 +124,51 @@ for item in dif:
    dep_path = fix_path(dep_path)
    import sysconfig
-    soabi=sysconfig.get_config_var('SOABI')
+    soabi = sysconfig.get_config_var('SOABI')
    # Check if its a shared library and deconstruct it
    if soabi in dep_path:
-        if (debug==True):
+        if debug == True:
-            log.write('Shared library found in %s' % dep_path)
+            log.write('Shared library found in %s\n' % dep_path)
        dep_path = dep_path.replace(soabi,'*')
        print (dep_path)
        continue
    if "_sysconfigdata" in dep_path:
        dep_path = dep_path.replace(sysconfig._get_sysconfigdata_name(), "_sysconfigdata*")
-    if (debug==True):
+    if debug == True:
        log.write(dep_path+'\n')
    # Prints out result, which is what will be used by create_manifest
    print (dep_path)
-    import imp
+    cpython_tag = sys.implementation.cache_tag
-    cpython_tag = imp.get_tag() 
+    cached = ''
-    cached=''
    # Theres no naive way to find *.pyc files on python3
    try:
-        if (debug==True):
+        if debug == True:
-            log.write('Calling: sys.modules[' + '%s' % item + '].__cached__\n')
+            log.write('\nCalling: sys.modules[' + '%s' % item + '].__cached__\n')
        cached = sys.modules['%s' % item].__cached__
    except AttributeError as e:
        # Deals with thread (builtin module) not having __cached__ attribute
-        if debug==True:
+        if debug == True:
            log.write(item + ' ')
            log.write(str(e))
            log.write('\n')
        pass
    except NameError as e:
        # Deals with NameError: name 'cached' is not defined
-        if (debug==True):
+        if debug == True:
            log.write(item+' ') 
            log.write(str(e))                                              
        pass
    if cached is not None:
-        if (debug==True):
+        if debug == True:
-            log.write(cached)
+            log.write(cached + '\n')
        cached = fix_path(cached)
        cached = cached.replace(cpython_tag,'*')
        if "_sysconfigdata" in cached:
            cached = cached.replace(sysconfig._get_sysconfigdata_name(), "_sysconfigdata*")
        print (cached)
-if debug==True:
+if debug == True:
    log.close()
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch
new file mode 100644
index 0000000000..b115a6fa65
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/makerace.patch
@@ -0,0 +1,31 @@
+From 2b458b4e1bcd57e3f135d3f0e715f64b98b27906 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 13 Jul 2021 23:19:29 +0100
+Subject: [PATCH] python3: Fix make race
+libainstall installs python-config.py but the .pyc cache files are generated
+by the libinstall target. This means some builds may not generate the pyc files
+for python-config.py depending on the order things happen in. This means builds
+are not always reproducible.
+Add a dependency to avoid the race.
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ Makefile.pre.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index be1b9ea..9ec3a71 100644
+--- a/Makefile.pre.in
+++ b/Makefile.pre.in
+@@ -2485,7 +2485,7 @@ COMPILEALL_OPTS=-j0
+ TEST_MODULES=@TEST_MODULES@
+ 
+ .PHONY: libinstall
+-libinstall:    all $(srcdir)/Modules/xxmodule.c
+libinstall:    all $(srcdir)/Modules/xxmodule.c libainstall
+        @for i in $(SCRIPTDIR) $(LIBDEST); \
+        do \
+                if test ! -d $(DESTDIR)$$i; then \
diff --git a/meta/recipes-devtools/python/python3/python-config.patch b/meta/recipes-devtools/python/python3/python-config.patch
deleted file mode 100644
index d0ddbbc7fd..0000000000
--- a/meta/recipes-devtools/python/python3/python-config.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 57d073c12e7bede29919117b0141df14015eb27f Mon Sep 17 00:00:00 2001
-From: Tyler Hall <tylerwhall@gmail.com>
-Date: Sun, 4 May 2014 20:06:43 -0400
-Subject: [PATCH] python-config: Revert to using distutils.sysconfig
-The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in
-12-distutils-prefix-is-inside-staging-area.patch makes distutils.sysconfig
-affect the native runtime as well as cross building. Use the old, patched
-implementation which returns paths in the staging directory and for the target,
-as appropriate.
-Upstream-Status: Inappropriate [Embedded Specific]
-Signed-off-by: Tyler Hall <tylerwhall@gmail.com>
-:
---
- Misc/python-config.in | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/Misc/python-config.in b/Misc/python-config.in
-index ebd99da..13e57ae 100644
--- a/Misc/python-config.in
-+++ b/Misc/python-config.in
-@@ -6,7 +6,7 @@
- import getopt
- import os
- import sys
-import sysconfig
-+from distutils import sysconfig
- 
- valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
-               'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir',
-@@ -35,14 +35,14 @@ if '--help' in opt_flags:
- 
- for opt in opt_flags:
-     if opt == '--prefix':
-        print(getvar('prefix'))
-+        print(sysconfig.PREFIX)
- 
-     elif opt == '--exec-prefix':
-        print(getvar('exec_prefix'))
-+        print(sysconfig.EXEC_PREFIX)
- 
-     elif opt in ('--includes', '--cflags'):
-        flags = ['-I' + sysconfig.get_path('include'),
-                 '-I' + sysconfig.get_path('platinclude')]
-+        flags = ['-I' + sysconfig.get_python_inc(),
-+                 '-I' + sysconfig.get_python_inc(plat_specific=True)]
-         if opt == '--cflags':
-             flags.extend(getvar('CFLAGS').split())
-         print(' '.join(flags))
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json
index 615dc3a5e5..441830833b 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -1,7 +1,7 @@
 # DO NOT (entirely) modify this file manually, please read.
 #
 # IMPORTANT NOTE:
-# Please keep in mind that the create_manifest task relies on the fact the the
+# Please keep in mind that the create_manifest task relies on the fact that the
 # target and native Python packages are the same, and it also needs to be executed
 # with a fully working native package (with all the PACKAGECONFIGs enabled and all
 # and all the modules should be working, check log.do_compile), otherwise the script
@@ -103,17 +103,6 @@
        ],
        "cached": []
    },
-    "2to3": {
-        "summary": "Python automated Python 2 to 3 code translator",
-        "rdepends": [
-            "core"
-        ],
-        "files": [
-            "${bindir}/2to3*",
-            "${libdir}/python${PYTHON_MAJMIN}/lib2to3"
-        ],
-        "cached": []
-    },
    "asyncio": {
        "summary": "Python Asynchronous I/O",
        "rdepends": [
@@ -138,17 +127,9 @@
            "core"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/chunk.py",
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/audioop.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/ossaudiodev.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/sndhdr.py",
-            "${libdir}/python${PYTHON_MAJMIN}/sunau.py",
            "${libdir}/python${PYTHON_MAJMIN}/wave.py"
        ],
        "cached": [
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/chunk.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/sndhdr.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/sunau.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/wave.*.pyc"
        ]
    },
@@ -158,12 +139,9 @@
            "core"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_multibytecodec.*.so",
+            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_multibytecodec.*.so"
-            "${libdir}/python${PYTHON_MAJMIN}/xdrlib.py"
        ],
-        "cached": [
+        "cached": []
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/xdrlib.*.pyc"
-        ]
    },
    "compile": {
        "summary": "Python bytecode compilation support",
@@ -189,17 +167,17 @@
        "files": [
            "${libdir}/python${PYTHON_MAJMIN}/gzip.py",
            "${libdir}/python${PYTHON_MAJMIN}/tarfile.py",
-            "${libdir}/python${PYTHON_MAJMIN}/zipfile.py"
+            "${libdir}/python${PYTHON_MAJMIN}/zipfile",
+            "${libdir}/python${PYTHON_MAJMIN}/zipfile/_path"
        ],
        "cached": [
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/gzip.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tarfile.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tarfile.*.pyc"
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/zipfile.*.pyc"
        ]
    },
    "core": {
        "summary": "Python interpreter and core modules",
-        "rdepends": [],
+        "rdepends": ["compression"],
        "files": [
            "${bindir}/python${PYTHON_MAJMIN}",
            "${bindir}/python${PYTHON_MAJMIN}.real",
@@ -212,8 +190,12 @@
            "${libdir}/python${PYTHON_MAJMIN}/_abcoll.py",
            "${libdir}/python${PYTHON_MAJMIN}/_bootlocale.py",
            "${libdir}/python${PYTHON_MAJMIN}/_collections_abc.py",
+            "${libdir}/python${PYTHON_MAJMIN}/_colorize.py",
            "${libdir}/python${PYTHON_MAJMIN}/_compression.py",
            "${libdir}/python${PYTHON_MAJMIN}/_markupbase.py",
+            "${libdir}/python${PYTHON_MAJMIN}/_opcode_metadata.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}/_weakrefset.py",
@@ -232,6 +214,7 @@
            "${libdir}/python${PYTHON_MAJMIN}/copy.py",
            "${libdir}/python${PYTHON_MAJMIN}/copyreg.py",
            "${libdir}/python${PYTHON_MAJMIN}/csv.py",
+            "${libdir}/python${PYTHON_MAJMIN}/dataclasses.py",
            "${libdir}/python${PYTHON_MAJMIN}/dis.py",
            "${libdir}/python${PYTHON_MAJMIN}/encodings",
            "${libdir}/python${PYTHON_MAJMIN}/encodings/aliases.py",
@@ -243,9 +226,11 @@
            "${libdir}/python${PYTHON_MAJMIN}/genericpath.py",
            "${libdir}/python${PYTHON_MAJMIN}/getopt.py",
            "${libdir}/python${PYTHON_MAJMIN}/gettext.py",
+            "${libdir}/python${PYTHON_MAJMIN}/glob.py",
            "${libdir}/python${PYTHON_MAJMIN}/heapq.py",
            "${libdir}/python${PYTHON_MAJMIN}/imp.py",
            "${libdir}/python${PYTHON_MAJMIN}/importlib",
+            "${libdir}/python${PYTHON_MAJMIN}/importlib/_abc.py",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/_bootstrap.py",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/_bootstrap_external.py",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/abc.py",
@@ -253,6 +238,7 @@
            "${libdir}/python${PYTHON_MAJMIN}/importlib/util.py",
            "${libdir}/python${PYTHON_MAJMIN}/inspect.py",
            "${libdir}/python${PYTHON_MAJMIN}/io.py",
+            "${libdir}/python${PYTHON_MAJMIN}/ipaddress.py",
            "${libdir}/python${PYTHON_MAJMIN}/keyword.py",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/__pycache__/_struct.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/__pycache__/binascii.*.so",
@@ -266,8 +252,10 @@
            "${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/array.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/binascii.*.so",
+            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/fcntl.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/math.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/parser.*.so",
@@ -286,11 +274,18 @@
            "${libdir}/python${PYTHON_MAJMIN}/operator.py",
            "${libdir}/python${PYTHON_MAJMIN}/optparse.py",
            "${libdir}/python${PYTHON_MAJMIN}/os.py",
+            "${libdir}/python${PYTHON_MAJMIN}/pathlib",
            "${libdir}/python${PYTHON_MAJMIN}/pathlib.py",
+            "${libdir}/python${PYTHON_MAJMIN}/pathlib/_abc.py",
+            "${libdir}/python${PYTHON_MAJMIN}/pathlib/_local.py",
            "${libdir}/python${PYTHON_MAJMIN}/pkgutil.py",
            "${libdir}/python${PYTHON_MAJMIN}/platform.py",
            "${libdir}/python${PYTHON_MAJMIN}/posixpath.py",
-            "${libdir}/python${PYTHON_MAJMIN}/re.py",
+            "${libdir}/python${PYTHON_MAJMIN}/re",
+            "${libdir}/python${PYTHON_MAJMIN}/re/_casefix.py",
+            "${libdir}/python${PYTHON_MAJMIN}/re/_compiler.py",
+            "${libdir}/python${PYTHON_MAJMIN}/re/_constants.py",
+            "${libdir}/python${PYTHON_MAJMIN}/re/_parser.py",
            "${libdir}/python${PYTHON_MAJMIN}/reprlib.py",
            "${libdir}/python${PYTHON_MAJMIN}/rlcompleter.py",
            "${libdir}/python${PYTHON_MAJMIN}/runpy.py",
@@ -307,6 +302,7 @@
            "${libdir}/python${PYTHON_MAJMIN}/struct.py",
            "${libdir}/python${PYTHON_MAJMIN}/subprocess.py",
            "${libdir}/python${PYTHON_MAJMIN}/symbol.py",
+            "${libdir}/python${PYTHON_MAJMIN}/sysconfig",
            "${libdir}/python${PYTHON_MAJMIN}/sysconfig.py",
            "${libdir}/python${PYTHON_MAJMIN}/textwrap.py",
            "${libdir}/python${PYTHON_MAJMIN}/threading.py",
@@ -319,14 +315,17 @@
            "${libdir}/python${PYTHON_MAJMIN}/urllib/parse.py",
            "${libdir}/python${PYTHON_MAJMIN}/warnings.py",
            "${libdir}/python${PYTHON_MAJMIN}/weakref.py",
+            "${libdir}/python${PYTHON_MAJMIN}/zipimport.py",
            "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]"
        ],
        "cached": [
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/__future__.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_bootlocale.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_collections_abc.*.pyc",
+            "${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__/_opcode_metadata.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sitebuiltins.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata*.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_weakrefset.*.pyc",
@@ -343,6 +342,7 @@
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/copy.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/copyreg.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/csv.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/dataclasses.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/dis.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/enum.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/fnmatch.*.pyc",
@@ -350,10 +350,12 @@
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/genericpath.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/getopt.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/gettext.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/glob.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/heapq.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/imp.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/inspect.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/io.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ipaddress.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/keyword.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/linecache.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/locale.*.pyc",
@@ -393,6 +395,8 @@
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/typing.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/warnings.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/weakref.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/_pyrepl/__pycache__",
+            "${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}/encodings/__pycache__",
@@ -400,9 +404,19 @@
            "${libdir}/python${PYTHON_MAJMIN}/encodings/__pycache__/latin_1.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/encodings/__pycache__/utf_8.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__",
+            "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/_abc.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/abc.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/machinery.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/util.*.pyc",
+            "${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}/re/__pycache__",
+            "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_casefix.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_compiler.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_constants.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_parser.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/sysconfig/__pycache__",
            "${libdir}/python${PYTHON_MAJMIN}/urllib/__pycache__",
            "${libdir}/python${PYTHON_MAJMIN}/urllib/__pycache__/parse.*.pyc"
        ]
@@ -410,24 +424,18 @@
    "crypt": {
        "summary": "Python basic cryptographic and hashing support",
        "rdepends": [
-            "core",
+            "core"
-            "math",
-            "stringold"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/crypt.py",
            "${libdir}/python${PYTHON_MAJMIN}/hashlib.py",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_blake2.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_crypt.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_hashlib.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_md5.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha1.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha256.*.so",
+            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha2.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha3.*.so",
+            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha3.*.so"
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha512.*.so"
        ],
        "cached": [
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/crypt.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/hashlib.*.pyc"
        ]
    },
@@ -435,7 +443,6 @@
        "summary": "Python C types support",
        "rdepends": [
            "core",
-            "crypt",
            "io",
            "math"
        ],
@@ -519,8 +526,7 @@
            "${libdir}/pkgconfig"
        ],
        "rdepends": [
-            "core",
+            "core"
-            "distutils"
        ],
        "summary": "Python development package"
    },
@@ -536,27 +542,6 @@
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/difflib.*.pyc"
        ]
    },
-    "distutils-windows": {
-        "summary": "Python distribution utilities (Windows installer stubs)",
-        "rdepends": [
-            "core"
-        ],
-        "files": [],
-        "cached": []
-    },
-    "distutils": {
-        "summary": "Python Distribution Utilities",
-        "rdepends": [
-            "compression",
-            "core",
-            "email",
-            "stringold"
-        ],
-        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/distutils"
-        ],
-        "cached": []
-    },
    "doctest": {
        "summary": "Python framework for running examples in docstrings",
        "rdepends": [
@@ -579,7 +564,6 @@
        "summary": "Python email support",
        "rdepends": [
            "core",
-            "crypt",
            "datetime",
            "io",
            "math",
@@ -595,6 +579,16 @@
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/imaplib.*.pyc"
        ]
    },
+    "ensurepip": {
+        "summary": "Support for bootstrapping the pip installer",
+        "rdepends": [
+            "core"
+        ],
+        "files": [
+            "${libdir}/python${PYTHON_MAJMIN}/ensurepip/"
+        ],
+        "cached": []
+    },
    "fcntl": {
        "summary": "Python's fcntl interface",
        "rdepends": [
@@ -621,12 +615,9 @@
            "core"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/formatter.py",
            "${libdir}/python${PYTHON_MAJMIN}/html"
        ],
-        "cached": [
+        "cached": []
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/formatter.*.pyc"
-        ]
    },
    "idle": {
        "summary": "Python Integrated Development Environment",
@@ -645,38 +636,30 @@
            "core"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/colorsys.py",
+            "${libdir}/python${PYTHON_MAJMIN}/colorsys.py"
-            "${libdir}/python${PYTHON_MAJMIN}/imghdr.py"
        ],
        "cached": [
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/colorsys.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/colorsys.*.pyc"
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/imghdr.*.pyc"
        ]
    },
    "io": {
        "summary": "Python low-level I/O",
        "rdepends": [
            "core",
-            "crypt",
            "math",
-            "netclient",
+            "netclient"
-            "shell"
        ],
        "files": [
            "${libdir}/python${PYTHON_MAJMIN}/_pyio.py",
-            "${libdir}/python${PYTHON_MAJMIN}/ipaddress.py",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_socket.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_ssl.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/termios.*.so",
-            "${libdir}/python${PYTHON_MAJMIN}/pipes.py",
            "${libdir}/python${PYTHON_MAJMIN}/socket.py",
            "${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__/ipaddress.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pipes.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/socket.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ssl.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tempfile.*.pyc"
@@ -712,10 +695,8 @@
        "summary": "Python mailbox format support",
        "rdepends": [
            "core",
-            "crypt",
            "datetime",
            "email",
-            "fcntl",
            "io",
            "math",
            "mime",
@@ -732,8 +713,7 @@
    "math": {
        "summary": "Python math support",
        "rdepends": [
-            "core",
+            "core"
-            "crypt"
        ],
        "files": [
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_random.*.so",
@@ -750,12 +730,10 @@
            "core"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/quopri.py",
+            "${libdir}/python${PYTHON_MAJMIN}/quopri.py"
-            "${libdir}/python${PYTHON_MAJMIN}/uu.py"
        ],
        "cached": [
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/quopri.*.pyc",
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/quopri.*.pyc"
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/uu.*.pyc"
        ]
    },
    "mmap": {
@@ -772,7 +750,6 @@
        "cached": [],
        "files": [],
        "rdepends": [
-            "2to3",
            "asyncio",
            "audio",
            "codecs",
@@ -786,9 +763,9 @@
            "db",
            "debugger",
            "difflib",
-            "distutils",
            "doctest",
            "email",
+            "ensurepip",
            "fcntl",
            "html",
            "idle",
@@ -812,21 +789,20 @@
            "pydoc",
            "resource",
            "shell",
-            "smtpd",
            "sqlite3",
+            "statistics",
            "stringold",
            "syslog",
            "terminal",
            "threading",
            "tkinter",
+            "tomllib",
            "unittest",
            "unixadmin",
            "venv",
            "xml",
-            "xmlrpc"
+            "xmlrpc",
-        ],
+            "zoneinfo"
-        "rrecommends": [
-            "distutils-windows"
        ],
        "summary": "All Python modules"
    },
@@ -870,11 +846,10 @@
            "${libdir}/python${PYTHON_MAJMIN}/http/__pycache__",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_uuid.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/mimetypes.py",
-            "${libdir}/python${PYTHON_MAJMIN}/nntplib.py",
            "${libdir}/python${PYTHON_MAJMIN}/poplib.py",
            "${libdir}/python${PYTHON_MAJMIN}/secrets.py",
            "${libdir}/python${PYTHON_MAJMIN}/smtplib.py",
-            "${libdir}/python${PYTHON_MAJMIN}/telnetlib.py",
+            "${libdir}/python${PYTHON_MAJMIN}/urllib",
            "${libdir}/python${PYTHON_MAJMIN}/uuid.py"
        ],
        "cached": [
@@ -882,11 +857,9 @@
            "${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__/nntplib.*.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__/telnetlib.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/uuid.*.pyc"
        ]
    },
@@ -894,22 +867,12 @@
        "summary": "Python Internet Protocol servers",
        "rdepends": [
            "core",
-            "crypt",
+            "io"
-            "datetime",
-            "email",
-            "html",
-            "io",
-            "math",
-            "mime",
-            "netclient",
-            "stringold"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/cgi.py",
            "${libdir}/python${PYTHON_MAJMIN}/socketserver.py"
        ],
        "cached": [
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cgi.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/socketserver.*.pyc"
        ]
    },
@@ -995,14 +958,12 @@
        ],
        "files": [
            "${libdir}/python${PYTHON_MAJMIN}/cProfile.py",
-            "${libdir}/python${PYTHON_MAJMIN}/dataclasses.py",
            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_lsprof.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/profile.py",
            "${libdir}/python${PYTHON_MAJMIN}/pstats.py"
        ],
        "cached": [
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cProfile.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/dataclasses.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/profile.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pstats.*.pyc"
        ]
@@ -1039,40 +1000,13 @@
        ],
        "files": [
            "${libdir}/python${PYTHON_MAJMIN}/cmd.py",
-            "${libdir}/python${PYTHON_MAJMIN}/glob.py",
            "${libdir}/python${PYTHON_MAJMIN}/shlex.py"
        ],
        "cached": [
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cmd.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/glob.*.pyc",
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shlex.*.pyc"
        ]
    },
-    "smtpd": {
-        "summary": "Python Simple Mail Transport Daemon",
-        "rdepends": [
-            "core",
-            "crypt",
-            "datetime",
-            "email",
-            "io",
-            "math",
-            "mime",
-            "netclient",
-            "stringold"
-        ],
-        "files": [
-            "${bindir}/smtpd.py",
-            "${libdir}/python${PYTHON_MAJMIN}/asynchat.py",
-            "${libdir}/python${PYTHON_MAJMIN}/asyncore.py",
-            "${libdir}/python${PYTHON_MAJMIN}/smtpd.py"
-        ],
-        "cached": [
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/asynchat.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/asyncore.*.pyc",
-            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/smtpd.*.pyc"
-        ]
-    },
    "sqlite3": {
        "summary": "Python Sqlite3 database support",
        "rdepends": [
@@ -1085,8 +1019,23 @@
        ],
        "cached": []
    },
+    "statistics": {
+        "summary": "Basic statistics module",
+        "rdepends": [
+            "core",
+            "math",
+            "numbers"
+        ],
+        "files": [
+            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_statistics.*.so",
+            "${libdir}/python${PYTHON_MAJMIN}/statistics.py"
+        ],
+        "cached": [
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/statistics.*.pyc"
+        ]
+    },
    "stringold": {
-        "summary": "Python string APIs [deprecated]",
+        "summary": "Common string operations",
        "rdepends": [
            "core"
        ],
@@ -1143,11 +1092,20 @@
            "core"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so",
            "${libdir}/python${PYTHON_MAJMIN}/tkinter"
        ],
        "cached": []
    },
+    "tomllib": {
+        "summary": "Provides an interface for parsing TOML",
+        "rdepends": [
+            "core"
+        ],
+        "files": [
+            "${libdir}/python${PYTHON_MAJMIN}/tomllib/"
+        ],
+        "cached": []
+    },
    "unittest": {
        "summary": "Python unit testing framework",
        "rdepends": [
@@ -1175,8 +1133,7 @@
            "io"
        ],
        "files": [
-            "${libdir}/python${PYTHON_MAJMIN}/getpass.py",
+            "${libdir}/python${PYTHON_MAJMIN}/getpass.py"
-            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/nis.*.so"
        ],
        "cached": [
            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/getpass.*.pyc"
@@ -1212,13 +1169,10 @@
        "rdepends": [
            "compression",
            "core",
-            "crypt",
            "datetime",
            "email",
-            "fcntl",
            "html",
            "io",
-            "math",
            "mime",
            "netclient",
            "netserver",
@@ -1232,5 +1186,30 @@
            "${libdir}/python${PYTHON_MAJMIN}/xmlrpc/__pycache__"
        ],
        "cached": []
+    },
+    "zipapp": {
+        "summary": "Tools to manage the creation of zip files containing Python code",
+        "rdepends": [
+            "compression",
+            "core"
+        ],
+        "files": [
+            "${libdir}/python${PYTHON_MAJMIN}/zipapp.py"
+        ],
+        "cached": [
+            "${libdir}/python${PYTHON_MAJMIN}/__pycache__/zipapp.*.pyc"
+        ]
+    },
+    "zoneinfo": {
+        "summary": "IANA time zone support",
+        "rdepends": [
+            "core",
+            "datetime"
+        ],
+        "files": [
+            "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_zoneinfo.*.so",
+            "${libdir}/python${PYTHON_MAJMIN}/zoneinfo"
+        ],
+        "cached": []
    }
 }
diff --git a/meta/recipes-devtools/python/python3/reformat_sysconfig.py b/meta/recipes-devtools/python/python3/reformat_sysconfig.py
index c4164313e8..5e2b12879d 100644
--- a/meta/recipes-devtools/python/python3/reformat_sysconfig.py
+++ b/meta/recipes-devtools/python/python3/reformat_sysconfig.py
@@ -16,6 +16,6 @@ with open(sys.argv[1], 'r') as f:
 with open(sys.argv[1], 'w') as f:
    for k in sorted(l.keys()):
        f.write('%s = ' % k)
-        pprint.pprint(l[k], stream=f, width=sys.maxsize)
+        pprint.pprint(l[k], stream=f, width=1)
        f.write('\n')
diff --git a/meta/recipes-devtools/python/python3/run-ptest b/meta/recipes-devtools/python/python3/run-ptest
index 405b07f495..d1c26c11e2 100644
--- a/meta/recipes-devtools/python/python3/run-ptest
+++ b/meta/recipes-devtools/python/python3/run-ptest
@@ -1,3 +1,3 @@
 #!/bin/sh
+SKIPPED_TESTS=
-python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
+{ SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test $SKIPPED_TESTS -v -j 4 || echo "FAIL: python3" ; } | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
diff --git a/meta/recipes-devtools/python/python3/valid-dists.patch b/meta/recipes-devtools/python/python3/valid-dists.patch
new file mode 100644
index 0000000000..1b2c078c21
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/valid-dists.patch
@@ -0,0 +1,160 @@
+From a65c29adc027b3615154cab73aaedd58a6aa23da Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+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 <ross.burton@arm.com>
+diff --git i/Lib/importlib/metadata/__init__.py w/Lib/importlib/metadata/__init__.py
+index 8ce62dd864f..085378caabc 100644
+--- i/Lib/importlib/metadata/__init__.py
+++ w/Lib/importlib/metadata/__init__.py
+@@ -21,7 +21,7 @@
+ 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 @@ def from_name(cls, name: str) -> Distribution:
+         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 @@ def discover(
+             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 i/Lib/importlib/metadata/_itertools.py w/Lib/importlib/metadata/_itertools.py
+index d4ca9b9140e..79d37198ce7 100644
+--- i/Lib/importlib/metadata/_itertools.py
+++ w/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)