msys2-runtime: Update to 3.4.5

See https://github.com/msys2/msys2-runtime/pull/136
2023-01-19 21:23:40 +01:00 · 2023-01-19 21:23:40 +01:00 · 46c064cc8b
commit 46c064cc8b
parent 6bd50b630e
38 changed files with 100 additions and 100 deletions
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@ -1,4 +1,4 @@
-From 5ac9d739274ef33f18decf270e020c1a157b2eba Mon Sep 17 00:00:00 2001
+From fe651f9109e228ac96e049d8b9874c44e22f6b1b 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 2514e3c6f3b725258a3a01c05592c5afafd4ec13 Mon Sep 17 00:00:00 2001
+From 019bcd87686e00a9855cd789e11c380a1b1b8a24 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 e049df29575e6c8eb6e85e38ca39f14c1286e9ee Mon Sep 17 00:00:00 2001
+From fe06affba4cddc6b0ea96605074bf80d7ff16cf6 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
@ -234,7 +234,7 @@ index 54918e7..518d11f 100644
   else
     thread_printf ("overflowed cygwin thread pool");
 diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
-index f1371af..3167f04 100644
+index c6768e4..ebca74d 100644
 --- a/winsup/cygwin/cygwin.din
 +++ b/winsup/cygwin/cygwin.din
@@ -1,4 +1,4 @@
@ -243,7 +243,7 @@ index f1371af..3167f04 100644
 
 EXPORTS
 # Exported variables
-@@ -398,8 +398,8 @@ cygwin_attach_handle_to_fd SIGFE
+@@ -399,8 +399,8 @@ cygwin_attach_handle_to_fd SIGFE
 cygwin_conv_path SIGFE
 cygwin_conv_path_list SIGFE
 cygwin_create_path SIGFE
@ -270,7 +270,7 @@ index 69526f5..4dc5dae 100644
 #error unimplemented for this target
 #endif
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 5c5a280..c80ce4f 100644
+index 49b7a44..4157bfe 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
@@ -376,12 +376,12 @@ check_sanity_and_sync (per_process *p)
@ -303,7 +303,7 @@ index 5c5a280..c80ce4f 100644
     {
       char buf1[PATH_MAX];
       GetModuleFileName (NULL, buf1, PATH_MAX);
-@@ -1066,7 +1066,11 @@ dll_crt0 (per_process *uptr)
+@@ -1064,7 +1064,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
@ -315,7 +315,7 @@ index 5c5a280..c80ce4f 100644
 {
   static int _fmode;
 
-@@ -1269,7 +1273,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
+@@ -1267,7 +1271,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
       return;
     }
 
@ -324,7 +324,7 @@ index 5c5a280..c80ce4f 100644
     return;
 
   if (CYGWIN_VERSION_MAGIC_VERSION (magic_version) == version)
-@@ -1289,7 +1293,7 @@ are unable to find another cygwin DLL.",
+@@ -1287,7 +1291,7 @@ are unable to find another cygwin DLL.",
 void
 cygbench (const char *s)
 {
@ -560,10 +560,10 @@ index 1e4cf98..b77598b 100644
       }									      \
     }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 0624d21..5a8afb7 100644
+index c53a884..5fe83cb 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
-@@ -495,7 +495,11 @@ details. */
+@@ -496,7 +496,11 @@ details. */
    names include the CYGWIN_VERSION_SHARED_DATA version as well as this
    identifier. */
 
@ -575,7 +575,7 @@ index 0624d21..5a8afb7 100644
 
 /* The Cygwin mount table interface in the Win32 registry also has a version
    number associated with it in case that is changed in a non-backwards
-@@ -511,7 +515,11 @@ details. */
+@@ -512,7 +516,11 @@ details. */
 
 /* Identifiers used in the Win32 registry. */
 
@ -680,7 +680,7 @@ index fc1576b..b297511 100644
 #ifndef __INSIDE_CYGWIN__
 class transport_layer_base;
 diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
-index e086ab9..0c7757e 100644
+index 8dc46ee..753d415 100644
 --- a/winsup/cygwin/pinfo.cc
 +++ b/winsup/cygwin/pinfo.cc
