msys2-runtime: bump to v3.5.5

This corresponds to https://github.com/msys2/msys2-runtime/pull/249. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2024-12-24 22:23:01 +01:00 · 2024-12-24 22:23:01 +01:00 · 01bdc2a6ae
commit 01bdc2a6ae
parent f1fc24ca0b
48 changed files with 188 additions and 298 deletions
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@ -1,4 +1,4 @@
-From 51380ec75b3f11228cb680f3a4d71fc1957e5aec Mon Sep 17 00:00:00 2001
+From bdad035f0baf6fa584ca10913e9948c0aba2970e 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
--- 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 a116f418453dc6b272c3b58fcb1498790efccd6f Mon Sep 17 00:00:00 2001
+From 900232bfff4076c483307b4af8f2bbf9b50a600f 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
--- a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch
+++ b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch
@ -1,4 +1,4 @@
-From f858c02bdb8d3444691dd99165718a1dd67ea753 Mon Sep 17 00:00:00 2001
+From 585fadf7eab7cc83f6445adcd30b5c2b2e9357f8 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
@ -277,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 3195d57..18271f5 100644
+index a560a3f..8590929 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
@@ -526,14 +526,14 @@ int exec_prepared_command (PWCHAR command)
@ -298,10 +298,10 @@ index 3195d57..18271f5 100644
 	  break;
 	}
 diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index 6658a23..5d2fe12 100644
+index 6a1ef03..7244fa4 100644
 --- a/winsup/cygwin/fhandler/pipe.cc
 +++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -727,7 +727,11 @@ fhandler_pipe::close ()
+@@ -751,7 +751,11 @@ fhandler_pipe::close ()
   return ret;
 }
 
@ -314,10 +314,10 @@ index 6658a23..5d2fe12 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 fa6bf10..12a0ab3 100644
+index 4f0f718..eb51c6d 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)
+@@ -875,7 +875,11 @@ fhandler_pty_slave::open (int flags, mode_t)
       pipe_reply repl;
       DWORD len;
 
@ -329,7 +329,7 @@ index fa6bf10..12a0ab3 100644
 		       &cygheap->installation_key, get_minor ());
       termios_printf ("dup handles via master control pipe %s", buf);
       if (!CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl,
-@@ -1206,7 +1210,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
+@@ -1137,7 +1141,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
 		    {
 		      char pipe[MAX_PATH];
 		      __small_sprintf (pipe,
@ -341,7 +341,7 @@ index fa6bf10..12a0ab3 100644
 			       &cygheap->installation_key, get_minor ());
 		      pipe_request req = { GetCurrentProcessId () };
 		      pipe_reply repl;
-@@ -2090,7 +2098,11 @@ fhandler_pty_master::close ()
+@@ -2021,7 +2029,11 @@ fhandler_pty_master::close ()
 	  pipe_reply repl;
 	  DWORD len;
 
@ -353,7 +353,7 @@ index fa6bf10..12a0ab3 100644
 			   &cygheap->installation_key, get_minor ());
 	  acquire_output_mutex (mutex_timeout);
 	  if (master_ctl)
-@@ -2996,7 +3008,11 @@ fhandler_pty_master::setup ()
+@@ -2927,7 +2939,11 @@ fhandler_pty_master::setup ()
 
   /* Create master control pipe which allows the master to duplicate
      the pty pipe handles to processes which deserve it. */
@ -365,7 +365,7 @@ index fa6bf10..12a0ab3 100644
 		   &cygheap->installation_key, unit);
   master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
 				     | FILE_FLAG_FIRST_PIPE_INSTANCE,
-@@ -3880,7 +3896,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
+@@ -3816,7 +3832,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
     {
       char pipe[MAX_PATH];
       __small_sprintf (pipe,
@ -436,7 +436,7 @@ index 1e4cf98..b77598b 100644
       }									      \
     }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 0f87fbc..2e624a9 100644
+index fb821a6..1c68287 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
@@ -502,7 +502,11 @@ details. */
@ -617,7 +617,7 @@ index 43b5803..db1d5c8 100644
   ts.SourceIdentifier.LowPart = kerberos_auth ? 0x0105 : 0x0106;
 
 diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index 9d88b60..ed564c8 100644
