diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch
index 0baf44d7..3c4c6404 100644
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@@ -1,4 +1,4 @@
-From 88039c4cb480595a608332fd900a94cbc7e8fe14 Mon Sep 17 00:00:00 2001
+From b7ea1ff3ee0900feb7e3a2592edb32c4fe856ce9 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 09d74c49..b929ac5e 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 95a30d3e61d87a14571db698bfb8877bd84e6dd7 Mon Sep 17 00:00:00 2001
+From b4a619f6cae1eaf30a5039c2ae7ddedce4718e42 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 651d813b..ef9160bd 100644
--- 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 06a72525d9b35815f3281fc214945c8349d4ed63 Mon Sep 17 00:00:00 2001
+From 78bdd1f9ba8c7d1ae54e71d02cd74e6224ad5f8d 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
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 c3c49bdb..b1cf9efa 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 8dcd7c5d7da369cf1dcf329b4223726614ee20d7 Mon Sep 17 00:00:00 2001
+From 73f04971bd0cb4b9f8ff22dafde05197e4287ed2 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
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 1e138eb3..39347b87 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 6c35e55ed6b9f60565737efda2d2833e7c9da8f7 Mon Sep 17 00:00:00 2001
+From 570fa722d23321581f533a573562f989136a40a8 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
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 7a51fa39..71186d67 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 fd8441d4a1dc7541954986345507f1d2c896137e Mon Sep 17 00:00:00 2001
+From c612aac3aa1ae4c0b154f18c42adb9f152ab6307 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 9717246b..d702c2dd 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 2f41ba83a1949dfdea9a15d9736792fe0e4ca417 Mon Sep 17 00:00:00 2001
+From 4d0a696e6a4c4a934117295545e22dec924e5612 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
diff --git a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
index db25c308..f121d9f2 100644
--- a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
+++ b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
@@ -1,4 +1,4 @@
-From b358d0e443b95978bc71bda15496c06651258423 Mon Sep 17 00:00:00 2001
+From b16328a5d1ecd8f7ed239259e625030e7d7cabd9 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
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 c2e8fee6..4eaa0e4e 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 b7ed4157cc491da1ff521e02236d058dcc8e9238 Mon Sep 17 00:00:00 2001
+From d379a22fc549042e1d757dc00b4d7864aab2cb9d 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-Special-case-for-converting-root-directory-to-have-t.patch b/msys2-runtime/0010-Special-case-for-converting-root-directory-to-have-t.patch
index 9228d44f..3ce2df04 100644
--- a/msys2-runtime/0010-Special-case-for-converting-root-directory-to-have-t.patch
+++ b/msys2-runtime/0010-Special-case-for-converting-root-directory-to-have-t.patch
@@ -1,4 +1,4 @@
-From f08a6ec07fefd1cafdd1894cdb2712f50d893c2e Mon Sep 17 00:00:00 2001
+From 6bb97a098add2ea75010211cd84ac871a39a810f 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
diff --git a/msys2-runtime/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
index 09044516..2205661f 100644
--- a/msys2-runtime/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
+++ b/msys2-runtime/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
@@ -1,4 +1,4 @@
-From 0f233ab6346e0546ab7e93516784555d51083a98 Mon Sep 17 00:00:00 2001
+From 77528d118c2dcd3185bdd81a52ee7b0448887b54 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 11/N] dcrt0.cc: Untangle allow_glob from winshell
diff --git a/msys2-runtime/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
index 5a8a92f3..eb212b97 100644
--- a/msys2-runtime/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
+++ b/msys2-runtime/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
@@ -1,4 +1,4 @@
-From bbe1dc2a71dc3d499ad5c797d3b06688db819b36 Mon Sep 17 00:00:00 2001
+From 35bfbdef58fbdbae2760bd85bba0347a877a7956 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 12/N] dcrt0.cc (globify): Don't quote literal strings
diff --git a/msys2-runtime/0013-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0013-strace.cc-Don-t-set-MSYS-noglob.patch
index 4528df44..7970c7a6 100644
--- a/msys2-runtime/0013-strace.cc-Don-t-set-MSYS-noglob.patch
+++ b/msys2-runtime/0013-strace.cc-Don-t-set-MSYS-noglob.patch
@@ -1,4 +1,4 @@
-From 20adab04a61716223a06132c90bf9e735a275b5c Mon Sep 17 00:00:00 2001
+From 6056dc4dbbd3a9bc4c86001ea10c16915dc5fda4 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 13/N] strace.cc: Don't set MSYS=noglob
diff --git a/msys2-runtime/0014-Add-debugging-for-build_argv.patch b/msys2-runtime/0014-Add-debugging-for-build_argv.patch
index c92d0a6f..7f5c6284 100644
--- a/msys2-runtime/0014-Add-debugging-for-build_argv.patch
+++ b/msys2-runtime/0014-Add-debugging-for-build_argv.patch
@@ -1,4 +1,4 @@
-From 41df0f040c1a4d6fd01e9c55fad6ba26c58a014b Mon Sep 17 00:00:00 2001
+From fc25b4254d19ede0f40a88adf254e38892684f6e 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 14/N] Add debugging for build_argv
diff --git a/msys2-runtime/0015-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0015-Add-debugging-for-strace-make_command_line.patch
index 4dc93b35..fb7a8d74 100644
--- a/msys2-runtime/0015-Add-debugging-for-strace-make_command_line.patch
+++ b/msys2-runtime/0015-Add-debugging-for-strace-make_command_line.patch
@@ -1,4 +1,4 @@
-From bd51202286206833b724a827e4e5c3caec0ae962 Mon Sep 17 00:00:00 2001
+From 22be03a600ca1c104e6f00200fb1dc8bc1ad7f25 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 15/N] Add debugging for strace make_command_line
diff --git a/msys2-runtime/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch
index 4b0dec3a..2f41b239 100644
--- a/msys2-runtime/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch
+++ b/msys2-runtime/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch
@@ -1,4 +1,4 @@
-From 82ccc92d9ee08b97077dc7dcedecff96660d3e0e Mon Sep 17 00:00:00 2001
+From 3526a60c0161e089ba5804d1c24e96c1d9c64468 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 16/N] environ.cc: New facility/environment variable
diff --git a/msys2-runtime/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch b/msys2-runtime/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
index 8a11885c..393bb112 100644
--- a/msys2-runtime/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
+++ b/msys2-runtime/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
@@ -1,4 +1,4 @@
-From 22c7f1dfccffa9e6bc045f92d5eca18635cd31d8 Mon Sep 17 00:00:00 2001
+From c331d4dc56fe2a69bc9f5c4c7a1d51c2868e1431 Mon Sep 17 00:00:00 2001
 From: SquallATF <squallatf@gmail.com>
 Date: Mon, 10 Sep 2018 11:32:18 +0300
 Subject: [PATCH 17/N] Fix native symbolic link spawn passing wrong arg0
diff --git a/msys2-runtime/0018-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch b/msys2-runtime/0018-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
index 6258c208..a4b3da77 100644
--- a/msys2-runtime/0018-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
+++ b/msys2-runtime/0018-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
@@ -1,4 +1,4 @@
-From 9291c55480b303b19e5fb359a3a631b3212a5083 Mon Sep 17 00:00:00 2001
+From a8003d9f999d73975f674c6d311eb9b54cd4262d Mon Sep 17 00:00:00 2001
 From: Alexey Pavlov <alexpux@gmail.com>
 Date: Fri, 24 May 2019 13:41:47 +0300
 Subject: [PATCH 18/N] QueryUnbiasedInterruptTime must be load from
diff --git a/msys2-runtime/0019-strace-quiet-be-really-quiet.patch b/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
index f4e31888..f15ec78b 100644
--- a/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
+++ b/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
@@ -1,4 +1,4 @@
-From b5c582a6566e6c01bf8e0a4355750c2cb3c51706 Mon Sep 17 00:00:00 2001
+From 4c54420029fabd3e5fd74d2adf55c7bfc73e5747 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 19/N] strace --quiet: be *really* quiet
diff --git a/msys2-runtime/0020-Default-to-disable_pcon.patch b/msys2-runtime/0020-Default-to-disable_pcon.patch
index 91423dd3..2a2816fa 100644
--- a/msys2-runtime/0020-Default-to-disable_pcon.patch
+++ b/msys2-runtime/0020-Default-to-disable_pcon.patch
@@ -1,4 +1,4 @@
-From 2f696d72e6fd418ccf485b0beb9e41c1b455df6c Mon Sep 17 00:00:00 2001
+From b3ba6102e34948d5f939551817564257e8209df8 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 19 May 2020 13:24:55 +0200
 Subject: [PATCH 20/N] Default to `disable_pcon`
diff --git a/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
index 93a0611b..741710e3 100644
--- a/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
+++ b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
@@ -1,4 +1,4 @@
-From 9322ca9df0a60c70207d29167bc75342ec10b6ea Mon Sep 17 00:00:00 2001
+From d18cf5f0435ab2a3904e2276c14f028a00253110 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 21/N] Introduce the `enable_pcon` value for `MSYS`
diff --git a/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch
index 93349388..b6dd1bde 100644
--- a/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+++ b/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch
@@ -1,4 +1,4 @@
-From b22c6adafcebe8dc325f5a7202015298dad5a607 Mon Sep 17 00:00:00 2001
+From 61700feba5eaedaf8f91e9fb7834854af1bc882c 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 22/N] popen: call /usr/bin/sh instead of /bin/sh
diff --git a/msys2-runtime/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch b/msys2-runtime/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch
index 57d54c67..eb6ef588 100644
--- a/msys2-runtime/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch
+++ b/msys2-runtime/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch
@@ -1,4 +1,4 @@
-From e5fbfc41995045e82916fb4baea6ca640dfdb780 Mon Sep 17 00:00:00 2001
+From aa1be5a6939e6091a146acc33a73fd365ac46820 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 9 Aug 2020 14:02:51 +0200
 Subject: [PATCH 23/N] CI: add a GHA for doing a basic build test
diff --git a/msys2-runtime/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch b/msys2-runtime/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
index 302ae52f..6ed7acdf 100644
--- a/msys2-runtime/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
+++ b/msys2-runtime/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
@@ -1,4 +1,4 @@
-From 1131bc08b5660335db02276998527a89200380cf Mon Sep 17 00:00:00 2001
+From 958ad875858ad92e7b914e849e33a1e41eb3f565 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 22 Nov 2019 11:20:22 +0100
 Subject: [PATCH 24/N] Set up a GitHub Action to keep in sync with Cygwin
diff --git a/msys2-runtime/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch
index e401a7ac..095a3137 100644
--- a/msys2-runtime/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch
+++ b/msys2-runtime/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch
@@ -1,4 +1,4 @@
-From aca6aa309972ec1786d0bc72a55bb03464e046bc Mon Sep 17 00:00:00 2001
+From bf863027c398caa16bbe8ff43c832b5d7e04fe8d 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 25/N] Expose full command-lines to other Win32 processes by
diff --git a/msys2-runtime/0026-Disable-the-cygwin-GitHub-workflow.patch b/msys2-runtime/0026-Disable-the-cygwin-GitHub-workflow.patch
index 5f46758a..e93d24a7 100644
--- a/msys2-runtime/0026-Disable-the-cygwin-GitHub-workflow.patch
+++ b/msys2-runtime/0026-Disable-the-cygwin-GitHub-workflow.patch
@@ -1,4 +1,4 @@
-From ed526a3eb6003b1b2cb2b7c17a17c3f9ebcaf0fb Mon Sep 17 00:00:00 2001
+From 7a24d3e2ef5338dddb661471407eaee1de5a6cff Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 17 Mar 2021 17:41:02 +0100
 Subject: [PATCH 26/N] Disable the 'cygwin' GitHub workflow
diff --git a/msys2-runtime/0027-Do-not-show-Error-dialogs-by-default.patch b/msys2-runtime/0027-Do-not-show-Error-dialogs-by-default.patch
index fbe6a10f..dc86a738 100644
--- a/msys2-runtime/0027-Do-not-show-Error-dialogs-by-default.patch
+++ b/msys2-runtime/0027-Do-not-show-Error-dialogs-by-default.patch
@@ -1,4 +1,4 @@
-From 0c8795022cb2ed694cf4545446ee883327c6905e Mon Sep 17 00:00:00 2001
+From b08821c36810608c5152746540663c145121b301 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 31 Mar 2021 11:38:41 +0200
 Subject: [PATCH 27/N] Do not show Error dialogs by default
diff --git a/msys2-runtime/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
index 2efcfdb3..2bda7e18 100644
--- a/msys2-runtime/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
+++ b/msys2-runtime/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
@@ -1,4 +1,4 @@
-From ebcfae76d4999d3141533900338a012b1db9c0e8 Mon Sep 17 00:00:00 2001
+From c60dab0f2191add1ad73b97ac07e5342d4332404 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 28/N] Add a helper to obtain a function's address in
diff --git a/msys2-runtime/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
index de227a29..92e06260 100644
--- a/msys2-runtime/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
+++ b/msys2-runtime/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
@@ -1,4 +1,4 @@
-From 17a8f32e326cd366c737c23ffd0352f4cc327d87 Mon Sep 17 00:00:00 2001
+From 31f8a0c0d60ce7b5d03d0007e2e63f66ac61d861 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 29/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
diff --git a/msys2-runtime/0030-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime/0030-kill-kill-Win32-processes-more-gently.patch
index 8244bcee..828c3e84 100644
--- a/msys2-runtime/0030-kill-kill-Win32-processes-more-gently.patch
+++ b/msys2-runtime/0030-kill-kill-Win32-processes-more-gently.patch
@@ -1,4 +1,4 @@
-From 0bff285e26446826fbb12112c52e4e2f828cdaf9 Mon Sep 17 00:00:00 2001
+From 6ccc6f5972986074a0dd89673ab121356f6c3da4 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 30/N] kill: kill Win32 processes more gently
diff --git a/msys2-runtime/0031-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime/0031-Cygwin-make-option-for-native-inner-link-handling.patch
index 5df4fac0..ceadec7f 100644
--- a/msys2-runtime/0031-Cygwin-make-option-for-native-inner-link-handling.patch
+++ b/msys2-runtime/0031-Cygwin-make-option-for-native-inner-link-handling.patch
@@ -1,4 +1,4 @@
-From 891fb6976639913168a71efd07afdcdc3d1baa3c Mon Sep 17 00:00:00 2001
+From 9158ee6eb36c75c908258b33096ab9eead5989b6 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 22 Jul 2021 11:59:16 -0700
 Subject: [PATCH 31/N] Cygwin: make option for native inner link handling.
diff --git a/msys2-runtime/0032-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime/0032-docs-skip-building-texinfo-and-PDF-files.patch
index b9b0cb1c..0698bd74 100644
--- a/msys2-runtime/0032-docs-skip-building-texinfo-and-PDF-files.patch
+++ b/msys2-runtime/0032-docs-skip-building-texinfo-and-PDF-files.patch
@@ -1,4 +1,4 @@
-From de9d09849b66c76e4323df2718bc75dc09ddb180 Mon Sep 17 00:00:00 2001
+From 7e71fb2470dc955df89c8d96e7d6db668b211853 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 32/N] docs: skip building texinfo and PDF files
diff --git a/msys2-runtime/0033-install-libs-depend-on-the-toollibs.patch b/msys2-runtime/0033-install-libs-depend-on-the-toollibs.patch
index b6c2a949..e77f896f 100644
--- a/msys2-runtime/0033-install-libs-depend-on-the-toollibs.patch
+++ b/msys2-runtime/0033-install-libs-depend-on-the-toollibs.patch
@@ -1,4 +1,4 @@
-From e6d83d943a6c7336dc746dd8c6e65acbf00801d8 Mon Sep 17 00:00:00 2001
+From 5a48b667eef43d343307a95407b221d0d85f0066 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 33/N] install-libs: depend on the "toollibs"
diff --git a/msys2-runtime/0034-Cygwin-pipe-Handle-WAIT_CANCELED-when-waiting-read_m.patch b/msys2-runtime/0034-Cygwin-pipe-Handle-WAIT_CANCELED-when-waiting-read_m.patch
new file mode 100644
index 00000000..65f4b7c7
--- /dev/null
+++ b/msys2-runtime/0034-Cygwin-pipe-Handle-WAIT_CANCELED-when-waiting-read_m.patch
@@ -0,0 +1,39 @@
+From c64fde18f02a18c9caec4a9b9cfd7a25241e0e3d Mon Sep 17 00:00:00 2001
+From: Takashi Yano <takashi.yano@nifty.ne.jp>
+Date: Wed, 10 Nov 2021 12:24:53 +0900
+Subject: [PATCH 34/N] Cygwin: pipe: Handle WAIT_CANCELED when waiting
+ read_mtx.
+
+- Add missing handling for WAIT_CANCELED in cygwait() for read_mtx
+  in raw_read().
+---
+ winsup/cygwin/fhandler_pipe.cc | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
+index ce58e37..22149ca 100644
+--- a/winsup/cygwin/fhandler_pipe.cc
++++ b/winsup/cygwin/fhandler_pipe.cc
+@@ -302,10 +302,18 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
+       set_errno (EAGAIN);
+       len = (size_t) -1;
+       return;
+-    default:
++    case WAIT_SIGNALED:
+       set_errno (EINTR);
+       len = (size_t) -1;
+       return;
++    case WAIT_CANCELED:
++      pthread::static_cancel_self ();
++      /* NOTREACHED */
++    default:
++      /* Should not reach here. */
++      __seterrno ();
++      len = (size_t) -1;
++      return;
+     }
+   while (nbytes < len)
+     {
+-- 
+2.33.0
+
diff --git a/msys2-runtime/0035-Cygwin-pipe-Fix-raw_write-for-non-cygwin-pipe-with-s.patch b/msys2-runtime/0035-Cygwin-pipe-Fix-raw_write-for-non-cygwin-pipe-with-s.patch
new file mode 100644
index 00000000..329dc041
--- /dev/null
+++ b/msys2-runtime/0035-Cygwin-pipe-Fix-raw_write-for-non-cygwin-pipe-with-s.patch
@@ -0,0 +1,32 @@
+From 4a526f2e8302b858ae65a7e8793852b34fdfacc0 Mon Sep 17 00:00:00 2001
+From: Takashi Yano <takashi.yano@nifty.ne.jp>
+Date: Thu, 11 Nov 2021 12:30:24 +0900
+Subject: [PATCH 35/N] Cygwin: pipe: Fix raw_write() for non-cygwin pipe with
+ size zero.
+
+- Currently, raw_write() fails to handle size zero pipe which may
+  be created by non-cygwin apps (e.g. Windows native ninja). This
+  patch fixes the issue.
+
+Addresses:
+  https://cygwin.com/pipermail/cygwin/2021-November/249844.html
+---
+ winsup/cygwin/fhandler_pipe.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
+index 22149ca..c1aa69f 100644
+--- a/winsup/cygwin/fhandler_pipe.cc
++++ b/winsup/cygwin/fhandler_pipe.cc
+@@ -449,7 +449,7 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
+       return -1;
+     }
+ 
+-  if (len <= pipe_buf_size)
++  if (len <= pipe_buf_size || pipe_buf_size == 0)
+     chunk = len;
+   else if (is_nonblocking ())
+     chunk = len = pipe_buf_size;
+-- 
+2.33.0
+
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index 988eeb74..2dad8abd 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -56,41 +56,45 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
         0030-kill-kill-Win32-processes-more-gently.patch
         0031-Cygwin-make-option-for-native-inner-link-handling.patch
         0032-docs-skip-building-texinfo-and-PDF-files.patch
-        0033-install-libs-depend-on-the-toollibs.patch)
+        0033-install-libs-depend-on-the-toollibs.patch
+        0034-Cygwin-pipe-Handle-WAIT_CANCELED-when-waiting-read_m.patch
+        0035-Cygwin-pipe-Fix-raw_write-for-non-cygwin-pipe-with-s.patch)
 sha256sums=('SKIP'
-            '3e789ba55d1aa296dac8462518d5d7a3be4df8a835d93884f5740a3a18db67cb'
-            '260d12dc8c23d13b2c5cf728bf1902a3d56e0e4d67ee50e60a43d84bb097089d'
-            '34c068eef8c369aa928873252a2ed17db80e6c999531c414d2487e03ea507978'
-            '685b4d9296fb70d82f25cc378f45d43f5d19a22e69c92b50aaf29e9093b4822b'
-            '90918031c45d8cb65fb62d8a6dbdcfbcdd18cf6a0c719dab1fb48f1ff4842eca'
-            '84802cd8a6c62527b8875b5036e58c05e8057b8aa7e6ffbbe95cd6be5277ed9b'
-            '04b5c7ebfc9983a06644c27562658285ceedbc47f67920af2e0dcbf32262dd12'
-            '31703942b3e79f43be7a1123941e9c209d1d750233186a6d525089d7978b0672'
-            '7cef73a50097d3b344ae65bcfe78aaf96151cf73fb72c325431e3b2e84acac42'
-            '199d8d7af909d295cfb3b5b68d09d6ebeb4ad70f0f588642948ffbb3a6cad76c'
-            '676962defbd5089d752294c3a750b54fadd78276ea084efa5e242b27e1b47bbf'
-            '1e2919651ee5b087153683d09054604344d452753a151723b43ef3723e42ae9a'
-            '561b7d7dec69c9f58281ea37c5841e5029a0f367cb510287798d4e17cd6236d2'
-            '7796d68231b665bc3e8bb6cf36dda65c6675ebf641252cbd2a3b370e79ca6cff'
-            '2596c924775817fed95809264faa5072e0e3854428aba4d3247a1a67083e50e6'
-            'e5f2b05dff632b91780c5463a1408054b89e1dd43d72e767b35b03e6bc4b6112'
-            'cb01206a759881ee1a08866396e1eb38a48137146ff07c1af9b408d1066b86d6'
-            '6ba8bb1875e9933e0cf33250edde576c5af81e9b92f67321f22788679306cdc8'
-            'ae1022aab5bff2bc479b483114784c1b7de9d499eb765ca3cb1532fc4cfb7cc3'
-            '73f6c2a123db3d5e0f5b337697ed2ea1ac7f56acdc37dd9174fbe0687054bef4'
-            '774d276b6cdd890b3a32aae081db2204ed7a3d2a56634aab730d280b7ed13f25'
-            '9eeabfd8db9543890c600415f52bbb9c2befcaa97ceb2dd68a7f7c4f182a3e2a'
-            '39d2a0229a7cf0ea9387423cac4dbcdf90c65c3664e35c89b991927c19271980'
-            '2154af41495e3cba9d7f097f2bba169838cb61fa3dc780c094918453ef0bb7f2'
-            '229821adf7e8fddf223262fa6157703943651d8625c7fc5fca14cb9bbb540066'
-            '623df1c43459c3971839a5e186475b6ec26a875d40cc7af3e31f9e03f8d756b2'
-            'a03beeb1ce71e84ada13008c6f60f740d42a3026d65fe5428fa583cef3049f3a'
-            'c498f1940f3cf4a6cb12e934d9bc9896d94cbdae2c707bdcb0914d2e264d2aa1'
-            '66add325fb3daa332d01d144f6aaaffe74847b4582645c678cbebeec11e54675'
-            'f9de71c2ea029b5d6832ed3d75eeddeabcde837d956fcc02d7c34c10b93a06fe'
-            'e8d957f1fe9b0a8c539f6052ddb34d829881f5f63f56980b8efe068dfb670af5'
-            '01b6ea9d8a36df326d3e8f184a3bb6cefe69563619226e7261a2fca7a6d7e139'
-            'a4fad4f3c048cf4387826b3e0e3090fd16493dbb768c460d5c7baf3c26b32cf3')
+            'e23ef64ef0c824f4ba92709e4b6e135e7abba13c170d1caf00af5bfb8ef4c609'
+            '93d59e341ba55a9679242b9623e96dd5d3e365170773272e9b774fa524f5b3b0'
+            'bfc9394fd298c1bf95219f20801b14d656f3fd36c6d2484ee3f2fcbe4c2d0ec6'
+            '72592a70a04d4b6fdcb90cbcadf15dae78779159fdc6ca9f160a582be08d1806'
+            '60e5aca8d03c98a6b0567e9fb445685b7a98a86a8452d7ab07e59b445fd4e140'
+            '6e99bb36901ef5ed053b7d5a58c11b1165dd5b4a269922c7aeafbe2209aa6f3b'
+            '6a8d552983938c68d657d47531af02b46c3dbf3da862dac74c353a30da7eec87'
+            'f4d2fb83f29fefb2955ae84e7f329b2ac46fec8847b9dc73ac2dcb44586bf0cf'
+            'bac9f56d1f698c9d5f7526760dddff49438189a3cdae7652e4e55bb5d43a7e79'
+            'e426387b6b8c488658ef8385584a55ecc407efbd6961aecdbaf9b9b50b340ed3'
+            '0a456f67efdd55c785f2e622b579bddedf47ce2c2dd5c71c745d0eb32cc7a705'
+            '1884067b211d34c7a05ea85eb1f8c794bae9a3fbb30937bfb89de188673eabc4'
+            '338d0df6c0488c37f25c1a1364d20b2a85553e17a3c2a867d99564a84b622073'
+            '52e7610badee70f22f1d935b34a5c769d3d9ca54ab2dce1070a5ed19137391fe'
+            '7a1dccadc4f62a3d26a25d265e5ab24269b083276c5e1e836116b3af32263a30'
+            'c1b1106a2341557f86b33d87d5ac809efe27f9841ad12c2f0ea71616f3ea2906'
+            '2e303260145866bcac245f14d5473deacca62d41afce9473c80ff83b35fe14e3'
+            '1fc88ed43212d04da6b74e0419247db6d731c70715afe1c96aa88d885cd56760'
+            '7a42b24870f3582559b1f19a722142a5fddd17eb1afcc4333a9d274559e57dde'
+            '423ffcca240df380cfcd1ac7ddb37ff37314c228e2db0cd78b9d3d865a3ce746'
+            '775d701385ba964e0306f02d1f94aea156d0f1a239de4f9d522d2789e2b2b94a'
+            'd62ea79c84cdc766aed8df80ec18cd64394f7dfc055f5779cdc1a68066310db3'
+            '8ce8951bac5a2a58a9e3349592387c4c19d0f90ae5ca4410af42fefc35a3a3d4'
+            '8257cdfe33de8410cf1a36cf1b431cf789951ced9f6a77eb51e78c15595659f0'
+            '822d44ce9ece8160ff312c84a0ef2da3d8a468f8e59c85d6edb14d82ffe6535f'
+            'b16a94774be3a227a54b17b541efa0df80c3f94bebf80031d19725d8c7cabaa8'
+            '1c39a9bdc0e29f16df08419dbd885edefd6c2710ea49cacd28109b0244c4a134'
+            'f6f2c6fd85ee20abd7093038dcfb10b4f3567322d80c9fb97e1ced78d5ed850b'
+            '5f60436ebbbaf00259b740dc947ea6ec6addc9baaa120238489ce2cc582283aa'
+            'c1c8ccaa50f69a7d3144e1f634da006aa5358035aae464c6d4c4376211c13e76'
+            '5e8bfb8712689a065f4a92aa13b221466781319048c2c3346772136dd511e20b'
+            'f74308a457525260e59ca2581a95fe6ed8818033fc43a8b2e861581f0240f1f2'
+            '878131329128d7a3acbb450abb16bba0a682206732a557d752ace37dcee9c894'
+            '3d1409fa9eb2194a259133595120dc2d27f38f701e53edb87abac5d08f3d9cd5'
+            'cfe72cf596dda4573b5ca74c27a33feaa3201c97d2381d9bfdcc8be8d1a09d4c')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -160,7 +164,9 @@ prepare() {
   0030-kill-kill-Win32-processes-more-gently.patch \
   0031-Cygwin-make-option-for-native-inner-link-handling.patch \
   0032-docs-skip-building-texinfo-and-PDF-files.patch \
-  0033-install-libs-depend-on-the-toollibs.patch
+  0033-install-libs-depend-on-the-toollibs.patch \
+  0034-Cygwin-pipe-Handle-WAIT_CANCELED-when-waiting-read_m.patch \
+  0035-Cygwin-pipe-Fix-raw_write-for-non-cygwin-pipe-with-s.patch
 }
 
 build() {