Merge pull request #237 from git-for-windows/msys2-runtime-086201ea001090dfb0d42669e59c122da205ee6b

dscho · web-flow · commit 4f31747d14a4 · 2025-06-05T14:06:22.000Z
msys2-runtime: update to 3.6.3-1
diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@@ -1,4 +1,4 @@
-From 13de2a173212340b0f85edc722c72d426bcd63e5 Mon Sep 17 00:00:00 2001
+From f51657ba5f587a296c90c4a14d002a21a1f57094 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 20:40:45 +0300
diff --git a/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch b/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch
@@ -1,4 +1,4 @@
-From ba274e444eaa417da44ace62199834885c6507df Mon Sep 17 00:00:00 2001
+From 3155a8c5f98e97692a6d1dd0047e9ca0dd4c3030 Mon Sep 17 00:00:00 2001
 From: Kaleb Barrett <dev.ktbarrett@gmail.com>
 Date: Sun, 14 Mar 2021 18:58:55 -0500
 Subject: [PATCH 02/N] Fix msys library name in import libraries
diff --git a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch
@@ -1,4 +1,4 @@
-From e971c0bcf575b7775d1d0121ef2e6440a9ed669c Mon Sep 17 00:00:00 2001
+From d9b4e1decb9999a9e1577eafeea8ae337d44924b 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
@@ -436,7 +436,7 @@ index 1e4cf98..b77598b 100644
        }									      \
      }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 622aaa9..a16c875 100644
+index 961a98c..aafb811 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -510,7 +510,11 @@ details. */
diff --git a/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch b/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch
@@ -1,4 +1,4 @@
-From b4519b016bf9dd78d0621163a9872c3d6808d331 Mon Sep 17 00:00:00 2001
+From 02128e4ad21c12aba2edbc183518f9de44750f47 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:17:46 +0300
diff --git a/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch b/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
@@ -1,4 +1,4 @@
-From 7d9c64cfd77ba10c1cf5146a9ca5d021301a51ec Mon Sep 17 00:00:00 2001
+From f5641c9f116e711014cce0b034c46577e76fdc50 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:29:01 +0300
diff --git a/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
@@ -1,4 +1,4 @@
-From 83a114a82db7ac3ba5dc46c3424b383e0a4d5b65 Mon Sep 17 00:00:00 2001
+From 834af426d590c5eafa5a31454bb3e96d1b66bd06 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
@@ -384,10 +384,10 @@ index 1cfee5c..affb7e9 100644
      root_idx = i;
  
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index 83883f9..7c2581d 100644
+index ffe71ee..4323cb1 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
-@@ -2815,7 +2815,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
+@@ -2811,7 +2811,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
  		     dom, name,
  		     sid.string ((char *) sidstr),
  		     home ?: "/home/", home ? L"" : name,
diff --git a/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch b/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch
@@ -1,4 +1,4 @@
-From 08cde45b834f536f05d9218c4bb0fe2e6b3549b2 Mon Sep 17 00:00:00 2001
+From a7a80da72303405b0932f8c1529ea22b5ea511cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:47:21 +0300
diff --git a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
@@ -1,4 +1,4 @@
-From 7c6318a0f68886a4174686c39ec8b89cb05b5d35 Mon Sep 17 00:00:00 2001
+From f671632ea5f1d8a5776afc19c6f55c5cb04574e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:48:54 +0300
diff --git a/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch b/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch
@@ -1,4 +1,4 @@
-From 1cc5abc667219cae2200f1ef5384c57ae1151a8e Mon Sep 17 00:00:00 2001
+From 8f58dba7794555fe5fcdaaeb4c799031d475340b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:50:55 +0300
diff --git a/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch
@@ -1,4 +1,4 @@
-From d3c18e8852b5da7734a2a78a829c7f6e383d3927 Mon Sep 17 00:00:00 2001
+From 055c3f431668f208cfbc35bd56c34e8ec7910f72 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 23 Aug 2015 20:47:30 +0100
 Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob
diff --git a/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch
@@ -1,4 +1,4 @@
-From 9e7926693a30e8eed827f0cfaef0113d02fe4fc0 Mon Sep 17 00:00:00 2001
+From a83678048ab5d4b27c6b5fd0813f6c8dc41afce6 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 09:52:47 +0100
 Subject: [PATCH 11/N] Add debugging for strace make_command_line
diff --git a/msys2-runtime/0012-strace-quiet-be-really-quiet.patch b/msys2-runtime/0012-strace-quiet-be-really-quiet.patch
@@ -1,4 +1,4 @@
-From 9876a9ed9392203a26bb760570db71fa8fc6032b Mon Sep 17 00:00:00 2001
+From 16e335f3fd875d2481bcfbcaa56a7021381d4b72 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 17 May 2017 18:13:32 +0200
 Subject: [PATCH 12/N] strace --quiet: be *really* quiet
diff --git a/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch b/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch
@@ -1,4 +1,4 @@
-From 9123f19fff758906012e9c491107fc93d0dfa53f Mon Sep 17 00:00:00 2001
+From 0f9740069ec89de5e6c30ed73c2a0f20886542ba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 22:13:51 +0300
diff --git a/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch b/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch
@@ -1,4 +1,4 @@
-From 11a478ce41484a6fb1bc50cbf540d5d6fe8105c9 Mon Sep 17 00:00:00 2001
+From 406cc5007a54620999e24c1cbdc0f4ae79590871 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 8 Nov 2022 16:24:20 +0100
 Subject: [PATCH 14/N] When converting to a Unix path, avoid double trailing
diff --git a/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch b/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
@@ -1,4 +1,4 @@
-From 12fc3431407356ace5c06e30647b8688e68b2c18 Mon Sep 17 00:00:00 2001
+From 665a09ba766997e513e3ecbbee36d4bda6629e15 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 20 Nov 2022 13:57:36 +0100
 Subject: [PATCH 15/N] msys2_path_conv: pass PC_NOFULL to path_conv
diff --git a/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch b/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch
@@ -1,4 +1,4 @@
-From c3750d97d280573167ba0cf29fb6c0d666369437 Mon Sep 17 00:00:00 2001
+From b2f6fafe17fd043d5a47f840218463331fc78424 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= <nalla@hamal.uberspace.de>
 Date: Wed, 17 Jun 2015 09:30:41 +0200
 Subject: [PATCH 16/N] path-conversion: Introduce ability to switch off
diff --git a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
@@ -1,4 +1,4 @@
-From f0f97a586d6316325e72d511af17692e9cee0dc3 Mon Sep 17 00:00:00 2001
+From 38378c51ae08b036b1ddf1ef6cf93170ff3d9aac Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:52:09 +0100
 Subject: [PATCH 17/N] dcrt0.cc: Untangle allow_glob from winshell
diff --git a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
@@ -1,4 +1,4 @@
-From f1b4d041cc3a440b36d57ba7cedf2d77fd8b344e Mon Sep 17 00:00:00 2001
+From b5312cbc07e0bf4f959d63219a4afd2c45610b04 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 24 Aug 2015 00:48:06 +0100
 Subject: [PATCH 18/N] dcrt0.cc (globify): Don't quote literal strings
diff --git a/msys2-runtime/0019-Add-debugging-for-build_argv.patch b/msys2-runtime/0019-Add-debugging-for-build_argv.patch
@@ -1,4 +1,4 @@
-From d6a3a54e98d9814a60cc2b836560edf0c25c1b9e Mon Sep 17 00:00:00 2001
+From 9ef526773bdf7c7677a9ac03610141a6f40c4f36 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:18:52 +0100
 Subject: [PATCH 19/N] Add debugging for build_argv
diff --git a/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch
@@ -1,4 +1,4 @@
-From 9ca61ea1a3bc20acd5ff25579d38f4a927e6b5e6 Mon Sep 17 00:00:00 2001
+From b9d70993b51871100ba96523474340d9594bd559 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 10 Apr 2016 21:47:41 +0100
 Subject: [PATCH 20/N] environ.cc: New facility/environment variable
diff --git a/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
@@ -1,4 +1,4 @@
-From 11374ded9416ba1d0c44584707b32dd9cefb4dcb Mon Sep 17 00:00:00 2001
+From f43ffb1f66d6d58b123cc90610d67971674acdaf Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 19 May 2020 13:49:37 +0200
 Subject: [PATCH 21/N] Introduce the `enable_pcon` value for `MSYS`
diff --git a/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch
@@ -1,4 +1,4 @@
-From 1199680444ab7030d58d17a2cfa6330fd9570a65 Mon Sep 17 00:00:00 2001
+From 65cf9f032554c2ed05d6b9e3c3ea4748df8ed5f5 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Fri, 5 Jun 2020 20:09:11 +0200
 Subject: [PATCH 22/N] popen: call /usr/bin/sh instead of /bin/sh
diff --git a/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch
@@ -1,4 +1,4 @@
-From e98dd3da1b78dcbf5aff25c0bc21b1b9aca143d8 Mon Sep 17 00:00:00 2001
+From 1e2b8bc4ab0b4cd173c437fd552a41cd64b12446 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 23/N] Expose full command-lines to other Win32 processes by
diff --git a/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
@@ -1,4 +1,4 @@
-From 6a56f892a76065ccc8bcd4adc01efe261059c15c Mon Sep 17 00:00:00 2001
+From 0e6a5b980d1ff5de93d81ae8a91bed9e888389b7 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 24/N] Add a helper to obtain a function's address in
diff --git a/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
@@ -1,4 +1,4 @@
-From bde54bf61d663dd6961ac772ef45152d604d67ee Mon Sep 17 00:00:00 2001
+From 803f2346ad6cd1ee05c8d25124678b0d282368f6 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 25/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
diff --git a/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch
@@ -1,4 +1,4 @@
-From 2b34729eb9f020d8ca7fa02ecfcacdbec67fe879 Mon Sep 17 00:00:00 2001
+From 4148d009cc1c5362101b6110d27918e39c965af9 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 26/N] kill: kill Win32 processes more gently
diff --git a/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch
@@ -1,4 +1,4 @@
-From 707761410163f4b33b8637c7882cf2c63b07cfe5 Mon Sep 17 00:00:00 2001
+From c6208de91ddbf64af43fff360797d9420a5adaa5 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 22 Jul 2021 11:59:16 -0700
 Subject: [PATCH 27/N] Cygwin: make option for native inner link handling.
