Merge pull request #231 from git-for-windows/msys2-runtime-bb4e8e05b4c68895887eba9c420e8a42e0e2801e

msys2-runtime: update to 3.6.1-2

Author: dscho

msys2-runtime/0048-Cygwin-console-Fix-the-console-states-after-the-cons.patch

@@ -0,0 +1,91 @@
+From 8ed79cf850b602a8fe6432027145f871f04d5690 Mon Sep 17 00:00:00 2001
+From: Takashi Yano <[email protected]>
+Date: Thu, 10 Apr 2025 16:18:17 +0900
+Subject: [PATCH 48/N] Cygwin: console: Fix the console states after the
+ console is closed
+
+Due to a bug introduced by the commit 3312f2d21f13, when the parent
+process exits before the child process exits, disable_master_thread
+is wrongly set to true, that disables special key handling such as
+Ctrl-C. With this patch, the disable_master_thread is set to true if
+any of the following conditions is met.
+  - The parent process is not a cygwin process.
+  - The master process already died.
+  - The current process is the master process.
+Otherwise, disable_master_thread remains false to keep special key
+handling enabled.
+
+Addresses: https://cygwin.com/pipermail/cygwin/2025-April/257909.html
+Fixed: 3312f2d21f13 ("Cygwin: console: Redesign mode set strategy on close().")
+Reported-by: Jeremy Drake <[email protected]>
+Signed-off-by: Takashi Yano <[email protected]>
+---
+ winsup/cygwin/fhandler/console.cc       | 24 ++++++++++++++++++++----
+ winsup/cygwin/local_includes/fhandler.h |  2 +-
+ 2 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/winsup/cygwin/fhandler/console.cc b/winsup/cygwin/fhandler/console.cc
+index a38487f..f33e354 100644
+--- a/winsup/cygwin/fhandler/console.cc
++++ b/winsup/cygwin/fhandler/console.cc
+@@ -932,7 +932,7 @@ fhandler_console::cleanup_for_non_cygwin_app (handle_set_t *p)
+   /* Cleaning-up console mode for non-cygwin app. */
+   /* conmode can be tty::restore when non-cygwin app is
+      exec'ed from login shell. */
+-  tty::cons_mode conmode = cons_mode_on_close ();
++  tty::cons_mode conmode = cons_mode_on_close (p);
+   set_output_mode (conmode, ti, p);
+   set_input_mode (conmode, ti, p);
+   set_disable_master_thread (con.owner == GetCurrentProcessId ());
+@@ -1991,8 +1991,9 @@ fhandler_console::close (int flag)
+ 
+   acquire_output_mutex (mutex_timeout);
+ 
+-  if (shared_console_info[unit] && myself->ppid == 1
+-      && (dev_t) myself->ctty == get_device ())
++  if (shared_console_info[unit] && con.curr_input_mode != tty::restore
++      && (dev_t) myself->ctty == get_device ()
++      && cons_mode_on_close (&handle_set) == tty::restore)
+     {
+       set_output_mode (tty::restore, &get_ttyp ()->ti, &handle_set);
+       set_input_mode (tty::restore, &get_ttyp ()->ti, &handle_set);
+@@ -4704,10 +4705,25 @@ fhandler_console::fstat (struct stat *st)
+ }
+ 
+ tty::cons_mode
+-fhandler_console::cons_mode_on_close ()
++fhandler_console::cons_mode_on_close (handle_set_t *p)
+ {
++  int unit = p->unit;
+   if (myself->ppid != 1) /* Execed from normal cygwin process. */
+     return tty::cygwin;
+ 
++  if (!process_alive (con.owner)) /* The Master process already died. */
++    return tty::restore;
++  if (con.owner == GetCurrentProcessId ()) /* Master process */
++    return tty::restore;
++
++  PROCESS_BASIC_INFORMATION pbi;
++  NTSTATUS status =
++    NtQueryInformationProcess (GetCurrentProcess (), ProcessBasicInformation,
++			       &pbi, sizeof (pbi), NULL);
++  if (NT_SUCCESS (status)
++      && !process_alive ((DWORD) pbi.InheritedFromUniqueProcessId))
++    /* Execed from normal cygwin process and the parent has been exited. */
++    return tty::cygwin;
++
+   return tty::restore; /* otherwise, restore */
+ }
+diff --git a/winsup/cygwin/local_includes/fhandler.h b/winsup/cygwin/local_includes/fhandler.h
+index 8c71d84..4c013dd 100644
+--- a/winsup/cygwin/local_includes/fhandler.h
++++ b/winsup/cygwin/local_includes/fhandler.h
+@@ -2368,7 +2368,7 @@ private:
+ 
+   void setup_pcon_hand_over ();
+   static void pcon_hand_over_proc ();
+-  static tty::cons_mode cons_mode_on_close ();
++  static tty::cons_mode cons_mode_on_close (handle_set_t *);
+ 
+   friend tty_min * tty_list::get_cttyp ();
+ };

msys2-runtime/0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch

@@ -0,0 +1,31 @@
+From 0cfedd4f820f1b32ea0a7d8afd2795bd4910ae16 Mon Sep 17 00:00:00 2001
+From: Jeremy Drake <[email protected]>
+Date: Thu, 10 Apr 2025 10:18:01 -0700
+Subject: [PATCH 49/N] fixup! Instead of creating Cygwin symlinks, use deep
+ copy by default
+
+Adjust the infinite recursion check to make sure the source ends with a
+dir sep, so it doesn't think abcd is a subdirectory of a.
+
+Fixes #277
+
+Signed-off-by: Jeremy Drake <[email protected]>
+---
+ winsup/cygwin/path.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
+index 26ca1cf..6e35c5d 100644
+--- a/winsup/cygwin/path.cc
++++ b/winsup/cygwin/path.cc
+@@ -1855,7 +1855,9 @@ recursiveCopy (PUNICODE_STRING src, PUNICODE_STRING dst, USHORT origsrclen,
+ 	  /* Recurse into the child directory */
+ 	  /* avoids endless recursion */
+ 	  if (src->Length <= origsrclen ||
+-	      !wcsncmp (src->Buffer, dst->Buffer, origdstlen / sizeof (WCHAR)))
++	      (!wcsncmp (src->Buffer, dst->Buffer, origdstlen / sizeof (WCHAR)) &&
++	       (!src->Buffer[origdstlen / sizeof (WCHAR)] ||
++		iswdirsep(src->Buffer[origdstlen / sizeof (WCHAR)]))))
+ 	    {
+ 	      set_errno (ELOOP);
+ 	      goto done;

msys2-runtime/PKGBUILD

@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
 url="https://www.cygwin.com/"
@@ -73,9 +73,11 @@ source=('msys2-runtime'::git+https://github.com/cygwin/cygwin#tag=cygwin-${pkgve
         0044-Make-paths-WCS-MBS-conversion-explicit.patch
         0045-Use-MB_CUR_MAX-6-by-default.patch
         0046-Change-the-default-base-address-for-x86_64.patch
-        0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch)
+        0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch
+        0048-Cygwin-console-Fix-the-console-states-after-the-cons.patch
+        0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch)
 sha256sums=('24c4782e0e48d59f4155885c790d37a8bb59c4ab318851b99c675ca83792f563'
-            'a6d99dab3a1a91957d686d26d5157d601d89d271491744c5f6010bc3aff9d0c3'
+            '2280305f1f4a8f851abd3e24823f05d853e124ff34c56754fca18dabf1ea49d6'
             'f0fb7e2f29859d57fd61edf2fb5453f975117aa6c53400f79e6d0eecf9dddba2'
             '3083f60db3649474270319856e8ecb39b15015ad49df4e1ab8c93a0ad3a71152'
             '27c196e05e46f26b86b2154b048aac0727b7303c464263e49016aabf63335dfd'
@@ -122,7 +124,9 @@ sha256sums=('24c4782e0e48d59f4155885c790d37a8bb59c4ab318851b99c675ca83792f563'
             'cf13908873f7b67575080f55dc2e162b2b63aabae0bba07382bef91b31c8a32c'
             '2db6a3c777144343dfa40f02bbae7a9bfda843407549da42f6be4f0a131a5ad6'
             '84a91ae1cf46d7e358754a33d85c7580578c3e4f12776e4fd70f43e8258bd209'
-            'b13471f6459eb725ba85ee712e0c037b92d5128329b2dc599823e37bfa87812e')
+            'b13471f6459eb725ba85ee712e0c037b92d5128329b2dc599823e37bfa87812e'
+            'f2d679b59f68ddf025edb191d8888dcc783f85ea6ce63609fb9d562b5bcc9e7f'
+            '2194f705bfa4fae545fecd0251bd03acacc76a6f18783a281b8eb60dec166d9d')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -223,7 +227,9 @@ prepare() {
   0044-Make-paths-WCS-MBS-conversion-explicit.patch \
   0045-Use-MB_CUR_MAX-6-by-default.patch \
   0046-Change-the-default-base-address-for-x86_64.patch \
-  0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch
+  0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch \
+  0048-Cygwin-console-Fix-the-console-states-after-the-cons.patch \
+  0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch
 }
 
 build() {

msys2-runtime/msys2-runtime.commit

@@ -1 +1 @@
-754b26f8483bf6b333fd01d58dad4341e4b6d8a8
+bb4e8e05b4c68895887eba9c420e8a42e0e2801e