Merge pull request #4856 from dscho/msys2-runtime-3.5.4

msys2-runtime: update to v3.5.4

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

@@ -1,4 +1,4 @@
-From 50e235f7a0b309ffdb17bb06e14b4e39d9559863 Mon Sep 17 00:00:00 2001
+From 51380ec75b3f11228cb680f3a4d71fc1957e5aec 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 20:40:45 +0300

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

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

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

@@ -1,4 +1,4 @@
-From c3aa2124ec228bdc12e7297b76a73398a24949ba Mon Sep 17 00:00:00 2001
+From b084abe0ec93354984d37d0ec09fab39984d1e90 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?= <alexey.pawlow@gmail.com>
 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 c0d62e5..e36f3d5 100644
+index 1802e76..84851a1 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -66,6 +66,7 @@
@@ -1010,7 +1010,7 @@ index c0d62e5..e36f3d5 100644
  #undef basename
 
  suffix_info stat_suffixes[] =
-@@ -3872,6 +3873,74 @@ fchdir (int fd)
+@@ -3870,6 +3871,74 @@ fchdir (int fd)
    return res;
  }
 

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

@@ -1,4 +1,4 @@
-From ed83b2cc2e452756933227abe7a94cf6a5d5f49b Mon Sep 17 00:00:00 2001
+From f16038529ae929ad0371de5b7a8ba651b1888e29 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:29:01 +0300
@@ -7,10 +7,10 @@ Subject: [PATCH 05/N] Add functionality for changing OS name via MSYSTEM
 
 ---
  winsup/cygserver/cygserver-config   |  4 ++--
- winsup/cygwin/environ.cc            | 36 +++++++++++++++++++++++++----
+ winsup/cygwin/environ.cc            | 34 ++++++++++++++++++++++++++---
  winsup/cygwin/include/sys/utsname.h |  2 +-
- winsup/cygwin/uname.cc              | 17 ++++++++++++--
- 4 files changed, 50 insertions(+), 9 deletions(-)
+ winsup/cygwin/uname.cc              | 17 +++++++++++++--
+ 4 files changed, 49 insertions(+), 8 deletions(-)
 
 diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
 index 373bfd2..c902857 100755
@@ -35,7 +35,7 @@ index 373bfd2..c902857 100755
          echo
  	echo "Installation of cygserver as service failed.  Please check the"
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 639e693..0e9ce68 100644
+index 639e693..b9f7e05 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -192,7 +192,11 @@ parse_options (const char *inbuf)
@@ -119,14 +119,7 @@ index 639e693..0e9ce68 100644
        if (*eq && posify)
          posify_maybe (envp + i, *++eq ? eq : --eq, tmpbuf);
        debug_printf ("%p: %s", envp[i], envp[i]);
-@@ -953,12 +980,13 @@ struct spenv
- static NO_COPY spenv spenvs[] =
- {
- #ifdef DEBUGGING
--  {NL ("CYGWIN_DEBUG="), false, true, NULL},
-+  {NL ("MSYS_DEBUG="), false, true, NULL},
- #endif
-   {NL ("HOMEDRIVE="), false, false, &cygheap_user::env_homedrive},
+@@ -959,6 +986,7 @@ static NO_COPY spenv spenvs[] =
    {NL ("HOMEPATH="), false, false, &cygheap_user::env_homepath},
    {NL ("LOGONSERVER="), false, false, &cygheap_user::env_logsrv},
    {NL ("PATH="), false, true, NULL},

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

@@ -1,4 +1,4 @@
-From 6a937ecb5c2335ea8bdf12410052ede4fe377979 Mon Sep 17 00:00:00 2001
+From 6393488c9d7048ba7081374b806397c74ee2def6 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:45:06 +0300

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

@@ -1,4 +1,4 @@
-From 45c5946a16fe5314b4d976ebbf73d996ca850d96 Mon Sep 17 00:00:00 2001
+From 06ea20e4eceef17d67a404d670b439e87f282450 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:47:21 +0300
@@ -25,7 +25,7 @@ Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  3 files changed, 160 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 0e9ce68..7180892 100644
+index b9f7e05..5fb3f53 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -88,6 +88,10 @@ set_winsymlinks (const char *buf)
@@ -61,10 +61,10 @@ index d14ea59..0c21fa6 100644
  bool winjitdebug = false;
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index e36f3d5..470c93a 100644
+index 84851a1..8615386 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -1683,6 +1683,89 @@ conv_path_list (const char *src, char *dst, size_t size,
+@@ -1682,6 +1682,89 @@ conv_path_list (const char *src, char *dst, size_t size,
 
  /********************** Symbolic Link Support **************************/
 
@@ -154,7 +154,7 @@ index e36f3d5..470c93a 100644
  /* Create a symlink from FROMPATH to TOPATH. */
 
  extern "C" int
-@@ -2220,6 +2303,77 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2219,6 +2302,77 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  	}
        else /* wsym_type == WSYM_sysfile */
  	{

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

@@ -1,4 +1,4 @@
-From 474f787a2dbf18332d7c513b3ffa441b082583d9 Mon Sep 17 00:00:00 2001
+From 222fd37c0b4f4502a0dd67ab3369fb630ded3420 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:48:54 +0300
@@ -13,7 +13,7 @@ use our preferred TERM value.
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 7180892..1af6381 100644
+index 5fb3f53..1175313 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -908,7 +908,16 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)

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

@@ -1,4 +1,4 @@
-From 916afdca1a3693de1482571e99bef0b1b12998be Mon Sep 17 00:00:00 2001
+From 41e8ada0d105959dfd3a1665875a09b64ceb06a3 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:50:55 +0300

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

@@ -1,4 +1,4 @@
-From 4df3f8921ce0c2a7981f4c8703541b82c756b617 Mon Sep 17 00:00:00 2001
+From 766e55c1bea155c16b8fe28506b86f661c292dc6 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 23 Aug 2015 20:47:30 +0100
 Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob
@@ -26,7 +26,7 @@ See quoted () comment:
  1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/utils/mingw/strace.cc b/winsup/utils/mingw/strace.cc
-index a875bf2..cdfc3d6 100644
+index 29db640..25adf4e 100644
 --- a/winsup/utils/mingw/strace.cc
 +++ b/winsup/utils/mingw/strace.cc
 @@ -354,10 +354,28 @@ create_child (char **argv)

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

@@ -1,4 +1,4 @@
-From 1ddc4cd699de9df111a2223b017f8f3a1952b7f8 Mon Sep 17 00:00:00 2001
+From 4f01c3f5c7c3201c46d682f378d8b1ddbd7a0d87 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 09:52:47 +0100
 Subject: [PATCH 11/N] Add debugging for strace make_command_line
@@ -8,7 +8,7 @@ Subject: [PATCH 11/N] Add debugging for strace make_command_line
  1 file changed, 1 insertion(+)
 
 diff --git a/winsup/utils/mingw/strace.cc b/winsup/utils/mingw/strace.cc
-index cdfc3d6..e7ec38e 100644
+index 25adf4e..d346abc 100644
 --- a/winsup/utils/mingw/strace.cc
 +++ b/winsup/utils/mingw/strace.cc
 @@ -352,6 +352,7 @@ create_child (char **argv)

msys2-runtime/0012-strace-quiet-be-really-quiet.patch

@@ -1,4 +1,4 @@
-From 271294ce2a2259413c3cf515d2fdfde0c9cac136 Mon Sep 17 00:00:00 2001
+From d43f1eebf2fed9c1c9321eecae12b4830fc19b92 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 17 May 2017 18:13:32 +0200
 Subject: [PATCH 12/N] strace --quiet: be *really* quiet
@@ -22,7 +22,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/utils/mingw/strace.cc b/winsup/utils/mingw/strace.cc
-index e7ec38e..f6186be 100644
+index d346abc..a6b2e5d 100644
 --- a/winsup/utils/mingw/strace.cc
 +++ b/winsup/utils/mingw/strace.cc
 @@ -352,7 +352,8 @@ create_child (char **argv)

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

@@ -1,4 +1,4 @@
-From 7c2d94dc53be96b1fca7de0956afb95cdad4e47d Mon Sep 17 00:00:00 2001
+From 0053f7b38e025ef1358958232e0231c455cc2bc3 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?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 22:13:51 +0300
@@ -31,10 +31,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 7 insertions(+)
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 470c93a..c972665 100644
+index 8615386..b1a088a 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -710,6 +710,12 @@ path_conv::check (const char *src, unsigned opt,
+@@ -709,6 +709,12 @@ path_conv::check (const char *src, unsigned opt,
  	      need_directory = 1;
  	      *--tail = '\0';
  	    }
@@ -47,7 +47,7 @@ index 470c93a..c972665 100644
  	  path_end = tail;
 
  	  /* Scan path_copy from right to left looking either for a symlink
-@@ -1249,6 +1255,7 @@ path_conv::check (const char *src, unsigned opt,
+@@ -1248,6 +1254,7 @@ path_conv::check (const char *src, unsigned opt,
  		cfree (wide_path);
  	      wide_path = NULL;
  	    }

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

@@ -1,4 +1,4 @@
-From 5d4fff4e1d103897e4505b114963deb99c06e45b Mon Sep 17 00:00:00 2001
+From 1e8a891f5ec4bb1b96f18c07b7180999c14b8ce0 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 8 Nov 2022 16:24:20 +0100
 Subject: [PATCH 14/N] When converting to a Unix path, avoid double trailing

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

@@ -1,4 +1,4 @@
-From 1a60554fae00441a3a555ffe9e386551a768b6ee Mon Sep 17 00:00:00 2001
+From 673065dd1eeedc82dda43aaeb435040be2703ea4 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 20 Nov 2022 13:57:36 +0100
 Subject: [PATCH 15/N] msys2_path_conv: pass PC_NOFULL to path_conv

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

@@ -1,4 +1,4 @@
-From 9b6d2a32d5024742b8b2a0c3cf50002805e70985 Mon Sep 17 00:00:00 2001
+From e1db14849f307053cf0728f385fd8e2c884b4d03 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= <nalla@hamal.uberspace.de>
 Date: Wed, 17 Jun 2015 09:30:41 +0200
 Subject: [PATCH 16/N] path-conversion: Introduce ability to switch off

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

@@ -1,4 +1,4 @@
-From 92ce9c20c85b4068ab18adcc084d8e22a8a0f050 Mon Sep 17 00:00:00 2001
+From f6e516da390ea3f729132274db1303ab95a61e7c Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:52:09 +0100
 Subject: [PATCH 17/N] dcrt0.cc: Untangle allow_glob from winshell
@@ -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 f8479bb..30f6b67 100644
+index 16b624e..3536e80 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -154,12 +154,12 @@ isquote (char c)
@@ -40,7 +40,7 @@ index f8479bb..30f6b67 100644
    while (*cmd && *++cmd)
      if ((p = strpbrk (cmd, s)) == NULL)
        {
-@@ -291,7 +291,7 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
+@@ -292,7 +292,7 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
  /* Build argv, argc from string passed from Windows.  */
 
  static void
@@ -49,7 +49,7 @@ index f8479bb..30f6b67 100644
  {
    int argvlen = 0;
    int nesting = 0;		// monitor "nesting" from insert_file
-@@ -325,7 +325,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
+@@ -326,7 +326,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
  		 a Cygwin process, or if the word starts with a '@'.
  		 In this case, the insert_file function needs an unquoted
  		 DOS filename and globbing isn't performed anyway. */
@@ -58,7 +58,7 @@ index f8479bb..30f6b67 100644
  	    }
  	  if (issep (*cmd))	// End of argument if space
  	    break;
-@@ -351,7 +351,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
+@@ -352,7 +352,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
  	}
 
        /* Add word to argv file after (optional) wildcard expansion. */
@@ -67,7 +67,7 @@ index f8479bb..30f6b67 100644
  	{
  	  debug_printf ("argv[%d] = '%s'", argc, word);
  	  argv[argc++] = word;
-@@ -906,6 +906,7 @@ dll_crt0_1 (void *)
+@@ -907,6 +907,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/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch

@@ -1,4 +1,4 @@
-From fc188165cbe646710e9900d1f59b94d72330e85e Mon Sep 17 00:00:00 2001
+From 1059fbbdea827dc369d76eb59d2c2bf087faa84b Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 24 Aug 2015 00:48:06 +0100
 Subject: [PATCH 18/N] dcrt0.cc (globify): Don't quote literal strings
@@ -30,13 +30,13 @@ 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 30f6b67..710fb34 100644
+index 3536e80..81031ca 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
-@@ -236,10 +236,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
- 	char quote = *s;
+@@ -237,10 +237,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
  	while (*++s && *s != quote)
  	  {
+ 	    mbstate_t mbs = { 0 };
 +	    /* This used to be:
  	    if (dos_spec || *s != '\\')
 -	      /* nothing */;
@@ -53,5 +53,5 @@ index 30f6b67..710fb34 100644
 +	    if (*s == '\\' && (s[1] == quote || s[1] == '\\'))
 +	      s++;
  	    *p++ = '\\';
- 	    size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
+ 	    size_t cnt = isascii (*s) ? 1 : mbrtowi (NULL, s, MB_CUR_MAX, &mbs);
  	    if (cnt <= 1 || cnt == (size_t)-1)

msys2-runtime/0019-Add-debugging-for-build_argv.patch

@@ -1,4 +1,4 @@
-From 619f25935b4e3e8d5fcd74bd5fc660d46921857f Mon Sep 17 00:00:00 2001
+From f8da08fd7e82b038fe2e278153bc6545dae232b0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:18:52 +0100
 Subject: [PATCH 19/N] Add debugging for build_argv
@@ -8,10 +8,10 @@ Subject: [PATCH 19/N] Add debugging for build_argv
  1 file changed, 2 insertions(+)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 710fb34..c1dbd5f 100644
+index 81031ca..0a5c817 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)
+@@ -311,6 +311,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob)
    argvlen = 0;
    argv = NULL;
 

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

@@ -1,4 +1,4 @@
-From 60f6b7e1c2d29d2d4d6e874fff905e4589046de0 Mon Sep 17 00:00:00 2001
+From 03d6fe120a36c805008cc611ad140e2a222dc8b0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 10 Apr 2016 21:47:41 +0100
 Subject: [PATCH 20/N] environ.cc: New facility/environment variable
@@ -25,7 +25,7 @@ it to another absolute path, R_HOME, forming an invalid path.
  5 files changed, 48 insertions(+), 21 deletions(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 1af6381..4a3c133 100644
+index 1175313..a9cce96 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -1173,6 +1173,10 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
@@ -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 c972665..36f2a73 100644
+index b1a088a..39819dc 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -4053,7 +4053,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -4051,7 +4051,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
      return arg_result;
    }
 

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

@@ -1,4 +1,4 @@
-From a4f1634cbf58b3d03e62c8c5e875012c9c9655c8 Mon Sep 17 00:00:00 2001
+From 90d66ee649c0b2f265583942352725e9fac74aa9 Mon Sep 17 00:00:00 2001
 From: SquallATF <squallatf@gmail.com>
 Date: Mon, 10 Sep 2018 11:32:18 +0300
 Subject: [PATCH 21/N] Fix native symbolic link spawn passing wrong arg0

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

@@ -1,4 +1,4 @@
-From 1af273a76a4da332d1c9881afa72a1488b072237 Mon Sep 17 00:00:00 2001
+From 7b84fed8f06744f2d308c6ace42275b4941cb90c Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 19 May 2020 13:49:37 +0200
 Subject: [PATCH 22/N] Introduce the `enable_pcon` value for `MSYS`
@@ -19,7 +19,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 9 insertions(+)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 4a3c133..299c692 100644
+index a9cce96..b9600ef 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -42,6 +42,7 @@ enum settings

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

@@ -1,4 +1,4 @@
-From 81d7c6b3a4257345083fa0845b50690aca7256d5 Mon Sep 17 00:00:00 2001
+From 6f87e23bae318aa95fefe6d40a6630901d91c2aa Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Fri, 5 Jun 2020 20:09:11 +0200
 Subject: [PATCH 23/N] popen: call /usr/bin/sh instead of /bin/sh

msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch

@@ -1,4 +1,4 @@
-From 5925d0638e4e42fbbaf41f80c7b26b4e86029450 Mon Sep 17 00:00:00 2001
+From 4dd6aad8634373e09d218628eea91f02840e014a Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 12 Aug 2020 12:22:38 +0200
 Subject: [PATCH 24/N] Expose full command-lines to other Win32 processes by