diff --git a/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch
@@ -1,4 +1,4 @@
-From f34f9e3670478382340627523521713b517fdcd4 Mon Sep 17 00:00:00 2001
+From 1e065198eeabc0945c2e035d65ee4c614195d3b1 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 28/N] docs: skip building texinfo and PDF files
diff --git a/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch b/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch
@@ -1,4 +1,4 @@
-From af4a7b89b5a3638afd406627ef75b31c07bb6171 Mon Sep 17 00:00:00 2001
+From c325e7f4058c3d501ba301ee66ecac9cfa7dcef0 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 29/N] install-libs: depend on the "toollibs"
diff --git a/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch
@@ -1,4 +1,4 @@
-From 2fc902a8e31cc1c2b04a60f72b617f44b50aef6a Mon Sep 17 00:00:00 2001
+From 4b304dcdce500ad68b0c1bb0b788beb80d753b13 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 30/N] POSIX-ify the SHELL variable
diff --git a/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch
@@ -1,4 +1,4 @@
-From ee9feddd89dcfc5555124b97fa897ed21ce736e4 Mon Sep 17 00:00:00 2001
+From 129ee40f2f119cb11a7df0a2f96df3442c163657 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 31/N] Handle ORIGINAL_PATH just like PATH
diff --git a/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch
@@ -1,4 +1,4 @@
-From 8f46d66228ccd9d5a35a76ae0ac59e8aa2bf759f Mon Sep 17 00:00:00 2001
+From 5f01a6f359f1ad9af7bec6fa393b2e2bbe3f7617 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 32/N] uname: allow setting the system name to CYGWIN
diff --git a/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch b/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch
@@ -1,4 +1,4 @@
-From 4fcc938c082c937ac4ebf2b595c107a43712c29c Mon Sep 17 00:00:00 2001
+From 2897bc0c8bfe0e34224fb52cf89054798922f21a 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 33/N] Pass environment variables with empty values
diff --git a/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch
@@ -1,4 +1,4 @@
-From dc73cb92eafe5bf838cc7da8a2bc4bf6c2810bff Mon Sep 17 00:00:00 2001
+From 23846ef082f5a79ef8ccb1435c5c4a3cc9c789db 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 34/N] Optionally disallow empty environment values again
diff --git a/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch
@@ -1,4 +1,4 @@
-From 08a146bca3d1ec67172fdde840ea24d66295ddf4 Mon Sep 17 00:00:00 2001
+From 24df6e4c3fd34089559f9c4ffcc9ecfed1f3f97b 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 35/N] build_env(): respect the `MSYS` environment variable
diff --git a/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch b/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch
@@ -1,4 +1,4 @@
-From 97086fdeca6681fc86f29dce02af10221d9c54ea Mon Sep 17 00:00:00 2001
+From 6bb8c6264034e5f4a66c368d31a4f42981859a7d 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 36/N] Revert "Cygwin: Enable dynamicbase on the Cygwin DLL by
diff --git a/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch
@@ -1,4 +1,4 @@
-From baade52168a8c181eaa1f4e00b581ba574344f8c Mon Sep 17 00:00:00 2001
+From 5670c939d42401650e8eb97ac7739afe21c3b165 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 30 Jan 2023 23:22:22 +0100
 Subject: [PATCH 37/N] Avoid sharing cygheaps across Cygwin versions
diff --git a/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch b/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch
@@ -1,4 +1,4 @@
-From 642a5ae7f4c8f3e3e54f23a2c0716af2f5ba5222 Mon Sep 17 00:00:00 2001
+From 7b0c7aef996d148a4e5daa67c8033ceb85b7b039 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 21 Feb 2023 16:36:36 +0100
 Subject: [PATCH 38/N] uname: report msys2-runtime commit hash, too
diff --git a/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch b/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch
@@ -1,4 +1,4 @@
-From 24ff97bf040632306e7b99d86b55dd2e2374d7f0 Mon Sep 17 00:00:00 2001
+From e3e73edccb7c4060f65716b8b9a5d50362993636 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 22 May 2023 13:36:27 +0200
 Subject: [PATCH 39/N] Cygwin: Adjust CWD magic to accommodate for the latest
diff --git a/msys2-runtime/0040-Handle-8-bit-characters-under-LOCALE-C.patch b/msys2-runtime/0040-Handle-8-bit-characters-under-LOCALE-C.patch
@@ -1,4 +1,4 @@
-From e2d94d7426193d161eea5896eabcd7ed46a9414c Mon Sep 17 00:00:00 2001
+From 7cd580aa405413447cc48e95a68234afa827761d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Feb 2015 13:56:22 +0000
 Subject: [PATCH 40/N] Handle 8-bit characters under LOCALE=C
diff --git a/msys2-runtime/0041-Mention-the-extremely-useful-small_printf-function.patch b/msys2-runtime/0041-Mention-the-extremely-useful-small_printf-function.patch
@@ -1,4 +1,4 @@
-From 17915305fb76dd9484b1a9e75b05bb4a8e08a31f Mon Sep 17 00:00:00 2001
+From b2914cf710eed19df7fa81afb8c3e4cf80812ea9 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Feb 2015 11:54:47 +0000
 Subject: [PATCH 41/N] Mention the extremely useful small_printf() function
diff --git a/msys2-runtime/0042-Fixed-path-converting-with-non-ascii-char.patch b/msys2-runtime/0042-Fixed-path-converting-with-non-ascii-char.patch
@@ -1,4 +1,4 @@
-From 8e809e94dcf9c91abe0279fe3ddf5ba63c87ccd0 Mon Sep 17 00:00:00 2001
+From 0944d19d500850be868921207c42ee579994f1e7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= <nalla@hamal.uberspace.de>
 Date: Mon, 9 Mar 2015 16:24:43 +0100
 Subject: [PATCH 42/N] Fixed path converting with non ascii char.
diff --git a/msys2-runtime/0043-Allow-native-symlinks-to-non-existing-targets-in-nat.patch b/msys2-runtime/0043-Allow-native-symlinks-to-non-existing-targets-in-nat.patch
@@ -1,4 +1,4 @@
-From 755bea826d332ff7e193a149f11cee5f342fd700 Mon Sep 17 00:00:00 2001
+From e5b7338d5a9207967f0eef53ba2691b65a15cb2c Mon Sep 17 00:00:00 2001
 From: Karsten Blees <blees@dcon.de>
 Date: Wed, 20 May 2015 16:32:52 +0200
 Subject: [PATCH 43/N] Allow native symlinks to non-existing targets in
diff --git a/msys2-runtime/0044-Make-paths-WCS-MBS-conversion-explicit.patch b/msys2-runtime/0044-Make-paths-WCS-MBS-conversion-explicit.patch
@@ -1,4 +1,4 @@
-From 0f660c9e25acc19e301013a2112d0119ff763208 Mon Sep 17 00:00:00 2001
+From 6f2afa8cfca5ff7bf893f2df0f753b9d9fe01740 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 18 Dec 2015 20:19:57 +0100
 Subject: [PATCH 44/N] Make paths' WCS->MBS conversion explicit
@@ -562,7 +562,7 @@ index 6f04658..79eb6f6 100644
      }
    else
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index 7c2581d..f72fbe9 100644
+index 4323cb1..9f2685a 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
 @@ -385,12 +385,12 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
diff --git a/msys2-runtime/0045-Use-MB_CUR_MAX-6-by-default.patch b/msys2-runtime/0045-Use-MB_CUR_MAX-6-by-default.patch
@@ -1,4 +1,4 @@
-From 634644074851d1e09704aee11a7df8897616e691 Mon Sep 17 00:00:00 2001
+From 7e7c72beec88ec73a59bc89c6c22fb5b7ae198a7 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Thu, 21 Nov 2019 14:21:01 +0100
 Subject: [PATCH 45/N] Use MB_CUR_MAX == 6 by default
diff --git a/msys2-runtime/0046-Change-the-default-base-address-for-x86_64.patch b/msys2-runtime/0046-Change-the-default-base-address-for-x86_64.patch
@@ -1,4 +1,4 @@
-From 2ebd67b5cdac2425643047bde17db10dd99ca2eb Mon Sep 17 00:00:00 2001
+From 423c4c3d271a832d646a0389b9be55b90093f22b Mon Sep 17 00:00:00 2001
 From: Mikael Larsson <95430516+chirpnot@users.noreply.github.com>
 Date: Thu, 10 Mar 2022 17:26:42 +0000
 Subject: [PATCH 46/N] Change the default base address for x86_64
diff --git a/msys2-runtime/0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch b/msys2-runtime/0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch
@@ -1,4 +1,4 @@
-From e0605d98a02d1639201a5499d075b79ba9e4fae1 Mon Sep 17 00:00:00 2001
+From 09097de2121f1057a2012043648eaade9b38e8bb Mon Sep 17 00:00:00 2001
 From: Richard Glidden <rglidden@brocksolutions.com>
 Date: Thu, 24 Aug 2023 13:36:10 -0400
 Subject: [PATCH 47/N] msys2-runtime: restore fast path for current user
@@ -55,7 +55,7 @@ index fed87ec..821ccf7 100644
    inline bool nss_cygserver_caching () const { return caching; }
    inline void nss_disable_cygserver_caching () { caching = false; }
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index 7c2581d..820ee06 100644
+index 4323cb1..15a9307 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
 @@ -637,6 +637,11 @@ cygheap_pwdgrp::nss_init_line (const char *line)
@@ -78,7 +78,7 @@ index 7c2581d..820ee06 100644
    char *shell = NULL;
    char *home = NULL;
    char *gecos = NULL;
-@@ -2470,9 +2476,19 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
+@@ -2466,9 +2472,19 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
  	    uid = posix_offset + sid_sub_auth_rid (sid);
  	  if (!is_group () && acc_type == SidTypeUser)
  	    {
@@ -101,7 +101,7 @@ index 7c2581d..820ee06 100644
  	    }
  
  	  if (is_domain_account)
-@@ -2480,9 +2496,11 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
+@@ -2476,9 +2492,11 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
  	      /* Skip this when creating group entries and for non-users. */
  	      if (is_group() || acc_type != SidTypeUser)
  		break;
diff --git a/msys2-runtime/0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch b/msys2-runtime/0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
diff --git a/msys2-runtime/msys2-runtime.commit b/msys2-runtime/msys2-runtime.commit

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 13de2a173212340b0f85edc722c72d426bcd63e5 Mon Sep 17 00:00:00 2001`
	`1`	`+From f51657ba5f587a296c90c4a14d002a21a1f57094 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=`
`3`	`3`	`=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>`
`4`	`4`	`Date: Sun, 14 Apr 2019 20:40:45 +0300`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From ba274e444eaa417da44ace62199834885c6507df Mon Sep 17 00:00:00 2001`
	`1`	`+From 3155a8c5f98e97692a6d1dd0047e9ca0dd4c3030 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Kaleb Barrett <[email protected]>`
`3`	`3`	`Date: Sun, 14 Mar 2021 18:58:55 -0500`
`4`	`4`	`Subject: [PATCH 02/N] Fix msys library name in import libraries`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From b4519b016bf9dd78d0621163a9872c3d6808d331 Mon Sep 17 00:00:00 2001`
	`1`	`+From 02128e4ad21c12aba2edbc183518f9de44750f47 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=`
`3`	`3`	`=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>`
`4`	`4`	`Date: Sun, 14 Apr 2019 21:17:46 +0300`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 7d9c64cfd77ba10c1cf5146a9ca5d021301a51ec Mon Sep 17 00:00:00 2001`
	`1`	`+From f5641c9f116e711014cce0b034c46577e76fdc50 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=`
`3`	`3`	`=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>`
`4`	`4`	`Date: Sun, 14 Apr 2019 21:29:01 +0300`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 08cde45b834f536f05d9218c4bb0fe2e6b3549b2 Mon Sep 17 00:00:00 2001`
	`1`	`+From a7a80da72303405b0932f8c1529ea22b5ea511cd Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=`
`3`	`3`	`=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>`
`4`	`4`	`Date: Sun, 14 Apr 2019 21:47:21 +0300`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 7c6318a0f68886a4174686c39ec8b89cb05b5d35 Mon Sep 17 00:00:00 2001`
	`1`	`+From f671632ea5f1d8a5776afc19c6f55c5cb04574e0 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=`
`3`	`3`	`=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>`
`4`	`4`	`Date: Sun, 14 Apr 2019 21:48:54 +0300`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 1cc5abc667219cae2200f1ef5384c57ae1151a8e Mon Sep 17 00:00:00 2001`
	`1`	`+From 8f58dba7794555fe5fcdaaeb4c799031d475340b Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=`
`3`	`3`	`=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>`
`4`	`4`	`Date: Sun, 14 Apr 2019 21:50:55 +0300`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From d3c18e8852b5da7734a2a78a829c7f6e383d3927 Mon Sep 17 00:00:00 2001`
	`1`	`+From 055c3f431668f208cfbc35bd56c34e8ec7910f72 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <[email protected]>`
`3`	`3`	`Date: Sun, 23 Aug 2015 20:47:30 +0100`
`4`	`4`	`Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob`