Merge pull request #3576 from lazka/msys2-runtime-3.4.6

msys2-runtime: Update to 3.4.6
2023-02-15 18:31:07 +01:00 · 2023-02-15 18:31:07 +01:00 · 0324dc629c
commit 0324dc629c
parent 212751e0bb e366db9fb4
39 changed files with 145 additions and 95 deletions
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@ -1,4 +1,4 @@
-From fe651f9109e228ac96e049d8b9874c44e22f6b1b Mon Sep 17 00:00:00 2001
+From a5b1a45284bbf466ae9061b65824487b42c92817 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 019bcd87686e00a9855cd789e11c380a1b1b8a24 Mon Sep 17 00:00:00 2001
+From e6c92c6eaf63d328b94f7942a1173c2adb63f1f1 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 fe06affba4cddc6b0ea96605074bf80d7ff16cf6 Mon Sep 17 00:00:00 2001
+From 2c9d4a4a1e6c92e73d59a94bc6ff8e9f973b55c5 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
@ -425,7 +425,7 @@ 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 7959d4b..3951ca1 100644
+index e9a379b..34b31d0 100644
 --- a/winsup/cygwin/fhandler/pty.cc
 +++ b/winsup/cygwin/fhandler/pty.cc
@@ -925,7 +925,11 @@ fhandler_pty_slave::open (int flags, mode_t)
@ -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 c53a884..5fe83cb 100644
+index c3c5d1e..60bfc15 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
@@ -496,7 +496,11 @@ details. */
--- 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 e01462bfdf43f53bd97558964d6d7988261b2775 Mon Sep 17 00:00:00 2001
+From 8e6ef491081215ff6f12fbe36851ed6527c384da 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
--- 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 4609d0ee13fac7702e4d2ca777dfb0697d43eade Mon Sep 17 00:00:00 2001
+From b50660f063adf207d741ae3efee777bd251e3dc5 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 a7a9ea0b97b8f87bfea6a4f64c66ef3c719a80cf Mon Sep 17 00:00:00 2001
+From c494ce4447139c9a4a33ded83d177a760a52209b 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
@ -79,7 +79,7 @@ index 6094076..c2505a6 100644
 
 /* Initialize bucket_val.  The value is the max size of a block
 diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
-index 63c9d28..840130f 100644
+index 14c1ac7..939578a 100644
 --- a/winsup/cygwin/mount.cc
 +++ b/winsup/cygwin/mount.cc
@@ -39,7 +39,6 @@ details. */
@ -89,8 +89,8 @@ index 63c9d28..840130f 100644
 -bool NO_COPY mount_info::got_usr_lib;
 int NO_COPY mount_info::root_idx = -1;
 
- /* is_unc_share: Return non-zero if PATH begins with //server/share
-@@ -332,7 +331,6 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
+ /* is_native_path: Return non-zero if PATH starts with \??\[a-zA-Z] or
+@@ -354,7 +353,6 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
 #define MINIMAL_WIN_NTFS_FLAGS (FILE_CASE_SENSITIVE_SEARCH \
 				| FILE_CASE_PRESERVED_NAMES \
 				| FILE_UNICODE_ON_DISK \
@ -98,7 +98,7 @@ index 63c9d28..840130f 100644
 				| FILE_FILE_COMPRESSION \
 				| FILE_VOLUME_QUOTAS \
 				| FILE_SUPPORTS_SPARSE_FILES \
-@@ -473,13 +471,13 @@ mount_info::create_root_entry (const PWCHAR root)
+@@ -495,13 +493,13 @@ mount_info::create_root_entry (const PWCHAR root)
   sys_wcstombs (native_root, PATH_MAX, root);
   assert (*native_root != '\0');
   if (add_item (native_root, "/",
@ -114,7 +114,7 @@ index 63c9d28..840130f 100644
   strcpy (cygdrive, CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX "/");
   cygdrive_len = strlen (cygdrive);
 }
-@@ -499,22 +497,14 @@ mount_info::init (bool user_init)
+@@ -521,22 +519,14 @@ mount_info::init (bool user_init)
   pathend = wcpcpy (pathend, L"\\etc\\fstab");
   from_fstab (user_init, path, pathend);
 
@ -141,7 +141,7 @@ index 63c9d28..840130f 100644
     }
 }
 
-@@ -595,6 +585,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
+@@ -617,6 +607,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
   /* See if this is a cygwin "device" */
   if (win32_device_name (src_path, dst, dev))
     {
@ -149,7 +149,7 @@ index 63c9d28..840130f 100644
       *flags = 0;
       rc = 0;
       goto out_no_chroot_check;
-@@ -625,6 +616,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
+@@ -647,6 +638,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
     }
   if (isproc (src_path))
     {
@ -157,7 +157,7 @@ index 63c9d28..840130f 100644
       dev = *proc_dev;
       dev = fhandler_proc::get_proc_fhandler (src_path);
       if (dev == FH_NADA)
-@@ -646,6 +638,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
+@@ -668,6 +660,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
      off the prefix and transform it into an MS-DOS path. */
   else if (iscygdrive (src_path))
     {
@ -165,7 +165,7 @@ index 63c9d28..840130f 100644
       int n = mount_table->cygdrive_len - 1;
       int unit;
 
-@@ -657,11 +650,15 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
+@@ -679,11 +672,15 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
 	}
       else if (cygdrive_win32_path (src_path, dst, unit))
 	{
@ -182,7 +182,7 @@ index 63c9d28..840130f 100644
     }
 
   int chroot_pathlen;
-@@ -672,7 +669,9 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
+@@ -694,7 +691,9 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
       const char *path;
       int len;
 
@ -193,7 +193,7 @@ index 63c9d28..840130f 100644
       if (!cygheap->root.exists ()
 	  || (mi->posix_pathlen == 1 && mi->posix_path[0] == '/'))
 	{
-@@ -912,7 +911,8 @@ mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
+@@ -934,7 +933,8 @@ mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
   int pathbuflen = tail - pathbuf;
   for (int i = 0; i < nmounts; ++i)
     {
@ -203,7 +203,7 @@ index 63c9d28..840130f 100644
       if (!path_prefix_p (mi.native_path, pathbuf, mi.native_pathlen,
 			  mi.flags & MOUNT_NOPOSIX))
 	continue;
-@@ -1125,8 +1125,17 @@ mount_info::from_fstab_line (char *line, bool user)
+@@ -1147,8 +1147,17 @@ mount_info::from_fstab_line (char *line, bool user)
   if (!*c)
     return true;
   cend = find_ws (c);
@ -222,7 +222,7 @@ index 63c9d28..840130f 100644
   /* Third field: FS type. */
   c = skip_ws (cend + 1);
   if (!*c)
-@@ -1355,16 +1364,145 @@ sort_by_native_name (const void *a, const void *b)
+@@ -1377,16 +1386,145 @@ sort_by_native_name (const void *a, const void *b)
   return res;
 }
 
@ -369,7 +369,7 @@ index 63c9d28..840130f 100644
 }
 
 /* Add an entry to the mount table.
-@@ -1455,12 +1593,9 @@ mount_info::add_item (const char *native, const char *posix,
+@@ -1477,12 +1615,9 @@ mount_info::add_item (const char *native, const char *posix,
   if (i == nmounts)
     nmounts++;
 
--- 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 79f2fd1a70825f12d755093fee9b064b3f47ddf2 Mon Sep 17 00:00:00 2001
+From aa291fa865b4e7c7461d80adabe557f3dd9b6b83 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 87bd33d55782a5ef9b3d7745e8093d50548796e5 Mon Sep 17 00:00:00 2001
+From b919e783207ca3445ad9a915a6fd685d827b37bd 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 481d1f59ae0399f09edce6ba5d0b31aeaa5ec073 Mon Sep 17 00:00:00 2001
+From 816f0daf61368c5ca838e87acc2338d975a122f4 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 32fa6d92471988bc3b3d8298dba8a980d345b35e Mon Sep 17 00:00:00 2001
+From e3b0552708e5b3b37efa6b1570348c7cb4eadc8e 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 cbdf7cda3dec2d24ebdd6864e97d527ecff46971 Mon Sep 17 00:00:00 2001
+From a294e874b68c451ad2a3c255a1b6c3737cca9c30 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
--- 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 46eaf939b8bf797b7ddb943ecca00452b972f348 Mon Sep 17 00:00:00 2001
+From 707b7aa20be0e995b7d5e93bb768edb3903b27fc 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
--- 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 426c1a9aaacdf02c993fe9f7e29b69b3b780f9fc Mon Sep 17 00:00:00 2001
+From 3c14a5c765eb2d03e8868f7f8fced99ee7251957 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 b03c9d44aab75dcd8d20a62043ce42fb215b2758 Mon Sep 17 00:00:00 2001
+From 91838113847aec8f12293d27aeb2404c5fe91144 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
--- 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 da3e0c1d7a5186fd5ceb02cd978d24f122360f3c Mon Sep 17 00:00:00 2001
+From e58442de2e3f388d77ab98c9689f4690640f1c11 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 f248a23416ca317ecc93d6b44e6ea5efb11c3bbc Mon Sep 17 00:00:00 2001
+From b8e5e1256e8a88da59a16a2d14d98e434f384ec7 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
--- 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 c6bba0fb30e6f757bb176874fef2a22d5c4a39e0 Mon Sep 17 00:00:00 2001
+From 80c228011025a7c1f97dfb8f1688b5dc5911dd0e 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 86a5ed1563af646d38ac006b5827a55c641c68d9 Mon Sep 17 00:00:00 2001
+From 318e0d993805e558037b9b7203019e2ae5fe15f6 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 f551915d073c647514458ea39a6aa70327ac8d5c Mon Sep 17 00:00:00 2001
+From 9e05817e1f09390f59c1d9a2495749fbf3d5a381 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 fdbf092b8b89a7a0e575ae61486e1275d60f98b7 Mon Sep 17 00:00:00 2001
+From bdc061ab60cc64607474ce498658cd7dcdf11b5a 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 64966673241ba412f03550aca721b234379118d7 Mon Sep 17 00:00:00 2001
+From 2eb95110e80720d37ef13816f31c96c8f38f244e 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 0c6f10d3cafec1aadcbffe41ab87d5f869ea3e9e Mon Sep 17 00:00:00 2001
+From d206ab5f824371405379c35a81dd39bcc234730e 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 695780dfbd1844336d226ab4872f36e95a342509 Mon Sep 17 00:00:00 2001
+From 990c3a40e37fa58cc11f48662efb04c9734eddab 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
--- 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 83c2b2228e88ffae33fa7ef2b61ed681405fb910 Mon Sep 17 00:00:00 2001
+From ed3a873c05396db59ccb19b6de0e97b3bdab46cf 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 6ce8da63e38fc613a047fc9d16cc771c99a47fbc Mon Sep 17 00:00:00 2001
+From c1a7edb960bbe168f19183af09c1eb39c40dbf04 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 2e11d934ea9acce26ad7b47303748a01dd4106be Mon Sep 17 00:00:00 2001
+From def78cc05ce738107d9696dd2a444ee046f1d967 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 14c843681a777daf612a660c02ac45bf3c6c5f65 Mon Sep 17 00:00:00 2001
+From d12580026cd4124b2acbd35baaecf85a8ecef50a 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 2e75efa39d210cdaa1ec09a53c89778866e5d80b Mon Sep 17 00:00:00 2001
+From ef4ee8a03d349d28462f104707f6e3525d43f5bb 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 43bde599853255c3e61dc9f795cd9be2f61b8636 Mon Sep 17 00:00:00 2001
+From 329fae1f4ff69bcbb5d3a54dd960545a9572f32a 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 5b991ebab5fc6713355cde287b0b25dac2c17d5a Mon Sep 17 00:00:00 2001
+From e3b0c8488445666fce1b3a053cc958b1967b1d2b 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 f8e60dcbc883b008ac4b963750fe1eadd73763b1 Mon Sep 17 00:00:00 2001
+From ad2f8b3c1ad64befcbbde4be4f970a62756c188e 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 5ed4408054996b26ffcbc1661fcdc9e78c6ccf9e Mon Sep 17 00:00:00 2001
+From c4bd559c5e0da08756f082556c98ead0194c44a3 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 21db2259d9d5abbf732b4a6b1ea854d6b271a35c Mon Sep 17 00:00:00 2001
+From 107567f3ad121b6ad16662d5c92deb550f095af1 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 fee6a5ad81725dbc7b4d1ed7ac79aaaee7f98709 Mon Sep 17 00:00:00 2001
+From bce9e93d1913ab02a8704b76c6ba43ca91b7263f 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 f503140b5459c3801bbf90ff657bb530590e96f5 Mon Sep 17 00:00:00 2001
+From 5562607627ddf84ee4cf6719d1c9a011576049ac 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
@ -18,10 +18,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 3 insertions(+)

 diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
-index 840130f..1aa0925 100644
+index 939578a..37152fb 100644
 --- a/winsup/cygwin/mount.cc
 +++ b/winsup/cygwin/mount.cc
-@@ -932,6 +932,9 @@ mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
+@@ -954,6 +954,9 @@ mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
 	nextchar = 1;
 
       int addslash = nextchar > 0 ? 1 : 0;
--- 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 3d1778b9d8c6986ab2a17cd31e6b33b8e0f6580d Mon Sep 17 00:00:00 2001
+From 73974dabc99f312907a16692bcddb44a64c0d800 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 108a4aca5610d4e4d74caaa65fce3342e36fd10e Mon Sep 17 00:00:00 2001
+From eeed7e515039501179e5f2577ff51c3a9b08b76d 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
@ -0,0 +1,47 @@
+From 9acb704afe9d9d8a090f2391e2bb88add63997c6 Mon Sep 17 00:00:00 2001
+From: Johannes Schindelin <johannes.schindelin@gmx.de>
+Date: Tue, 31 Jan 2023 09:32:08 +0100
+Subject: [PATCH 38/N] dumper: avoid linker problem when `libbfd` depends on
+ `libsframe`
+
+A recent binutils version introduced `libsframe` and made it a
+dependency of `libbfd`. Which means that we have to link that library
+into `dumper.exe`, too, if it exists.
+
+Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
+---
+ winsup/configure.ac      | 5 +++++
+ winsup/utils/Makefile.am | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/winsup/configure.ac b/winsup/configure.ac
+index a27b301..86f168a 100644
+--- a/winsup/configure.ac
+++ b/winsup/configure.ac
+@@ -120,6 +120,11 @@ AC_CHECK_LIB([bfd], [bfd_init], [true],
+ 
+ AM_CONDITIONAL(BUILD_DUMPER, [test "x$ac_cv_lib_bfd_bfd_init" = "xyes"])
+ 
+AC_CHECK_LIB([sframe], [sframe_decode],
+	     AC_MSG_NOTICE([Detected libsframe; Assuming that libbfd depends on it]), [true])
+
+AM_CONDITIONAL(HAVE_LIBSFRAME, [test "x$ac_cv_lib_sframe_sframe_decode" = "xyes"])
+
+ AC_CONFIG_FILES([
+     Makefile
+     cygwin/Makefile
+diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am
+index 6be5b12..890090f 100644
+--- a/winsup/utils/Makefile.am
+++ b/winsup/utils/Makefile.am
+@@ -87,6 +87,10 @@ profiler_CXXFLAGS = -I$(srcdir) -idirafter ${top_srcdir}/cygwin/local_includes -
+ profiler_LDADD = $(LDADD) -lntdll
+ cygps_LDADD = $(LDADD) -lpsapi -lntdll
+ 
+if HAVE_LIBSFRAME
+dumper_LDADD += -lsframe
+endif
+
+ if CROSS_BOOTSTRAP
+ SUBDIRS = mingw
+ endif
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@ -3,7 +3,7 @@

 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
-pkgver=3.4.5
+pkgver=3.4.6
 pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
@ -61,45 +61,47 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0034-build_env-respect-the-MSYS-environment-variable.patch
        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)
+        0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
+        0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch)
 sha256sums=('SKIP'
-            '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')
+            'e061d933f7ec1a6ba5a8c56cbdb9e796e3df266409893afba33d9f4f5365f000'
+            '52f3b36d3e420374b75af3502afb971279b70828a88fe05870fe35ccab90e2f0'
+            'd1526bdea50b470fbbf5a6d5d5d7814a1bed7940d380e140153c290ead320979'
+            '4b0a8736d0d74b5f70c6cd41d79e8345653acf4f7b2c227cf8e19597d1ff980c'
+            '019f5c0e8288a9298526848d8b47e6252c76ed2930f507103bd2c45e35cab43d'
+            '3ebf0983343a467c87cb645596d9bcc3388be8ac69c36ad89779ce00da6eb2b1'
+            'c303f3615453fa0152717863075fdbeaa3c4df540c3b0a0137c901f9f6090c78'
+            '498daed5b8be78833ece469ce2e010cc7a2fdb69d79cc8ece789bf364603f44d'
+            '9ed7ffed25603fad733aca242df76fcbad05a20b047f899f4b2a73deb277fce3'
+            'cc929c4b02971ab4e60bac89d1f405be52402a5cab40d8a86de9933a78d4c88e'
+            '0396a16b391df18b5c783c973e983399eb57e328fb6eee582db0cf8738bed358'
+            'f4667394cd4e908c2fd70df99951217421d992023a2cf8e7912f5c29f5f4d53d'
+            'c8e75e7ad5bfca5f60fcb5e5af46ed4c837f14837fdad8e0da66c9dfe5d078c7'
+            '5d624f098160fdb6d87e3d194d2f0bb7f19900db080149e5712a24ddb53618fb'
+            '4cd1a73a014f7d2a5ac02d8e3d88ec2745f6865ae132688cec5d6dd9f0771f54'
+            'a92d71d172323d4d66c5879838196d5e1b9f46af6057892b1d006895f7690079'
+            '14213e0d616c3f4e9682da51ebd12863041e9d9183db6de8d60608229c7c0ecd'
+            '9d4fc021add4340e14841ccfa92ffcd032352e7eb246968589eb622fdcd81375'
+            '7fae1a6bea2c1da24c9d971b402602458816e244e54d26f28dcc8a4fd5ca2083'
+            '91920b0008155b7213ae493101b6c5e017e565493b0ca80b592c71fd1ca3def7'
+            'c3b9a1a7504de43a5de220a94c1c4cde5c0e54a6f3f2b2ec9289b0a47ada37e1'
+            '19e458405fc46a21c113a8bef076f5109ac93ae16f80b307ae56eaaeccbd0f6a'
+            '814439f033a3ebf73350e4f32244e5dee8ce333ffe6d04241eaf421d85a73bcb'
+            '05eb311fddae7baf57aca6dba52723aae9901054512635d5f33d81d0653ee791'
+            '57955999732300ea5e50fc9c27b664b71373b82c5250a2b80ad20503865c6dbf'
+            'db81e5a0d71a71373993434f8628c61bf779d1ed94172d9d80a0d90728ba367e'
+            '2a0f0bb4b859cf0b001abefb66f8fcc955214fcc40b5042414b03154737f98e5'
+            '6e2609e2d07e1a3fbf5a21295861c90acdab19b514240353bf5f5e7345420085'
+            '7fe0bb903324e92da7fe2cda1adac255b637d6b030ca74ae603065caaa0d4b83'
+            'fa16dc6372ad1d13b1bef53fd4d6a0f565ede359fb7eb12e9c8ae0980509d908'
+            'e408bd646a5a53394961e4065e88e558ea954f81564e8142892c8f951dff8fc4'
+            'e46450f609f2acf98d05b75292eb7ffa6a24a86a012409e70f7779b46f1430ee'
+            '6c4779b649f109ef3f3a35566a52c92c1f4ce4b5f9beed77df61990f8fdf5dd3'
+            '4611dfe864b34b37785ff919366fd7dd79e08c3273e198a8ff4c3a558df13e48'
+            'f0c520b1c6f0f7acf09a668b051b14a919bf953473bdc35870aa0fd660283c53'
+            'f98690a8d8ae778874187c983c2f94f215daa57e87a016d40f95efd8213798e9'
+            'c94acbae53eb589c5d0fa74cfe5652a685a1fdd6f91612e813b7dd2b8a73a3cc'
+            'c9e3b60e83f0489916ad159f65d72df5055105629e643b67f8645b36ef652b8b')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@ -173,7 +175,8 @@ prepare() {
  0034-build_env-respect-the-MSYS-environment-variable.patch \
  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
+  0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch \
+  0038-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch
 }

 build() {