Merge pull request #205 from git-for-windows/msys2-runtime-ff2b7c9087029c32fbf1c088ffd7c11f9529103a

msys2-runtime: update to ff2b7c9087029c32fbf1c088ffd7c11f9529103a

Author: dscho

msys2-runtime/0001-Add-MSYS2-triplet.patch

@@ -1,4 +1,4 @@
-From 51380ec75b3f11228cb680f3a4d71fc1957e5aec Mon Sep 17 00:00:00 2001
+From bdad035f0baf6fa584ca10913e9948c0aba2970e 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 20:40:45 +0300

msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch

@@ -1,4 +1,4 @@
-From a116f418453dc6b272c3b58fcb1498790efccd6f Mon Sep 17 00:00:00 2001
+From 900232bfff4076c483307b4af8f2bbf9b50a600f Mon Sep 17 00:00:00 2001
 From: Kaleb Barrett <[email protected]>
 Date: Sun, 14 Mar 2021 18:58:55 -0500
 Subject: [PATCH 02/N] Fix msys library name in import libraries

msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch

@@ -1,4 +1,4 @@
-From f858c02bdb8d3444691dd99165718a1dd67ea753 Mon Sep 17 00:00:00 2001
+From 585fadf7eab7cc83f6445adcd30b5c2b2e9357f8 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:09:17 +0300
@@ -277,7 +277,7 @@ index 9508f3e..3c40e0f 100644
  	  w32len = cygheap->installation_key.Length / sizeof (WCHAR);
  	  if (w32len
 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
-index 3195d57..18271f5 100644
+index a560a3f..8590929 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
 @@ -526,14 +526,14 @@ int exec_prepared_command (PWCHAR command)
@@ -298,10 +298,10 @@ index 3195d57..18271f5 100644
  	  break;
  	}
 diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index 6658a23..5d2fe12 100644
+index 6a1ef03..7244fa4 100644
 --- a/winsup/cygwin/fhandler/pipe.cc
 +++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -727,7 +727,11 @@ fhandler_pipe::close ()
+@@ -751,7 +751,11 @@ fhandler_pipe::close ()
    return ret;
  }
 
@@ -314,10 +314,10 @@ index 6658a23..5d2fe12 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 fa6bf10..12a0ab3 100644
+index 4f0f718..eb51c6d 100644
 --- a/winsup/cygwin/fhandler/pty.cc
 +++ b/winsup/cygwin/fhandler/pty.cc
-@@ -927,7 +927,11 @@ fhandler_pty_slave::open (int flags, mode_t)
+@@ -875,7 +875,11 @@ fhandler_pty_slave::open (int flags, mode_t)
        pipe_reply repl;
        DWORD len;
 
@@ -329,7 +329,7 @@ index fa6bf10..12a0ab3 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,
-@@ -1206,7 +1210,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
+@@ -1137,7 +1141,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
  		    {
  		      char pipe[MAX_PATH];
  		      __small_sprintf (pipe,
@@ -341,7 +341,7 @@ index fa6bf10..12a0ab3 100644
  			       &cygheap->installation_key, get_minor ());
  		      pipe_request req = { GetCurrentProcessId () };
  		      pipe_reply repl;
-@@ -2090,7 +2098,11 @@ fhandler_pty_master::close ()
+@@ -2021,7 +2029,11 @@ fhandler_pty_master::close ()
  	  pipe_reply repl;
  	  DWORD len;
 
@@ -353,7 +353,7 @@ index fa6bf10..12a0ab3 100644
  			   &cygheap->installation_key, get_minor ());
  	  acquire_output_mutex (mutex_timeout);
  	  if (master_ctl)
-@@ -2996,7 +3008,11 @@ fhandler_pty_master::setup ()
+@@ -2927,7 +2939,11 @@ fhandler_pty_master::setup ()
 
    /* Create master control pipe which allows the master to duplicate
       the pty pipe handles to processes which deserve it. */
@@ -365,7 +365,7 @@ index fa6bf10..12a0ab3 100644
  		   &cygheap->installation_key, unit);
    master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
  				     | FILE_FLAG_FIRST_PIPE_INSTANCE,
