diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index fcc8be52b..601acea26 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,10 +1,10 @@
-{% set version = "3.10.20" %}
+{% set version = "3.10.21" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
 {% set ver3nd = ''.join(version.split('.')[0:3]) %}
-{% set build_number = 1 %}
+{% set build_number = 0 %}
 
 # this makes the linter happy
 {% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -47,7 +47,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
-    sha256: de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505
+    sha256: a0da1e72132e950154eca0f6f47d5db828454700de20e5113667940d81e0db04
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -83,8 +83,6 @@ source:
       - patches/0024-unvendor-zlib.patch
       - patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
       - patches/0026-Unvendor-expat.patch
-      # backport https://github.com/python/cpython/pull/100373
-      - patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch
 
 build:
   number: {{ build_number }}
diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
index 05afb9672..2e05c3ada 100644
--- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
+++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -1,7 +1,7 @@
-From d90bf48069c628f8b49d3b14ea50516232430056 Mon Sep 17 00:00:00 2001
+From 664e2356fdbd34f87e4a2cb3f59c97dd1e6026e9 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
-Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
diff --git a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
index 3c4ad95f3..84f75c44b 100644
--- a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
+++ b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
@@ -1,7 +1,7 @@
-From 8bd1fc261aa011920bf689212738fd8b96bcbd03 Mon Sep 17 00:00:00 2001
+From 76e282d3720759bd681934774ea3d710e8c5fa69 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:59:00 +0100
-Subject: [PATCH 02/27] Win32: distutils: Add support to cygwinccompiler for
+Subject: [PATCH 02/26] Win32: distutils: Add support to cygwinccompiler for
  VS>=2015
 
 Really this is for mingw-w64 though
diff --git a/recipe/patches/0003-Support-cross-compiling-byte-code.patch b/recipe/patches/0003-Support-cross-compiling-byte-code.patch
index 91c2271a4..c68b0a09c 100644
--- a/recipe/patches/0003-Support-cross-compiling-byte-code.patch
+++ b/recipe/patches/0003-Support-cross-compiling-byte-code.patch
@@ -1,7 +1,7 @@
-From b99a8df226dcc6f83322971b2e65316b9235934c Mon Sep 17 00:00:00 2001
+From 6473bec059b0b98c2d96198ce87c2d453645c852 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 12:17:33 +0100
-Subject: [PATCH 03/27] Support cross-compiling byte-code
+Subject: [PATCH 03/26] Support cross-compiling byte-code
 
 https://bugs.python.org/issue22724
 ---
diff --git a/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch b/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch
index f63a320f4..b906b84f0 100644
--- a/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch
+++ b/recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch
@@ -1,7 +1,7 @@
-From 2531597720a73cca27a1871a1d654d9dced1c218 Mon Sep 17 00:00:00 2001
+From 957a0e6e879f4e43769c78dc76ffafb2cda862eb Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Tue, 21 Sep 2021 13:05:20 -0500
-Subject: [PATCH 04/27] bpo-45258: search for -isysroot in addition to
+Subject: [PATCH 04/26] bpo-45258: search for -isysroot in addition to
  --sysroot
 
 -isysroot is for macOS, while --sysroot is for gcc/linux
diff --git a/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
index b6c758350..0efec69e1 100644
--- a/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
+++ b/recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
@@ -1,7 +1,7 @@
-From 0a1f271aea29d6c0691860643f3383d8f3bc5118 Mon Sep 17 00:00:00 2001
+From 42fe97e6cbb184cda0e2c96b63e227627828ddf8 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 5 Oct 2017 02:00:41 +0100
-Subject: [PATCH 05/27] runtime_library_dir_option: Use 1st word of CC as
+Subject: [PATCH 05/26] runtime_library_dir_option: Use 1st word of CC as
  compiler
 
 Previous, 'CC' got passed to os.path.basename, so any paths in it after
diff --git a/recipe/patches/0006-Win32-Do-not-download-externals.patch b/recipe/patches/0006-Win32-Do-not-download-externals.patch
index 460356008..d3e3a4d64 100644
--- a/recipe/patches/0006-Win32-Do-not-download-externals.patch
+++ b/recipe/patches/0006-Win32-Do-not-download-externals.patch
@@ -1,7 +1,7 @@
-From 678488a772e807546a4763ac17010f5bb7288029 Mon Sep 17 00:00:00 2001
+From 4892411b32b8b4e46fc00e75504daf3e25ecd610 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
-Subject: [PATCH 06/27] Win32: Do not download externals
+Subject: [PATCH 06/26] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 2 +-
diff --git a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
index 9fa2d4796..944de1d39 100644
--- a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
+++ b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
@@ -1,7 +1,7 @@
-From 5ab8259dcb27d5c38fe2ccec3f2b090eed44e647 Mon Sep 17 00:00:00 2001
+From d69ba7d9a48299238f7c564f99234e56ea74dcca Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
-Subject: [PATCH 07/27] Fix find_library so that it looks in sys.prefix/lib
+Subject: [PATCH 07/26] Fix find_library so that it looks in sys.prefix/lib
  first
 
 ---
diff --git a/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch b/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
index bf695d26f..b4a62a779 100644
--- a/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
+++ b/recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
@@ -1,7 +1,7 @@
-From 9b4fb93be060983edfca1bbffc404e699f807dd4 Mon Sep 17 00:00:00 2001
+From 2936ce4d00b332f2539524c00571bff9cfac5f02 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Thu, 16 Sep 2021 15:46:09 -0500
-Subject: [PATCH 08/27] bpo-22699: Allow compiling on debian/ubuntu with a
+Subject: [PATCH 08/26] bpo-22699: Allow compiling on debian/ubuntu with a
  different compiler
 
 This PR fixes one issue mentioned in the bpo
diff --git a/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
index f7b904656..e16c152bf 100644
--- a/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
+++ b/recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
@@ -1,7 +1,7 @@
-From 138a7f1c63f9dbdb98da5011d99f1d1131059b5f Mon Sep 17 00:00:00 2001
+From 250524b831eaf0684399911a5285a8cb582109a1 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
-Subject: [PATCH 09/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 09/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 ---
diff --git a/recipe/patches/0010-Unvendor-openssl.patch b/recipe/patches/0010-Unvendor-openssl.patch
index 4523aa77c..50bc449d8 100644
--- a/recipe/patches/0010-Unvendor-openssl.patch
+++ b/recipe/patches/0010-Unvendor-openssl.patch
@@ -1,7 +1,7 @@
-From 7c32bbf7a8e35efcfc6fccac3be3b88ad9d6d0cb Mon Sep 17 00:00:00 2001
+From f5bad88adbed923fe017d01691cdec1ce1c8e562 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 24 Nov 2018 20:38:02 -0600
-Subject: [PATCH 10/27] Unvendor openssl
+Subject: [PATCH 10/26] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <isuruf@gmail.com>
 ---
diff --git a/recipe/patches/0011-Unvendor-sqlite3.patch b/recipe/patches/0011-Unvendor-sqlite3.patch
index b1dd9680d..8944400b6 100644
--- a/recipe/patches/0011-Unvendor-sqlite3.patch
+++ b/recipe/patches/0011-Unvendor-sqlite3.patch
@@ -1,7 +1,7 @@
-From 464469d29ed8a1edf449254dc7b67cc525342f96 Mon Sep 17 00:00:00 2001
+From 13fddbf07b7cdf832b90e4a2ab56cbaaf38703f2 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
-Subject: [PATCH 11/27] Unvendor sqlite3
+Subject: [PATCH 11/26] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj |  9 ++++-----
diff --git a/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch b/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch
index 6f94e2014..b586ae7e9 100644
--- a/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch
+++ b/recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch
@@ -1,7 +1,7 @@
-From c4cb6f93d3fa86d89fa2f07a4d8c855f63d9aef7 Mon Sep 17 00:00:00 2001
+From d7816251bb78db7b8ac45f9081bf41be9e7b02dd Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 3 Nov 2019 15:09:45 -0600
-Subject: [PATCH 12/27] Use ranlib from env if env variable is set
+Subject: [PATCH 12/26] Use ranlib from env if env variable is set
 
 ---
  Lib/distutils/sysconfig.py | 3 +++
diff --git a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
index 638f86b19..16974d0fb 100644
--- a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
+++ b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,7 +1,7 @@
-From a2480fc4455eaf5a143e662d57981e5c323723bb Mon Sep 17 00:00:00 2001
+From dcdf1dee198f8fc7a63828ec179bcd23096a0211 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
-Subject: [PATCH 13/27] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 13/26] Add CondaEcosystemModifyDllSearchPath()
 
 There are 2 modes depending on CONDA_DLL_SEARCH_MODIFICATION env variable
 
diff --git a/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch b/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
index da4ef7dfc..7e2a81398 100644
--- a/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
+++ b/recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
@@ -1,7 +1,7 @@
-From d41109addfba685eeb4c16a733987b8932d77f15 Mon Sep 17 00:00:00 2001
+From 422fe2754b69fd46b815cf97e6040c690d43f13a Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 20:46:36 +0100
-Subject: [PATCH 14/27] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
+Subject: [PATCH 14/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
 
 ---
  Lib/distutils/_msvccompiler.py | 9 ++++++++-
diff --git a/recipe/patches/0015-Doing-d1trimfile.patch b/recipe/patches/0015-Doing-d1trimfile.patch
index d7fe8b050..a8be5c91c 100644
--- a/recipe/patches/0015-Doing-d1trimfile.patch
+++ b/recipe/patches/0015-Doing-d1trimfile.patch
@@ -1,7 +1,7 @@
-From 89a0be2ad0fa43c8e6330f9bc8ac42f4336fb9a1 Mon Sep 17 00:00:00 2001
+From 38058502bcf78ccea4493ae11b92e7e8d63d8e6e Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 21:47:47 +0100
-Subject: [PATCH 15/27] Doing d1trimfile
+Subject: [PATCH 15/26] Doing d1trimfile
 
 ---
  PCbuild/_asyncio.vcxproj            | 20 ++++++++++++++++++++
@@ -156,13 +156,13 @@ index 0916f1a2d37..17a4cbfcd7c 100644
    </ItemDefinitionGroup>
    <ItemGroup>
 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
-index 4a125b243b7..20cc09d63ff 100644
+index 8aad9513e35..ec55d5c981e 100644
 --- a/PCbuild/_elementtree.vcxproj
 +++ b/PCbuild/_elementtree.vcxproj
 @@ -95,6 +95,10 @@
      <ClCompile>
        <AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_POOR_ENTROPY;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -584,13 +584,13 @@ index 4dd42ab98a9..7c2dbc7e701 100644
    </ItemDefinitionGroup>
    <ItemGroup>
 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
-index b2d9f5d57d4..26ac82980ca 100644
+index 27b0123c777..a5c01c6bc6f 100644
 --- a/PCbuild/pyexpat.vcxproj
 +++ b/PCbuild/pyexpat.vcxproj
 @@ -92,6 +92,10 @@
      <ClCompile>
        <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_POOR_ENTROPY;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
diff --git a/recipe/patches/0016-cross-compile-darwin.patch b/recipe/patches/0016-cross-compile-darwin.patch
index 00c93ebea..eb9914026 100644
--- a/recipe/patches/0016-cross-compile-darwin.patch
+++ b/recipe/patches/0016-cross-compile-darwin.patch
@@ -1,7 +1,7 @@
-From 28fe86f8a9abad9fa08616fd249e5a24b8bb8d71 Mon Sep 17 00:00:00 2001
+From 6fd1398ae9b032b26f98b01f4d8e5dd46e1d4eb2 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 2 Oct 2020 00:03:12 +0200
-Subject: [PATCH 16/27] cross compile darwin
+Subject: [PATCH 16/26] cross compile darwin
 
 By Isuru Fernando.
 ---
diff --git a/recipe/patches/0017-Fix-TZPATH-on-windows.patch b/recipe/patches/0017-Fix-TZPATH-on-windows.patch
index 36ea0a543..7511b15bd 100644
--- a/recipe/patches/0017-Fix-TZPATH-on-windows.patch
+++ b/recipe/patches/0017-Fix-TZPATH-on-windows.patch
@@ -1,7 +1,7 @@
-From 479536de92fe29ef4cbf0c0f0a8aac1a02af36b8 Mon Sep 17 00:00:00 2001
+From 5abfc2e9f4c53c5e8794e847922e40ead4488046 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
-Subject: [PATCH 17/27] Fix TZPATH on windows
+Subject: [PATCH 17/26] Fix TZPATH on windows
 
 ---
  Lib/sysconfig.py | 1 +
diff --git a/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
index 4b8ce87b3..4bb332fcb 100644
--- a/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
+++ b/recipe/patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
@@ -1,7 +1,7 @@
-From 8d74bd3c5fe8a400d0b37696b03f63c0ab722008 Mon Sep 17 00:00:00 2001
+From 19048581ca7c132b08925ee485d12ba27baf5a0e Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 25 Jan 2021 03:28:08 -0600
-Subject: [PATCH 18/27] Make dyld search work with SYSTEM_VERSION_COMPAT=1
+Subject: [PATCH 18/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1
 
 In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15`
 or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur
diff --git a/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch b/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
index c3355dc70..061a992f0 100644
--- a/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
+++ b/recipe/patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
@@ -1,7 +1,7 @@
-From 621a2396b9879263ed8a9a8f17857b240e9e405a Mon Sep 17 00:00:00 2001
+From 9db97dceb515b1860f73bb8868422b4274ac7b9c Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:18:50 -0700
-Subject: [PATCH 19/27] Fix LDSHARED when CC is overriden on Linux too
+Subject: [PATCH 19/26] Fix LDSHARED when CC is overriden on Linux too
 
 ---
  Lib/distutils/sysconfig.py | 5 ++---
diff --git a/recipe/patches/0020-Unvendor-bzip2.patch b/recipe/patches/0020-Unvendor-bzip2.patch
index b140c5dba..c0753176f 100644
--- a/recipe/patches/0020-Unvendor-bzip2.patch
+++ b/recipe/patches/0020-Unvendor-bzip2.patch
@@ -1,7 +1,7 @@
-From 377d101255ea5687b4dcb81a1aee9e090b3794c5 Mon Sep 17 00:00:00 2001
+From d80291c3d64900625d4bc591c2924007daa7dc6b Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:56:27 -0700
-Subject: [PATCH 20/27] Unvendor bzip2
+Subject: [PATCH 20/26] Unvendor bzip2
 
 ---
  PCbuild/_bz2.vcxproj         | 15 +++++----------
diff --git a/recipe/patches/0021-Unvendor-libffi.patch b/recipe/patches/0021-Unvendor-libffi.patch
index 778c0cca9..aacb9e62a 100644
--- a/recipe/patches/0021-Unvendor-libffi.patch
+++ b/recipe/patches/0021-Unvendor-libffi.patch
@@ -1,7 +1,7 @@
-From 96be926cb9fe2aeea544ecfc3839a88347f78d74 Mon Sep 17 00:00:00 2001
+From 3b5d0cbe4b3aecd5197c6b65552fda0917101134 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 03:07:40 -0700
-Subject: [PATCH 21/27] Unvendor libffi
+Subject: [PATCH 21/26] Unvendor libffi
 
 ---
  PCbuild/libffi.props | 15 +++------------
diff --git a/recipe/patches/0022-Unvendor-tcltk.patch b/recipe/patches/0022-Unvendor-tcltk.patch
index 3ac9b5b4a..9c4c3264d 100644
--- a/recipe/patches/0022-Unvendor-tcltk.patch
+++ b/recipe/patches/0022-Unvendor-tcltk.patch
@@ -1,7 +1,7 @@
-From 593d2b046a3c412fd2c9f7dcb561f94e4cecd56c Mon Sep 17 00:00:00 2001
+From 90fe3783c82fb0dffce2ddede7c26c235cfb85ce Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 20 Aug 2021 10:23:51 -0700
-Subject: [PATCH 22/27] Unvendor tcltk
+Subject: [PATCH 22/26] Unvendor tcltk
 
 ---
  PCbuild/tcltk.props | 8 ++++----
diff --git a/recipe/patches/0023-unvendor-xz.patch b/recipe/patches/0023-unvendor-xz.patch
index 654ad6a3d..3525f98b6 100644
--- a/recipe/patches/0023-unvendor-xz.patch
+++ b/recipe/patches/0023-unvendor-xz.patch
@@ -1,7 +1,7 @@
-From 0fa654de11ce3095841a6113d232f0070edd341b Mon Sep 17 00:00:00 2001
+From ac0c2638890346fea3f81a8c13503914939d34c9 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 25 Sep 2021 10:07:05 -0700
-Subject: [PATCH 23/27] unvendor xz
+Subject: [PATCH 23/26] unvendor xz
 
 ---
  PCbuild/_lzma.vcxproj | 10 +++-------
diff --git a/recipe/patches/0024-unvendor-zlib.patch b/recipe/patches/0024-unvendor-zlib.patch
index a14ccb24d..1913108fc 100644
--- a/recipe/patches/0024-unvendor-zlib.patch
+++ b/recipe/patches/0024-unvendor-zlib.patch
@@ -1,7 +1,7 @@
-From c8d1db5666af8dfb17fa80e988c58327c8b5f12c Mon Sep 17 00:00:00 2001
+From 8e3be19ebe2b3543988fd7a08e9141c7b7d1dbc8 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Sep 2021 15:21:55 -0700
-Subject: [PATCH 24/27] unvendor zlib
+Subject: [PATCH 24/26] unvendor zlib
 
 ---
  PCbuild/pythoncore.vcxproj         | 33 ++-------------
diff --git a/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
index 6b80ad1d1..35de18217 100644
--- a/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+++ b/recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
@@ -1,7 +1,7 @@
-From 1342fec25aec89d6c7ac222848aa6747c5931e69 Mon Sep 17 00:00:00 2001
+From 52513b2bb34d129063ec179ce799aded30f9eaf2 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:45:28 +0100
-Subject: [PATCH 25/27] Do not pass -g to GCC when not Py_DEBUG
+Subject: [PATCH 25/26] Do not pass -g to GCC when not Py_DEBUG
 
 This bloats our exe and our modules a lot.
 ---
diff --git a/recipe/patches/0026-Unvendor-expat.patch b/recipe/patches/0026-Unvendor-expat.patch
index 48a6bd5ad..e06f993af 100644
--- a/recipe/patches/0026-Unvendor-expat.patch
+++ b/recipe/patches/0026-Unvendor-expat.patch
@@ -1,17 +1,17 @@
-From 9aa71bc2a319a5f5bbb25766f9ee38f698b7c7c2 Mon Sep 17 00:00:00 2001
+From 3cb9f861f64aca04fb652250fa0056a9ae7e40ed Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
-Date: Fri, 28 Mar 2025 22:41:20 +0100
-Subject: [PATCH 26/27] Unvendor expat
+Date: Wed, 29 Mar 2023 23:07:10 -0500
+Subject: [PATCH 26/26] Unvendor expat
 
 ---
- PCbuild/_elementtree.vcxproj         | 22 +----------
- PCbuild/_elementtree.vcxproj.filters | 58 +---------------------------
- PCbuild/pyexpat.vcxproj              | 12 ++----
- PCbuild/pyexpat.vcxproj.filters      | 19 +--------
- 4 files changed, 7 insertions(+), 104 deletions(-)
+ PCbuild/_elementtree.vcxproj         | 23 +----------
+ PCbuild/_elementtree.vcxproj.filters | 59 ----------------------------
+ PCbuild/pyexpat.vcxproj              | 14 ++-----
+ PCbuild/pyexpat.vcxproj.filters      | 23 -----------
+ 4 files changed, 5 insertions(+), 114 deletions(-)
 
 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
-index 20cc09d63ff..87927871067 100644
+index ec55d5c981e..3a51495de73 100644
 --- a/PCbuild/_elementtree.vcxproj
 +++ b/PCbuild/_elementtree.vcxproj
 @@ -93,7 +93,7 @@
@@ -20,10 +20,10 @@ index 20cc09d63ff..87927871067 100644
      <ClCompile>
 -      <AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>$(condaDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_POOR_ENTROPY;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
-@@ -101,28 +101,8 @@
+@@ -101,29 +101,8 @@
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
      </ClCompile>
    </ItemDefinitionGroup>
@@ -33,10 +33,11 @@ index 20cc09d63ff..87927871067 100644
 -    <ClInclude Include="..\Modules\expat\expat.h" />
 -    <ClInclude Include="..\Modules\expat\expat_config.h" />
 -    <ClInclude Include="..\Modules\expat\expat_external.h" />
+-    <ClInclude Include="..\Modules\expat\fallthrough.h" />
 -    <ClInclude Include="..\Modules\expat\iasciitab.h" />
 -    <ClInclude Include="..\Modules\expat\internal.h" />
 -    <ClInclude Include="..\Modules\expat\latin1tab.h" />
--    <ClInclude Include="..\Modules\expat\macconfig.h" />
+-    <ClInclude Include="..\Modules\expat\memory_sanitizer.h" />
 -    <ClInclude Include="..\Modules\expat\nametab.h" />
 -    <ClInclude Include="..\Modules\expat\pyexpatns.h" />
 -    <ClInclude Include="..\Modules\expat\utf8tab.h" />
@@ -53,10 +54,10 @@ index 20cc09d63ff..87927871067 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc" />
 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
-index bc14e31f32b..7cc8e9a3b9b 100644
+index f6b55d8ff82..88a13faa683 100644
 --- a/PCbuild/_elementtree.vcxproj.filters
 +++ b/PCbuild/_elementtree.vcxproj.filters
-@@ -17,70 +17,14 @@
+@@ -17,69 +17,10 @@
        <UniqueIdentifier>{f99990ba-cd06-40cc-8f28-d2d424ec13be}</UniqueIdentifier>
      </Filter>
    </ItemGroup>
@@ -76,6 +77,9 @@ index bc14e31f32b..7cc8e9a3b9b 100644
 -    <ClInclude Include="..\Modules\expat\expat_external.h">
 -      <Filter>Header Files\expat</Filter>
 -    </ClInclude>
+-    <ClInclude Include="..\Modules\expat\fallthrough.h">
+-      <Filter>Header Files\expat</Filter>
+-    </ClInclude>
 -    <ClInclude Include="..\Modules\expat\iasciitab.h">
 -      <Filter>Header Files\expat</Filter>
 -    </ClInclude>
@@ -85,7 +89,7 @@ index bc14e31f32b..7cc8e9a3b9b 100644
 -    <ClInclude Include="..\Modules\expat\latin1tab.h">
 -      <Filter>Header Files\expat</Filter>
 -    </ClInclude>
--    <ClInclude Include="..\Modules\expat\macconfig.h">
+-    <ClInclude Include="..\Modules\expat\memory_sanitizer.h">
 -      <Filter>Header Files\expat</Filter>
 -    </ClInclude>
 -    <ClInclude Include="..\Modules\expat\nametab.h">
@@ -123,23 +127,17 @@ index bc14e31f32b..7cc8e9a3b9b 100644
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
-       <Filter>Resource Files</Filter>
-     </ResourceCompile>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
-index 26ac82980ca..302ea38fbd9 100644
+index a5c01c6bc6f..f56eff65e8b 100644
 --- a/PCbuild/pyexpat.vcxproj
 +++ b/PCbuild/pyexpat.vcxproj
-@@ -90,23 +90,19 @@
+@@ -90,25 +90,19 @@
    <PropertyGroup Label="UserMacros" />
    <ItemDefinitionGroup>
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>$(condaDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_POOR_ENTROPY;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -150,6 +148,8 @@ index 26ac82980ca..302ea38fbd9 100644
 +    </Link>
    </ItemDefinitionGroup>
 -  <ItemGroup>
+-    <ClInclude Include="..\Modules\expat\fallthrough.h" />
+-    <ClInclude Include="..\Modules\expat\memory_sanitizer.h" />
 -    <ClInclude Include="..\Modules\expat\xmlrole.h" />
 -    <ClInclude Include="..\Modules\expat\xmltok.h" />
 -  </ItemGroup>
@@ -162,14 +162,20 @@ index 26ac82980ca..302ea38fbd9 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc" />
 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
-index fd22fc8c477..41c73b434b9 100644
+index 230531033fc..b8280b4049c 100644
 --- a/PCbuild/pyexpat.vcxproj.filters
 +++ b/PCbuild/pyexpat.vcxproj.filters
-@@ -11,31 +11,14 @@
+@@ -11,33 +11,10 @@
        <UniqueIdentifier>{f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4}</UniqueIdentifier>
      </Filter>
    </ItemGroup>
 -  <ItemGroup>
+-    <ClInclude Include="..\Modules\expat\fallthrough.h">
+-      <Filter>Header Files</Filter>
+-    </ClInclude>
+-    <ClInclude Include="..\Modules\expat\memory_sanitizer.h">
+-      <Filter>Header Files</Filter>
+-    </ClInclude>
 -    <ClInclude Include="..\Modules\expat\xmlrole.h">
 -      <Filter>Header Files</Filter>
 -    </ClInclude>
@@ -193,9 +199,3 @@ index fd22fc8c477..41c73b434b9 100644
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
-       <Filter>Resource Files</Filter>
-     </ResourceCompile>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
diff --git a/recipe/patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch b/recipe/patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch
deleted file mode 100644
index 5fffbb4c8..000000000
--- a/recipe/patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 76d7661f10677a0054b49469fc3548931e1c9fca Mon Sep 17 00:00:00 2001
-From: David Benjamin <davidben@google.com>
-Date: Fri, 24 Mar 2023 09:04:30 -0400
-Subject: [PATCH 27/27] gh-100372: Use BIO_eof to detect EOF for
- SSL_FILETYPE_ASN1 (GH-100373)
-
-In PEM, we need to parse until error and then suppress `PEM_R_NO_START_LINE`, because PEM allows arbitrary leading and trailing data. DER, however, does not. Parsing until error and suppressing `ASN1_R_HEADER_TOO_LONG` doesn't quite work because that error also covers some cases that should be rejected.
-
-Instead, check `BIO_eof` early and stop the loop that way.
-
-Automerge-Triggered-By: GH:Yhg1s
----
- Lib/test/test_ssl.py |  2 ++
- Modules/_ssl.c       | 10 ++++++----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index 0f1397de732..f4bba8ff037 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -1533,6 +1533,8 @@ def test_load_verify_cadata(self):
-             "not enough data: cadata does not contain a certificate"
-         ):
-             ctx.load_verify_locations(cadata=b"broken")
-+        with self.assertRaises(ssl.SSLError):
-+            ctx.load_verify_locations(cadata=cacert_der + b"A")
- 
-     @unittest.skipIf(Py_DEBUG_WIN32, "Avoid mixing debug/release CRT on Windows")
-     def test_load_dh_params(self):
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index 3bd8b96dcc4..af770c7f18a 100644
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -3961,7 +3961,7 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
- {
-     BIO *biobuf = NULL;
-     X509_STORE *store;
--    int retval = -1, err, loaded = 0;
-+    int retval = -1, err, loaded = 0, was_bio_eof = 0;
- 
-     assert(filetype == SSL_FILETYPE_ASN1 || filetype == SSL_FILETYPE_PEM);
- 
-@@ -3989,6 +3989,10 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
-         int r;
- 
-         if (filetype == SSL_FILETYPE_ASN1) {
-+            if (BIO_eof(biobuf)) {
-+                was_bio_eof = 1;
-+                break;
-+            }
-             cert = d2i_X509_bio(biobuf, NULL);
-         } else {
-             cert = PEM_read_bio_X509(biobuf, NULL,
-@@ -4024,9 +4028,7 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
-         }
-         _setSSLError(get_state_ctx(self), msg, 0, __FILE__, __LINE__);
-         retval = -1;
--    } else if ((filetype == SSL_FILETYPE_ASN1) &&
--                    (ERR_GET_LIB(err) == ERR_LIB_ASN1) &&
--                    (ERR_GET_REASON(err) == ASN1_R_HEADER_TOO_LONG)) {
-+    } else if ((filetype == SSL_FILETYPE_ASN1) && was_bio_eof) {
-         /* EOF ASN1 file, not an error */
-         ERR_clear_error();
-         retval = 0;