+index 11033bc..2d7071b 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
@@ -339,7 +339,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
@ -626,15 +626,15 @@ index 9d88b60..ed564c8 100644
     {
 -      /* Create unique filename.  Start with a dot, followed by "cyg"
 +      /* Create unique filename.  Start with a dot, followed by "msys"
- 	 transposed into the Unicode low surrogate area (U+dc00) on file
- 	 systems supporting Unicode (except Samba), followed by the inode
- 	 number in hex, followed by a path hash in hex.  The combination
+ 	 transposed to the Unicode private use area in the U+f700 area
+ 	 on file systems supporting Unicode (except Samba), followed by
+ 	 the inode number in hex, followed by a path hash in hex.  The
@@ -347,7 +347,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
       RtlAppendUnicodeToString (&recycler,
 				(pc.fs_flags () & FILE_UNICODE_ON_DISK
 				 && !pc.fs_is_samba ())
-				? L".\xdc63\xdc79\xdc67" : L".cyg");
-+				? L".\xdc6d\xdc73\xdc79\xdc73" : L".msys");
+-				? L".\xf763\xf779\xf767" : L".cyg");
+				? L".\xf76d\xf773\xf779\xf773" : L".msys");
       pfii = (PFILE_INTERNAL_INFORMATION) infobuf;
       status = NtQueryInformationFile (fh, &io, pfii, sizeof *pfii,
 				       FileInternalInformation);
--- 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 b084abe0ec93354984d37d0ec09fab39984d1e90 Mon Sep 17 00:00:00 2001
+From d076660c2d88cc79897b73b53134b040d623c547 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
@ -1086,7 +1086,7 @@ index 1802e76..84851a1 100644
 
 /* Cover functions to the path conversion routines.
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index d01f678..845121f 100644
+index f5a4b91..902cef8 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -292,6 +292,27 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
--- 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 f16038529ae929ad0371de5b7a8ba651b1888e29 Mon Sep 17 00:00:00 2001
+From 35a477b5cd63373397b0dc713de7b95d610ad300 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
--- 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 6393488c9d7048ba7081374b806397c74ee2def6 Mon Sep 17 00:00:00 2001
+From 41ed62e6f51e80b764de465ab9f9045552107813 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
--- 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 06ea20e4eceef17d67a404d670b439e87f282450 Mon Sep 17 00:00:00 2001
+From 8096583fac66461dbe1414f210d998a3087c1ecc 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
--- 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 222fd37c0b4f4502a0dd67ab3369fb630ded3420 Mon Sep 17 00:00:00 2001
+From 0ba54e8cc1940f94e9cde6b6c74cb6a8fb240d56 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
--- 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 41e8ada0d105959dfd3a1665875a09b64ceb06a3 Mon Sep 17 00:00:00 2001
+From e28b7422e206f39202a9f1f840a84cd7a59287c2 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
@ -10,7 +10,7 @@ Strace is a Windows program so MSYS2 will convert all arguments and environment
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 845121f..ace43db 100644
+index 902cef8..d7affaa 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -545,11 +545,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
--- 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 766e55c1bea155c16b8fe28506b86f661c292dc6 Mon Sep 17 00:00:00 2001
+From 4a24304b8b1463097d2532f327eb9e44f272a303 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
--- 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 4f01c3f5c7c3201c46d682f378d8b1ddbd7a0d87 Mon Sep 17 00:00:00 2001
+From b3a4a5bd44740716566e221dba0625e117d92ab4 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
--- 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 d43f1eebf2fed9c1c9321eecae12b4830fc19b92 Mon Sep 17 00:00:00 2001
+From f8c098028cde692958bfed365c8877a038860d6c 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
--- 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 0053f7b38e025ef1358958232e0231c455cc2bc3 Mon Sep 17 00:00:00 2001
+From c4d9d83ede9abf0c47949bd3ac6f91fd3325dc64 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
--- 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 1e8a891f5ec4bb1b96f18c07b7180999c14b8ce0 Mon Sep 17 00:00:00 2001
+From 1c5a6e869c61b66c9924c38a9948413667e3ee44 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
--- 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 673065dd1eeedc82dda43aaeb435040be2703ea4 Mon Sep 17 00:00:00 2001
+From 8b5e9b55a1021d73b91a49cc640f2817394a5bb5 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
--- 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 e1db14849f307053cf0728f385fd8e2c884b4d03 Mon Sep 17 00:00:00 2001
+From b09fb7fd5a22f32b58938da80aff0d02193c64c2 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
--- 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 f6e516da390ea3f729132274db1303ab95a61e7c Mon Sep 17 00:00:00 2001
+From b2391806dbe3f72235fe1431940631f26757a2f0 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
--- 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 1059fbbdea827dc369d76eb59d2c2bf087faa84b Mon Sep 17 00:00:00 2001
+From 1e94f3ee1dc663bc0292324bef65be88c74c30fa 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
--- 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 f8da08fd7e82b038fe2e278153bc6545dae232b0 Mon Sep 17 00:00:00 2001
+From e6c5e3ec30c0c99d797b69314d5721eaca2d752b 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
--- 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 03d6fe120a36c805008cc611ad140e2a222dc8b0 Mon Sep 17 00:00:00 2001
+From d44fc10030e02b339fe4253b2cf3d6d3e72e5c92 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
@ -98,7 +98,7 @@ index d52deba..c4dbe02 100644
 extern inline void
 transform_chars (PUNICODE_STRING upath, USHORT start_idx)
 diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
-index 767384f..160c996 100644
+index 4220f62..5446654 100644
 --- a/winsup/cygwin/miscfuncs.cc
 +++ b/winsup/cygwin/miscfuncs.cc
@@ -311,6 +311,26 @@ NT_readline::gets ()
@ -141,7 +141,7 @@ index b1a088a..39819dc 100644
     {
       /* Since we've got regex linked we should maybe switch to that, but
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index ace43db..57231b3 100644
+index d7affaa..5b3cbeb 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -293,8 +293,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
--- 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 90d66ee649c0b2f265583942352725e9fac74aa9 Mon Sep 17 00:00:00 2001
+From 98c164175f51d79bc91caaad905b386e8d45615b 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
@ -8,7 +8,7 @@ Subject: [PATCH 21/N] Fix native symbolic link spawn passing wrong arg0
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 57231b3..9d2a016 100644
+index 5b3cbeb..b97c6da 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -50,7 +50,7 @@ perhaps_suffix (const char *prog, path_conv& buf, int& err, unsigned opt)
--- 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 7b84fed8f06744f2d308c6ace42275b4941cb90c Mon Sep 17 00:00:00 2001
+From d12ab6d59cbc9473f29afdf2bd12318a1a5f09ea 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`
--- 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 6f87e23bae318aa95fefe6d40a6630901d91c2aa Mon Sep 17 00:00:00 2001
+From 865ad5d64ececf728b8027043684b5e2a4e9ae2a 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
@ -17,10 +17,10 @@ in this scenario, so this maybe should be extended to all of them.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index ed564c8..fe4b9cb 100644
+index 2d7071b..e584e96 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
-@@ -4423,7 +4423,7 @@ popen (const char *command, const char *in_type)
+@@ -4425,7 +4425,7 @@ popen (const char *command, const char *in_type)
       fcntl (stdchild, F_SETFD, stdchild_state | FD_CLOEXEC);
 
       /* Start a shell process to run the given command without forking. */
--- 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 4dd6aad8634373e09d218628eea91f02840e014a Mon Sep 17 00:00:00 2001
+From 080e2b0f6abe07f4eab5e44bf689f3f48efc7b61 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
--- 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 6ef58ed329d4d1b59091471a575a5c0af3ac192d Mon Sep 17 00:00:00 2001
+From 9f45f58388505943f06fff68c8695dd5f17d2a67 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
--- 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 38a8880717c5431c2c4d596dc0aa22c6906059f9 Mon Sep 17 00:00:00 2001
+From f6f7e2c92880e56d0c4b8712630941aa72257f4d 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 18271f5..f6b6255 100644
+index 8590929..469052a 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
@@ -29,6 +29,7 @@ details. */
@ -104,7 +104,7 @@ index 18271f5..f6b6255 100644
 
 /* Define macros for CPU-agnostic register access.  The _CX_foo
    macros are for access into CONTEXT, the _MC_foo ones for access into
-@@ -1598,10 +1599,25 @@ exit_sig:
+@@ -1605,10 +1606,25 @@ exit_sig:
 dosig:
   if (have_execed)
     {
--- 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 b9d1fadafe592ced300e80ddfa1f6358a46ecdb5 Mon Sep 17 00:00:00 2001
+From 86cd50d151515388c06d5f0e860cf002480d94fd 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
@ -13,7 +13,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 15 insertions(+), 4 deletions(-)

 diff --git a/winsup/utils/kill.cc b/winsup/utils/kill.cc
-index fb45e4c..28473d1 100644
+index bcabcd4..31ad57a 100644
 --- a/winsup/utils/kill.cc
 +++ b/winsup/utils/kill.cc
@@ -17,6 +17,7 @@ details. */
--- 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 715f6ce8910a7ccfedb90a021ead592ec8e62be7 Mon Sep 17 00:00:00 2001
+From 4b228ef2e491970f967aaed3339ce807c282d73c 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.
--- 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 abeeb31b2b49921b01d4ce7cfbac82dfa6c292bb Mon Sep 17 00:00:00 2001
+From 6e0c3b56c7c232ad7a20a2a93fd1679ca58e4a2c 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
--- 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 fbe8ae30a3ea6af5541cf9f412f601bca963aa6f Mon Sep 17 00:00:00 2001
+From ecf50e64ce03f2840dc08605e087c2f3f361c14b 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"
--- 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 38abc7cfff7f580c7563b90dc799ae28e6338bf5 Mon Sep 17 00:00:00 2001
+From 8cb4ff2c0ecb196f77686ada7f3c165b7183d380 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
--- 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 9c758e8f9cb30d58e5499eed5154a4266d335be1 Mon Sep 17 00:00:00 2001
+From 1f6020c6bfa115ac641881aadeece5ee40eb02bc 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
--- 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 312f7660cc8f4690f30327994212ec890df09e28 Mon Sep 17 00:00:00 2001
+From 79e3880244c30efecd2221a0bc90d452a62d873e 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
--- 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 e19af2018e02eb7365c931d63748b2bad021855e Mon Sep 17 00:00:00 2001
+From ef59c45434b5296d18f7aab785ca2db13f1be8d7 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
--- 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 4deb751587f85296e3b0a06f89860ad2e18b8c29 Mon Sep 17 00:00:00 2001
+From c347d6c26b4722c12051ef0d19257323dafbd75b 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
--- 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 a1f282d18d19df8a864df70b9d05bc4b9d18ce1c Mon Sep 17 00:00:00 2001
+From 210e5f3c4d43efc6f6aa140cb28f3cbaf261593d 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
--- 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 d1b382b8d646c8f8cae10ebeb87d6b593df586fd Mon Sep 17 00:00:00 2001
+From bef1e6ba82fb0a7992caeee892721fe4214b64ab 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
--- a/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
+++ b/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
@ -1,4 +1,4 @@
-From e347515e99ad03ef377bd9c255ec1dd4037fbb54 Mon Sep 17 00:00:00 2001
+From 6e10b1bdd96863136dd3c0e1e71b9c7895def917 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 38/N] Avoid sharing cygheaps across Cygwin versions
@ -116,10 +116,10 @@ index 0a5c817..351d32d 100644
       strace.activate (false);
       res = NULL;
 diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
-index 99fa3c3..a89f09d 100644
+index 58a9e5a..cf43aa9 100644
 --- a/winsup/cygwin/sigproc.cc
 +++ b/winsup/cygwin/sigproc.cc
-@@ -811,7 +811,7 @@ int child_info::retry_count = 0;
+@@ -836,7 +836,7 @@ int child_info::retry_count = 0;
 child_info::child_info (unsigned in_cb, child_info_types chtype,
 			bool need_subproc_ready):
   msv_count (0), cb (in_cb), intro (PROC_MAGIC_GENERIC),
--- a/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch
+++ b/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch
@ -1,4 +1,4 @@
-From dd9d970a97430c3b2e287598e07dd06dd3a70ff0 Mon Sep 17 00:00:00 2001
+From f61f7fb71aaa15a8d6ccfc1b08dfca83b4118458 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 39/N] uname: report msys2-runtime commit hash, too
--- a/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch
+++ b/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch
@ -1,7 +1,7 @@
-From 16dfe943bcba396ac0b11c5b52cdbaeed4e03a8d Mon Sep 17 00:00:00 2001
+From debafbf93f8c7099eb9147d40db596af221fed19 Mon Sep 17 00:00:00 2001
 From: Corinna Vinschen <corinna@vinschen.de>
 Date: Tue, 13 Feb 2024 16:47:51 +0100
-Subject: [PATCH 41/N] Cygwin: find_fast_cwd: don't run assembler checking
+Subject: [PATCH 40/N] Cygwin: find_fast_cwd: don't run assembler checking
 code on ARM64

 https://cygwin.com/pipermail/cygwin/2024-February/255397.html
--- a/msys2-runtime/0040-Cygwin-pipe-Fix-a-regression-that-raw_write-slows-do.patch
+++ b/msys2-runtime/0040-Cygwin-pipe-Fix-a-regression-that-raw_write-slows-do.patch
@ -1,46 +0,0 @@
-From 2bfb7739dadf6a27f9b4c006adfd69944f3df2f1 Mon Sep 17 00:00:00 2001
-From: Takashi Yano <takashi.yano@nifty.ne.jp>
-Date: Sun, 1 Sep 2024 04:31:03 +0900
-Subject: [PATCH 40/N] Cygwin: pipe: Fix a regression that raw_write() slows
- down
-
-After the commit 7f3c22532577, writing to pipe extremely slows down.
-This is because cygwait(select_sem, 10, cw_cancel) is called even
-when write operation is already completed. With this patch, the
-cygwait() is called only if the write operation is not completed.
-
-Backported-from: 37ab3e0d55 (Cygwin: pipe: Fix a regression that raw_write() slows down, 2024-09-01)
-Addresses: https://cygwin.com/pipermail/cygwin/2024-August/256398.html
-Fixes: 7f3c22532577 ("Cygwin: pipe: handle signals explicitely in raw_write")
-Reported-by: Jim Reisert AD1C <jjreisert@alum.mit.edu>
-Reviewed-by: Corinna Vinschen <corinna@vinschen.de>
-Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
-Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
- winsup/cygwin/fhandler/pipe.cc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index 5d2fe12..040176e 100644
--- a/winsup/cygwin/fhandler/pipe.cc
-+++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -503,8 +503,9 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
- 		      raise (SIGPIPE);
- 		      goto out;
- 		    }
-		  else
-		    cygwait (select_sem, 10, cw_cancel);
-+		  /* Break out on completion */
-+		  if (waitret == WAIT_OBJECT_0)
-+		    break;
- 		  /* If we got a timeout in the blocking case, and we already
- 		     did a short write, we got a signal in the previous loop. */
- 		  if (waitret == WAIT_TIMEOUT && short_write_once)
-@@ -512,6 +513,7 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
- 		      waitret = WAIT_SIGNALED;
- 		      break;
- 		    }
-+		  cygwait (select_sem, 10, cw_cancel);
- 		}
- 	      /* Loop in case of blocking write or SA_RESTART */
- 	      while (waitret == WAIT_TIMEOUT || waitret == WAIT_SIGNALED);
--- a/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch
+++ b/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch
@ -1,7 +1,7 @@
-From e09c64ef65cf51011122e55b26abdbda9e70f7e6 Mon Sep 17 00:00:00 2001
+From 2c55ca50eeb8532432f51391c2ec28a14fc4e510 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Mon, 11 Nov 2024 20:09:49 -0800
-Subject: [PATCH 42/N] cygthread: suspend thread before terminating.
+Subject: [PATCH 41/N] cygthread: suspend thread before terminating.

 This addresses an extremely difficult to debug deadlock when running
 under emulation on ARM64.
@ -30,8 +30,9 @@ Addresses: https://cygwin.com/pipermail/cygwin-developers/2024-May/012694.html
 Signed-off-by: Jeremy Drake <cygwin@jdrake.com>
 ---
 winsup/cygwin/cygthread.cc | 14 ++++++++++++++
- winsup/cygwin/sigproc.cc   |  3 ++-
- 2 files changed, 16 insertions(+), 1 deletion(-)
+ winsup/cygwin/pinfo.cc     | 10 +++++++---
+ winsup/cygwin/sigproc.cc   | 12 ++++++++++--
+ 3 files changed, 31 insertions(+), 5 deletions(-)

 diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
 index 54918e7..4f16097 100644
@ -58,17 +59,58 @@ index 54918e7..4f16097 100644
   TerminateThread (h, 0);
   WaitForSingleObject (h, INFINITE);
   CloseHandle (h);
+diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
+index a5f5d6e..4bb1946 100644
+--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
+@@ -1262,13 +1262,17 @@ proc_waiter (void *arg)
+ 
+   for (;;)
+     {
+-      DWORD nb;
+      DWORD nb, err;
+       char buf = '\0';
+ 
+       if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)
+-	  && GetLastError () != ERROR_BROKEN_PIPE)
+	  && (err = GetLastError ()) != ERROR_BROKEN_PIPE)
+ 	{
+-	  system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
+	  /* ERROR_OPERATION_ABORTED is expected due to the possibility that
+	     CancelSynchronousIo interruped the ReadFile call, so don't output
+	     that error */
+	  if (err != ERROR_OPERATION_ABORTED)
+	    system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
+ 	  break;
+ 	}
+ 
 diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
-index a89f09d..0089626 100644
+index cf43aa9..4260f88 100644
 --- a/winsup/cygwin/sigproc.cc
 +++ b/winsup/cygwin/sigproc.cc
-@@ -410,7 +410,8 @@ proc_terminate ()
+@@ -413,7 +413,11 @@ proc_terminate ()
+ 	     to 1 iff it is a Cygwin process.  */
 	  if (!have_execed || !have_execed_cygwin)
 	    chld_procs[i]->ppid = 1;
- 	  if (chld_procs[i].wait_thread)
-	    chld_procs[i].wait_thread->terminate_thread ();
-+	    if (!CancelSynchronousIo (chld_procs[i].wait_thread->thread_handle ()))
-+	      chld_procs[i].wait_thread->terminate_thread ();
+-	  if (chld_procs[i].wait_thread)
+	  /* Attempt to exit the wait_thread cleanly via CancelSynchronousIo
+	     before falling back to the (explicitly dangerous) cross-thread
+	     termination */
+	  if (chld_procs[i].wait_thread
+	      && !CancelSynchronousIo (chld_procs[i].wait_thread->thread_handle ()))
+ 	    chld_procs[i].wait_thread->terminate_thread ();
 	  /* Release memory associated with this process unless it is 'myself'.
 	     'myself' is only in the chld_procs table when we've execed.  We
- 	     reach here when the next process has finished initializing but we
+@@ -1199,7 +1203,11 @@ remove_proc (int ci)
+ {
+   if (have_execed)
+     {
+-      if (_my_tls._ctinfo != chld_procs[ci].wait_thread)
+      /* Attempt to exit the wait_thread cleanly via CancelSynchronousIo
+	 before falling back to the (explicitly dangerous) cross-thread
+	 termination */
+      if (_my_tls._ctinfo != chld_procs[ci].wait_thread
+	  && !CancelSynchronousIo (chld_procs[ci].wait_thread->thread_handle ()))
+ 	chld_procs[ci].wait_thread->terminate_thread ();
+     }
+   else if (chld_procs[ci] && chld_procs[ci]->exists ())
--- a/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch
+++ b/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch
@ -1,7 +1,7 @@
-From 2eb6be14ee7baeff294a7297260fb47b40f59679 Mon Sep 17 00:00:00 2001
+From e5dc132b3fa1c6a06867e73c7f67c81a502e3993 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 21 Nov 2024 22:13:42 -0800
-Subject: [PATCH 45/N] Cygwin: revert use of CancelSyncronousIo on
+Subject: [PATCH 42/N] Cygwin: revert use of CancelSyncronousIo on
 wait_thread.

 It appears this is causing hangs on native x86_64 in similar scenarios
@ -42,10 +42,10 @@ index 4bb1946..a5f5d6e 100644
 	}
 
 diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
-index 19a2aec..a89f09d 100644
+index 4260f88..cf43aa9 100644
 --- a/winsup/cygwin/sigproc.cc
 +++ b/winsup/cygwin/sigproc.cc
-@@ -409,11 +409,7 @@ proc_terminate ()
+@@ -413,11 +413,7 @@ proc_terminate ()
 	     to 1 iff it is a Cygwin process.  */
 	  if (!have_execed || !have_execed_cygwin)
 	    chld_procs[i]->ppid = 1;
@ -58,7 +58,7 @@ index 19a2aec..a89f09d 100644
 	    chld_procs[i].wait_thread->terminate_thread ();
 	  /* Release memory associated with this process unless it is 'myself'.
 	     'myself' is only in the chld_procs table when we've execed.  We
-@@ -1178,11 +1174,7 @@ remove_proc (int ci)
+@@ -1203,11 +1199,7 @@ remove_proc (int ci)
 {
   if (have_execed)
     {
--- a/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch
+++ b/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch
@ -1,7 +1,7 @@
-From fe383b0dadf5ea0d3181395475e0462955fb2852 Mon Sep 17 00:00:00 2001
+From 5453f9fab649b5fc02b2d6cdb8411c8fbd0b7409 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <cygwin@jdrake.com>
 Date: Wed, 27 Nov 2024 11:22:49 -0800
-Subject: [PATCH 46/N] Cygwin: cache IsWow64Process2 host arch in wincap.
+Subject: [PATCH 43/N] Cygwin: cache IsWow64Process2 host arch in wincap.

 This was already used in the FAST_CWD check, and could be used in a
 couple other places.
--- a/msys2-runtime/0043-fixup-cygthread-suspend-thread-before-terminating.patch
+++ b/msys2-runtime/0043-fixup-cygthread-suspend-thread-before-terminating.patch
@ -1,33 +0,0 @@
-From eafd9a22bc82cc443352a08c2853cd0d8649a436 Mon Sep 17 00:00:00 2001
-From: Jeremy Drake <github@jdrake.com>
-Date: Wed, 13 Nov 2024 15:13:04 -0800
-Subject: [PATCH 43/N] fixup! cygthread: suspend thread before terminating.
-
-Suppress error output if ReadFile on child wait pipe returns
-ERROR_OPERATION_ABORTED due to addition of CancelSynchronousIo call.
---
- winsup/cygwin/pinfo.cc | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
-index a5f5d6e..43e0034 100644
--- a/winsup/cygwin/pinfo.cc
-+++ b/winsup/cygwin/pinfo.cc
-@@ -1262,13 +1262,14 @@ proc_waiter (void *arg)
- 
-   for (;;)
-     {
-      DWORD nb;
-+      DWORD nb, err;
-       char buf = '\0';
- 
-       if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)
-	  && GetLastError () != ERROR_BROKEN_PIPE)
-+	  && (err = GetLastError ()) != ERROR_BROKEN_PIPE)
- 	{
-	  system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
-+	  if (err != ERROR_OPERATION_ABORTED)
-+	    system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
- 	  break;
- 	}
- 
--- a/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch
+++ b/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch
@ -1,7 +1,7 @@
-From 8d847f4e94acea433d18c2397221e726ab2d06ec Mon Sep 17 00:00:00 2001
+From 985e2654b8498dea90f240be8af40f1ddc9bb7a8 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <cygwin@jdrake.com>
 Date: Wed, 27 Nov 2024 11:26:50 -0800
-Subject: [PATCH 47/N] Cygwin: uname: add host machine tag to sysname.
+Subject: [PATCH 44/N] Cygwin: uname: add host machine tag to sysname.

 If the Cygwin dll's architecture is different from the host system's
 architecture, append an additional tag that indicates the host system
--- a/msys2-runtime/0044-fixup-cygthread-suspend-thread-before-terminating.patch
+++ b/msys2-runtime/0044-fixup-cygthread-suspend-thread-before-terminating.patch
@ -1,64 +0,0 @@
-From 7829673c0c6aad989084a9b72287988efe00a317 Mon Sep 17 00:00:00 2001
-From: Jeremy Drake <github@jdrake.com>
-Date: Tue, 19 Nov 2024 10:57:05 -0800
-Subject: [PATCH 44/N] fixup! cygthread: suspend thread before terminating.
-
-Address review comments:
-* add comments
-* change nested ifs to && conditions
-
-Added CancelSynchronousIo before another terminate_thread call, which
-was not the one that was causing issues, but still makes sense to avoid
-termination if possible.
---
- winsup/cygwin/pinfo.cc   |  3 +++
- winsup/cygwin/sigproc.cc | 15 +++++++++++----
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
-index 43e0034..4bb1946 100644
--- a/winsup/cygwin/pinfo.cc
-+++ b/winsup/cygwin/pinfo.cc
-@@ -1268,6 +1268,9 @@ proc_waiter (void *arg)
-       if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)
- 	  && (err = GetLastError ()) != ERROR_BROKEN_PIPE)
- 	{
-+	  /* ERROR_OPERATION_ABORTED is expected due to the possibility that
-+	     CancelSynchronousIo interruped the ReadFile call, so don't output
-+	     that error */
- 	  if (err != ERROR_OPERATION_ABORTED)
- 	    system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
- 	  break;
-diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
-index 0089626..19a2aec 100644
--- a/winsup/cygwin/sigproc.cc
-+++ b/winsup/cygwin/sigproc.cc
-@@ -409,9 +409,12 @@ proc_terminate ()
- 	     to 1 iff it is a Cygwin process.  */
- 	  if (!have_execed || !have_execed_cygwin)
- 	    chld_procs[i]->ppid = 1;
-	  if (chld_procs[i].wait_thread)
-	    if (!CancelSynchronousIo (chld_procs[i].wait_thread->thread_handle ()))
-	      chld_procs[i].wait_thread->terminate_thread ();
-+	  /* Attempt to exit the wait_thread cleanly via CancelSynchronousIo
-+	     before falling back to the (explicitly dangerous) cross-thread
-+	     termination */
-+	  if (chld_procs[i].wait_thread
-+	      && !CancelSynchronousIo (chld_procs[i].wait_thread->thread_handle ()))
-+	    chld_procs[i].wait_thread->terminate_thread ();
- 	  /* Release memory associated with this process unless it is 'myself'.
- 	     'myself' is only in the chld_procs table when we've execed.  We
- 	     reach here when the next process has finished initializing but we
-@@ -1175,7 +1178,11 @@ remove_proc (int ci)
- {
-   if (have_execed)
-     {
-      if (_my_tls._ctinfo != chld_procs[ci].wait_thread)
-+      /* Attempt to exit the wait_thread cleanly via CancelSynchronousIo
-+	 before falling back to the (explicitly dangerous) cross-thread
-+	 termination */
-+      if (_my_tls._ctinfo != chld_procs[ci].wait_thread
-+	  && !CancelSynchronousIo (chld_procs[ci].wait_thread->thread_handle ()))
- 	chld_procs[ci].wait_thread->terminate_thread ();
-     }
-   else if (chld_procs[ci] && chld_procs[ci]->exists ())
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@ -3,8 +3,8 @@

 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
-pkgver=3.5.4
-pkgrel=8
+pkgver=3.5.5
+pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
 url="https://www.cygwin.com/"
@ -68,62 +68,56 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
        0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
        0039-uname-report-msys2-runtime-commit-hash-too.patch
-        0040-Cygwin-pipe-Fix-a-regression-that-raw_write-slows-do.patch
-        0041-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch
-        0042-cygthread-suspend-thread-before-terminating.patch
-        0043-fixup-cygthread-suspend-thread-before-terminating.patch
-        0044-fixup-cygthread-suspend-thread-before-terminating.patch
-        0045-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch
-        0046-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch
-        0047-Cygwin-uname-add-host-machine-tag-to-sysname.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'
-            '41e896036ea67c5d12a712554f4d53949c2dc809bb3545ac6be1fe619848f8af'
-            '34035a411acb71c81a7f4a2367d2cf9f7f00572b6e92c7ba5506e6a48e4867ca'
-            '6ae29efcd4d17aad01eed252d166de4dd13c0bb2274905933152a1eb21c517dc'
-            '1c08c1c6ff588b8a3db23b8506c3e2c52c207f363d7c04b44da50640f176aab6'
-            'd40da853f11607c7c4bfe5abd95499a2042e520bb483b62fdae34182907f8d74'
-            'b580775232a40bffa60798564988ab2827d0b179db21988552a8533ec8e5098d'
-            'e3a4c550ca64f004db7ec2f28693b08d84d05f127f2698893ab52cb07176ca8b'
-            '23b5b098c147996f620456a1e11d109a231bc1a53cf8db20b996f8414ac7934c')
+        0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch
+        0041-cygthread-suspend-thread-before-terminating.patch
+        0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch
+        0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch
+        0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch)
+sha256sums=('0c6fcf91be78369e753deb1963b4a04e0db613194e70a7ec653774b028adf509'
+            '76e37d572d2aba473aab8f5a1984af2084e6069f9195795c71bc45778edbd1eb'
+            '5c79b09f9337cc8a5f993db6dd1f54df269f8390ab3348a94e5a139a5d060e39'
+            'ad84aab9a9f88b5f7510f04b33b77bbe380ce48e29a9a4feb54b485a3def3114'
+            '89efe4ed3c93ae1508376d33cd775bd4275b2c02c51b754d4f29f6f9bbeeb1c5'
+            'ea9df2911864c80cc70ff1c8026b22d47cbabcdcbad82ff072188b0d651eeb34'
+            'a5984a95c83c782e02f1db14ff0789c79474a6197d33ecf849fab5dda95e581a'
+            'c0172da962a94e5d2f1ba325967a91c5f037cc00f6aeffaeeebec7858931c2a9'
+            'cd600a8b45ee7fe14c932f81b27c4e051b1ea8244258bf0172788df863011963'
+            '1668b401e4ca68257663623fa7de7994b4499b0c183c495a6b07a71c81d4ff64'
+            '6d03e2d13e2e5b87eb9d58fdcc9b61917da170a5052e1cba048e484f736b8604'
+            'e2f2bcb5c3ea0d46e33b4eb938f858e7e302e7d3d45d5bf638a3522db57c3dc1'
+            '4e24df7714b810c7451a90eb27f8d7c94eeefa42e314019517445f2963672d62'
+            '77fd82e00ece7cced83494ca92b78b1c2df4fd903f4b5263e2d3bc3de557c03d'
+            'ef149a162cdb6cca098640aaae73b270e0df08e016a8f66c5c666d7e69f1495e'
+            '2a12a835c30ea729830df30e45135ef83476e2fb9cf5ba3969d65a9ba7a901ca'
+            '0dcff7c8a47d79f6a7b432623475f5cf241221176a58acbc9438c5d0f6dd0640'
+            '3c8baa45e81b329ac2737dd09861910cd42435b05ae49c2b343c62564c6f1b6d'
+            'ead4e40ad7a5efe0ff4f2c0ece682ea8bbc0e5b2013c7c1bbc41c1160a79818d'
+            '6149aa6901bad4c4b62ebb1b270ca13506491e299d60ae5f327a81882f791a4f'
+            '3a686b4baae983fed1996109ec86f78091bbd65a3163ffe0a73e3e283004baf7'
+            'ffd7319e19839cabe6d048775d258818b82631eeaa62475850220ba63062447a'
+            '020ef4fd46dc3c48a9c3d7f4914860363d8d1012c27fc935cae0d2ac638cb211'
+            '3b473683e9f1de616f41542e2e46dbf3212d45a62f1cca34daba6a618d235756'
+            '91b46b4f1b79024b50e75113089612248336e07733930960fff5e6cddb3bbff0'
+            '6e4e2e0ed960fd014d11f92a8a4b8ca96bf1a47249f104809fd549b7ee1b7129'
+            '6c5bdca8f8c3655db90216a13405bf38c4bc504ccf6bc60ab277fc859d99776d'
+            'a992b1fb7243c5b3e0cf6a7848dd5d4b6a5fa6bfd85ac13b744a09b812770c1f'
+            '08540ea1bf7d23cff0d239c99771ab231927576845187f3b55ebbae3abc2e1a4'
+            'd163f7e899099964b0c67af7597bc08d4e887813ccba1a08610bbcb06beacda1'
+            '6c958541e116200d5cc2d407bdabf14825a66d11e80f8937ec4dbdcb7f9bc570'
+            'd0b701bf91d8cd70f4e8ef2f753f03668d176ae5b5b41b7304d666d9a4b09cb4'
+            'd2be4b5d9449711b1b52fe81aa8b41f71e1071cff19e5db43a6ed9e7cd6b2e19'
+            '0752d0df9c493be8eabcfb6bd3fd49e3cddb3828b38c3ae828945dcb8681744e'
+            'a6660ecb7a7f02a3e23ef0bfef234d477412da54e56446c24db39dc1faf50c88'
+            'd499d11b94c71201945915107c2ed55384dae60a5c6284a5bb685798fe58276c'
+            '08207bdb9af01cffacb859be228dfa9a7574deb26a7d08fcf7e86a0c551db059'
+            '4ce0b8c8e05d52030a1411f36b5b4075db90d3450380663c4f46ffbc28553b9e'
+            '7bb4f2d31cc77492c0df7ea16114edefbb8c79e305eae22610c0298759704626'
+            'e8f0340048346be4ef0e49f24433087c4ff2eff0aac4803cb42dc85a76ddaf1c'
+            'a7dc3d4b8a170338e2fea44b3efb7f9b299d1846edb8f6a6ba9375a6d53e88f1'
+            'eac80fb3b54dced1e982c01a755c1914eccd1f8d74b7b88a0af43819ab317a2f'
+            '29c3412a1c7b0e4e719b64337ba5508b141037884ba96e9bee5f8ea253811aa3'
+            '7064362256cb558fe443469b5f9988ca927667b7cf13f1c1020aca98e616f900'
+            'fb6c38381eb4f36338a5184f79c98e6046c9ff741da37f2f38f4757c8714ca92')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@ -200,14 +194,11 @@ prepare() {
  0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch \
  0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch \
  0039-uname-report-msys2-runtime-commit-hash-too.patch \
-  0040-Cygwin-pipe-Fix-a-regression-that-raw_write-slows-do.patch \
-  0041-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch \
-  0042-cygthread-suspend-thread-before-terminating.patch \
-  0043-fixup-cygthread-suspend-thread-before-terminating.patch \
-  0044-fixup-cygthread-suspend-thread-before-terminating.patch \
-  0045-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch \
-  0046-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch \
-  0047-Cygwin-uname-add-host-machine-tag-to-sysname.patch
+  0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch \
+  0041-cygthread-suspend-thread-before-terminating.patch \
+  0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch \
+  0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch \
+  0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch
 }

 build() {