msys2-runtime-3.5: upgrade to v3.5.3

This corresponds to msys2/msys2-runtime#211.

Signed-off-by: Johannes Schindelin <[email protected]>

msys2-runtime-3.5/0001-Add-MSYS2-triplet.patch

@@ -1,4 +1,4 @@
-From 466f9bc0c09c3e60e78cc21fefa804046cda4ef2 Mon Sep 17 00:00:00 2001
+From 50e235f7a0b309ffdb17bb06e14b4e39d9559863 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 20:40:45 +0300

msys2-runtime-3.5/0002-Fix-msys-library-name-in-import-libraries.patch

@@ -1,4 +1,4 @@
-From 29cbc0b9927a8f833597a6e7a5eac9f706fbf6fb Mon Sep 17 00:00:00 2001
+From e5ae236775ef4122dd7ff7850286cb1a97a6e347 Mon Sep 17 00:00:00 2001
 From: Kaleb Barrett <[email protected]>
 Date: Sun, 14 Mar 2021 18:58:55 -0500
 Subject: [PATCH 02/N] Fix msys library name in import libraries

msys2-runtime-3.5/0003-Rename-dll-from-cygwin-to-msys.patch

@@ -1,4 +1,4 @@
-From d958d215d3513cc9c5c3e93af5349b57a250a306 Mon Sep 17 00:00:00 2001
+From d1cb51f64425bb111e1f1cf002008642e1abf53f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:09:17 +0300
@@ -253,7 +253,7 @@ index 69526f5..4dc5dae 100644
  #error unimplemented for this target
  #endif
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index fc1eec7..5644cc9 100644
+index ea6a18b..f8479bb 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -376,12 +376,12 @@ check_sanity_and_sync (per_process *p)
@@ -286,7 +286,7 @@ index fc1eec7..5644cc9 100644
      {
        char buf1[PATH_MAX];
        GetModuleFileName (NULL, buf1, PATH_MAX);
-@@ -1073,7 +1073,11 @@ dll_crt0 (per_process *uptr)
+@@ -1076,7 +1076,11 @@ dll_crt0 (per_process *uptr)
     See winsup/testsuite/cygload for an example of how to use cygwin1.dll
     from MSVC and non-cygwin MinGW applications.  */
  extern "C" void
@@ -298,7 +298,7 @@ index fc1eec7..5644cc9 100644
  {
    static int _fmode;
 
-@@ -1274,7 +1278,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
+@@ -1277,7 +1281,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
        return;
      }
 
@@ -307,7 +307,7 @@ index fc1eec7..5644cc9 100644
      return;
 
    if (CYGWIN_VERSION_MAGIC_VERSION (magic_version) == version)
-@@ -1294,7 +1298,7 @@ are unable to find another cygwin DLL.",
+@@ -1297,7 +1301,7 @@ are unable to find another cygwin DLL.",
  void
  cygbench (const char *s)
  {
@@ -392,10 +392,10 @@ index a2a6f9d..b369799 100644
  	  break;
  	}
 diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index 1a97108..e19457f 100644
+index 4c4ad03..2c809c2 100644
 --- a/winsup/cygwin/fhandler/pipe.cc
 +++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -671,7 +671,11 @@ fhandler_pipe::close ()
+@@ -683,7 +683,11 @@ fhandler_pipe::close ()
    return ret;
  }
 
@@ -543,7 +543,7 @@ index 1e4cf98..b77598b 100644
        }									      \
      }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 5998b75..0a18e4e 100644
+index b39a7e5..efe3890 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -502,7 +502,11 @@ details. */

msys2-runtime-3.5/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch

@@ -1,4 +1,4 @@
-From ea53dd65508bdc64db0c9d3a374d4516fb04db50 Mon Sep 17 00:00:00 2001
+From c3aa2124ec228bdc12e7297b76a73398a24949ba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:17:46 +0300
@@ -999,7 +999,7 @@ index 0000000..67d85ec
 +#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */
 +
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index b8e5746..2615aa7 100644
+index c0d62e5..e36f3d5 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -66,6 +66,7 @@
@@ -1010,7 +1010,7 @@ index b8e5746..2615aa7 100644
  #undef basename
 
  suffix_info stat_suffixes[] =
-@@ -3863,6 +3864,74 @@ fchdir (int fd)
+@@ -3872,6 +3873,74 @@ fchdir (int fd)
    return res;
  }
 
@@ -1086,7 +1086,7 @@ index b8e5746..2615aa7 100644
 
  /* Cover functions to the path conversion routines.
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 77dc6df..142c897 100644
+index d01f678..845121f 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
 @@ -292,6 +292,27 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

msys2-runtime-3.5/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch

@@ -1,4 +1,4 @@
-From 658607eab1b94ada42f9d4819f0ae36a50adcf6a Mon Sep 17 00:00:00 2001
+From ed83b2cc2e452756933227abe7a94cf6a5d5f49b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:29:01 +0300

msys2-runtime-3.5/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch

@@ -1,4 +1,4 @@
-From a4833b5e63087de42796da4b33c5d32f1b10464a Mon Sep 17 00:00:00 2001
+From 6a937ecb5c2335ea8bdf12410052ede4fe377979 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:45:06 +0300

msys2-runtime-3.5/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch

@@ -1,4 +1,4 @@
-From 6881300ba33df87631868b4cb2249b7756e2460a Mon Sep 17 00:00:00 2001
+From 45c5946a16fe5314b4d976ebbf73d996ca850d96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:47:21 +0300
@@ -61,10 +61,10 @@ index d14ea59..0c21fa6 100644
  bool winjitdebug = false;
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 2615aa7..bc5b4d3 100644
+index e36f3d5..470c93a 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -1682,6 +1682,89 @@ conv_path_list (const char *src, char *dst, size_t size,
+@@ -1683,6 +1683,89 @@ conv_path_list (const char *src, char *dst, size_t size,
 
  /********************** Symbolic Link Support **************************/
 
@@ -154,7 +154,7 @@ index 2615aa7..bc5b4d3 100644
  /* Create a symlink from FROMPATH to TOPATH. */
 
  extern "C" int
-@@ -2219,6 +2302,77 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2220,6 +2303,77 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  	}
        else /* wsym_type == WSYM_sysfile */
  	{

msys2-runtime-3.5/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch

@@ -1,4 +1,4 @@
-From 36560075d440ea977dfc6a8a206ee7b5348a9c72 Mon Sep 17 00:00:00 2001
+From 474f787a2dbf18332d7c513b3ffa441b082583d9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:48:54 +0300

msys2-runtime-3.5/0009-Do-not-convert-environment-for-strace.patch

@@ -1,4 +1,4 @@
-From f6436d4edd10644651b542345d82bc693531da88 Mon Sep 17 00:00:00 2001
+From 916afdca1a3693de1482571e99bef0b1b12998be Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:50:55 +0300
@@ -10,7 +10,7 @@ Strace is a Windows program so MSYS2 will convert all arguments and environment
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 142c897..69217ed 100644
+index 845121f..ace43db 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
 @@ -545,11 +545,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

msys2-runtime-3.5/0013-strace.cc-Don-t-set-MSYS-noglob.patch → msys2-runtime-3.5/0010-strace.cc-Don-t-set-MSYS-noglob.patch

@@ -1,7 +1,7 @@
-From 68f682c22488f649b749a71f277540d605aac103 Mon Sep 17 00:00:00 2001
+From 4df3f8921ce0c2a7981f4c8703541b82c756b617 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Sun, 23 Aug 2015 20:47:30 +0100
-Subject: [PATCH 13/N] strace.cc: Don't set MSYS=noglob
+Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob
 
 Commit message for this code was:
 

msys2-runtime-3.5/0015-Add-debugging-for-strace-make_command_line.patch → msys2-runtime-3.5/0011-Add-debugging-for-strace-make_command_line.patch

@@ -1,7 +1,7 @@
-From a655c3368b1e0f1e1b4b4e9283200a0ce43b5c53 Mon Sep 17 00:00:00 2001
+From 1ddc4cd699de9df111a2223b017f8f3a1952b7f8 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Fri, 21 Aug 2015 09:52:47 +0100
-Subject: [PATCH 15/N] Add debugging for strace make_command_line
+Subject: [PATCH 11/N] Add debugging for strace make_command_line
 
 ---
  winsup/utils/mingw/strace.cc | 1 +

msys2-runtime-3.5/0018-strace-quiet-be-really-quiet.patch → msys2-runtime-3.5/0012-strace-quiet-be-really-quiet.patch

@@ -1,7 +1,7 @@
-From 3e03940f0dd186b34f2cb3fa6707bc030279bcb7 Mon Sep 17 00:00:00 2001
+From 271294ce2a2259413c3cf515d2fdfde0c9cac136 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Wed, 17 May 2017 18:13:32 +0200
-Subject: [PATCH 18/N] strace --quiet: be *really* quiet
+Subject: [PATCH 12/N] strace --quiet: be *really* quiet
 
 The biggest problem with strace spitting out `create_child: ...` despite
 being asked to be real quiet is that its output can very well interfere

msys2-runtime-3.5/0010-path_conv-special-case-root-directory-to-have-traili.patch → msys2-runtime-3.5/0013-path_conv-special-case-root-directory-to-have-traili.patch

@@ -1,8 +1,8 @@
-From 5efcac483d54b9d83e45bf4d65110e642fc998df Mon Sep 17 00:00:00 2001
+From 7c2d94dc53be96b1fca7de0956afb95cdad4e47d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
 Date: Sun, 14 Apr 2019 22:13:51 +0300
-Subject: [PATCH 10/N] path_conv: special-case root directory to have trailing
+Subject: [PATCH 13/N] path_conv: special-case root directory to have trailing
  slash
 
 When converting `/c/` to `C:\`, the trailing slash is actually really
@@ -31,10 +31,10 @@ Signed-off-by: Johannes Schindelin <[email protected]>
  1 file changed, 7 insertions(+)
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index bc5b4d3..ed3076c 100644
+index 470c93a..c972665 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -709,6 +709,12 @@ path_conv::check (const char *src, unsigned opt,
+@@ -710,6 +710,12 @@ path_conv::check (const char *src, unsigned opt,
  	      need_directory = 1;
  	      *--tail = '\0';
  	    }
@@ -47,7 +47,7 @@ index bc5b4d3..ed3076c 100644
  	  path_end = tail;
 
  	  /* Scan path_copy from right to left looking either for a symlink
-@@ -1248,6 +1254,7 @@ path_conv::check (const char *src, unsigned opt,
+@@ -1249,6 +1255,7 @@ path_conv::check (const char *src, unsigned opt,
  		cfree (wide_path);
  	      wide_path = NULL;
  	    }

msys2-runtime-3.5/0034-When-converting-to-a-Unix-path-avoid-double-trailing.patch → msys2-runtime-3.5/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch

@@ -1,7 +1,7 @@
-From c7908f7f0603b3c80c349bcf2e7dfdf339f311ba Mon Sep 17 00:00:00 2001
+From 5d4fff4e1d103897e4505b114963deb99c06e45b Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Tue, 8 Nov 2022 16:24:20 +0100
-Subject: [PATCH 34/N] When converting to a Unix path, avoid double trailing
+Subject: [PATCH 14/N] When converting to a Unix path, avoid double trailing
  slashes
 
 When calling `cygpath -u C:/msys64/` in an MSYS2 setup that was

msys2-runtime-3.5/0035-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch → msys2-runtime-3.5/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch

@@ -1,7 +1,7 @@
-From 8b63bbdf1c38bfcc9577b79782ce1cc61cdc0b42 Mon Sep 17 00:00:00 2001
+From 1a60554fae00441a3a555ffe9e386551a768b6ee Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <[email protected]>
 Date: Sun, 20 Nov 2022 13:57:36 +0100
-Subject: [PATCH 35/N] msys2_path_conv: pass PC_NOFULL to path_conv
+Subject: [PATCH 15/N] msys2_path_conv: pass PC_NOFULL to path_conv
 
 In theory this doesn't make a difference because posix_to_win32_path()
 is only called with rooted/absolute paths, but as pointed out in

msys2-runtime-3.5/0037-path-conversion-Introduce-ability-to-switch-off-conv.patch → msys2-runtime-3.5/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch

@@ -1,7 +1,7 @@
-From 4762c7192c8a62191e7472ce6f5faf18d20abb40 Mon Sep 17 00:00:00 2001
+From 9b6d2a32d5024742b8b2a0c3cf50002805e70985 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= <[email protected]>
 Date: Wed, 17 Jun 2015 09:30:41 +0200
-Subject: [PATCH 37/N] path-conversion: Introduce ability to switch off
+Subject: [PATCH 16/N] path-conversion: Introduce ability to switch off
  conversion.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

msys2-runtime-3.5/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch → msys2-runtime-3.5/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch

@@ -1,7 +1,7 @@
-From a758d14496865db81d57fc236c13f703c37b1180 Mon Sep 17 00:00:00 2001
+From 92ce9c20c85b4068ab18adcc084d8e22a8a0f050 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Fri, 21 Aug 2015 12:52:09 +0100
-Subject: [PATCH 11/N] dcrt0.cc: Untangle allow_glob from winshell
+Subject: [PATCH 17/N] dcrt0.cc: Untangle allow_glob from winshell
 
 Otherwise if globbing is allowed and we get called from a
 Windows program, build_argv thinks we've been called from
@@ -11,7 +11,7 @@ a Cygwin program.
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 5644cc9..bd206b4 100644
+index f8479bb..30f6b67 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -154,12 +154,12 @@ isquote (char c)
@@ -67,7 +67,7 @@ index 5644cc9..bd206b4 100644
  	{
  	  debug_printf ("argv[%d] = '%s'", argc, word);
  	  argv[argc++] = word;
-@@ -903,6 +903,7 @@ dll_crt0_1 (void *)
+@@ -906,6 +906,7 @@ dll_crt0_1 (void *)
        /* Scan the command line and build argv.  Expand wildcards if not
  	 called from another cygwin process. */
        build_argv (line, __argv, __argc,

msys2-runtime-3.5/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch → msys2-runtime-3.5/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch

@@ -1,7 +1,7 @@
-From 921063a246e45b82797e7f36df5ed7b7d4ebed74 Mon Sep 17 00:00:00 2001
+From fc188165cbe646710e9900d1f59b94d72330e85e Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Mon, 24 Aug 2015 00:48:06 +0100
-Subject: [PATCH 12/N] dcrt0.cc (globify): Don't quote literal strings
+Subject: [PATCH 18/N] dcrt0.cc (globify): Don't quote literal strings
  differently when dos_spec
 
 Reverts 25ba8f306f3099caf8397859019e936b90510e8d. I can't figure out what
@@ -30,7 +30,7 @@ the expense of sensible forward-slash-containing input.
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index bd206b4..3bddce5 100644
+index 30f6b67..710fb34 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -236,10 +236,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)

msys2-runtime-3.5/0014-Add-debugging-for-build_argv.patch → msys2-runtime-3.5/0019-Add-debugging-for-build_argv.patch

@@ -1,14 +1,14 @@
-From be8f9d03a8fe1b415611a5d1858d6e8679c96237 Mon Sep 17 00:00:00 2001
+From 619f25935b4e3e8d5fcd74bd5fc660d46921857f Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Fri, 21 Aug 2015 12:18:52 +0100
-Subject: [PATCH 14/N] Add debugging for build_argv
+Subject: [PATCH 19/N] Add debugging for build_argv
 
 ---
  winsup/cygwin/dcrt0.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 3bddce5..7b80211 100644
+index 710fb34..c1dbd5f 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -310,6 +310,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob)

msys2-runtime-3.5/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch → msys2-runtime-3.5/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch

@@ -1,7 +1,7 @@
-From a2cdd69f3139717ff0ecfc696a728dc0285873aa Mon Sep 17 00:00:00 2001
+From 60f6b7e1c2d29d2d4d6e874fff905e4589046de0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Sun, 10 Apr 2016 21:47:41 +0100
-Subject: [PATCH 16/N] environ.cc: New facility/environment variable
+Subject: [PATCH 20/N] environ.cc: New facility/environment variable
  MSYS2_ENV_CONV_EXCL
 
 Works very much like MSYS2_ARG_CONV_EXCL. In fact it uses the same
@@ -129,10 +129,10 @@ index 767384f..160c996 100644
 
     (See "How to: Set a Thread Name in Native Code"
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index ed3076c..7802c20 100644
+index c972665..36f2a73 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -4044,7 +4044,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -4053,7 +4053,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
      return arg_result;
    }
 
@@ -141,7 +141,7 @@ index ed3076c..7802c20 100644
      {
        /* Since we've got regex linked we should maybe switch to that, but
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 69217ed..7240ec5 100644
+index ace43db..57231b3 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
 @@ -293,8 +293,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

msys2-runtime-3.5/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch → msys2-runtime-3.5/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch

@@ -1,14 +1,14 @@
-From 759dd9a3a764daa9ed1dcec34abb51fdde5524cf Mon Sep 17 00:00:00 2001
+From a4f1634cbf58b3d03e62c8c5e875012c9c9655c8 Mon Sep 17 00:00:00 2001
 From: SquallATF <[email protected]>
 Date: Mon, 10 Sep 2018 11:32:18 +0300
-Subject: [PATCH 17/N] Fix native symbolic link spawn passing wrong arg0
+Subject: [PATCH 21/N] Fix native symbolic link spawn passing wrong arg0
 
 ---
  winsup/cygwin/spawn.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 7240ec5..ce1999d 100644
+index 57231b3..9d2a016 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
 @@ -50,7 +50,7 @@ perhaps_suffix (const char *prog, path_conv& buf, int& err, unsigned opt)

msys2-runtime-3.5/0019-Introduce-the-enable_pcon-value-for-MSYS.patch → msys2-runtime-3.5/0022-Introduce-the-enable_pcon-value-for-MSYS.patch

@@ -1,7 +1,7 @@
-From 2e9f8f57aab0b039cc37c059f16e963b8eb55927 Mon Sep 17 00:00:00 2001
+From 1af273a76a4da332d1c9881afa72a1488b072237 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Tue, 19 May 2020 13:49:37 +0200
-Subject: [PATCH 19/N] Introduce the `enable_pcon` value for `MSYS`
+Subject: [PATCH 22/N] Introduce the `enable_pcon` value for `MSYS`
 
 It is simply the negation of `disable_pcon`, i.e. `MSYS=enable_pcon` is
 equivalent to `MSYS=nodisable_pcon` (the former is slightly more

msys2-runtime-3.5/0020-popen-call-usr-bin-sh-instead-of-bin-sh.patch → msys2-runtime-3.5/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch

@@ -1,7 +1,7 @@
-From d39ad7c47d99a88556b235ce01aa7ecabe7bc96d Mon Sep 17 00:00:00 2001
+From 81d7c6b3a4257345083fa0845b50690aca7256d5 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <[email protected]>
 Date: Fri, 5 Jun 2020 20:09:11 +0200
-Subject: [PATCH 20/N] popen: call /usr/bin/sh instead of /bin/sh
+Subject: [PATCH 23/N] popen: call /usr/bin/sh instead of /bin/sh
 
 We mount /usr/bin to /bin, but in a chroot this is broken and we
 have no /bin, so try to use the real path.