@@ -194,7 +194,7 @@ pinfo::maybe_set_exit_code_from_windows ()
--- 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 d146fc2f75bc65599544b62be4f9dded793783a0 Mon Sep 17 00:00:00 2001
+From e01462bfdf43f53bd97558964d6d7988261b2775 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
@ -939,7 +939,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 c2ad39c..e48a388 100644
+index 97099af..2ca749c 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
@@ -66,6 +66,7 @@
--- 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 ea1ee317705a15f60b7b2609526488f59f9116e9 Mon Sep 17 00:00:00 2001
+From 4609d0ee13fac7702e4d2ca777dfb0697d43eade 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 1a622ef1c5ac1076b909aaf24cdd931ba75249a9 Mon Sep 17 00:00:00 2001
+From a7a9ea0b97b8f87bfea6a4f64c66ef3c719a80cf 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
@ -35,10 +35,10 @@ index 5bb84b9..cb48a68 100644
  public:
   void init (bool);
 diff --git a/winsup/cygwin/mm/cygheap.cc b/winsup/cygwin/mm/cygheap.cc
-index a305570..538d88f 100644
+index 6094076..c2505a6 100644
 --- a/winsup/cygwin/mm/cygheap.cc
 +++ b/winsup/cygwin/mm/cygheap.cc
-@@ -215,14 +215,22 @@ init_cygheap::init_installation_root ()
+@@ -217,14 +217,22 @@ init_cygheap::init_installation_root ()
 
   /* Strip off last path component ("\\cygwin1.dll") */
   PWCHAR w = wcsrchr (installation_root_buf, L'\\');
@ -62,7 +62,7 @@ index a305570..538d88f 100644
 
   /* Copy result into installation_dir before stripping off "bin" dir and
      revert to Win32 path.  This path is added to the Windows environment
-@@ -247,6 +255,7 @@ init_cygheap::init_installation_root ()
+@@ -249,6 +257,7 @@ init_cygheap::init_installation_root ()
   RtlInitUnicodeString (&installation_root, installation_root_buf);
   RtlInitUnicodeString (&installation_dir, installation_dir_buf);
 
@ -70,7 +70,7 @@ index a305570..538d88f 100644
   for (int i = 1; i >= 0; --i)
     {
       reg_key r (i, KEY_WRITE, _WIDE (CYGWIN_INFO_INSTALLATIONS_NAME),
-@@ -255,6 +264,7 @@ init_cygheap::init_installation_root ()
+@@ -257,6 +266,7 @@ init_cygheap::init_installation_root ()
 				    installation_root_buf)))
 	break;
     }
--- 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 32823ef5f27f25727951647c8bdb466907c78a00 Mon Sep 17 00:00:00 2001
+From 79f2fd1a70825f12d755093fee9b064b3f47ddf2 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
@ -61,7 +61,7 @@ index aef4a68..cd907b7 100644
 
 bool NO_COPY in_forkee;
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index e48a388..1841328 100644
+index 2ca749c..3378b6d 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
@@ -1682,6 +1682,89 @@ conv_path_list (const char *src, char *dst, size_t size,
--- 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 97f98b3f7525b0f0df45f64118d973645a29539a Mon Sep 17 00:00:00 2001
+From 87bd33d55782a5ef9b3d7745e8093d50548796e5 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 caf7d40512c4bf8140f86dd0bf7c4ec63d857fbe Mon Sep 17 00:00:00 2001
+From 481d1f59ae0399f09edce6ba5d0b31aeaa5ec073 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
--- a/msys2-runtime/0010-path_conv-special-case-root-directory-to-have-traili.patch
+++ b/msys2-runtime/0010-path_conv-special-case-root-directory-to-have-traili.patch
@ -1,4 +1,4 @@
-From 8e558de8572da4520c6ba5ffbf37d0943b64cc22 Mon Sep 17 00:00:00 2001
+From 32fa6d92471988bc3b3d8298dba8a980d345b35e 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,7 +31,7 @@ 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 1841328..977786c 100644
+index 3378b6d..916ec61 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
@@ -709,6 +709,12 @@ path_conv::check (const char *src, unsigned opt,
--- 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 703132cc178fe18f85b005f6396b12f347daed20 Mon Sep 17 00:00:00 2001
+From cbdf7cda3dec2d24ebdd6864e97d527ecff46971 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
@ -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 c80ce4f..d05e976 100644
+index 4157bfe..478a0a5 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
@@ -154,12 +154,12 @@ isquote (char c)
@ -67,7 +67,7 @@ index c80ce4f..d05e976 100644
 	{
 	  debug_printf ("argv[%d] = '%s'", argc, word);
 	  argv[argc++] = word;
-@@ -905,6 +905,7 @@ dll_crt0_1 (void *)
+@@ -903,6 +903,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,
--- 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 80f8f1cce81114b7c6658b78db85e46bb2e3cfaa Mon Sep 17 00:00:00 2001
+From 46eaf939b8bf797b7ddb943ecca00452b972f348 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
@ -30,7 +30,7 @@ the expense of sensible forward-slash-containing input.
 1 file changed, 11 insertions(+), 1 deletion(-)

 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index d05e976..7a115f7 100644
+index 478a0a5..38e4052 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
@@ -236,10 +236,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
--- 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 17905eebbeebfe070586149f9725219847ab729b Mon Sep 17 00:00:00 2001
+From 426c1a9aaacdf02c993fe9f7e29b69b3b780f9fc 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
--- 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 d34bf4f3247ed387745f9c414912817d91c49752 Mon Sep 17 00:00:00 2001
+From b03c9d44aab75dcd8d20a62043ce42fb215b2758 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
@ -8,7 +8,7 @@ Subject: [PATCH 14/N] Add debugging for build_argv
 1 file changed, 2 insertions(+)

 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 7a115f7..8232179 100644
+index 38e4052..300b31c 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)
--- 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 fe1ed457943e37beba5447ea4d1409b24eef67ed Mon Sep 17 00:00:00 2001
+From da3e0c1d7a5186fd5ceb02cd978d24f122360f3c 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
--- 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 30df5c4b21976708056953aa3cfc1b378a5d50fd Mon Sep 17 00:00:00 2001
+From f248a23416ca317ecc93d6b44e6ea5efb11c3bbc 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
@ -129,7 +129,7 @@ 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 977786c..b548dc6 100644
+index 916ec61..6cbd449 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
@@ -4019,7 +4019,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
--- 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 2408ddaf396f0068cf1c68cd28ef59d1e947fa54 Mon Sep 17 00:00:00 2001
+From c6bba0fb30e6f757bb176874fef2a22d5c4a39e0 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
--- a/msys2-runtime/0018-strace-quiet-be-really-quiet.patch
+++ b/msys2-runtime/0018-strace-quiet-be-really-quiet.patch
@ -1,4 +1,4 @@
-From a8da27fcac64076d0c514f1b7fb2b1fc96b7cf04 Mon Sep 17 00:00:00 2001
+From 86a5ed1563af646d38ac006b5827a55c641c68d9 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 18/N] strace --quiet: be *really* quiet
--- a/msys2-runtime/0019-Introduce-the-enable_pcon-value-for-MSYS.patch
+++ b/msys2-runtime/0019-Introduce-the-enable_pcon-value-for-MSYS.patch
@ -1,4 +1,4 @@
-From 2bcf93a372e6275b5d194ec1b2afadf6fb15bf0e Mon Sep 17 00:00:00 2001
+From f551915d073c647514458ea39a6aa70327ac8d5c 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 19/N] Introduce the `enable_pcon` value for `MSYS`
--- a/msys2-runtime/0020-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+++ b/msys2-runtime/0020-popen-call-usr-bin-sh-instead-of-bin-sh.patch
@ -1,4 +1,4 @@
-From 33e75a231edc94c1d5a07d0c0642084e19c43e7d Mon Sep 17 00:00:00 2001
+From fdbf092b8b89a7a0e575ae61486e1275d60f98b7 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 20/N] popen: call /usr/bin/sh instead of /bin/sh
--- a/msys2-runtime/0021-Expose-full-command-lines-to-other-Win32-processes-b.patch
+++ b/msys2-runtime/0021-Expose-full-command-lines-to-other-Win32-processes-b.patch
@ -1,4 +1,4 @@
-From 6b0529a0a5dc491265d3b5ffa608899012f3644f Mon Sep 17 00:00:00 2001
+From 64966673241ba412f03550aca721b234379118d7 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 21/N] Expose full command-lines to other Win32 processes by
--- a/msys2-runtime/0022-Do-not-show-Error-dialogs-by-default.patch
+++ b/msys2-runtime/0022-Do-not-show-Error-dialogs-by-default.patch
@ -1,4 +1,4 @@
-From be313d22648907a88dcc8986f2fde56e3ca3e76e Mon Sep 17 00:00:00 2001
+From 0c6f10d3cafec1aadcbffe41ab87d5f869ea3e9e 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 22/N] Do not show Error dialogs by default
--- a/msys2-runtime/0023-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
+++ b/msys2-runtime/0023-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
@ -1,4 +1,4 @@
-From 46c12d6fe2c0c3cb9b3f057fdfc466df6cd8e33e Mon Sep 17 00:00:00 2001
+From 695780dfbd1844336d226ab4872f36e95a342509 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 23/N] Add a helper to obtain a function's address in
@ -39,7 +39,7 @@ index 9205a88..9713244 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 255fc46..95829a3 100644
+index c26eef8..d66c226 100644
 --- a/winsup/utils/mingw/Makefile.am
 +++ b/winsup/utils/mingw/Makefile.am
@@ -26,6 +26,21 @@ bin_PROGRAMS = \
--- a/msys2-runtime/0024-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
+++ b/msys2-runtime/0024-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
@ -1,4 +1,4 @@
-From c18e74a4dd824285d1fe9b676a748a53520003b2 Mon Sep 17 00:00:00 2001
+From 83c2b2228e88ffae33fa7ef2b61ed681405fb910 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 24/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
--- a/msys2-runtime/0025-kill-kill-Win32-processes-more-gently.patch
+++ b/msys2-runtime/0025-kill-kill-Win32-processes-more-gently.patch
@ -1,4 +1,4 @@
-From 628b124e9859147f8c037268993ad5c66e0c997f Mon Sep 17 00:00:00 2001
+From 6ce8da63e38fc613a047fc9d16cc771c99a47fbc 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 25/N] kill: kill Win32 processes more gently
--- a/msys2-runtime/0026-Cygwin-make-option-for-native-inner-link-handling.patch
+++ b/msys2-runtime/0026-Cygwin-make-option-for-native-inner-link-handling.patch
@ -1,4 +1,4 @@
-From 189c0b231d3bf69b66aa63fe794cd1e239d57249 Mon Sep 17 00:00:00 2001
+From 2e11d934ea9acce26ad7b47303748a01dd4106be Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 22 Jul 2021 11:59:16 -0700
 Subject: [PATCH 26/N] Cygwin: make option for native inner link handling.
@ -37,7 +37,7 @@ index f243aad..bb37ca2 100644
 bool NO_COPY in_forkee;
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index b548dc6..e9dfd64 100644
+index 6cbd449..c0b85c0 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
@@ -3690,7 +3690,8 @@ restart:
--- a/msys2-runtime/0027-docs-skip-building-texinfo-and-PDF-files.patch
+++ b/msys2-runtime/0027-docs-skip-building-texinfo-and-PDF-files.patch
@ -1,4 +1,4 @@
-From dec1f6dbf105916ec195ab610fe0aa611c4fadb7 Mon Sep 17 00:00:00 2001
+From 14c843681a777daf612a660c02ac45bf3c6c5f65 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 27/N] docs: skip building texinfo and PDF files
--- a/msys2-runtime/0028-install-libs-depend-on-the-toollibs.patch
+++ b/msys2-runtime/0028-install-libs-depend-on-the-toollibs.patch
@ -1,4 +1,4 @@
-From 98911eb59580518976c73345c47d798695a4e775 Mon Sep 17 00:00:00 2001
+From 2e75efa39d210cdaa1ec09a53c89778866e5d80b 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 28/N] install-libs: depend on the "toollibs"
--- a/msys2-runtime/0029-POSIX-ify-the-SHELL-variable.patch
+++ b/msys2-runtime/0029-POSIX-ify-the-SHELL-variable.patch
@ -1,4 +1,4 @@
-From 5ee1ddc59b14b3e981f2490e639656a2191cea46 Mon Sep 17 00:00:00 2001
+From 43bde599853255c3e61dc9f795cd9be2f61b8636 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 29/N] POSIX-ify the SHELL variable
--- a/msys2-runtime/0030-Handle-ORIGINAL_PATH-just-like-PATH.patch
+++ b/msys2-runtime/0030-Handle-ORIGINAL_PATH-just-like-PATH.patch
@ -1,4 +1,4 @@
-From 5fd47357a50116cf4a523140a227081b97bf00e1 Mon Sep 17 00:00:00 2001
+From 5b991ebab5fc6713355cde287b0b25dac2c17d5a 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 30/N] Handle ORIGINAL_PATH just like PATH
--- a/msys2-runtime/0031-uname-allow-setting-the-system-name-to-CYGWIN.patch
+++ b/msys2-runtime/0031-uname-allow-setting-the-system-name-to-CYGWIN.patch
@ -1,4 +1,4 @@
-From e0a25ece9a45c380123bcf833b166cd3e0c2f673 Mon Sep 17 00:00:00 2001
+From f8e60dcbc883b008ac4b963750fe1eadd73763b1 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 31/N] uname: allow setting the system name to CYGWIN
--- a/msys2-runtime/0032-Pass-environment-variables-with-empty-values.patch
+++ b/msys2-runtime/0032-Pass-environment-variables-with-empty-values.patch
@ -1,4 +1,4 @@
-From 7ebbf1ebff75dd5c33dcde8c6d3ab86d315f98aa Mon Sep 17 00:00:00 2001
+From 5ed4408054996b26ffcbc1661fcdc9e78c6ccf9e 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 32/N] Pass environment variables with empty values
--- a/msys2-runtime/0033-Optionally-disallow-empty-environment-values-again.patch
+++ b/msys2-runtime/0033-Optionally-disallow-empty-environment-values-again.patch
@ -1,4 +1,4 @@
-From 3b73cf011625fc7a4f4820d85c195987bbf4ec53 Mon Sep 17 00:00:00 2001
+From 21db2259d9d5abbf732b4a6b1ea854d6b271a35c 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 33/N] Optionally disallow empty environment values again
--- a/msys2-runtime/0034-build_env-respect-the-MSYS-environment-variable.patch
+++ b/msys2-runtime/0034-build_env-respect-the-MSYS-environment-variable.patch
@ -1,4 +1,4 @@
-From a8a479cc8fc9c3461d56e4287962f75e647a1648 Mon Sep 17 00:00:00 2001
+From fee6a5ad81725dbc7b4d1ed7ac79aaaee7f98709 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 34/N] build_env(): respect the `MSYS` environment variable
--- a/msys2-runtime/0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
+++ b/msys2-runtime/0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
@ -1,4 +1,4 @@
-From c17bf2334d9d61a80dba950fdb6c6a38b23aad45 Mon Sep 17 00:00:00 2001
+From f503140b5459c3801bbf90ff657bb530590e96f5 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 35/N] When converting to a Unix path, avoid double trailing
--- a/msys2-runtime/0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
+++ b/msys2-runtime/0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
@ -1,4 +1,4 @@
-From 25b1cd12ada75eeabea493ba7696974ee131fc30 Mon Sep 17 00:00:00 2001
+From 3d1778b9d8c6986ab2a17cd31e6b33b8e0f6580d 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 36/N] msys2_path_conv: pass PC_NOFULL to path_conv
--- 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 5d726330b633327b93fa21de91c9594db8665f90 Mon Sep 17 00:00:00 2001
+From 108a4aca5610d4e4d74caaa65fce3342e36fd10e 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/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@ -3,8 +3,8 @@

 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
-pkgver=3.4.3
-pkgrel=6
+pkgver=3.4.5
+pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
 url="https://www.cygwin.com/"
@ -63,43 +63,43 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
        0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch)
 sha256sums=('SKIP'
-            '26fce1982a4f7e932fe302ca053d4bcf1fbe19a91c54ba5e611f7850d16f795e'
-            'd99c884591a640e018f4a03f9b67e04e73cb33998ad0a8c9dd40373383e99c9b'
-            '2509540dcd0669f31fc943c37f03021694638a5507666f20ca9dcdf83e3eac7b'
-            'bb47dbf2fef809a15f2d8df16e2359b877fa3a999e708ed9388b0dd0b8ccee98'
-            '76da9fd4ae8443944d1bf3f23035e861946c4500d4784649cf61a7ef4c894ac4'
-            '77ce24434187676b18ac2d5387c6b9b293a1f43d709f5fc93cb5f142600b041d'
-            '397e61ea91710d3a516c99b721c72c611c4eb5e4536617a2ec0ea3fb45c640da'
-            '2ab180de61314ef7da51c947166328e6769bf70fffbb61f581f91b3b082bb4ec'
-            'f7d498d8c4357064c26bcf63eaceca9970d6fb081e9c6714938f50840ad21335'
-            'ed33d336a3b6183c81ca674dd4fcadc8a1cdf4e766d08c5f983977382f1a9cdc'
-            '431aedc2296105d1f399da48564480aad01cd1a1cea13ce6c203f59beec48e5e'
-            'eb9ed42fbbb0436da0aa33ad584718918cbb45f6f05bf0b29fc36649915fe696'
-            '00c100cce5a9f1dca43ead3e8b916ea3de0adb92d6e14d0cfd4591ca06b2d25c'
-            '4e42d075971634b33876b616f221cf1e76fb9c249f1b5e0a30014e9cb6133475'
-            '17d3f03001ae2a6aa325f10b9581e7ec2b9bff4bef0c2ba05eb431d3e4d2ccbd'
-            '667e630f66190c6af94c9512c0bbd9271f711f290598845ddf9fc56af6ba4daf'
-            '9acad8f8654c4fa1bc34226f42036543bc5a867ff6b245e718b4fb96fc2bc9c1'
-            'abc3832279dc0edb720da7b03d73a00151c1a9f4802e7b2595bf5e93992b3129'
-            'f8552defb45d78f84f8caffa03b0789d6ee8741630cee6be1ec09b1aedc11127'
-            '0a46aa72027163939dacd40e8e47d9b1e93584082f25a027f33af43afbc30aad'
-            'f3576bf8d6eda00a614ed5c636f947b08310d2f9b57f1684b40138831ea22180'
-            '6f9ef4089710b7595afc2722ce068c1d993ca4b7037049493c2383884cbd6ca2'
-            '6a0162cd9f552d7a069d4730d73935755167a52a4aba727c80a230fe85a7d6f4'
-            '23b57f96ba092e19fd633f0862d506d572f764848514a5d9b135178b5f267cd1'
-            '87bfea288b66b05a47bb1332b0bb9f7b8bd0c29682045a31d942d733a894224e'
-            '8335b5eb6b0108cb4519a7367e2dc842d201b9a1ce2d6ae7f0c100fc506c5438'
-            'baa1fbcc1ab9a7e71a1e3b3f0ff1dd51ba554e312fd459ac3466893dd9b397a5'
-            'f41c098c7528b2ed7525882b790c3a6fe53a24c6b73040380ce8dc90d1fc8aec'
-            '410c71723374a91c0b2f760acdcb2287112a0302267f7131ffb4adae712b1e05'
-            '5988a8a4a6527477fcfd2bee177c805cfbd50920fd0ae5011eb4ab40793a50d8'
-            'c0dd98360b3a841ccbb331ae396fa52aa2a397e69ec7b3316d02a8d9eb3ea72d'
-            '340fe2d262514d7ae8164ecf34d1696442263f063b9594aa10ebfb9bc0794eed'
-            '6793a01abc766c911fd774ec732889d744591b22df3aa4035c8a7ada89bd8f0f'
-            '7d6500214add9ed8735cd7d8520a9b9920f87dded1788e4961d12fcba3cb5a85'
-            '0b2f3a158ce75369503eb55ff1d0182a33968228de33f30fdc89e506e5959662'
-            '2508a119e5fd158a883059668660317e7fc60f44a1d871ec59301a5541b73626'
-            'c1cb4531f83d51dc496ecc7b1cf735f7abf985fb1066bc8bbab6283992d71e9e')
+            'd07ac873d787ab2713a2af922d1957a0f875c4f7f522c3c93d750e6906d5ddd0'
+            '622ddfafe8004bbd26c7d13fcd9151e921e72bc70b09255d934130e89992cddf'
+            '7f66563086d3e5ac1264ec9d1b29f34823c4c776d3dd8ebfba08145cb0789c8e'
+            '9f649ce103bbd6c80ec66c024ccd5948468177696c66d8cfd7be2efa84db25dd'
+            'ed52588654e3d7095df6f5f2dd538dceb020aaeb4f59437002eeaa671926750b'
+            'cc891b1a4ab8253dd00f80fbccd8438cd49283b6da0fdef6a69555c3c655e4c9'
+            '97a2f3e772863be4efd54bc046d1a974e72fbabd172cf78ffae9e74240b8daa9'
+            'eaef1e470cbe237caa1627c05c4c52fa9b84716d528b244f26981b5c2ff1f4e9'
+            '792cab94cf492606add3e4d5bc422adfacd3fa4347f17d93dbb897f924ace1a3'
+            '6eaadc26c60450f37a93a5d491a24d90a530f35764452b26803837a15b86e465'
+            '25482a1e72332fd7983717bde8d3feda486644968102d384ee2d01263b191a30'
+            'd3ecf3a3a13b7ea3f316c8a02d54b4b73e3ff4aed8a25b14d78032f38a18601d'
+            '164d362616cde5e2e7f373287499de69c9eb5783070636e7cca144a3e6e45758'
+            'cfc5d94013f80ea2d005cae73165aa85145bbee9bdf34923aa4eb3fade42ef06'
+            'c2fad54f0a7689d36e0d9d6bb21eb1411f2a7db0431eab61c069c8cc14204cca'
+            '881c78014be74961625955ce4be605fac753710f0cd4f91495422608d384a558'
+            'c67b49c4a4c6b5ac8d01b4d3e3bc0721ae8c6abc37d990f22e6479e4d2e2a4ac'
+            'f330d4e250085d7274b847fdba574adb6737435b3d8441ebeeed3373b48d487e'
+            'e29292cf58312b816c65fedb8ec46752e46e895eaf158f389fc8ac43840e86c6'
+            '6878ea17ea947edb551f4b051b7be9d64cd7412f2afb7ccd70ed1393ca3de001'
+            '8b96d19a97ecdb94222221b07b70c329c9a5352c54423b89aacefe01b60406e2'
+            'b3a55d5a455be8f0ff12c3d1f310743ded8fb3d054bc9feb873e1fd8be5e6f2a'
+            'c20b6cba7b3354cc0addb70c8f837a4f0fd87bd672279d2f8dd116d59ca5fab9'
+            '9095e41ac748c543e0a4445a1a98e4b3265a24f65414ecc04c9b41cc0867b213'
+            'c568a9666eea29b2bd129326e2d108f86680cb2ad196fc5691c5d28864e1a7b7'
+            '0f0bd2391ad1225247ba847a2534dbe4cb3b2b7a189946254f42a565be643fd5'
+            '61b40cd679f3989aedf0e6fddbfdc4b64736371c098b0fb7d8868fb069f3b296'
+            'cb6f8f5936bbab2e46e266117c429f9af89184abfba4e693eeb04028ddd544c0'
+            '99fe295d754d5ce3a04d2174e8200e0fb326dc3eff69b8cf0c0017a30150c357'
+            '119962f6e7552075561c2552b83fb35fb944eff1323521cf477c637e15d52a98'
+            '0c24e42417ea7b18ba8582285e21cd1c4f54d239baa91dea3585128bc0dc0e28'
+            '87824147b9295f95c703eb817a5a609d3d3ac52069c862997f37814580913913'
+            '9e2c7454a23d995d3bc04d415640a2a3e7aebb89f1ae07177bf82c2d00e372f6'
+            '3310858d6f72ead8a597daff6d81bde5570f7f1e32c965c9e725981395b990e8'
+            'c69ac6122662b70c089bbaec868b1544b1ef9d04836ae55f4f9d4dd642521919'
+            'c7a4836037881e3eb8ed2415dc239e2e845e50a9efb596e6ad7e06d5b5dd723b'
+            'd7e0a49989998b7f7e6de2468b5ac7624d8992faacac69ea2216e6370b02cfe1')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {