rebase patches

h-vetinari · h-vetinari · commit 11d4bf349863 · 2026-04-08T08:57:47.000+11:00
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
@@ -1,7 +1,7 @@
-From e197022b6c7d45967a8a5b740b8fd7d21d059aed Mon Sep 17 00:00:00 2001
+From a70742c0b7ff8e15b948a74e112f1c5542cf8e57 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/24] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch
@@ -1,7 +1,7 @@
-From fb978fc203b5318e3fce4361d3698b0feb939abc Mon Sep 17 00:00:00 2001
+From 3a4008e96246da906293908fbb4606040f959573 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 02/24] Win32: Do not download externals
+Subject: [PATCH 02/25] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 4 ++--
diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
@@ -1,7 +1,8 @@
-From 24c5979ae5cf7febe41ad52060b248493735c517 Mon Sep 17 00:00:00 2001
+From 88bd8f9025833f84620ef05689285bf8f49d0092 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] Fix find_library so that it looks in sys.prefix/lib first
+Subject: [PATCH 03/25] Fix find_library so that it looks in sys.prefix/lib
+ first
 
 ---
  Lib/ctypes/macholib/dyld.py |  4 ++++
diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
@@ -1,7 +1,7 @@
-From 4e3f13907040ce28ac000970380c56eb24437c84 Mon Sep 17 00:00:00 2001
+From 41a3e039bf637311f375d30d939d4486dc3aff0d 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 04/24] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 04/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 Co-authored-by: Isuru Fernando<isuruf@gmail.com>
diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch
@@ -1,7 +1,7 @@
-From a5bc981e40a00c01ddd9c82015cc987358721c89 Mon Sep 17 00:00:00 2001
+From bffdcfa936322c7bf70469c2b7839b1b84b62785 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 05/24] Unvendor openssl
+Subject: [PATCH 05/25] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <isuruf@gmail.com>
 ---
@@ -90,18 +90,18 @@ index 7ca750dda8f..17eee400ebb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index 62f42d0ce9c..0ec0914facd 100644
+index c29caa61bbd..d0d58ce57e4 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
-@@ -61,6 +61,7 @@
+@@ -62,6 +62,7 @@
    <!-- Directories of external projects. tcltk is handled in tcltk.props -->
    <PropertyGroup>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
 +    <condaDir>$(LIBRARY_PREFIX)\</condaDir>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
      <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
    </PropertyGroup>
-@@ -68,18 +69,8 @@
+@@ -69,18 +70,8 @@
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
  
    <PropertyGroup>
@@ -112,8 +112,8 @@ index 62f42d0ce9c..0ec0914facd 100644
 -    <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
 -    <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
      <mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
--    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.18\</opensslDir>
--    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.18\$(ArchName)\</opensslOutDir>
+-    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.19\</opensslDir>
+-    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.19\$(ArchName)\</opensslOutDir>
 -    <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
      <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
 -    <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,7 +1,7 @@
-From d29e0ce1655c9323a39b2d3dc23327f82b246429 Mon Sep 17 00:00:00 2001
+From 54ebce771e1cc5f36d69ca80277786f709ae41ce 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 06/24] Unvendor sqlite3
+Subject: [PATCH 06/25] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,7 +1,7 @@
-From e80541cbc8a42d8cc5d80fbb3dfcd6ec23fdfd8b Mon Sep 17 00:00:00 2001
+From 91619d973f19541cef025dc1ff192feed29fd1ce 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 07/24] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 07/25] Add CondaEcosystemModifyDllSearchPath()
 
   The python interpreter is modifed so that it works as if the python interpreter
   was called with the following conda directories.
@@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  1 file changed, 96 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index 5e420bdf337..8f6b67c42b9 100644
+index 8ba9b2bd006..fb397de1ffb 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -74,6 +74,10 @@
diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch
@@ -1,7 +1,7 @@
-From d1c349d5e8cade417eb4263cd30b4e5585b7a368 Mon Sep 17 00:00:00 2001
+From 87116ba01329804b3fdca98410416c075bd6c27e 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 08/24] Doing d1trimfile
+Subject: [PATCH 08/25] Doing d1trimfile
 
 ---
  PCbuild/_asyncio.vcxproj            | 20 ++++++++++++++++++++
diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch
@@ -1,7 +1,7 @@
-From 4ca3a6e8016607bbb1a5d570f257e45364abc69a Mon Sep 17 00:00:00 2001
+From 1c3831e5afa7bf46f2525f8dd7ab08073b7d545e 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 09/24] cross compile darwin
+Subject: [PATCH 09/25] cross compile darwin
 
 By Isuru Fernando.
 ---
@@ -29,7 +29,7 @@ index 8895177e326..fd93841d034 100755
      try:
          import plistlib
 diff --git a/configure b/configure
-index 901a26c9602..e96a4d404e8 100755
+index 9ddb712b534..9e3d1d4929a 100755
 --- a/configure
 +++ b/configure
 @@ -4052,6 +4052,9 @@ then
@@ -53,7 +53,7 @@ index 901a26c9602..e96a4d404e8 100755
  		_host_ident=
  		;;
 diff --git a/configure.ac b/configure.ac
-index 597a44b331a..2287ee877c8 100644
+index d9acfce793e..ca97817db17 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -324,6 +324,9 @@ then
diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch
@@ -1,14 +1,14 @@
-From 3e6a9ea22336ec417dd43c896f9655fa1dc1b18e Mon Sep 17 00:00:00 2001
+From 598cafbb2d198448c9ccc5085d165bedaa2d1b79 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
-Subject: [PATCH 10/24] Fix TZPATH on windows
+Subject: [PATCH 10/25] Fix TZPATH on windows
 
 ---
  Lib/sysconfig/__init__.py | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 510c7b9568a..c45f79fbc29 100644
+index 43edebce347..2df352ff415 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
 @@ -499,6 +499,7 @@ def _init_config_vars():
diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
@@ -1,7 +1,7 @@
-From 9d74b2765ed81422abef76d0f9274d9879c8b81c Mon Sep 17 00:00:00 2001
+From 6d35fd22703f762a7b497b4ae3ac2702650a80c2 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 25 Jan 2021 03:28:08 -0600
-Subject: [PATCH 11/24] Make dyld search work with SYSTEM_VERSION_COMPAT=1
+Subject: [PATCH 11/25] 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/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch
@@ -1,7 +1,7 @@
-From d045ac342ba5e3556a834a7effce5fd616fd29e4 Mon Sep 17 00:00:00 2001
+From bdb7cb70431d64debe347a4112d85c165006aafb Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:56:27 -0700
-Subject: [PATCH 12/24] Unvendor bzip2
+Subject: [PATCH 12/25] Unvendor bzip2
 
 ---
  PCbuild/_bz2.vcxproj         | 15 +++++----------
diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch
@@ -1,7 +1,7 @@
-From 94b6bad05bb680053ebc68993ff576c6355c4070 Mon Sep 17 00:00:00 2001
+From b8a4cd2e7c9b4a46d6d6f61311116983ee8a6fc9 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 03:07:40 -0700
-Subject: [PATCH 13/24] Unvendor libffi
+Subject: [PATCH 13/25] Unvendor libffi
 
 ---
  PCbuild/libffi.props | 17 ++++-------------
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,7 +1,7 @@
-From 2edf7ebf9ca5706be576c8f22c622834409a5559 Mon Sep 17 00:00:00 2001
+From 0ad0879eec0bd6349a479894db2758121dd3d2ab Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 20 Aug 2021 10:23:51 -0700
-Subject: [PATCH 14/24] Unvendor tcltk
+Subject: [PATCH 14/25] Unvendor tcltk
 
 ---
  PCbuild/_tkinter.vcxproj |  6 ------
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
@@ -1,7 +1,7 @@
-From 8a311a9adbd25026bf704ed89659727d2156465e Mon Sep 17 00:00:00 2001
+From 12182663cc91d74bc19715cfcf1b857c90654e59 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 25 Sep 2021 10:07:05 -0700
-Subject: [PATCH 15/24] unvendor xz
+Subject: [PATCH 15/25] unvendor xz
 
 ---
  PCbuild/_lzma.vcxproj | 10 +++-------
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,7 +1,7 @@
-From e2ecbd37bf6cc41b3f772cf232e159178346ae4f Mon Sep 17 00:00:00 2001
+From 7aa5e5e91bfd9a52ea08e6737824299435fd59c2 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Sep 2021 15:21:55 -0700
-Subject: [PATCH 16/24] unvendor zlib
+Subject: [PATCH 16/25] unvendor zlib
 
 ---
  PCbuild/pythoncore.vcxproj         | 33 ++-------------
diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
@@ -1,7 +1,7 @@
-From aead054ab122ac78a19d0fdcec8281b9591554f7 Mon Sep 17 00:00:00 2001
+From 717d9f0257864959e279715d9548bdb9f9245e58 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 17/24] Do not pass -g to GCC when not Py_DEBUG
+Subject: [PATCH 17/25] Do not pass -g to GCC when not Py_DEBUG
 
 This bloats our exe and our modules a lot.
 ---
@@ -10,7 +10,7 @@ This bloats our exe and our modules a lot.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index e96a4d404e8..007a288bef9 100755
+index 9e3d1d4929a..50a25868016 100755
 --- a/configure
 +++ b/configure
 @@ -5671,9 +5671,9 @@ if test $ac_test_CFLAGS; then
@@ -25,7 +25,7 @@ index e96a4d404e8..007a288bef9 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -9522,7 +9522,7 @@ then
+@@ -9559,7 +9559,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -35,10 +35,10 @@ index e96a4d404e8..007a288bef9 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 2287ee877c8..4297b33cfad 100644
+index ca97817db17..c88fcca1967 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2389,7 +2389,7 @@ then
+@@ -2392,7 +2392,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch
@@ -1,7 +1,7 @@
-From d8314955ea2fb0a086a38fd69f5886a4547e2593 Mon Sep 17 00:00:00 2001
+From 7b0d94fe8148aedb83dbdf911e37b1cd162dc6ab Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Mar 2023 23:07:10 -0500
-Subject: [PATCH 18/24] Unvendor expat
+Subject: [PATCH 18/25] Unvendor expat
 
 ---
  PCbuild/_elementtree.vcxproj         | 25 ++----------
diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch
@@ -1,7 +1,7 @@
-From b71ed0276f3394f3aeaa7d1c594533a81b302d9d Mon Sep 17 00:00:00 2001
+From 0c5ec96d061cc0769c7c577ec687604249198537 Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Thu, 25 May 2023 17:56:53 -0400
-Subject: [PATCH 19/24] Remove unused readelf
+Subject: [PATCH 19/25] Remove unused readelf
 
 readelf has been dropped.
 .. date: 2022-11-02-10-56-40
@@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``.
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a7dc9709d62..1cea3bcb829 100644
+index ecf77bdc41c..190eb5a1d1f 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -38,7 +38,6 @@ CC=		@CC@
diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch
@@ -1,7 +1,7 @@
-From 12c76d34c63b9db0d0c5352d353da44519516bae Mon Sep 17 00:00:00 2001
+From f94236352a144cc0815b630352b8586b7a08ebac Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 1 Sep 2023 23:32:14 +0200
-Subject: [PATCH 20/24] Don't checksharedmods if cross-compiling
+Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling
 
 ---
  Makefile.pre.in |  2 +-
@@ -10,7 +10,7 @@ Subject: [PATCH 20/24] Don't checksharedmods if cross-compiling
  create mode 100755 if_runnable.sh
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 1cea3bcb829..79ebf5e9806 100644
+index 190eb5a1d1f..8f170a02a80 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1372,7 +1372,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch
@@ -1,17 +1,17 @@
-From 69dc8292f799bfb815a1a6c759f00651b90b6274 Mon Sep 17 00:00:00 2001
+From bdffd18d709e2fb55999928117e97399f6a49273 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Tue, 5 Sep 2023 21:51:31 +0200
-Subject: [PATCH 21/24] Override configure LIBFFI
+Subject: [PATCH 21/25] Override configure LIBFFI
 
 ---
  configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 007a288bef9..3d26aba9318 100755
+index 50a25868016..e5140a6b6c9 100755
 --- a/configure
 +++ b/configure
-@@ -14493,7 +14493,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
+@@ -14530,7 +14530,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
  then :
  
                  have_libffi=yes
diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch
@@ -1,7 +1,7 @@
-From e5c7b0a2f1e9c50e676772826379b719bb973f40 Mon Sep 17 00:00:00 2001
+From 94f837c0c46e6e5c4454ea594955f431064c85e2 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 16 Aug 2024 21:34:43 -0500
-Subject: [PATCH 22/24] Unvendor libmpdec
+Subject: [PATCH 22/25] Unvendor libmpdec
 
 ---
  PCbuild/_decimal.vcxproj | 50 +++++-----------------------------------
diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch
@@ -1,7 +1,7 @@
-From 48db4749f96042bbda5fe1450e48ad305669d34f Mon Sep 17 00:00:00 2001
+From fbc76946acb1d2808eb8a17410dc546070d9fef0 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 28 Aug 2024 11:12:22 -0500
-Subject: [PATCH 23/24] Brand conda-forge
+Subject: [PATCH 23/25] Brand conda-forge
 
 ---
  Lib/platform.py     | 1 +
diff --git a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
@@ -1,7 +1,7 @@
-From 4bfe782c70be96684b25964887ae9507f0f17208 Mon Sep 17 00:00:00 2001
+From cf10296511485f2fba7912f0ad3e9b72a9da590f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 12 Jan 2025 10:37:29 +0530
-Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the
+Subject: [PATCH 24/25] Do not define pid_t as it might conflict with the
  actual definition
 
 ---
@@ -29,7 +29,7 @@ index 769c3909ea3..242636c7cc4 100644
  module _testcapi
  [clinic start generated code]*/
 diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
-index 97e046a4822..feb5c0b13f0 100644
+index 51baf1e8ef6..26f988b2fdd 100644
 --- a/Modules/_testcapimodule.c
 +++ b/Modules/_testcapimodule.c
 @@ -23,6 +23,10 @@
@@ -59,7 +59,7 @@ index e2af09d0840..24715ac5182 100644
  module _testlimitedcapi
  [clinic start generated code]*/
 diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
-index 2aa771ab62b..ea1dd33504d 100644
+index dabce06705a..7718c09e829 100644
 --- a/Modules/clinic/posixmodule.c.h
 +++ b/Modules/clinic/posixmodule.c.h
 @@ -10,6 +10,10 @@ preserve
@@ -74,7 +74,7 @@ index 2aa771ab62b..ea1dd33504d 100644
  "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n"
  "--\n"
 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-index f31659808d7..2d5bf2d8995 100644
+index 78a8776c1ca..e48910a09bb 100644
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
 @@ -43,6 +43,7 @@
diff --git a/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch b/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch
