Merge pull request #230 from git-for-windows/msys2-runtime-754b26f8483bf6b333fd01d58dad4341e4b6d8a8

msys2-runtime: update to 3.6.1-1

Author: dscho

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

@@ -1,4 +1,4 @@
-From 90f0b2f7fb7f45e4cb7a9f68d0363238255d8b60 Mon Sep 17 00:00:00 2001
+From be88bf581b370c45c96bf14f8286e02c61a4cf45 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 3949c156122acec609e9b14a06081f096d40682a Mon Sep 17 00:00:00 2001
+From b00015672a4c3b7054c8d497bd5dfd5c20af97b6 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 ae1dc7cd646de0e1e258cef787eac0797fb108c8 Mon Sep 17 00:00:00 2001
+From c6ac7c6b6e57836b47e1e563660567d0f702de41 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
@@ -223,7 +223,7 @@ index f4c09be..e19b7d3 100644
    static int _fmode;
 
 diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
-index fb70524..7367d29 100644
+index 10bd0ac..f9c9fe2 100644
 --- a/winsup/cygwin/dlfcn.cc
 +++ b/winsup/cygwin/dlfcn.cc
 @@ -147,8 +147,13 @@ collect_basenames (pathfinder::basenamelist & basenames,
@@ -241,10 +241,10 @@ index fb70524..7367d29 100644
    /* ... using original basename with new suffix. */
    basenames.appendv (basename, baselen, ext, extlen, NULL);
 diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
-index 1a04751..7c5f8cc 100644
+index b8f38b5..a62f65a 100644
 --- a/winsup/cygwin/dll_init.cc
 +++ b/winsup/cygwin/dll_init.cc
-@@ -874,7 +874,11 @@ dll_dllcrt0_1 (VOID *x)
+@@ -903,7 +903,11 @@ dll_dllcrt0_1 (VOID *x)
  }
 
  extern "C" void
@@ -277,7 +277,7 @@ index 7303f7e..6ccc19a 100644
  	  w32len = cygheap->installation_key.Length / sizeof (WCHAR);
  	  if (w32len
 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
-index 2e25aa2..dfbb935 100644
+index 49fc166..a2a589e 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 2e25aa2..dfbb935 100644
  	  break;
  	}
 diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index ac8bbe7..3537180 100644
+index e35d523..506dd09 100644
 --- a/winsup/cygwin/fhandler/pipe.cc
 +++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -785,7 +785,11 @@ fhandler_pipe::close (int flag)
+@@ -790,7 +790,11 @@ fhandler_pipe::close (int flag)
    return ret;
  }
 
@@ -314,7 +314,7 @@ index ac8bbe7..3537180 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 e61a1c8..ebb9dbc 100644
+index 3128b92..0969b2f 100644
 --- a/winsup/cygwin/fhandler/pty.cc
 +++ b/winsup/cygwin/fhandler/pty.cc
 @@ -875,7 +875,11 @@ fhandler_pty_slave::open (int flags, mode_t)
@@ -341,7 +341,7 @@ index e61a1c8..ebb9dbc 100644
  			       &cygheap->installation_key, get_minor ());
  		      pipe_request req = { GetCurrentProcessId () };
  		      pipe_reply repl;
-@@ -2021,7 +2029,11 @@ fhandler_pty_master::close (int flag)
+@@ -2024,7 +2032,11 @@ fhandler_pty_master::close (int flag)
  	  pipe_reply repl;
  	  DWORD len;
 
@@ -353,7 +353,7 @@ index e61a1c8..ebb9dbc 100644
  			   &cygheap->installation_key, get_minor ());
  	  acquire_output_mutex (mutex_timeout);
  	  if (master_ctl)
-@@ -2927,7 +2939,11 @@ fhandler_pty_master::setup ()
+@@ -2930,7 +2942,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 e61a1c8..ebb9dbc 100644
  		   &cygheap->installation_key, unit);
    master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
  				     | FILE_FLAG_FIRST_PIPE_INSTANCE,
-@@ -3816,7 +3832,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
+@@ -3819,7 +3835,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 0228074..0bd0256 100644
+index f4f908f..37122d4 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -510,7 +510,11 @@ details. */

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

@@ -1,4 +1,4 @@
-From 894b05ef767c95400be2406c28988e4d06f3e0a8 Mon Sep 17 00:00:00 2001
+From 4bb3f5dcfa50bcf955df54d1975cfd3388306946 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

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

@@ -1,4 +1,4 @@
-From 70c8b732241944068aea4a958c42a39337476a0b Mon Sep 17 00:00:00 2001
+From 2a7153d171a579324b2fc0c83e491952ed7764b2 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 83c84acd7c46696e4ddd5df8ce3f097de85a61d3 Mon Sep 17 00:00:00 2001
+From 25add3b86d2346d019e810a732bd05675c12cf19 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 aebb0471f35665f3fab4c574c273ac7769cd757a Mon Sep 17 00:00:00 2001
+From b127b7469e05d0d974ae0f89626522e01a138443 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
@@ -22,8 +22,8 @@ Co-authored-by: Jeremy Drake <[email protected]>
 ---
  winsup/cygwin/environ.cc |   4 +
  winsup/cygwin/globals.cc |   3 +-
- winsup/cygwin/path.cc    | 268 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 274 insertions(+), 1 deletion(-)
+ winsup/cygwin/path.cc    | 250 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 256 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
 index b9f7e05..5fb3f53 100644
@@ -62,7 +62,7 @@ index d8e058f..b7e0e21 100644
  bool winjitdebug = false;
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 0e7ebdf..251c6a6 100644
+index 0e7ebdf..d8e456a 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -1722,6 +1722,171 @@ conv_path_list (const char *src, char *dst, size_t size,
@@ -237,7 +237,7 @@ index 0e7ebdf..251c6a6 100644
  /* Create a symlink from FROMPATH to TOPATH. */
 
  extern "C" int
-@@ -2034,6 +2199,102 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
+@@ -2034,6 +2199,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
    return 0;
  }
 
@@ -247,25 +247,7 @@ index 0e7ebdf..251c6a6 100644
 +  tmp_pathbuf tp;
 +  path_conv win32_oldpath;
 +
-+  /* **BEGIN** replace this with
-+     resolve_symlink_target (oldpath, win32_newpath. win32_oldpath);
-+     when rebasing over 5a706ff0fceb83fd1fe7f072fc28a741fdde65f2
-+     (probably Cygwin 3.6) */
-+  /* The symlink target is relative to the directory in which the
-+     symlink gets created, not relative to the cwd.  Therefore we
-+     have to mangle the path quite a bit before calling path_conv.*/
-+  if (isabspath (oldpath))
-+    win32_oldpath.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
-+  else
-+    {
-+      size_t len = strrchr (win32_newpath.get_posix (), '/')
-+		    - win32_newpath.get_posix () + 1;
-+      char *absoldpath = tp.t_get ();
-+      stpcpy (stpncpy (absoldpath, win32_newpath.get_posix (), len),
-+	      oldpath);
-+      win32_oldpath.check (absoldpath, PC_SYM_NOFOLLOW, stat_suffixes);
-+    }
-+  /* **END** */
++  resolve_symlink_target (oldpath, win32_newpath, win32_oldpath);
 +  if (win32_oldpath.error)
 +    {
 +      set_errno (win32_oldpath.error);
@@ -340,7 +322,7 @@ index 0e7ebdf..251c6a6 100644
  int
  symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  {
-@@ -2101,6 +2362,13 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2101,6 +2344,13 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  	case WSYM_nfs:
  	  res = symlink_nfs (oldpath, win32_newpath);
  	  __leave;

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

@@ -1,4 +1,4 @@
-From b7e7e107a5c443d11ac51e9a15f40f6a4305feb8 Mon Sep 17 00:00:00 2001
+From 07e2ec8f36d080e1f7443b2658d0b17d871a9307 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 511ebb14dc75bf6df92c01633c4b3f5cbf805436 Mon Sep 17 00:00:00 2001
+From ccb8cb97309edd55bb8753073a6030bf20a9b643 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

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

@@ -1,4 +1,4 @@
-From 89f33bd736e7403e0be6fd5b8cf66588119bb280 Mon Sep 17 00:00:00 2001
+From 712d8de47182b4c4239051a288e0ffbb50a94cfe 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