Merge pull request #4020 from dscho/msys2-runtime-3.4.9

msys2-runtime: upgrade to v3.4.9
2023-09-07 10:01:04 +02:00 · 2023-09-07 10:01:04 +02:00 · ffd46cfdd5
commit ffd46cfdd5
parent 3304a00985 97363ba104
40 changed files with 109 additions and 150 deletions
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@ -1,4 +1,4 @@
-From 7d015d21713754d31fc4ba398fa65b00c472e083 Mon Sep 17 00:00:00 2001
+From 01f7ce4fd147496f1147100e6078cc4e0b2051e0 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 61f9f3954a92fa7fc16a018c3459e7b7f12b74f1 Mon Sep 17 00:00:00 2001
+From 04e699b5878c274560deb8f8d265c5e87cd3cc67 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 f09af38c78294c2aac91a550b936b791b5b54999 Mon Sep 17 00:00:00 2001
+From bbedcadbf70a909698ed3b310828ecf139c89e9b 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 c6768e4..ebca74d 100644
+index be40426..34f6650 100644
 --- a/winsup/cygwin/cygwin.din
 +++ b/winsup/cygwin/cygwin.din
@@ -1,4 +1,4 @@
@ -243,7 +243,7 @@ index c6768e4..ebca74d 100644
 
 EXPORTS
 # Exported variables
-@@ -399,8 +399,8 @@ cygwin_attach_handle_to_fd SIGFE
+@@ -401,8 +401,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 49b7a44..4157bfe 100644
+index 130d652..b40697a 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 49b7a44..4157bfe 100644
     {
       char buf1[PATH_MAX];
       GetModuleFileName (NULL, buf1, PATH_MAX);
-@@ -1064,7 +1064,11 @@ dll_crt0 (per_process *uptr)
+@@ -1073,7 +1073,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 49b7a44..4157bfe 100644
 {
   static int _fmode;
 
-@@ -1267,7 +1271,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
+@@ -1276,7 +1280,7 @@ multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t ve
       return;
     }
 
@ -324,7 +324,7 @@ index 49b7a44..4157bfe 100644
     return;
 
   if (CYGWIN_VERSION_MAGIC_VERSION (magic_version) == version)
-@@ -1287,7 +1291,7 @@ are unable to find another cygwin DLL.",
+@@ -1296,7 +1300,7 @@ are unable to find another cygwin DLL.",
 void
 cygbench (const char *s)
 {
@ -425,10 +425,10 @@ index e231316..283319c 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 df37d91..2836e4e 100644
+index aff899b..dbeffc9 100644
 --- a/winsup/cygwin/fhandler/pty.cc
 +++ b/winsup/cygwin/fhandler/pty.cc
-@@ -924,7 +924,11 @@ fhandler_pty_slave::open (int flags, mode_t)
+@@ -927,7 +927,11 @@ fhandler_pty_slave::open (int flags, mode_t)
       pipe_reply repl;
       DWORD len;
 
@ -440,7 +440,7 @@ index df37d91..2836e4e 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,
-@@ -1199,7 +1203,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
+@@ -1202,7 +1206,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
 		    {
 		      char pipe[MAX_PATH];
 		      __small_sprintf (pipe,
@ -452,7 +452,7 @@ index df37d91..2836e4e 100644
 			       &cygheap->installation_key, get_minor ());
 		      pipe_request req = { GetCurrentProcessId () };
 		      pipe_reply repl;
-@@ -2078,7 +2086,11 @@ fhandler_pty_master::close ()
+@@ -2081,7 +2089,11 @@ fhandler_pty_master::close ()
 	  pipe_reply repl;
 	  DWORD len;
 
@ -464,7 +464,7 @@ index df37d91..2836e4e 100644
 			   &cygheap->installation_key, get_minor ());
 	  acquire_output_mutex (mutex_timeout);
 	  if (master_ctl)
-@@ -2985,7 +2997,11 @@ fhandler_pty_master::setup ()
+@@ -2988,7 +3000,11 @@ fhandler_pty_master::setup ()
 
   /* Create master control pipe which allows the master to duplicate
      the pty pipe handles to processes which deserve it. */
@ -476,7 +476,7 @@ index df37d91..2836e4e 100644
 		   &cygheap->installation_key, unit);
   master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
 				     | FILE_FLAG_FIRST_PIPE_INSTANCE,
-@@ -3899,7 +3915,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
+@@ -3904,7 +3920,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
     {
       char pipe[MAX_PATH];
       __small_sprintf (pipe,
@ -560,7 +560,7 @@ index 1e4cf98..b77598b 100644
       }									      \
     }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 51b2884..93068e6 100644
+index 4cc0502..2e08a9d 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
@@ -496,7 +496,11 @@ details. */
@ -767,7 +767,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 a0ad3c2..dba1c0d 100644
+index ba0cd05..70c3af1 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
@@ -297,7 +297,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
--- 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 f810746047f3105b2a1fef152520d2c1b558fa45 Mon Sep 17 00:00:00 2001
+From 6fe093f16de1ffd1ca30fa1dd28c48011ee2d145 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
@ -126,10 +126,10 @@ index 86e64a7..0dd4535 100644
 char **win32env_to_cygenv (PWCHAR rawenv, bool posify);
 
 diff --git a/winsup/cygwin/local_includes/winf.h b/winsup/cygwin/local_includes/winf.h
-index 651f78b..38719f3 100644
+index b586934..bc53cd1 100644
 --- a/winsup/cygwin/local_includes/winf.h
 +++ b/winsup/cygwin/local_includes/winf.h
-@@ -51,6 +51,10 @@ class av
+@@ -56,6 +56,10 @@ class av
 	calloced = 1;
       }
   }
@ -1023,7 +1023,7 @@ index e788c7d..79d784f 100644
 
 /* Cover functions to the path conversion routines.
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 32ba5b3..614b8cd 100644
+index 5ac9080..f7af9f7 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -281,6 +281,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 352a420ae759165349a57ff4f47f21b1e0a753ec Mon Sep 17 00:00:00 2001
+From 2a23aebb707297cd8ec97407b12d29bb9f65f4ac 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 544e24710d47e1a941459888466fa7e08ccd1f63 Mon Sep 17 00:00:00 2001
+From d7d7c59cc5847e3354af7a841eb7bf0cf560a800 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 e6599e0dd16ba302a46065320488524b4f32331f Mon Sep 17 00:00:00 2001
+From 6085c158ccac432003cb9ea0157b9c946d2c4416 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 eba0398f5009f22a403cedb618cf40e0bcaf4633 Mon Sep 17 00:00:00 2001
+From b2f377fd24136edfb30877c0431e81c0ac0a4ead 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 ac57d016d17c97e358c3899c6c3bb640da52bc69 Mon Sep 17 00:00:00 2001
+From 3ddd8cd7120727430476fb0ad431345debda7116 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 614b8cd..95f64a4 100644
+index f7af9f7..73e6a00 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -534,11 +534,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
--- 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 4ffc0436e0d3b5ceeb8c7583cfa006b1c9f21190 Mon Sep 17 00:00:00 2001
+From 2b62456ea79c664a54e34c51bad73cccf575d8a6 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/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 34561af15adf6d861f8ba46c65cdbea9fa4c8f4f Mon Sep 17 00:00:00 2001
+From 79a9de58c4f4292ca73c4fb635dca23026eb29bb 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 4157bfe..478a0a5 100644
+index b40697a..2e6d00a 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
@@ -154,12 +154,12 @@ isquote (char c)
--- 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 05b2ac972c2e8784991c8fee0158e715def3f2cb Mon Sep 17 00:00:00 2001
+From 549cc7edebd9838218d4d8918eadb1307b9db6e9 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 478a0a5..38e4052 100644
+index 2e6d00a..3c977d0 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 0600ea28681041ae352a19dcb4f01f8d2b3a5e1b Mon Sep 17 00:00:00 2001
+From 8709ebbcfc8480e538b357df6f4c7011a572c92b 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 4b5ceb138c3f998a28674d9454db1cffc66c1858 Mon Sep 17 00:00:00 2001
+From 04cf05a93f35e284ea64fae21468db4ed49e5144 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 38e4052..300b31c 100644
+index 3c977d0..d7a1b1a 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 44cd2849b35a5744cd6bfaca32bbae858e5bb243 Mon Sep 17 00:00:00 2001
+From baace0b99529cda4fdd458b2ebff4e75e21dd736 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 b3a91e38a43be69e6aeaba002aee2165cbe76a4d Mon Sep 17 00:00:00 2001
+From b67239992750ab5f15fed8cae011b5bd8c3784d9 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
@ -141,7 +141,7 @@ index 2d18cd2..02f4b2a 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 95f64a4..e285653 100644
+index 73e6a00..99dbe64 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -282,8 +282,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
--- 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 bfd04ad219d31ec6dc0495d881a61beb2c9f8b3a Mon Sep 17 00:00:00 2001
+From 12198197ec8dbce3bff5719e5065fbed37fb2f15 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
@ -8,7 +8,7 @@ Subject: [PATCH 17/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 e285653..4d93c13 100644
+index 99dbe64..c77970b 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/0018-strace-quiet-be-really-quiet.patch
+++ b/msys2-runtime/0018-strace-quiet-be-really-quiet.patch
@ -1,4 +1,4 @@
-From 31730e6a7dfc387810be809db69cd5c7eac9e879 Mon Sep 17 00:00:00 2001
+From 4aa083ec34b83b94ffad9c91ac21711036674516 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 3eb205195e2984e8a817c004e9808b19979c6aee Mon Sep 17 00:00:00 2001
+From 53cfd18bd9ecfee645612dde1f8226377b14bb00 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 294472a269b48bdc7b9c01af5f6b6aabedaee9e5 Mon Sep 17 00:00:00 2001
+From e70cae27a535e7c0986da72af39590cbdfd88213 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
@ -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 dba1c0d..068aeeb 100644
+index 70c3af1..ef6bb0d 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
-@@ -4332,7 +4332,7 @@ popen (const char *command, const char *in_type)
+@@ -4338,7 +4338,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/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 79c704f72d6b21e17e979c2d2fbd06e4e54a0494 Mon Sep 17 00:00:00 2001
+From 50478bbe56d483b76459f9cad752403599c1b52c 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 754166406c305499872f704e32dbe8bd1c48bc03 Mon Sep 17 00:00:00 2001
+From a438c32ca54b86bcc40760925a417fb59d193ad9 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
@ -51,7 +51,7 @@ index 1541fa4..f243aad 100644
 bool NO_COPY in_forkee;
 
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index 4d93c13..e0770ae 100644
+index c77970b..383f5e5 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
@@ -429,7 +429,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
--- 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 49cd2c1e8eb5a32edb918dc17a14a28f569c89c7 Mon Sep 17 00:00:00 2001
+From 771bea432fde559d57f112296909f796db60628d 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
@ -23,7 +23,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 create mode 100644 winsup/utils/mingw/getprocaddr.c

 diff --git a/winsup/configure.ac b/winsup/configure.ac
-index 49a8346..e461581 100644
+index 132028d..bc5c774 100644
 --- a/winsup/configure.ac
 +++ b/winsup/configure.ac
@@ -106,6 +106,11 @@ if test "x$with_cross_bootstrap" != "xyes"; then
--- 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 1c889bf2888be05318ef6f11111a7aba0da3b02a Mon Sep 17 00:00:00 2001
+From 2befb21ebb89e36316459acdc1ab50b35c713356 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 a2ad6e000a4edfdb678c7abd3f299f813402fc14 Mon Sep 17 00:00:00 2001
+From 5e85ca5b445d7d6fbc78b4e1b04eefa68dcfd0ca 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 62eaab2b905783276f5a11ad6a9f44a2207fea0b Mon Sep 17 00:00:00 2001
+From 878160a8d6da5e33b000cc325939f63c32e2ff5d 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.
--- 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 ce2565fa4a6599b2d2f73a21bc9e221df5f4995a Mon Sep 17 00:00:00 2001
+From 9fbbdf6061cb4cfe75cf1b7285897ac8c5d083c0 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
@ -12,7 +12,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2 files changed, 6 insertions(+), 10 deletions(-)

 diff --git a/winsup/configure.ac b/winsup/configure.ac
-index e461581..f387b81 100644
+index bc5c774..e55e19a 100644
 --- a/winsup/configure.ac
 +++ b/winsup/configure.ac
@@ -84,11 +84,10 @@ AM_CONDITIONAL(BUILD_DOC, [test $enable_doc != "no"])
--- 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 cef30bde31f9624d488d61e3e8d72b70371d0cfe Mon Sep 17 00:00:00 2001
+From 82bbdeaf6b563b1c3ca0363d8cfd94d76e48e9fe 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 c7f3f40a1ce52ce88a22de31f4cd4deec5c98835 Mon Sep 17 00:00:00 2001
+From a7e656a67185be1b1c4f794d798402ad6cfe1d7b 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 2bb72a55b19fcd80ce6a704da670e2d59fcf0ffe Mon Sep 17 00:00:00 2001
+From 3c2b1f3fabbb5d2f35e0b9c272267fc867ce90cb 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 541ff9145ad07640a1fbee5a6bc532e11fff6a95 Mon Sep 17 00:00:00 2001
+From 723401047a894f1dc1007ff4465a24237d4be917 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 61b7b6079518970bbec2f15df5cf5b8f72a74070 Mon Sep 17 00:00:00 2001
+From 102d9a2ee6a019d9a5f083a1e00330fd260d3299 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 e26a108d6da043dbb01e93c282020b8e4390bdea Mon Sep 17 00:00:00 2001
+From 0924ea36bcb93a1794e68dbaf83bdf273007cee8 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 50c1efa6baa912b033ab92410b45190e4650f329 Mon Sep 17 00:00:00 2001
+From e4cf39bf0b46f4fc66e56a3a9bc7c86b4de39adc 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 d549396baf93c7ffd757e631c3b5498ed1daff72 Mon Sep 17 00:00:00 2001
+From 5db940f08a235d077edd307a25ac5c1606dc555b 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 cd6eb6ed8544caf13cc7fe3fbaae0eb2e32a30c2 Mon Sep 17 00:00:00 2001
+From eb19539016e33d24930cd0905018712ea7df4aa1 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 9b5f88b13c879ccd783b3629157b9823a0cb97ac Mon Sep 17 00:00:00 2001
+From d325910f42094039b82e69f386e4b31fce69d77f 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-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch
+++ b/msys2-runtime/0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch
@ -1,4 +1,4 @@
-From 2e6bc656aa66ffb64215a02956eaf3fc6aaa7434 Mon Sep 17 00:00:00 2001
+From d52da7859b7a3c8d183adbc7782af679eacb4da3 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 1 Feb 2023 15:08:16 +0100
 Subject: [PATCH 38/N] dumper: avoid linker problem when `libbfd` depends on
@ -19,10 +19,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2 files changed, 9 insertions(+)

 diff --git a/winsup/configure.ac b/winsup/configure.ac
-index f387b81..092cf4f 100644
+index e55e19a..59b77fe 100644
 --- a/winsup/configure.ac
 +++ b/winsup/configure.ac
-@@ -127,6 +127,11 @@ AC_CHECK_LIB([sframe], [sframe_decode], [BFD_LIBS="${BFD_LIBS} -lsframe"])
+@@ -129,6 +129,11 @@ AC_CHECK_LIB([sframe], [sframe_decode], [BFD_LIBS="${BFD_LIBS} -lsframe"])
 AC_CHECK_LIB([zstd], [ZSTD_isError], [BFD_LIBS="${BFD_LIBS} -lzstd"])
 AC_SUBST([BFD_LIBS])
 
--- a/msys2-runtime/0039-Cygwin-configure-Add-option-to-disable-building-dump.patch
+++ b/msys2-runtime/0039-Cygwin-configure-Add-option-to-disable-building-dump.patch
@ -1,38 +0,0 @@
-From f992cbcdd8070a8e078025d5f310160c4a479e85 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Tue, 13 Dec 2022 23:17:48 +0000
-Subject: [PATCH 39/N] Cygwin: configure: Add option to disable building
- 'dumper'
-
-Rather than guessing, based on just the presence of libbfd, add an
-explicit configuration option, to build dumper or not, defaulting to
-building it.
-
-This might have some use when bootstrapping Cygwin for a new
-architecture, or when building your own Cygwin-targetted cross-compiler,
-rather than installing one from the copr, along with the dependencies of
-libbfd.
---
- winsup/configure.ac | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/winsup/configure.ac b/winsup/configure.ac
-index 092cf4f..59b77fe 100644
--- a/winsup/configure.ac
-+++ b/winsup/configure.ac
-@@ -115,10 +115,12 @@ AM_CONDITIONAL(CROSS_BOOTSTRAP, [test "x$with_cross_bootstrap" != "xyes"])
- 
- AC_EXEEXT
- 
-AC_CHECK_LIB([bfd], [bfd_init], [true],
-	     AC_MSG_WARN([Not building dumper.exe since some required libraries or headers are missing]))
-+AC_ARG_ENABLE([dumper],
-+	      [AS_HELP_STRING([--disable-dumper], [do not build the 'dumper' utility])],
-+	      [build_dumper=$enableval],
-+	      [build_dumper=yes])
- 
-AM_CONDITIONAL(BUILD_DUMPER, [test "x$ac_cv_lib_bfd_bfd_init" = "xyes"])
-+AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" = "xyes"])
- 
- # libbfd.a doesn't have a pkgconfig file, so we guess what it's dependencies
- # are, based on what's present in the build environment
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@ -3,7 +3,7 @@

 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
-pkgver=3.4.8
+pkgver=3.4.9
 pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
@ -62,48 +62,46 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
        0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
        0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
-        0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch
-        0039-Cygwin-configure-Add-option-to-disable-building-dump.patch)
+        0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch)
 sha256sums=('SKIP'
-            '18da8bc0a566c4df4154d6413c586ac1f6e21927fa137c58b14d691f040f907a'
-            '7a8270c2670745e97987f19ff6c9a4a4d7231b5be99efd3a8d2a5f34102c9daa'
-            '762ce0dd60f9287b3375a1aa0b62ebf7d7f67dc8f957328838cbdf7a30a16798'
-            'e80110cf0aeaf653d43a38102b561dded9bbfab6675d3cee6aad23673af93a19'
-            'cc1cc4e5e36b5881888df6bbfab5cdaa5bb256942d85b4d7f1fcfd1673504b6f'
-            '6c4af72af5b0d6301cb40e9159cad3460299d42bac6c31b2a599a80ab99e09a1'
-            'b4ff3c8194411fe1e4670b9cf3cc90d974dd23622c68fd78f72f96ea90274561'
-            'a0033973fe9a715e445af195e47301ebb81f2a353d14436eacd48b77de0ccdb5'
-            '75aaeca502dceab26d61df8a5c8d140fbb47d29a36f116b3c8b1f81acc35d1ed'
-            '6e4efda1d586e3642450ef62c328620b67ebff971e64847de368fc58d1b05c43'
-            '11ab000f7c2249b0ac17ea74a0d5306c48e6e8bd98a0f9cf6f9f3d01893e1552'
-            'fcfb9a07c15c4f0f4940fee0e65da10fad4f0dfbbb9b4e5dce11068c1c24e6b9'
-            '066fab31ac3f55544162fa9045b955e4464d379fa128c0ac34b5b90ccc6de8ea'
-            'e6982a527f3a89a332e8e688d1a6564563b621d2c02da0108f4168942b8fb2cf'
-            '1c4d6221b12d1a9f1dff20e175648495a8aeb69ee4f612280e6dfd612355842e'
-            '667cb545e903c71ae7aa85bf5bdd937219196ef9644509e997574ca865fbec8d'
-            'd83bef6ba05a445ac4a74524dca8b3dda4129a8bde459eba6818772bfec9117b'
-            '770aecfe22bc8809d72819bab68462ec7f8f9a5ee6b0fe8d97000a0a6d11e380'
-            '96088feec8dc2d71728164b7748b726e528d2b70ede81ded1bde7bf7570acdbd'
-            'c606fec704cdd5927c0410ae4a006e0c97bb98a5649608b08d360dfd128249d9'
-            'e5205a2e74647c75d157d67e2751009c7ecd430bdb146df904d52dd3c049e625'
-            '58c3b440f469f88ca22aab4f38719b940165a432a1798eceb359811300395661'
-            '6ba1c7100c122d0f2640f9d01f9d570e9388a755db6ce6f722b704df93169a04'
-            '1f196162cde33852b48e92b62ba743099e7b78c7d67896122ce3d6a114237423'
-            'a7ed00fb34ddb8bd244436d5c7c9c466ae24c4e7f55951b9e1de6e46d534b092'
-            'ece9ab38ddb0d19aba5fde2c8d4d0eef864e04b85eb953a6a3347dd45044b1d2'
-            'c1ef89a1c2ce22c2ecdf7403fc0ec329a613f078548215c84cf00c496eab8d5f'
-            '25590f578958020ad352bb49f4c3dcac9cbd9ae68dabb6c148f18e4c73d2f3f1'
-            'a17009351228208530a1cd0e6b181b22e27f7323a8fc68b63c8732ffc69b2412'
-            'ecf41b27a312797c56f50b45bc1653135c9b5bedaffd358dae926e33caa65c45'
-            '5e526b963c8fb3af50000801836c8ae41bf9aa6bd8eff1fed4e5cff10f531240'
-            '94311c102c23d86e3bfd459d506563930400d7285a758aeea70192c54dde87f0'
-            'c050d8c7a705001ef0459aad40711f89ff4949c9f10bd754e7ca185abc238ca1'
-            '71bd94a79ce7a9106025b8959c76f9d8f46b25354cb36fb7ebece889c0b37e1e'
-            '549cd3b984ebf796a798d21dbfffb9c50ab87c0bfacdd15fc1c754703febd1d8'
-            '2e5e355552df645914f28593ab085a0dc495ba2a50f40bb45340248f1a469c18'
-            '146aaa43416c4ef4135eda6a7a9b124c79312e6dee0eeccc651f7ec119da1d68'
-            '02019b3793b5f5f8c41c6836c95db3efab8c4b2f70234ece1bcbf0e59351337f'
-            'e0b93bbdbdbbb5179ecd20ca27e7eb9ab7989f51ab100c3bc6b20ecc6bdf395c')
+            '021fd67841a12ef09dd72d08e3ed4a1ccc58d38dc475bdf79ecff3a90c7d6197'
+            '6b6187c8e9343cf2875fe8d622762892bfb2d8087f1e510882928ec63584e4bc'
+            '0b8933eb38b42aed816bdded768ed92047e220157085778a0dbf23278d8355d9'
+            '942ca9901118c8fa115a2a444f210bc7658cf0803e0599e7d7d6c4cac265c45f'
+            '618d815ae99becb1258691da1f5516aab046a3b8dbbf9ee2253bf9da605cc22e'
+            '944d4947f61c91db553402debf0031d4fc842ea9f68c1a527f639653939d768f'
+            '578d83b8c1bbef5b6dea2d6a8c2a69415b8ffbe4c290afe91b756aadb24c4443'
+            '207c21cc3a1a819ee138fd5b84214ee8c699e5e0cd01bb37c961ad540e166bed'
+            '2b9a0b5bcf8e377e3470efd1e462dd730617ad675454919e804f2faf2cdf24e5'
+            '61d1ce62bd4b8df3cf24ad22458a24faeadec24f00a39942ade8836f76f07f65'
+            'c20c6a1bda232532467489a140756b3063df6650eead472cfb25145c9312cbc7'
+            '93967ac10d07f7a86ffde37509d7d95e8b42f5bd9fee98ba6f9bf86bd0caf14e'
+            'e9e5da7e9b3774bfd12b2daa6c473360e83bc6a9b23b1b39e3f29316bbfd1a25'
+            '0bca116bfaf7c354eee8f8b08d406c3150c57420809383c572095b398c0b5c2d'
+            'eee4f98d26cef1a860b5e10174239779df3f80574dd0c958bc2d06174acb0765'
+            'b7c282e9696546e8f3ece8ada5befd59b8b9e548cb659df0b1416526920b6973'
+            'c8c871b3ef45052e0377b1bd0c01dcfb0cf1384391cf139d7367e3806ffd8326'
+            '19249eac1e85632d0fa53b099ae979b3a38aa91029632de14609c66d1fb08dc4'
+            'c085b8eab12e3bac5dcd8f7bdfb5121599714a7bca64ee4abc0fae87d8a1340f'
+            'ace573bd1d131258106504eb849ba0c20df6bb16ee3e4537d78374148f9ba1ef'
+            'd3033d5bbdb4a6107261a200b65224049d16721ecc6e342494020a9c4aab55d7'
+            '0734175b39fca6a4de8d6aec8a056266fc4c34a9ee40809e717dcf2838d1f6e4'
+            '8a7820a5682639448bae4db0a304ba08b27f4492458d9a9237a446fc0e9a3fff'
+            '5bbfbe070982c0565223a539f87f91b29c31b78bdcc2fb020e657c087db3f459'
+            '5630089c934e264942ae0820bda8c844955ea07ed71f7080448d8d41a2109d76'
+            'ddee0009f9da05f34a76b983419ff2d37a2323873b86d854f9c2b901cc8e134e'
+            '29c289e9b83272b07c5fd3ee2c8175c1a88da7207c2844f13214c562066c1097'
+            '51054cd6da7cefb1599be4658c9bf586727afeb4521089542542056b4d82964b'
+            'df01ecbed967af1ef11c00dc00ac158add8dc8501ee418128567269acc4b5309'
+            'cba2eda0a6cca5849d1003024721184b3bc73e19d65403f905a879c25cf09d1f'
+            '47c2a999b8679e87441713b55c54d074b7335d448a785b912c973cb54cc87073'
+            '2437209bfafce63468d8617168615af4952c9ec1ecf87aca4052cc15bf83c463'
+            '3e7c2d553ebefcce5e35ad5361118edd4f0d29fccb184ffff1f7e4c6670ad8e8'
+            '4add71cf941c6e49ee20b8b4a03772f539dbf04aabf7be0ebcd1de884a1a97a0'
+            'f9cf227e20e491a823d1bd8fac12f0be9d371e21239368e8b30f203a48b18995'
+            '6defe4f95bda4ba9ec52c6aab4bb6f61e51aad5e2b5aef25dc277e108bdef553'
+            '9226d25556c04de2506ee6d9d8ebc1e369d456fe5ca8d335705c2dd090b3cb64'
+            '54b45f5a0b86057bdd7225d9d1d69674dfd93e923ce3b053d7129f43700b1aeb')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@ -178,8 +176,7 @@ prepare() {
  0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch \
  0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch \
  0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch \
-  0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch \
-  0039-Cygwin-configure-Add-option-to-disable-building-dump.patch
+  0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch
 }

 build() {