diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch
index b8e6f17357d..a83d943d21b 100644
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/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
diff --git a/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch b/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch
index 5493adefe0a..0443ec2fd2a 100644
--- a/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch
+++ b/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
diff --git a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch
index 46ca399481b..4809d05f4f5 100644
--- a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch
+++ b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch
@@ -1,78 +1,45 @@
-From d1cb51f64425bb111e1f1cf002008642e1abf53f Mon Sep 17 00:00:00 2001
+From f858c02bdb8d3444691dd99165718a1dd67ea753 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:09:17 +0300
 Subject: [PATCH 03/N] Rename dll from cygwin to msys
 
 ---
- winsup/Makefile.am                            |  2 +-
- winsup/cygserver/Makefile.am                  |  2 +-
- winsup/cygserver/transport_pipes.h            |  4 ++
- winsup/cygwin/Makefile.am                     | 27 ++++++------
- winsup/cygwin/crt0.c                          |  8 ++++
- winsup/cygwin/cygthread.cc                    |  2 +-
- winsup/cygwin/cygwin.din                      |  6 +--
- winsup/cygwin/cygwin.sc.in                    |  4 ++
- winsup/cygwin/dcrt0.cc                        | 16 ++++---
- winsup/cygwin/dlfcn.cc                        |  5 +++
- winsup/cygwin/dll_init.cc                     |  4 ++
- winsup/cygwin/dtable.cc                       |  6 +++
- winsup/cygwin/exceptions.cc                   |  4 +-
- winsup/cygwin/fhandler/pipe.cc                |  4 ++
- winsup/cygwin/fhandler/pty.cc                 | 20 +++++++++
- winsup/cygwin/fork.cc                         |  2 +-
- winsup/cygwin/hookapi.cc                      |  4 ++
- winsup/cygwin/include/cygwin/cygwin_dll.h     | 10 ++---
- winsup/cygwin/include/cygwin/version.h        |  8 ++++
- winsup/cygwin/lib/_cygwin_crt0_common.cc      |  4 ++
- winsup/cygwin/lib/crt0.h                      |  4 ++
- winsup/cygwin/lib/cygwin_attach_dll.c         |  8 ++++
- winsup/cygwin/lib/cygwin_crt0.c               |  8 ++++
- .../cygwin/local_includes/cygserver_setpwd.h  |  4 ++
- winsup/cygwin/pinfo.cc                        |  2 +-
- winsup/cygwin/pseudo-reloc.cc                 |  2 +-
- winsup/cygwin/scripts/mkvers.sh               |  6 +--
- winsup/cygwin/sec/auth.cc                     |  8 ++--
- winsup/cygwin/syscalls.cc                     |  4 +-
- winsup/cygwin/syslog.cc                       |  4 ++
+ winsup/cygserver/transport_pipes.h            |  4 +++
+ winsup/cygwin/Makefile.am                     | 27 ++++++++++---------
+ winsup/cygwin/crt0.c                          |  8 ++++++
+ winsup/cygwin/cygwin.din                      |  6 ++---
+ winsup/cygwin/cygwin.sc.in                    |  4 +++
+ winsup/cygwin/dcrt0.cc                        |  4 +++
+ winsup/cygwin/dlfcn.cc                        |  5 ++++
+ winsup/cygwin/dll_init.cc                     |  4 +++
+ winsup/cygwin/dtable.cc                       |  6 +++++
+ winsup/cygwin/exceptions.cc                   |  4 +--
+ winsup/cygwin/fhandler/pipe.cc                |  4 +++
+ winsup/cygwin/fhandler/pty.cc                 | 20 ++++++++++++++
+ winsup/cygwin/hookapi.cc                      |  4 +++
+ winsup/cygwin/include/cygwin/cygwin_dll.h     | 10 +++----
+ winsup/cygwin/include/cygwin/version.h        |  8 ++++++
+ winsup/cygwin/lib/_cygwin_crt0_common.cc      |  4 +++
+ winsup/cygwin/lib/crt0.h                      |  4 +++
+ winsup/cygwin/lib/cygwin_attach_dll.c         |  8 ++++++
+ winsup/cygwin/lib/cygwin_crt0.c               |  8 ++++++
+ .../cygwin/local_includes/cygserver_setpwd.h  |  4 +++
+ winsup/cygwin/scripts/mkvers.sh               |  6 ++---
+ winsup/cygwin/sec/auth.cc                     |  8 +++---
+ winsup/cygwin/syscalls.cc                     |  4 +--
+ winsup/cygwin/syslog.cc                       |  4 +++
  winsup/cygwin/winver.rc                       |  2 +-
- winsup/testsuite/cygrun.c                     |  2 +-
- winsup/testsuite/winsup.api/cygload.cc        | 12 +++---
+ winsup/testsuite/winsup.api/cygload.cc        | 10 +++----
  winsup/testsuite/winsup.api/cygload.h         |  2 +-
  winsup/utils/ldd.cc                           |  2 +-
- winsup/utils/loadlib.h                        |  6 +--
- winsup/utils/mingw/cygcheck.cc                | 43 +++++++++----------
- winsup/utils/mingw/strace.cc                  | 11 +++--
- winsup/utils/path.cc                          | 12 +++---
- winsup/utils/ssp.c                            |  8 ++--
- 40 files changed, 197 insertions(+), 95 deletions(-)
+ winsup/utils/loadlib.h                        |  6 ++---
+ winsup/utils/mingw/cygcheck.cc                | 27 +++++++++----------
+ winsup/utils/mingw/strace.cc                  |  9 +++----
+ winsup/utils/path.cc                          | 12 ++++-----
+ winsup/utils/ssp.c                            |  8 +++---
+ 33 files changed, 174 insertions(+), 72 deletions(-)
 
-diff --git a/winsup/Makefile.am b/winsup/Makefile.am
-index 9efdd4c..0946152 100644
---- a/winsup/Makefile.am
-+++ b/winsup/Makefile.am
-@@ -8,7 +8,7 @@
- 
- # This makefile requires GNU make.
- 
--cygdocdir = $(datarootdir)/doc/Cygwin
-+cygdocdir = $(datarootdir)/doc/Msys
- 
- cygdoc_DATA = \
- 	CYGWIN_LICENSE \
-diff --git a/winsup/cygserver/Makefile.am b/winsup/cygserver/Makefile.am
-index ec7a622..b0d5735 100644
---- a/winsup/cygserver/Makefile.am
-+++ b/winsup/cygserver/Makefile.am
-@@ -46,7 +46,7 @@ libcygserver_a_SOURCES = \
- 
- libcygserver_a_CXXFLAGS = $(cygserver_flags)
- 
--cygdocdir = $(datarootdir)/doc/Cygwin
-+cygdocdir = $(datarootdir)/doc/Msys
- 
- install-data-local:
- 	@$(MKDIR_P) $(DESTDIR)$(cygdocdir)
 diff --git a/winsup/cygserver/transport_pipes.h b/winsup/cygserver/transport_pipes.h
 index e101623..66272bc 100644
 --- a/winsup/cygserver/transport_pipes.h
@@ -203,19 +170,6 @@ index 1096e58..3160df4 100644
  
    /* These are never actually called.  They are just here to force the inclusion
       of things like -lbinmode.  */
-diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
-index 54918e7..518d11f 100644
---- a/winsup/cygwin/cygthread.cc
-+++ b/winsup/cygwin/cygthread.cc
-@@ -170,7 +170,7 @@ new (size_t)
-       }
- 
- #ifdef DEBUGGING
--  if (!getenv ("CYGWIN_FREERANGE_NOCHECK"))
-+  if (!getenv ("MSYS_FREERANGE_NOCHECK"))
-     api_fatal ("overflowed cygwin thread pool");
-   else
-     thread_printf ("overflowed cygwin thread pool");
 diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
 index 9e354ac..76e88df 100644
 --- a/winsup/cygwin/cygwin.din
@@ -253,40 +207,10 @@ index 69526f5..4dc5dae 100644
  #error unimplemented for this target
  #endif
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index ea6a18b..f8479bb 100644
+index ff7e6ec..16b624e 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
-@@ -376,12 +376,12 @@ check_sanity_and_sync (per_process *p)
- 
-   /* magic_biscuit must be SIZEOF_PER_PROCESS.  */
-   if (p->magic_biscuit != SIZEOF_PER_PROCESS)
--    api_fatal ("Incompatible cygwin .dll -- incompatible per_process info %u != %u",
-+    api_fatal ("Incompatible msys .dll -- incompatible per_process info %u != %u",
- 	       p->magic_biscuit, SIZEOF_PER_PROCESS);
- 
-   /* Complain if incompatible API changes made */
-   if (p->api_major > cygwin_version.api_major)
--    api_fatal ("cygwin DLL and APP are out of sync -- API version mismatch %u > %u",
-+    api_fatal ("msys DLL and APP are out of sync -- API version mismatch %u > %u",
- 	       p->api_major, cygwin_version.api_major);
- }
- 
-@@ -476,12 +476,12 @@ break_here ()
- static void
- initial_env ()
- {
--  if (GetEnvironmentVariableA ("CYGWIN_TESTING", NULL, 0))
-+  if (GetEnvironmentVariableA ("MSYS_TESTING", NULL, 0))
-     _cygwin_testing = 1;
- 
- #ifdef DEBUGGING
-   char buf[PATH_MAX];
--  if (GetEnvironmentVariableA ("CYGWIN_DEBUG", buf, sizeof (buf) - 1))
-+  if (GetEnvironmentVariableA ("MSYS_DEBUG", buf, sizeof (buf) - 1))
-     {
-       char buf1[PATH_MAX];
-       GetModuleFileName (NULL, buf1, PATH_MAX);
-@@ -1076,7 +1076,11 @@ dll_crt0 (per_process *uptr)
+@@ -1077,7 +1077,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,24 +222,6 @@ index ea6a18b..f8479bb 100644
  {
    static int _fmode;
  
-@@ -1277,7 +1281,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
-       return;
-     }
- 
--  if (GetEnvironmentVariableA ("CYGWIN_MISMATCH_OK", NULL, 0))
-+  if (GetEnvironmentVariableA ("MSYS_MISMATCH_OK", NULL, 0))
-     return;
- 
-   if (CYGWIN_VERSION_MAGIC_VERSION (magic_version) == version)
-@@ -1297,7 +1301,7 @@ are unable to find another cygwin DLL.",
- void
- cygbench (const char *s)
- {
--  if (GetEnvironmentVariableA ("CYGWIN_BENCH", NULL, 0))
-+  if (GetEnvironmentVariableA ("MSYS_BENCH", NULL, 0))
-     small_printf ("%05u ***** %s : %10d\n", GetCurrentProcessId (), s, strace.microseconds ());
- }
- #endif
 diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
 index fb70524..7367d29 100644
 --- a/winsup/cygwin/dlfcn.cc
@@ -371,7 +277,7 @@ index 9508f3e..3c40e0f 100644
  	  w32len = cygheap->installation_key.Length / sizeof (WCHAR);
  	  if (w32len
 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
-index a2a6f9d..b369799 100644
+index 3195d57..18271f5 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
 @@ -526,14 +526,14 @@ int exec_prepared_command (PWCHAR command)
@@ -392,10 +298,10 @@ index a2a6f9d..b369799 100644
  	  break;
  	}
 diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index 4c4ad03..2c809c2 100644
+index 6658a23..5d2fe12 100644
 --- a/winsup/cygwin/fhandler/pipe.cc
 +++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -683,7 +683,11 @@ fhandler_pipe::close ()
+@@ -727,7 +727,11 @@ fhandler_pipe::close ()
    return ret;
  }
  
@@ -408,7 +314,7 @@ index 4c4ad03..2c809c2 100644
  /* Create a pipe, and return handles to the read and write ends,
     just like CreatePipe, but ensure that the write end permits
 diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
-index 9d7ef3c..90de7af 100644
+index fa6bf10..12a0ab3 100644
 --- a/winsup/cygwin/fhandler/pty.cc
 +++ b/winsup/cygwin/fhandler/pty.cc
 @@ -927,7 +927,11 @@ fhandler_pty_slave::open (int flags, mode_t)
@@ -459,7 +365,7 @@ index 9d7ef3c..90de7af 100644
  		   &cygheap->installation_key, unit);
    master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
  				     | FILE_FLAG_FIRST_PIPE_INSTANCE,
-@@ -3861,7 +3877,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
+@@ -3880,7 +3896,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
      {
        char pipe[MAX_PATH];
        __small_sprintf (pipe,
@@ -471,19 +377,6 @@ index 9d7ef3c..90de7af 100644
  		       &cygheap->installation_key, ttyp->get_minor ());
        pipe_request req = { GetCurrentProcessId () };
        pipe_reply repl;
-diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
-index 0742ab3..3e08419 100644
---- a/winsup/cygwin/fork.cc
-+++ b/winsup/cygwin/fork.cc
-@@ -158,7 +158,7 @@ frok::child (volatile char * volatile here)
-   char buf[80];
-   /* This is useful for debugging fork problems.  Use gdb to attach to
-      the pid reported here. */
--  if (GetEnvironmentVariableA ("CYGWIN_FORK_SLEEP", buf, sizeof (buf)))
-+  if (GetEnvironmentVariableA ("MSYS_FORK_SLEEP", buf, sizeof (buf)))
-     {
-       small_printf ("Sleeping %d after fork, pid %u\n", atoi (buf), GetCurrentProcessId ());
-       Sleep (atoi (buf));
 diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc
 index ee2edba..9f31a71 100644
 --- a/winsup/cygwin/hookapi.cc
@@ -543,7 +436,7 @@ index 1e4cf98..b77598b 100644
        }									      \
      }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index b39a7e5..efe3890 100644
+index 0f87fbc..2e624a9 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -502,7 +502,11 @@ details. */
@@ -662,32 +555,6 @@ index fc1576b..b297511 100644
  
  #ifndef __INSIDE_CYGWIN__
  class transport_layer_base;
-diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
-index bfd338e..12e88c8 100644
---- a/winsup/cygwin/pinfo.cc
-+++ b/winsup/cygwin/pinfo.cc
-@@ -194,7 +194,7 @@ pinfo::maybe_set_exit_code_from_windows ()
-       GetExitCodeProcess (hProcess, &x);
-       set_exit_code (x);
-     }
--  sigproc_printf ("pid %d, exit value - old %y, windows %y, cygwin %y",
-+  sigproc_printf ("pid %d, exit value - old %y, windows %y, MSYS %y",
- 		  self->pid, oexitcode, x, self->exitcode);
- }
- 
-diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc
-index 5a0eab9..895cacd 100644
---- a/winsup/cygwin/pseudo-reloc.cc
-+++ b/winsup/cygwin/pseudo-reloc.cc
-@@ -85,7 +85,7 @@ __report_error (const char *msg, ...)
-   char buf[128];
-   char *posix_module = NULL;
-   static const char UNKNOWN_MODULE[] = "<unknown module>: ";
--  static const char CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: ";
-+  static const char CYGWIN_FAILURE_MSG[] = "MSYS runtime failure: ";
-   HANDLE errh = GetStdHandle (STD_ERROR_HANDLE);
-   va_list args;
- 
 diff --git a/winsup/cygwin/scripts/mkvers.sh b/winsup/cygwin/scripts/mkvers.sh
 index 38f439c..a3d45c5 100755
 --- a/winsup/cygwin/scripts/mkvers.sh
@@ -800,21 +667,8 @@ index 980d512..58878d4 100644
        VALUE "ProductVersion", STRINGIFY(CYGWIN_VERSION)
        VALUE "APIVersion", CYGWIN_API_VERSION
        VALUE "SharedMemoryVersion", STRINGIFY(CYGWIN_VERSION_SHARED_DATA)
-diff --git a/winsup/testsuite/cygrun.c b/winsup/testsuite/cygrun.c
-index 50c5187..af01b64 100644
---- a/winsup/testsuite/cygrun.c
-+++ b/winsup/testsuite/cygrun.c
-@@ -47,7 +47,7 @@ main (int argc, char **argv)
-       exit (1);
-     }
- 
--  SetEnvironmentVariable ("CYGWIN_TESTING", "1");
-+  SetEnvironmentVariable ("MSYS_TESTING", "1");
- 
-   memset (&sa, 0, sizeof (sa));
-   memset (&pi, 0, sizeof (pi));
 diff --git a/winsup/testsuite/winsup.api/cygload.cc b/winsup/testsuite/winsup.api/cygload.cc
-index afd3ee9..59eac89 100644
+index afd3ee9..1b2f79d 100644
 --- a/winsup/testsuite/winsup.api/cygload.cc
 +++ b/winsup/testsuite/winsup.api/cygload.cc
 @@ -25,7 +25,7 @@
@@ -826,12 +680,9 @@ index afd3ee9..59eac89 100644
  
  #include "cygload.h"
  #include <iostream>
-@@ -152,15 +152,15 @@ cygwin::connector::connector (const char *dll)
-   if ((_library = LoadLibrary (dll)) == NULL)
-     throw windows_error ("LoadLibrary", dll);
+@@ -154,13 +154,13 @@ cygwin::connector::connector (const char *dll)
  
--  *out << "Initializing cygwin..." << endl;
-+  *out << "Initializing msys..." << endl;
+   *out << "Initializing cygwin..." << endl;
  
 -  // This calls dcrt0.cc:cygwin_dll_init(), which calls dll_crt0_1(),
 +  // This calls dcrt0.cc:msys_dll_init(), which calls dll_crt0_1(),
@@ -914,7 +765,7 @@ index c83b764..42ffbfd 100644
    wcscpy (dllpath, sysdir);
    wcscpy (dllpath + sysdir_len, dll);
 diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc
-index 1dde2ec..11957eb 100644
+index 1dde2ec..7718ab9 100644
 --- a/winsup/utils/mingw/cygcheck.cc
 +++ b/winsup/utils/mingw/cygcheck.cc
 @@ -95,8 +95,7 @@ static const char *known_env_vars[] = {
@@ -927,7 +778,7 @@ index 1dde2ec..11957eb 100644
    "dejagnu",
    "expect",
    "gcc_default_options",
-@@ -554,12 +553,12 @@ struct ImpDirectory
+@@ -554,7 +553,7 @@ struct ImpDirectory
  
  static bool track_down (const char *file, const char *suffix, int lvl);
  
@@ -936,12 +787,6 @@ index 1dde2ec..11957eb 100644
  static void
  cygwin_info (HANDLE h)
  {
-   char *buf, *bufend, *buf_start = NULL;
--  const char *hello = "    Cygwin DLL version info:\n";
-+  const char *hello = "    Msys DLL version info:\n";
-   DWORD size = GetFileSize (h, NULL);
-   DWORD n;
- 
 @@ -586,7 +585,7 @@ cygwin_info (HANDLE h)
    while (buf < bufend)
      if ((buf = (char *) memchr (buf, '%', bufend - buf)) == NULL)
@@ -969,21 +814,8 @@ index 1dde2ec..11957eb 100644
        cygwin = 1;
  
    DWORD num_subkeys, max_subkey_len, num_values;
-@@ -1291,7 +1290,7 @@ dump_sysinfo_services ()
- 
-   /* inform the user if nothing found */
-   if (no_services)
--    puts ("No Cygwin services found.\n");
-+    puts ("No Msys services found.\n");
- }
- 
- enum handle_reg_t
-@@ -1306,10 +1305,10 @@ handle_reg_installation (handle_reg_t what)
-   HKEY key;
- 
-   if (what == PRINT_KEY)
--    printf ("Cygwin installations found in the registry:\n");
-+    printf ("Msys installations found in the registry:\n");
+@@ -1309,7 +1308,7 @@ handle_reg_installation (handle_reg_t what)
+     printf ("Cygwin installations found in the registry:\n");
    for (int i = 0; i < 2; ++i)
      if (RegOpenKeyEx (i ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE,
 -		      "SOFTWARE\\Cygwin\\Installations", 0,
@@ -1000,24 +832,6 @@ index 1dde2ec..11957eb 100644
  	      if (what == PRINT_KEY)
  		printf ("%s\n", access (path, F_OK) ? " (ORPHANED)" : "");
  	      else if (access (path, F_OK))
-@@ -1405,7 +1404,7 @@ dump_sysinfo ()
-       _wputenv (comspec);
-     }
- 
--  printf ("\nCygwin Configuration Diagnostics\n");
-+  printf ("\nMsys Configuration Diagnostics\n");
-   time (&now);
-   printf ("Current System Time: %s\n", ctime (&now));
- 
-@@ -1733,7 +1732,7 @@ dump_sysinfo ()
- 
- 
-   if (givehelp)
--    printf ("Here's some environment variables that may affect cygwin:\n");
-+    printf ("Here's some environment variables that may affect msys:\n");
-   for (i = 0; environ[i]; i++)
-     {
-       char *eq = strchr (environ[i], '=');
 @@ -1783,7 +1782,7 @@ dump_sysinfo ()
    if (registry)
      {
@@ -1027,15 +841,6 @@ index 1dde2ec..11957eb 100644
        scan_registry (0, HKEY_CURRENT_USER,
  		     (char *) "HKEY_CURRENT_USER", 0, false);
        scan_registry (0, HKEY_LOCAL_MACHINE,
-@@ -1961,7 +1960,7 @@ dump_sysinfo ()
-   printf ("\n");
- 
-   if (givehelp)
--    printf ("Looking for various Cygwin DLLs...  (-v gives version info)\n");
-+    printf ("Looking for various Msys DLLs...  (-v gives version info)\n");
-   int cygwin_dll_count = 0;
-   char cygdll_path[32768];
-   for (pathlike *pth = paths; pth->dir; pth++)
 @@ -1978,10 +1977,10 @@ dump_sysinfo ()
  	  wcstombs (f, ffinfo.cFileName, sizeof f);
  	  if (strcasecmp (f + strlen (f) - 4, ".dll") == 0)
@@ -1061,17 +866,6 @@ index 1dde2ec..11957eb 100644
  
    dump_dodgy_apps (verbose);
  
-@@ -2993,8 +2992,8 @@ static char opts[] = "cdnsrvkfliephV";
- static void
- print_version ()
- {
--  printf ("cygcheck (cygwin) %d.%d.%d\n"
--	  "System Checker for Cygwin\n"
-+  printf ("cygcheck (msys) %d.%d.%d\n"
-+	  "System Checker for Msys\n"
- 	  "Copyright (C) 1998 - %s Cygwin Authors\n"
- 	  "This is free software; see the source for copying conditions.  "
- 	  "There is NO\n"
 @@ -3021,7 +3020,7 @@ load_cygwin (int& argc, char **&argv)
  {
    HMODULE h;
@@ -1082,7 +876,7 @@ index 1dde2ec..11957eb 100644
    GetModuleFileNameW (h, cygwin_dll_path, 32768);
    if ((cygwin_internal = (uintptr_t (*) (cygwin_getinfo_types, ...))
 diff --git a/winsup/utils/mingw/strace.cc b/winsup/utils/mingw/strace.cc
-index c220643..a875bf2 100644
+index c220643..29db640 100644
 --- a/winsup/utils/mingw/strace.cc
 +++ b/winsup/utils/mingw/strace.cc
 @@ -284,7 +284,7 @@ load_cygwin ()
@@ -1115,15 +909,6 @@ index c220643..a875bf2 100644
    _putenv (newenv);
    ret = CreateProcess (0, one_line.buf,	/* command line */
  		       NULL,	/* Security */
-@@ -815,7 +814,7 @@ dotoggle (pid_t pid)
-   child_pid = (DWORD) cygwin_internal (CW_CYGWIN_PID_TO_WINPID, pid);
-   if (!child_pid)
-     {
--      warn (0, "no such cygwin pid - %d", pid);
-+      warn (0, "no such msys pid - %d", pid);
-       child_pid = pid;
-     }
-   if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))
 diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
 index fe55a64..323e4c7 100644
 --- a/winsup/utils/path.cc
diff --git a/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch b/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch
index bc824375214..21256ab7d83 100644
--- a/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch
+++ b/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;
  }
  
diff --git a/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch b/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
index 6a0b9953bb0..0f76797cb99 100644
--- a/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
+++ b/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},
diff --git a/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
index 90c22660a02..1f55d628097 100644
--- a/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
+++ b/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
diff --git a/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch b/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch
index a3f5cfc6e60..453071d420c 100644
--- a/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch
+++ b/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 */
  	{
diff --git a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
index ead7d4989f1..c72d105058d 100644
--- a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
+++ b/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)
diff --git a/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch b/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch
index c4c443f97a6..6afc95a9007 100644
--- a/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch
+++ b/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
diff --git a/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch
index 970df25d09f..12d078bb49c 100644
--- a/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch
+++ b/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)
diff --git a/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch
index 9fcc656bf6e..28293be1ec7 100644
--- a/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch
+++ b/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)
diff --git a/msys2-runtime/0012-strace-quiet-be-really-quiet.patch b/msys2-runtime/0012-strace-quiet-be-really-quiet.patch
index 7cb001de457..c6c861e2870 100644
--- a/msys2-runtime/0012-strace-quiet-be-really-quiet.patch
+++ b/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)
diff --git a/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch b/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch
index 47540e7684f..d3774c1d569 100644
--- a/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch
+++ b/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;
  	    }
diff --git a/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch b/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch
index 8f4255cd534..ed06a650abf 100644
--- a/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch
+++ b/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
diff --git a/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch b/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
index f3cea134084..034d00d3e12 100644
--- a/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
+++ b/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
diff --git a/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch b/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch
index 08a3cf22e5a..e2878a575cc 100644
--- a/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch
+++ b/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
diff --git a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
index a996cd29c8c..d37cd1e37a5 100644
--- a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
+++ b/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,
diff --git a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
index 99af64507ea..e45bd1ed1b1 100644
--- a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
+++ b/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)
diff --git a/msys2-runtime/0019-Add-debugging-for-build_argv.patch b/msys2-runtime/0019-Add-debugging-for-build_argv.patch
index a181fcabadc..c29c61ec10e 100644
--- a/msys2-runtime/0019-Add-debugging-for-build_argv.patch
+++ b/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;
  
diff --git a/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch
index 4996e901e28..57236159a56 100644
--- a/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch
+++ b/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;
    }
  
diff --git a/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch b/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
index 79b4905117f..ff9187b1bb8 100644
--- a/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
+++ b/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
diff --git a/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch
index 446777a7516..47b15adeee0 100644
--- a/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch
+++ b/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
diff --git a/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
index c8dcf6364c8..6482f0358fc 100644
--- a/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+++ b/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
diff --git a/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch
index d1979e42858..2a1b1e93cce 100644
--- a/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch
+++ b/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
diff --git a/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
index 7d73aabadb4..f452f61d7dc 100644
--- a/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
+++ b/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
@@ -1,4 +1,4 @@
-From d5a888d235d9b91aebee53e330d172f712f50db8 Mon Sep 17 00:00:00 2001
+From 6ef58ed329d4d1b59091471a575a5c0af3ac192d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 16 Apr 2018 14:59:39 +0200
 Subject: [PATCH 25/N] Add a helper to obtain a function's address in
@@ -39,7 +39,7 @@ index 9b9b59d..b9e3977 100644
  AM_CONDITIONAL(CROSS_BOOTSTRAP, [test "x$with_cross_bootstrap" != "xyes"])
  
 diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
-index d9557d8..b89d894 100644
+index 7f7317a..07b9f92 100644
 --- a/winsup/utils/mingw/Makefile.am
 +++ b/winsup/utils/mingw/Makefile.am
 @@ -26,6 +26,21 @@ bin_PROGRAMS = \
diff --git a/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
index 8395ec5112d..b5b07c6b2d4 100644
--- a/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
+++ b/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
@@ -1,4 +1,4 @@
-From 86874b54d217cad9c3d82bcf00de5fb91c4df5d9 Mon Sep 17 00:00:00 2001
+From 38a8880717c5431c2c4d596dc0aa22c6906059f9 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Mar 2015 09:56:28 +0000
 Subject: [PATCH 26/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
@@ -93,7 +93,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  create mode 100644 winsup/cygwin/include/cygwin/exit_process.h
 
 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
-index b369799..36feb45 100644
+index 18271f5..f6b6255 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
 @@ -29,6 +29,7 @@ details. */
diff --git a/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch
index 2a73c92d284..8921fadf85f 100644
--- a/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch
+++ b/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch
@@ -1,4 +1,4 @@
-From 16e0f643d84a48cf3192c62201ef3ce3e899f292 Mon Sep 17 00:00:00 2001
+From b9d1fadafe592ced300e80ddfa1f6358a46ecdb5 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Mar 2015 10:01:50 +0000
 Subject: [PATCH 27/N] kill: kill Win32 processes more gently
diff --git a/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch
index 2619c21182b..38d6eecdd6c 100644
--- a/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch
+++ b/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch
@@ -1,4 +1,4 @@
-From 216a27d7c8d7fefcbdc5409ba405621d0a8e1d9d Mon Sep 17 00:00:00 2001
+From 715f6ce8910a7ccfedb90a021ead592ec8e62be7 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 22 Jul 2021 11:59:16 -0700
 Subject: [PATCH 28/N] Cygwin: make option for native inner link handling.
@@ -13,7 +13,7 @@ needed.  MSYS=nonativeinnerlinks
  3 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 299c692..37da358 100644
+index b9600ef..06b1111 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -123,6 +123,7 @@ static struct parse_thing
@@ -37,10 +37,10 @@ index b3b77de..ab2c205 100644
  /* Taken from BSD libc:
     This variable is zero until a process has created a pthread.  It is used
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 36f2a73..8806e59 100644
+index 39819dc..b0c45fa 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3724,7 +3724,8 @@ restart:
+@@ -3722,7 +3722,8 @@ restart:
  	 differ, return the final path as symlink content and set symlen
  	 to a negative value.  This forces path_conv::check to restart
  	 symlink evaluation with the new path. */
diff --git a/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch
index d3483ae5696..99bb9fabc68 100644
--- a/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch
+++ b/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch
@@ -1,4 +1,4 @@
-From b2ac8b0a3f4d4372c07cb0b51c19f974cceeae69 Mon Sep 17 00:00:00 2001
+From abeeb31b2b49921b01d4ce7cfbac82dfa6c292bb Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 8 Nov 2021 14:20:07 +0100
 Subject: [PATCH 29/N] docs: skip building texinfo and PDF files
diff --git a/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch b/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch
index 37541474d3a..a3a8e72a357 100644
--- a/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch
+++ b/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch
@@ -1,4 +1,4 @@
-From dea0da49908fe86e1592af5f5ebd7e21f2b98b33 Mon Sep 17 00:00:00 2001
+From fbe8ae30a3ea6af5541cf9f412f601bca963aa6f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 8 Nov 2021 16:22:57 +0100
 Subject: [PATCH 30/N] install-libs: depend on the "toollibs"
diff --git a/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch
index 3e36fd92970..b5bf494b7eb 100644
--- a/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch
+++ b/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch
@@ -1,4 +1,4 @@
-From b332ee59f4731d2c1ec2922554fa0dcd76aeb6a2 Mon Sep 17 00:00:00 2001
+From 38abc7cfff7f580c7563b90dc799ae28e6338bf5 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 23 Nov 2015 20:03:11 +0100
 Subject: [PATCH 31/N] POSIX-ify the SHELL variable
@@ -47,7 +47,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 37da358..1682420 100644
+index 06b1111..e21c8fd 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -323,6 +323,7 @@ static win_env conv_envvars[] =
diff --git a/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch
index 9830e0db76e..a8956fbedfa 100644
--- a/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch
+++ b/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch
@@ -1,4 +1,4 @@
-From 379c6917bd70d073776f49c22924bf76a8380971 Mon Sep 17 00:00:00 2001
+From 9c758e8f9cb30d58e5499eed5154a4266d335be1 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 21 Mar 2017 13:18:38 +0100
 Subject: [PATCH 32/N] Handle ORIGINAL_PATH just like PATH
@@ -26,7 +26,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 1682420..b6c02f9 100644
+index e21c8fd..031db03 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -323,6 +323,7 @@ static win_env conv_envvars[] =
diff --git a/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch
index e71c45607a5..5ffc1a13ae1 100644
--- a/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch
+++ b/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch
@@ -1,4 +1,4 @@
-From b2e2b5669bee4b93de6edf34e85cab6cc4defd28 Mon Sep 17 00:00:00 2001
+From 312f7660cc8f4690f30327994212ec890df09e28 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 3 Jul 2022 22:39:32 +0200
 Subject: [PATCH 33/N] uname: allow setting the system name to CYGWIN
diff --git a/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch b/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch
index df08437ec68..b92e3faff6d 100644
--- a/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch
+++ b/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch
@@ -1,4 +1,4 @@
-From ba2bf4662eb3fcf2397ff759f316d626f00369b7 Mon Sep 17 00:00:00 2001
+From e19af2018e02eb7365c931d63748b2bad021855e Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 18 Feb 2015 12:32:17 +0000
 Subject: [PATCH 34/N] Pass environment variables with empty values
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index b6c02f9..c19227f 100644
+index 031db03..6b385cd 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -1326,11 +1326,11 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
diff --git a/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch
index 859ea27f095..79996d2620c 100644
--- a/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch
+++ b/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch
@@ -1,4 +1,4 @@
-From 6594dacd3717648c2d6708cecdadba43797c2083 Mon Sep 17 00:00:00 2001
+From 4deb751587f85296e3b0a06f89860ad2e18b8c29 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 6 Sep 2022 10:40:58 +0200
 Subject: [PATCH 35/N] Optionally disallow empty environment values again
@@ -27,7 +27,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index c19227f..69647a4 100644
+index 6b385cd..12b4d57 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -36,6 +36,7 @@ static char **lastenviron;
diff --git a/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch
index 91f52bb9082..d721bed345e 100644
--- a/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch
+++ b/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch
@@ -1,4 +1,4 @@
-From cdd9e8df3723c315686f90eb08bc2876ebdb8601 Mon Sep 17 00:00:00 2001
+From a1f282d18d19df8a864df70b9d05bc4b9d18ce1c Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 6 Sep 2022 12:18:18 +0200
 Subject: [PATCH 36/N] build_env(): respect the `MSYS` environment variable
@@ -16,7 +16,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 69647a4..97e75ce 100644
+index 12b4d57..4e04921 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
 @@ -1204,7 +1204,11 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
diff --git a/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch b/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
index 156bc977496..ccbad0e2fa0 100644
--- a/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
+++ b/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
@@ -1,4 +1,4 @@
-From ae4c9c303f6b06551731a7944a61ed6faf4b3fb1 Mon Sep 17 00:00:00 2001
+From d1b382b8d646c8f8cae10ebeb87d6b593df586fd Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sat, 17 Dec 2022 20:14:49 +0100
 Subject: [PATCH 37/N] Revert "Cygwin: Enable dynamicbase on the Cygwin DLL by
diff --git a/msys2-runtime/0040-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
similarity index 95%
rename from msys2-runtime/0040-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
rename to msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
index a87e1267ab8..2a657864f3f 100644
--- a/msys2-runtime/0040-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
+++ b/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
@@ -1,7 +1,7 @@
-From 317fc51b3af5280d8d115cab17a502f7c37b204c Mon Sep 17 00:00:00 2001
+From e347515e99ad03ef377bd9c255ec1dd4037fbb54 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 30 Jan 2023 23:22:22 +0100
-Subject: [PATCH 40/N] Avoid sharing cygheaps across Cygwin versions
+Subject: [PATCH 38/N] Avoid sharing cygheaps across Cygwin versions
 
 It frequently leads to problems when trying, say, to call from MSYS2's
 Bash into Cygwin's or Git for Windows', merely because sharing that data
@@ -103,10 +103,10 @@ index 76b54eb..774e562 100644
  AM_CXXFLAGS=$(cxxflags_common) $(COMMON_CFLAGS) -fno-threadsafe-statics
  
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index c1dbd5f..4759f8c 100644
+index 0a5c817..351d32d 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
-@@ -530,7 +530,7 @@ get_cygwin_startup_info ()
+@@ -531,7 +531,7 @@ get_cygwin_startup_info ()
    child_info *res = (child_info *) si.lpReserved2;
  
    if (si.cbReserved2 < EXEC_MAGIC_SIZE || !res
@@ -116,7 +116,7 @@ index c1dbd5f..4759f8c 100644
        strace.activate (false);
        res = NULL;
 diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
-index 86e4e60..2f5fd47 100644
+index 99fa3c3..a89f09d 100644
 --- a/winsup/cygwin/sigproc.cc
 +++ b/winsup/cygwin/sigproc.cc
 @@ -811,7 +811,7 @@ int child_info::retry_count = 0;
diff --git a/msys2-runtime/0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch b/msys2-runtime/0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch
deleted file mode 100644
index 4ad1be29118..00000000000
--- a/msys2-runtime/0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From abcb3c6c0f330ac7568956b2be6bf3376517bb56 Mon Sep 17 00:00:00 2001
-From: Johannes Schindelin <johannes.schindelin@gmx.de>
-Date: Thu, 1 Feb 2024 12:45:30 +0100
-Subject: [PATCH 38/N] =?UTF-8?q?proc:=20fix=20`error:=20the=20address=20o?=
- =?UTF-8?q?f=20=E2=80=98iso15924=E2=80=99=20will=20never=20be=20NULL`?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The `iso15924` variable is not actually a pointer.
-
-Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
----
- winsup/cygwin/fhandler/proc.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc
-index be107cb..cf40e82 100644
---- a/winsup/cygwin/fhandler/proc.cc
-+++ b/winsup/cygwin/fhandler/proc.cc
-@@ -2153,7 +2153,7 @@ format_proc_locale_proc (LPWSTR win_locale, DWORD info, LPARAM param)
-       if (!(cp2 = wcschr (cp + 2, L'-')))
-         return TRUE;
-       /* Otherwise, store in iso15924 */
--      if (iso15924)
-+      if (cp2 - cp + 1 < ENCODING_LEN)
-         wcpcpy (wcpncpy (iso15924, cp, cp2 - cp), L";");
-     }
-   cp = wcsrchr (win_locale, L'-');
diff --git a/msys2-runtime/0039-Cygwin-disable-high-entropy-VA-for-ldh.patch b/msys2-runtime/0039-Cygwin-disable-high-entropy-VA-for-ldh.patch
deleted file mode 100644
index 669b6cfaf9b..00000000000
--- a/msys2-runtime/0039-Cygwin-disable-high-entropy-VA-for-ldh.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 28d69fba269dd4a9f4281f8af7c2775292241e8b Mon Sep 17 00:00:00 2001
-From: Jeremy Drake via Cygwin-patches <cygwin-patches@cygwin.com>
-Date: Tue, 28 May 2024 10:19:22 -0700
-Subject: [PATCH 39/N] Cygwin: disable high-entropy VA for ldh
-
-If ldd is run against a DLL which links to the Cygwin DLL, ldh will end
-up loading the Cygwin DLL dynamically, much like cygcheck or strace.
-
-Addresses: https://cygwin.com/pipermail/cygwin/2024-May/255991.html
-Fixes: 60675f1a7eb2 ("Cygwin: decouple shared mem regions from Cygwin DLL")
-Reviewed-by: Ken Brown <kbrown@cornell.edu>, Takashi Yano <takashi.yano@nifty.ne.jp>
-Signed-off-by: Jeremy Drake <cygwin@jdrake.com>
----
- winsup/utils/mingw/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
-index b89d894..07b9f92 100644
---- a/winsup/utils/mingw/Makefile.am
-+++ b/winsup/utils/mingw/Makefile.am
-@@ -53,6 +53,7 @@ cygcheck_LDADD = -lz -lwininet -lshlwapi -lpsapi -lntdll
- cygwin_console_helper_SOURCES = cygwin-console-helper.cc
- 
- ldh_SOURCES = ldh.cc
-+ldh_LDFLAGS = ${AM_LDFLAGS} -Wl,--disable-high-entropy-va
- 
- strace_SOURCES = \
- 	path.cc \
diff --git a/msys2-runtime/0041-uname-report-msys2-runtime-commit-hash-too.patch b/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch
similarity index 97%
rename from msys2-runtime/0041-uname-report-msys2-runtime-commit-hash-too.patch
rename to msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch
index 3cf9ab4378a..317af977053 100644
--- a/msys2-runtime/0041-uname-report-msys2-runtime-commit-hash-too.patch
+++ b/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch
@@ -1,7 +1,7 @@
-From 0ea583b9cb0326572ae1d446d4a5f41782d94b25 Mon Sep 17 00:00:00 2001
+From dd9d970a97430c3b2e287598e07dd06dd3a70ff0 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 21 Feb 2023 16:36:36 +0100
-Subject: [PATCH 41/N] uname: report msys2-runtime commit hash, too
+Subject: [PATCH 39/N] uname: report msys2-runtime commit hash, too
 
 Having just Cygwin's version in the output of `uname` is not helpful, as
 both MSYS2 as well as Git for Windows release intermediate versions of
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index f2b07570941..67666040239 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
-pkgver=3.5.3
-pkgrel=5
+pkgver=3.5.4
+pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
 url="https://www.cygwin.com/"
@@ -66,52 +66,48 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
         0035-Optionally-disallow-empty-environment-values-again.patch
         0036-build_env-respect-the-MSYS-environment-variable.patch
         0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
-        0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch
-        0039-Cygwin-disable-high-entropy-VA-for-ldh.patch
-        0040-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
-        0041-uname-report-msys2-runtime-commit-hash-too.patch)
-sha256sums=('e395966060e0cf901f3cd4190b0b189bface69a2fec6ba93748387b61aa7dd5c'
-            'a0de51b420ad7fc67b007adf4159e065a5beefc56e66735827fc9f39364e045f'
-            '857830ffd5fe820e90e0f3b49b72c1f31c3c929be845e178eb3e6c7352181e18'
-            '35723eb517f034508d09e0974e70db99a003aa863509bb8b69d3feec87e47fb9'
-            '97ebf77b9d8977594c6b0cda1696ee3e6b7651bc44e1ab8feeea0ba6ba00296d'
-            '4822b632fc9827468ab0bd69ef609168ee5909f16efc78f50572f4f82ef0242b'
-            'f15fe4ac450ab59c9ae37fe4f1536961e4caa3b906ebf149512da6c34ec6f406'
-            '691c8001ff79a8b814f8feb3b94956d49abb4f209e4ec87ea1da49435eb839af'
-            '09a19369f97ef6de3c0b05667af125b6dbdae738815b495fc0010cff9dcedf83'
-            '372575f8e7c1dbb942c5cf6f4b1598adf2079eb3474e0cd0de84777dfff9a101'
-            '055121314086990ba31ba61d1c200cd084b4e27a2751530401c897d7621017e8'
-            '65e2015054cdb54da4ee7b617b3d2578350ea5664ccdd055ebc635bb05c65ad4'
-            '47f05d9720fc7607cd62758d1885627385afa0e143570a2a6366e97499370cec'
-            'a68503a5ec629c0f67fdeb9d665f1542f24f33288a6338102f4b4e7b89977668'
-            'e34d872cabe95124f6624efbd6f4683d78cd5fc36f35fd2ec8a86db8935691d6'
-            '38f33b085a237737b35dd168213d98c3ca2c33fcace18d793fda338b5094c9f7'
-            '7bcbec199fc009d986ba37e9b32cb491d4bc87fe6c2d0c35806072cf1ca113f4'
-            '65816fd36ae04af58c1b6595a75600f0a3d8f92c8d76065be1759af8a84c9528'
-            '174dd3a782a50d18c67954a5f6b7177259487319ab70833e9afefedd690a29b5'
-            '5e0510cbe2043a348f554583ade18b1b6496c23ec459ff1ae0228377ae77432f'
-            'c637342b6656c946901641170bb0b1adf470e63589ddeffa69d3b1c0f46d6b14'
-            '8757f2f27e95c27a289a0d3e425c5ec33877dd01c3e27273cf73529836522b1c'
-            '12bb20d78a9a88e548fa538e9dee1f0e7d0bc75909e2af73d3e61e8c268f10c4'
-            '249ba3beb4a4b469e0812996b6684fb6c6f6542a056350c210f719a68da835f8'
-            '81d9fe00d981ee75acd4f58a4cc344cb5da77bf948e09653b76e2106ed83d2ff'
-            'd25286caaca6fb3597e4e1d44fe16d0a13a71c598bc8064637a3fdf16b4a3ec7'
-            '35f761b27f73e78c5c363e2a33c035eb16f01d8a6a9fe0c4dc6a4f6f29da9afd'
-            'ce2dfb9b194055d4383a4f38c11136cbf39cbc2bf55bb1a25afc9bb68ee15131'
-            'ad7c77da4980742211e6c3d09a9b29cabf0cb1255c707836531f47f93267980c'
-            'ff7093cead563b300df20e7505b0efbb8b1c67a01bacf20b13c7aae9e7f743f8'
-            '5f25db396b9657c9a8b2165ebb102deec7279ce809ae6103d8e68b2e939c0c29'
-            'fa69f5d4cf8baa42018dc0b34b0075440a104805c87b753cae12ef3c9fca6a4d'
-            '3697ac83ab3e0226ca0d44c231d58111a50a1b5425a967ca7511d7891dfcda09'
-            '485964804b19716615541151b0f89ec7ff8e433db00177b049c35eaeb3ac56f9'
-            '65aebf69b7f2f5d19e6c8a666db3392416de39afcf21cd955b637984e8d30d8a'
-            '39fd77a2968bd39fd13daea5cd3b30e1cf3aa714e24aa3408ef634f81d39467a'
-            'd472029276932e7df3da56347d1d09d5bd422f9f96f6f607fe8a28362ebe4a1b'
-            '4683b3dca58af0fef7f704b3bcb199da1ddbce874e5fc69bfaaced9cc76d6be9'
-            '853c6c41da7e188811dae2b3df9251ce84dbb81b39c8632173556132fcbd96c1'
-            'd038eec988844df56ac2ed183dddc73c3f4296c2606c818f2521d40eb2fa7500'
-            'de9d29b6e889b64be316445529d03821473ad780e2950c72e1692975219483ae'
-            '26effe81ff2405d444845b484520a50ac6bdb1625474151b01835ba814a51a64')
+        0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
+        0039-uname-report-msys2-runtime-commit-hash-too.patch)
+sha256sums=('b8dce32fd9746506752d90ac3f30454fe1689100b08c41442016aaf244cc8584'
+            '9f9e1b6b05cbc9a715fe9443740b25171e9c1a276a058e6ba7e4f6eada6872c8'
+            'e5b2095e543a5d702cfce6da26cd17a78f40e17620315b1bcc434b94a007ae9b'
+            'f13b15dc14aa6ee1dd628a2487564bb484e74ff2f3e4059b9d9d64446a327db1'
+            '155986f35dfb072fe85993ef184ca029542c1706cf2b29c6483444bd31b13be1'
+            '87f23592b90efc996a4afa4cf4b74aa6828d62393550b8dca93280880cace5b4'
+            'd312eeec44f03b1be90e88fa5172f0c39412b3e89b5886799a956494bc91d9a2'
+            '83c7d19449c1e39d7d00ae1208ec3ad5c9807b7bdb0471e415f18ade67d5c39e'
+            'd77ae7eead224a20e4bf68013e049ca07ecbca63a18d7318d1061162978f3d6b'
+            'bae2d10f60e25dca74cd435e43fdc6bf9be47103d7d650c87a2fd6272954329a'
+            '9db10ecf658cd5f443f61d06e7649ffcd677d7be31b7e6fdf6dfa6268384834f'
+            '934ccc478f7d8e83b6da6f3b7436e613e169500f40905b5ec11bebc0729135c8'
+            '17c37645cf7cf4c3518b9135c498379de10820b686f99ffa2203284b024e6974'
+            '253bc53d1414e5096de6fce89796b89907fa33a779ea95c889bf9b9ce3e17bde'
+            'fde2bcc5ca961c7e22a38c85365e46584630d2886966c8c386846572db30146a'
+            '3568ad0e60a94da91716d3a300a2aded0f15cec964635ee7bec0371af0d7c44c'
+            '571e5ed60721f42e888b46e02fc503283a7813ac4e957ce962d36970b3f7eca0'
+            '5a1c306458090293d42ae9ffae7b1d75485b5365e31f5f62a0c548e1c411ccac'
+            '06367d83f7817f5ca9c494f688f224873fd8c56f90ea3bfb2f500c8649aa6150'
+            'ea67073b27f8f78de70a4e1ae4340e2c787115a8670d8140e36df2685e7c35ee'
+            '699f223b03b36332aebea12984c3770235b66df2902ab3ea177ff1066fd168e3'
+            'b00affd0e6df8b9697b1e13695cff3c6db98b484de7038abad6f533580db7e9a'
+            '158a53bcbdd2f044c197d015bf4fa9b05b2300ea2435794a7527adff2bc277de'
+            '902c4998dadba3b5a17f031afb9db0fe60feb65a537981921a04734c60bc9910'
+            '3bceeac2fe9ce7d88324cdc0f9bebe7de120e1d5b909571e606c619bce277689'
+            'c546b87225d433f6b312abc4f571a10bd4efbd4138fb11a5477dfe5e6df213c0'
+            'b21933657b87ff773b633c8dabb576d55c6aa9f8f42c7ab784f980de767c220d'
+            '9a9339b069a1c3f45fdd70805bae788e95f0d4fd2fea0ae8f37ae058b1ecfdde'
+            '785bf87f823025a842466647bdfbd83bade952c007d06f7e68176a186a983ad8'
+            'd729c1886bd2249e565ccb8b64f0c31fb71d605715320a76b56aa032e9fa5575'
+            '471c1a68767b05dafa5e12b23efdbd85123813cfcfef708be4bb6d734ae6b51c'
+            '33ec577def8ddc9180da824828acc8e201c08d87181f81685c26e0fd163d126e'
+            '61a411b4747c36fd20d2365eb3d45f53a8eed50b88a22a337e1ab73f8ee54928'
+            '14a7f6afdc232acaffbc8315543a973118ea205f559e04c6c17de75e9e12d845'
+            '0c2290d16f120bd64ef2e9824e5ba3af38c59d74008fd4c2028f42ed3bcbb058'
+            'e14b90eddb75b56fcf84b8d37044d57eb45c109f08d103ebac160f173a763192'
+            '5990fbc34e4ac09229383e9a0f3326513a5a9482ebcca929302af0707d96a321'
+            'f74cb189aafc9f8bf04cdad02531d9eca524c2dd12672e4e118bfdbb48926110'
+            '344f108bc9e9ad597e07f1cc8e834e3d1a9fbd9972a1554c1c5de0fce0ae8506'
+            'f93578a1150d724a60a7e8eb8491342aeb13f809e2ddb5193d8d126465f665cb')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -186,10 +182,8 @@ prepare() {
   0035-Optionally-disallow-empty-environment-values-again.patch \
   0036-build_env-respect-the-MSYS-environment-variable.patch \
   0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch \
-  0038-proc-fix-error-the-address-of-iso15924-will-never-be.patch \
-  0039-Cygwin-disable-high-entropy-VA-for-ldh.patch \
-  0040-Avoid-sharing-cygheaps-across-Cygwin-versions.patch \
-  0041-uname-report-msys2-runtime-commit-hash-too.patch
+  0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch \
+  0039-uname-report-msys2-runtime-commit-hash-too.patch
 }
 
 build() {