-@@ -3880,7 +3896,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
+@@ -3816,7 +3832,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
      {
        char pipe[MAX_PATH];
        __small_sprintf (pipe,
@@ -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 0f87fbc..2e624a9 100644
+index fb821a6..1c68287 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -502,7 +502,11 @@ details. */
@@ -617,7 +617,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 9d88b60..ed564c8 100644
+index 11033bc..2d7071b 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
 @@ -339,7 +339,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
@@ -626,15 +626,15 @@ index 9d88b60..ed564c8 100644
      {
 -      /* Create unique filename.  Start with a dot, followed by "cyg"
 +      /* Create unique filename.  Start with a dot, followed by "msys"
- 	 transposed into the Unicode low surrogate area (U+dc00) on file
- 	 systems supporting Unicode (except Samba), followed by the inode
- 	 number in hex, followed by a path hash in hex.  The combination
+ 	 transposed to the Unicode private use area in the U+f700 area
+ 	 on file systems supporting Unicode (except Samba), followed by
+ 	 the inode number in hex, followed by a path hash in hex.  The
 @@ -347,7 +347,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
        RtlAppendUnicodeToString (&recycler,
  				(pc.fs_flags () & FILE_UNICODE_ON_DISK
  				 && !pc.fs_is_samba ())
--				? L".\xdc63\xdc79\xdc67" : L".cyg");
-+				? L".\xdc6d\xdc73\xdc79\xdc73" : L".msys");
+-				? L".\xf763\xf779\xf767" : L".cyg");
++				? L".\xf76d\xf773\xf779\xf773" : L".msys");
        pfii = (PFILE_INTERNAL_INFORMATION) infobuf;
        status = NtQueryInformationFile (fh, &io, pfii, sizeof *pfii,
  				       FileInternalInformation);

msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch

@@ -1,4 +1,4 @@
-From b084abe0ec93354984d37d0ec09fab39984d1e90 Mon Sep 17 00:00:00 2001
+From d076660c2d88cc79897b73b53134b040d623c547 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:17:46 +0300
@@ -1086,7 +1086,7 @@ index 1802e76..84851a1 100644
 
  /* Cover functions to the path conversion routines.
 diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
-index d01f678..845121f 100644
+index f5a4b91..902cef8 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
 @@ -292,6 +292,27 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch

@@ -1,4 +1,4 @@
-From f16038529ae929ad0371de5b7a8ba651b1888e29 Mon Sep 17 00:00:00 2001
+From 35a477b5cd63373397b0dc713de7b95d610ad300 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:29:01 +0300

msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch

@@ -1,4 +1,4 @@
-From 6393488c9d7048ba7081374b806397c74ee2def6 Mon Sep 17 00:00:00 2001
+From 41ed62e6f51e80b764de465ab9f9045552107813 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:45:06 +0300

msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch

@@ -1,4 +1,4 @@
-From 06ea20e4eceef17d67a404d670b439e87f282450 Mon Sep 17 00:00:00 2001
+From 8096583fac66461dbe1414f210d998a3087c1ecc 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:47:21 +0300

msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch

@@ -1,4 +1,4 @@
-From 222fd37c0b4f4502a0dd67ab3369fb630ded3420 Mon Sep 17 00:00:00 2001
+From 0ba54e8cc1940f94e9cde6b6c74cb6a8fb240d56 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?= <[email protected]>
 Date: Sun, 14 Apr 2019 21:48:54 +0300

msys2-runtime/0009-Do-not-convert-environment-for-strace.patch

@@ -1,4 +1,4 @@
-From 41e8ada0d105959dfd3a1665875a09b64ceb06a3 Mon Sep 17 00:00:00 2001
+From e28b7422e206f39202a9f1f840a84cd7a59287c2 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?= <[email protected]>
 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 845121f..ace43db 100644
+index 902cef8..d7affaa 100644
 --- a/winsup/cygwin/spawn.cc
 +++ b/winsup/cygwin/spawn.cc
 @@ -545,11 +545,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch

@@ -1,4 +1,4 @@
-From 766e55c1bea155c16b8fe28506b86f661c292dc6 Mon Sep 17 00:00:00 2001
+From 4a24304b8b1463097d2532f327eb9e44f272a303 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Sun, 23 Aug 2015 20:47:30 +0100
 Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob