rebase patches

h-vetinari · h-vetinari · commit 4e4a6735de60 · 2025-08-15T12:27:29.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,4 +1,4 @@
-From b2dc38f831aa57016c7197a902310119c72a1b73 Mon Sep 17 00:00:00 2001
+From e197022b6c7d45967a8a5b740b8fd7d21d059aed 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
diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch
@@ -1,4 +1,4 @@
-From 6b2be09a90969918df41b16e3f04c6d65c8d618b Mon Sep 17 00:00:00 2001
+From fb978fc203b5318e3fce4361d3698b0feb939abc 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
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,4 +1,4 @@
-From d949c804acdacbc1e47de8e5aedc6c2ab3cbed5e Mon Sep 17 00:00:00 2001
+From 2744ccebb04a75e66d943b16a1899237d358f122 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 03/24] Fix find_library so that it looks in sys.prefix/lib
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,4 +1,4 @@
-From f4e637fd1598a98625f5c969a92edc3aab0a0704 Mon Sep 17 00:00:00 2001
+From 4e3f13907040ce28ac000970380c56eb24437c84 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
diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch
@@ -1,4 +1,4 @@
-From 0fe38386a63c0294fa0a25766554d3430ea909b4 Mon Sep 17 00:00:00 2001
+From a5bc981e40a00c01ddd9c82015cc987358721c89 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
@@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index 42f11754218..0ec0914facd 100644
+index 62f42d0ce9c..0ec0914facd 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -61,6 +61,7 @@
@@ -105,7 +105,7 @@ index 42f11754218..0ec0914facd 100644
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
  
    <PropertyGroup>
--    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.50.4.0\</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.4.4\</libffiDir>
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,4 +1,4 @@
-From 0f989c30617df3a745f5ae53077e48a3ce7af2bd Mon Sep 17 00:00:00 2001
+From d29e0ce1655c9323a39b2d3dc23327f82b246429 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
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,4 +1,4 @@
-From 9d2c319335f1a4e0dfb25b4a2e99657afbbd6a67 Mon Sep 17 00:00:00 2001
+From e80541cbc8a42d8cc5d80fbb3dfcd6ec23fdfd8b 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()
@@ -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 a8852a88f94..f1a919bad51 100644
+index 5e420bdf337..8f6b67c42b9 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,4 +1,4 @@
-From 383c3568b976dcb6a2994b1ea8d127645cf00ade Mon Sep 17 00:00:00 2001
+From d1c349d5e8cade417eb4263cd30b4e5585b7a368 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
diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch
@@ -1,4 +1,4 @@
-From 2b1e4a9b02d9644d294325d2236f57121db8b98f Mon Sep 17 00:00:00 2001
+From 4ca3a6e8016607bbb1a5d570f257e45364abc69a 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
@@ -29,7 +29,7 @@ index 8895177e326..fd93841d034 100755
      try:
          import plistlib
 diff --git a/configure b/configure
-index 1cd1f690f7b..603108eb031 100755
+index 901a26c9602..e96a4d404e8 100755
 --- a/configure
 +++ b/configure
 @@ -4052,6 +4052,9 @@ then
@@ -53,7 +53,7 @@ index 1cd1f690f7b..603108eb031 100755
  		_host_ident=
  		;;
 diff --git a/configure.ac b/configure.ac
-index 3fcb18922c5..fd3cba43283 100644
+index 597a44b331a..2287ee877c8 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,4 +1,4 @@
-From 80c75a40f139e463c1405af3e7ecf8a1185b09eb Mon Sep 17 00:00:00 2001
+From 3e6a9ea22336ec417dd43c896f9655fa1dc1b18e 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
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,4 +1,4 @@
-From a61264b976babc757e386d46d505f0c0c4b470a3 Mon Sep 17 00:00:00 2001
+From 9d74b2765ed81422abef76d0f9274d9879c8b81c 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
@@ -15,10 +15,10 @@ as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
-index f9864ebb735..c413621f01b 100644
+index 8f94d19024e..5b8f1196dc9 100644
 --- a/Modules/_ctypes/callproc.c
 +++ b/Modules/_ctypes/callproc.c
-@@ -1489,7 +1489,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
+@@ -1490,7 +1490,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
  #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
  #  ifdef HAVE_BUILTIN_AVAILABLE
  #    define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch
@@ -1,4 +1,4 @@
-From 9b6346b06684f48994c3ecdb96b34c1c22df5783 Mon Sep 17 00:00:00 2001
+From d045ac342ba5e3556a834a7effce5fd616fd29e4 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
diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch
@@ -1,4 +1,4 @@
-From 00cdc35f73b62ff9d380fbb02586eb88d0b7bbb2 Mon Sep 17 00:00:00 2001
+From 94b6bad05bb680053ebc68993ff576c6355c4070 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
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,4 +1,4 @@
-From 717122c210b8f6ff32879a060897f937d2e39c75 Mon Sep 17 00:00:00 2001
+From 2edf7ebf9ca5706be576c8f22c622834409a5559 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
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
@@ -1,4 +1,4 @@
-From f5cb3ed68fab92894c6e6833814155a19f75435e Mon Sep 17 00:00:00 2001
+From 8a311a9adbd25026bf704ed89659727d2156465e 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
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,4 +1,4 @@
-From a6201164d0c51c2aa574aa420d4662fb13481286 Mon Sep 17 00:00:00 2001
+From e2ecbd37bf6cc41b3f772cf232e159178346ae4f 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
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,4 +1,4 @@
-From 27fcf7aefe92bc81c68e73d92268b55213363345 Mon Sep 17 00:00:00 2001
+From aead054ab122ac78a19d0fdcec8281b9591554f7 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
@@ -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 603108eb031..a4df798edca 100755
+index e96a4d404e8..007a288bef9 100755
 --- a/configure
 +++ b/configure
 @@ -5671,9 +5671,9 @@ if test $ac_test_CFLAGS; then
@@ -35,7 +35,7 @@ index 603108eb031..a4df798edca 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index fd3cba43283..b747715f637 100644
+index 2287ee877c8..4297b33cfad 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2389,7 +2389,7 @@ then
diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch
@@ -1,4 +1,4 @@
-From 2b9f7797353290e3b11acfd3adf8353d6bc3e688 Mon Sep 17 00:00:00 2001
+From d8314955ea2fb0a086a38fd69f5886a4547e2593 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
diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch
@@ -1,4 +1,4 @@
-From ab2df197829c0d6050994268a287d9ddeb175976 Mon Sep 17 00:00:00 2001
+From b71ed0276f3394f3aeaa7d1c594533a81b302d9d 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
@@ -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 3bd4495f95b..bb1935d39f1 100644
+index a7dc9709d62..1cea3bcb829 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,4 +1,4 @@
-From ebec7ee6c8abe6c92b0729432bf7f3e1fb9270b0 Mon Sep 17 00:00:00 2001
+From 12c76d34c63b9db0d0c5352d353da44519516bae 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
@@ -10,10 +10,10 @@ 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 bb1935d39f1..9cdf143cece 100644
+index 1cea3bcb829..79ebf5e9806 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1367,7 +1367,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
+@@ -1372,7 +1372,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
  # dependency on BUILDPYTHON ensures that the target is run last
  .PHONY: checksharedmods
  checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch
@@ -1,4 +1,4 @@
-From 0419886743ef08325db0b5c55cbe9900d4e869cf Mon Sep 17 00:00:00 2001
+From 69dc8292f799bfb815a1a6c759f00651b90b6274 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
@@ -8,10 +8,10 @@ Subject: [PATCH 21/24] Override configure LIBFFI
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index a4df798edca..cd326e504e7 100755
+index 007a288bef9..3d26aba9318 100755
 --- a/configure
 +++ b/configure
-@@ -14296,7 +14296,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
+@@ -14493,7 +14493,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,4 +1,4 @@
-From ea4c51716d249618360910b88dc184f249935875 Mon Sep 17 00:00:00 2001
+From e5c7b0a2f1e9c50e676772826379b719bb973f40 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
diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch
@@ -1,4 +1,4 @@
-From f7651087d4ada24bbe464d1c423da5852856ba2e Mon Sep 17 00:00:00 2001
+From 48db4749f96042bbda5fe1450e48ad305669d34f 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
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,4 +1,4 @@
-From 57d58fa6a8cd001be82f6e1adef9640581dbbc7f Mon Sep 17 00:00:00 2001
+From 4bfe782c70be96684b25964887ae9507f0f17208 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
@@ -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 25d242dbd42..4b166677dcb 100644
+index 2aa771ab62b..ea1dd33504d 100644
 --- a/Modules/clinic/posixmodule.c.h
 +++ b/Modules/clinic/posixmodule.c.h
 @@ -10,6 +10,10 @@ preserve
@@ -74,7 +74,7 @@ index 25d242dbd42..4b166677dcb 100644
  "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n"
  "--\n"
 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-index 601145e561d..4feddc37737 100644
+index f31659808d7..2d5bf2d8995 100644
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
 @@ -43,6 +43,7 @@

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From b2dc38f831aa57016c7197a902310119c72a1b73 Mon Sep 17 00:00:00 2001`
	`1`	`+From e197022b6c7d45967a8a5b740b8fd7d21d059aed Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Wed, 16 Aug 2017 11:53:55 +0100`
`4`	`4`	`Subject: [PATCH 01/24] Win32: Change FD_SETSIZE from 512 to 2048`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 6b2be09a90969918df41b16e3f04c6d65c8d618b Mon Sep 17 00:00:00 2001`
	`1`	`+From fb978fc203b5318e3fce4361d3698b0feb939abc Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Thu, 7 Sep 2017 11:35:47 +0100`
`4`	`4`	`Subject: [PATCH 02/24] Win32: Do not download externals`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From d949c804acdacbc1e47de8e5aedc6c2ab3cbed5e Mon Sep 17 00:00:00 2001`
	`1`	`+From 2744ccebb04a75e66d943b16a1899237d358f122 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Tue, 5 Dec 2017 22:47:59 +0000`
`4`	`4`	`Subject: [PATCH 03/24] Fix find_library so that it looks in sys.prefix/lib`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From f4e637fd1598a98625f5c969a92edc3aab0a0704 Mon Sep 17 00:00:00 2001`
	`1`	`+From 4e3f13907040ce28ac000970380c56eb24437c84 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Sat, 27 Oct 2018 18:48:30 +0100`
`4`	`4`	`Subject: [PATCH 04/24] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 0f989c30617df3a745f5ae53077e48a3ce7af2bd Mon Sep 17 00:00:00 2001`
	`1`	`+From d29e0ce1655c9323a39b2d3dc23327f82b246429 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Nehal J Wani <nehaljw.kkd1@gmail.com>`
`3`	`3`	`Date: Tue, 5 Oct 2021 12:42:06 -0700`
`4`	`4`	`Subject: [PATCH 06/24] Unvendor sqlite3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 383c3568b976dcb6a2994b1ea8d127645cf00ade Mon Sep 17 00:00:00 2001`
	`1`	`+From d1c349d5e8cade417eb4263cd30b4e5585b7a368 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Tue, 31 Dec 2019 21:47:47 +0100`
`4`	`4`	`Subject: [PATCH 08/24] Doing d1trimfile`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 80c75a40f139e463c1405af3e7ecf8a1185b09eb Mon Sep 17 00:00:00 2001`
	`1`	`+From 3e6a9ea22336ec417dd43c896f9655fa1dc1b18e Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Isuru Fernando <isuruf@gmail.com>`
`3`	`3`	`Date: Wed, 7 Oct 2020 10:08:30 -0500`
`4`	`4`	`Subject: [PATCH 10/24] Fix TZPATH on windows`