diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 93cd877db..13b780332 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -19,11 +19,6 @@ jobs:
   timeoutInMinutes: 360
 
   steps:
-  - script: |
-         rm -rf /opt/ghc
-         df -h
-    displayName: Manage disk space
-
   # configure qemu binfmt-misc running.  This allows us to run docker containers
   # embedded qemu-static
   - script: |
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
index 4deb27235..2e9ebd813 100755
--- a/.azure-pipelines/azure-pipelines-win.yml
+++ b/.azure-pipelines/azure-pipelines-win.yml
@@ -5,7 +5,7 @@
 jobs:
 - job: win
   pool:
-    vmImage: windows-2019
+    vmImage: windows-2022
   strategy:
     matrix:
       win_64_:
@@ -36,7 +36,7 @@ jobs:
 
     - script: |
         call activate base
-        mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" -c conda-forge --strict-channel-priority --yes
+        mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 "libsolv<0.7.23" -c conda-forge --strict-channel-priority --yes
       displayName: Install conda-build
 
     - script: set PYTHONUNBUFFERED=1
@@ -60,7 +60,10 @@ jobs:
         if EXIST LICENSE.txt (
           copy LICENSE.txt "recipe\\recipe-scripts-license.txt"
         )
-        conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables
+        if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] (
+          set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test"
+        )
+        conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
       displayName: Build recipe
       env:
         PYTHONUNBUFFERED: 1
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
index 67238d4ce..260fa1802 100644
--- a/.ci_support/linux_64_.yaml
+++ b/.ci_support/linux_64_.yaml
@@ -3,7 +3,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libffi:
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
index 664506fe8..68dc68173 100644
--- a/.ci_support/linux_aarch64_.yaml
+++ b/.ci_support/linux_aarch64_.yaml
@@ -5,7 +5,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -17,7 +17,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
 libffi:
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
index 5481acf59..0fa62c5a2 100644
--- a/.ci_support/linux_ppc64le_.yaml
+++ b/.ci_support/linux_ppc64le_.yaml
@@ -3,7 +3,7 @@ bzip2:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos7
 channel_sources:
@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-ppc64le
 libffi:
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
index de93e7c09..99550535f 100644
--- a/.ci_support/osx_64_.yaml
+++ b/.ci_support/osx_64_.yaml
@@ -7,7 +7,7 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 libffi:
 - '3.4'
 macos_machine:
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
index ba3c26822..b61fd1ddd 100644
--- a/.ci_support/osx_arm64_.yaml
+++ b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 libffi:
 - '3.4'
 macos_machine:
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 025708f93..800756926 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -55,11 +55,6 @@ source run_conda_forge_build_setup
 echo -e "\n\nMaking the build clobber file"
 make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
 
-if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then
-    EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
-fi
-
-
 if [[ -f LICENSE.txt ]]; then
   cp LICENSE.txt "recipe/recipe-scripts-license.txt"
 fi
@@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
+
+    if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then
+        EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
+    fi
+
     conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml
diff --git a/README.md b/README.md
index ca59700b7..602ad17ef 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-About python
-============
+About python-feedstock
+======================
+
+Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/main/LICENSE.txt)
 
 Home: https://www.python.org/
 
 Package license: Python-2.0
 
-Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/python-feedstock/blob/main/LICENSE.txt)
-
 Summary: General purpose programming language
 
 Development: https://docs.python.org/devguide/
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 4e091a2ca..91395c1c6 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "3.9.16" %}
+{% set version = "3.9.17" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -47,7 +47,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
-    md5: 5738c204eecc375e29751cb2176fc9cc
+    md5: 601fc470594f378b4339b454901f8e41
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
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 094ed4759..88079562c 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,4 +1,4 @@
-From 93aa3a8d9975a216b942e3653b6bddf77eaf7507 Mon Sep 17 00:00:00 2001
+From aab83eae5106d4bb216695bff3eeca9c9a244c68 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/26] Win32: Change FD_SETSIZE from 512 to 2048
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 cd87eea24..ed10116d9 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,4 +1,4 @@
-From 1de694b53bbf8c7a5f001c02a207e23dcd85413c Mon Sep 17 00:00:00 2001
+From ae833c49df9df6ed8ae30351100523e46e44b80b 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/26] Win32: distutils: Add support to cygwinccompiler for
diff --git a/recipe/patches/0003-Support-cross-compiling-byte-code.patch b/recipe/patches/0003-Support-cross-compiling-byte-code.patch
index 445587922..673f2277e 100644
--- a/recipe/patches/0003-Support-cross-compiling-byte-code.patch
+++ b/recipe/patches/0003-Support-cross-compiling-byte-code.patch
@@ -1,4 +1,4 @@
-From d90f54d2f07fa7e2c407ace36db3f244acd3322e Mon Sep 17 00:00:00 2001
+From b06ec1cbb2e4549a79bd8b65013727f50904f9e7 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/26] Support cross-compiling byte-code
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 8706114f9..38b459653 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,4 +1,4 @@
-From e4a56df8c94c33393ad100f85073d32cbdae1f60 Mon Sep 17 00:00:00 2001
+From 9d18f846399b0b0c3f4e3d68cfd4a907a987704e 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/26] bpo-45258: search for -isysroot in addition to
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 6d1bf1ebe..0224aad7f 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,4 +1,4 @@
-From 0963b9a6a73618fc56f882518cc8fcbc0eea9e3c Mon Sep 17 00:00:00 2001
+From f0196804b6dc250ad77d63a28ff0d052311427a8 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/26] runtime_library_dir_option: Use 1st word of CC as
diff --git a/recipe/patches/0006-Win32-Do-not-download-externals.patch b/recipe/patches/0006-Win32-Do-not-download-externals.patch
index 5d011e75f..b6d19d0b8 100644
--- a/recipe/patches/0006-Win32-Do-not-download-externals.patch
+++ b/recipe/patches/0006-Win32-Do-not-download-externals.patch
@@ -1,4 +1,4 @@
-From ce7d76c31a2ea5f170eae9bd99b7f7212db028f5 Mon Sep 17 00:00:00 2001
+From 66c8aa39232181e7d98d263d7a4bd830cdb773bc 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/26] Win32: Do not download externals
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 a059cd643..cf106de0b 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,4 +1,4 @@
-From 150348f05cbbac9c756cc1ba352f45fb6c9e3b05 Mon Sep 17 00:00:00 2001
+From f6883c8a7e200573f5c8f99615ba4805dc736722 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/26] Fix find_library so that it looks in sys.prefix/lib
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 acfadbc82..fb89bfe69 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,4 +1,4 @@
-From ff186e604da9f2548914b7c4bbc5bf389ace18fa Mon Sep 17 00:00:00 2001
+From 0b05b5d5b54ebb6579cb9fa283d4d565e9f35eca 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/26] bpo-22699: Allow compiling on debian/ubuntu with a
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 154208107..81f5bd8bc 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,4 +1,4 @@
-From 1acc68b206deb46b5e9bdcbb130e543579a2aca2 Mon Sep 17 00:00:00 2001
+From dd2a03af9591b690f93e7a108e898b2c5e8f5dc3 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/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
diff --git a/recipe/patches/0010-Unvendor-openssl.patch b/recipe/patches/0010-Unvendor-openssl.patch
index 81fd97f79..6f82e5762 100644
--- a/recipe/patches/0010-Unvendor-openssl.patch
+++ b/recipe/patches/0010-Unvendor-openssl.patch
@@ -1,4 +1,4 @@
-From 6c114f57ac88196b59c7d1828cc9ede869726d7f Mon Sep 17 00:00:00 2001
+From b517e740c088b2941f7cb00445385d6b50da26ad 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/26] Unvendor openssl
@@ -141,7 +141,7 @@ index 0da6f67495..17eee400eb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index c451429da2..6bb03008bf 100644
+index 1b88a2ff21..c5d2952042 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -55,6 +55,7 @@
@@ -151,7 +151,7 @@ index c451429da2..6bb03008bf 100644
 +    <condaDir>$(LIBRARY_PREFIX)\</condaDir>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
      <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
-     <sqlite3Dir>$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
+   </PropertyGroup>
 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
 index 42b27084e0..28581d4dc4 100644
 --- a/PCbuild/python.vcxproj
diff --git a/recipe/patches/0011-Unvendor-sqlite3.patch b/recipe/patches/0011-Unvendor-sqlite3.patch
index f80f400ae..d193771ab 100644
--- a/recipe/patches/0011-Unvendor-sqlite3.patch
+++ b/recipe/patches/0011-Unvendor-sqlite3.patch
@@ -1,4 +1,4 @@
-From 13e5ad2054c83204a327241cae50cfc706c9a0ab Mon Sep 17 00:00:00 2001
+From e891386edddc9a56903a24baacf9b5f45f311764 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/26] Unvendor sqlite3
@@ -57,18 +57,18 @@ index 4b6dc1e677..19d75c75b8 100644
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index 6bb03008bf..0abbd875a1 100644
+index c5d2952042..f329a90a40 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
-@@ -58,7 +58,7 @@
-     <condaDir>$(LIBRARY_PREFIX)\</condaDir>
-     <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
-     <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
--    <sqlite3Dir>$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
-+    <sqlite3Dir>$(SQLITE3_DIR)\</sqlite3Dir>
-     <bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
-     <lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
-     <libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
+@@ -63,7 +63,7 @@
+   <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
+ 
+   <PropertyGroup>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
++    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(SQLITE3_DIR)\</sqlite3Dir>
+     <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
+     <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
+     <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
 diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
 index 7351a6dda2..56d18cfa94 100644
 --- a/PCbuild/sqlite3.vcxproj
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 e20a5080d..10a5b5c7d 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,4 +1,4 @@
-From 17ebb2c04a96bbdd3bf4d43c29f0cd823368cf48 Mon Sep 17 00:00:00 2001
+From d057489458147249b819b6151354055c6a63494c 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/26] Use ranlib from env if env variable is set
diff --git a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
index 7236c7bb0..4318e2b83 100644
--- a/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
+++ b/recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,4 +1,4 @@
-From 0dab4011b207b79ff9fa6b483a8e7eadd30d0faf Mon Sep 17 00:00:00 2001
+From b70b2833ca904eddeaef026e7dcf571e9758079f 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/26] Add CondaEcosystemModifyDllSearchPath()
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 c05dad25f..2e772fad1 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,4 +1,4 @@
-From 254b5645a835489334672ad58396225576dcdbd4 Mon Sep 17 00:00:00 2001
+From 6ebd60d35033b83847882408d2690fb21246190f 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/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
diff --git a/recipe/patches/0015-Doing-d1trimfile.patch b/recipe/patches/0015-Doing-d1trimfile.patch
index 8219a3109..30fbbbbc5 100644
--- a/recipe/patches/0015-Doing-d1trimfile.patch
+++ b/recipe/patches/0015-Doing-d1trimfile.patch
@@ -1,4 +1,4 @@
-From e5db109b5eb36d4f8d8e6e3b1eef2a3856893788 Mon Sep 17 00:00:00 2001
+From e16b350260a14d85c10ef4eef02822c8598af815 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/26] Doing d1trimfile
diff --git a/recipe/patches/0016-cross-compile-darwin.patch b/recipe/patches/0016-cross-compile-darwin.patch
index 2bdd8ccc6..4e637111e 100644
--- a/recipe/patches/0016-cross-compile-darwin.patch
+++ b/recipe/patches/0016-cross-compile-darwin.patch
@@ -1,4 +1,4 @@
-From 5be994ebf67dcd09f7fa3828ddf2a4f78ac30194 Mon Sep 17 00:00:00 2001
+From 326480dfa5811a8a2a4c7f4ad6a4bce0089c50cf 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/26] cross compile darwin
diff --git a/recipe/patches/0017-Fix-TZPATH-on-windows.patch b/recipe/patches/0017-Fix-TZPATH-on-windows.patch
index 30b58c48b..8ec1a7669 100644
--- a/recipe/patches/0017-Fix-TZPATH-on-windows.patch
+++ b/recipe/patches/0017-Fix-TZPATH-on-windows.patch
@@ -1,4 +1,4 @@
-From 2418b056ba84e352c2a8514b97c5cce9e7def159 Mon Sep 17 00:00:00 2001
+From 3c9fbda0914c6cc0a3985bcab43cc41b76ffc54b 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/26] Fix TZPATH on windows
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 09a46276f..07ff716af 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,4 +1,4 @@
-From 8d58dbe9ea64c50d5d412bd913a16e7fff9c0447 Mon Sep 17 00:00:00 2001
+From a25b7e3e4cc6560baf1e2f2a5e3e946a56bb1400 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/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1
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 3e2469bff..51f4e78fe 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,4 +1,4 @@
-From 8d5a385796cdc0f8a6d7cc2a0479dbd55d0a0633 Mon Sep 17 00:00:00 2001
+From d93e72ae50b4671f909f6cceb8c2545d683e8856 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/26] Fix LDSHARED when CC is overriden on Linux too
diff --git a/recipe/patches/0020-Unvendor-bzip2.patch b/recipe/patches/0020-Unvendor-bzip2.patch
index c686ac566..51f7029ec 100644
--- a/recipe/patches/0020-Unvendor-bzip2.patch
+++ b/recipe/patches/0020-Unvendor-bzip2.patch
@@ -1,4 +1,4 @@
-From e663a4247d5ed61c577c5aa49d7a99fe82e872c8 Mon Sep 17 00:00:00 2001
+From a0e983795a0767d1d6750ae24bbfc8c01135a8b1 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/26] Unvendor bzip2
diff --git a/recipe/patches/0021-Unvendor-libffi.patch b/recipe/patches/0021-Unvendor-libffi.patch
index ce80f17a8..80685e336 100644
--- a/recipe/patches/0021-Unvendor-libffi.patch
+++ b/recipe/patches/0021-Unvendor-libffi.patch
@@ -1,4 +1,4 @@
-From e36db61bcb82e7bc638f1c3537d7dbddd0a07d49 Mon Sep 17 00:00:00 2001
+From 2de809b883c95d8c4b5075b0d077d270806e32e1 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/26] Unvendor libffi
diff --git a/recipe/patches/0022-Unvendor-tcltk.patch b/recipe/patches/0022-Unvendor-tcltk.patch
index 90c082ecd..7ad450536 100644
--- a/recipe/patches/0022-Unvendor-tcltk.patch
+++ b/recipe/patches/0022-Unvendor-tcltk.patch
@@ -1,4 +1,4 @@
-From 885a4b58879842645c457c0cb4cda159913ffcd8 Mon Sep 17 00:00:00 2001
+From 26fc2896491c5914a6e6e6fce1b02260efc6c78b 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/26] Unvendor tcltk
diff --git a/recipe/patches/0023-unvendor-xz.patch b/recipe/patches/0023-unvendor-xz.patch
index 15d7aaa99..d1db10ed9 100644
--- a/recipe/patches/0023-unvendor-xz.patch
+++ b/recipe/patches/0023-unvendor-xz.patch
@@ -1,4 +1,4 @@
-From fb3ccb5f2323099a179046d711dbed7d969e45d9 Mon Sep 17 00:00:00 2001
+From 59044667127c3d02fa6ec3f9512977c4399a8be4 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/26] unvendor xz
diff --git a/recipe/patches/0024-unvendor-zlib.patch b/recipe/patches/0024-unvendor-zlib.patch
index 4334fc38b..8f99ff24b 100644
--- a/recipe/patches/0024-unvendor-zlib.patch
+++ b/recipe/patches/0024-unvendor-zlib.patch
@@ -1,4 +1,4 @@
-From 895cedf3900c01fd253d9edf2715b136fe93cac5 Mon Sep 17 00:00:00 2001
+From 06b1ee78ae2009ae61451674c07baf52eafa5386 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/26] unvendor zlib
diff --git a/recipe/patches/0025-Set-ssltag-to-3.patch b/recipe/patches/0025-Set-ssltag-to-3.patch
index 204f346ed..589625529 100644
--- a/recipe/patches/0025-Set-ssltag-to-3.patch
+++ b/recipe/patches/0025-Set-ssltag-to-3.patch
@@ -1,4 +1,4 @@
-From 2be568fdfaca8337eb39323202abf0b1f45386df Mon Sep 17 00:00:00 2001
+From d142bd6c6abe88e8812498c3857ca1f6c32b2821 Mon Sep 17 00:00:00 2001
 From: Chris Burr <chrisburr@users.noreply.github.com>
 Date: Tue, 28 Sep 2021 12:40:44 +0200
 Subject: [PATCH 25/26] Set ssltag to 3
diff --git a/recipe/patches/0026-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0026-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
index 45e7561ee..a83629478 100644
--- a/recipe/patches/0026-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+++ b/recipe/patches/0026-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
@@ -1,4 +1,4 @@
-From 1cc285aca52131ab5a8c84aa86089693d174802d Mon Sep 17 00:00:00 2001
+From 5412e871de745fd6e514b2fefffe2b05708efb37 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 26/26] Do not pass -g to GCC when not Py_DEBUG