Merge pull request #234 from git-for-windows/msys2-runtime-0b9a01b6b59f03187dcf1b184addc93e8555415c

msys2-runtime: update to 3.6.2-1

Author: dscho

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

@@ -1,4 +1,4 @@
-From be88bf581b370c45c96bf14f8286e02c61a4cf45 Mon Sep 17 00:00:00 2001
+From 13de2a173212340b0f85edc722c72d426bcd63e5 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 b00015672a4c3b7054c8d497bd5dfd5c20af97b6 Mon Sep 17 00:00:00 2001
+From ba274e444eaa417da44ace62199834885c6507df 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 c6ac7c6b6e57836b47e1e563660567d0f702de41 Mon Sep 17 00:00:00 2001
+From e971c0bcf575b7775d1d0121ef2e6440a9ed669c 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 10bd0ac..f9c9fe2 100644
+index 9b6bb55..2d0bae5 100644
 --- a/winsup/cygwin/dlfcn.cc
 +++ b/winsup/cygwin/dlfcn.cc
 @@ -147,8 +147,13 @@ collect_basenames (pathfinder::basenamelist & basenames,
@@ -241,7 +241,7 @@ index 10bd0ac..f9c9fe2 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 b8f38b5..a62f65a 100644
+index 1369165..5488737 100644
 --- a/winsup/cygwin/dll_init.cc
 +++ b/winsup/cygwin/dll_init.cc
 @@ -903,7 +903,11 @@ dll_dllcrt0_1 (VOID *x)
@@ -277,10 +277,10 @@ 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 49fc166..a2a589e 100644
+index 876b79e..466abdd 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
-@@ -526,14 +526,14 @@ int exec_prepared_command (PWCHAR command)
+@@ -528,14 +528,14 @@ int exec_prepared_command (PWCHAR command)
    PWCHAR rawenv = GetEnvironmentStringsW () ;
    for (PWCHAR p = rawenv; *p != L'\0'; p = wcschr (p, L'\0') + 1)
      {
@@ -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 f4f908f..37122d4 100644
+index 622aaa9..a16c875 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -510,7 +510,11 @@ details. */
@@ -617,7 +617,7 @@ index f9906a5..2361ae5 100644
    ts.SourceIdentifier.LowPart = kerberos_auth ? 0x0105 : 0x0106;
 
 diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index c93bf4c..ba02ff4 100644
+index d6a2c2d..affaa0d 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)

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

@@ -1,4 +1,4 @@
-From 4bb3f5dcfa50bcf955df54d1975cfd3388306946 Mon Sep 17 00:00:00 2001
+From b4519b016bf9dd78d0621163a9872c3d6808d331 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
@@ -999,7 +999,7 @@ index 0000000..67d85ec
 +#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */
 +
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index d2aaed3..0e7ebdf 100644
+index 42919a7..cb01afc 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -66,6 +66,7 @@

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

@@ -1,4 +1,4 @@
-From 2a7153d171a579324b2fc0c83e491952ed7764b2 Mon Sep 17 00:00:00 2001
+From 7d9c64cfd77ba10c1cf5146a9ca5d021301a51ec 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
@@ -13,7 +13,7 @@ Subject: [PATCH 05/N] Add functionality for changing OS name via MSYSTEM
  4 files changed, 49 insertions(+), 8 deletions(-)
 
 diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
-index 373bfd2..c902857 100755
+index abda186..1f0603f 100755
 --- a/winsup/cygserver/cygserver-config
 +++ b/winsup/cygserver/cygserver-config
 @@ -86,7 +86,7 @@ done
@@ -24,7 +24,7 @@ index 373bfd2..c902857 100755
 +_nt=`expr "${_sys}" : "MSYS_NT"`
 
  # Check for running cygserver processes first.
- if ps -ef | grep -v grep | grep -q ${service_name}
+ if ps -e | grep -v grep | grep -q ${service_name}
 @@ -178,7 +178,7 @@ then
      echo "Do you want to install cygserver as service?"
      if request "(Say \"no\" if it's already installed as service)"

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

@@ -1,4 +1,4 @@
-From 25add3b86d2346d019e810a732bd05675c12cf19 Mon Sep 17 00:00:00 2001
+From 83a114a82db7ac3ba5dc46c3424b383e0a4d5b65 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
@@ -384,10 +384,10 @@ index 1cfee5c..affb7e9 100644
      root_idx = i;
 
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index 27dc289..12097de 100644
+index 83883f9..7c2581d 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
-@@ -2794,7 +2794,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
+@@ -2815,7 +2815,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,

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

@@ -1,4 +1,4 @@
-From b127b7469e05d0d974ae0f89626522e01a138443 Mon Sep 17 00:00:00 2001
+From 08cde45b834f536f05d9218c4bb0fe2e6b3549b2 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    | 250 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 256 insertions(+), 1 deletion(-)
+ winsup/cygwin/path.cc    | 252 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 258 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
 index b9f7e05..5fb3f53 100644
@@ -62,10 +62,10 @@ index d8e058f..b7e0e21 100644
  bool winjitdebug = false;
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 0e7ebdf..d8e456a 100644
+index cb01afc..a3e4de2 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,
+@@ -1722,6 +1722,173 @@ conv_path_list (const char *src, char *dst, size_t size,
 
  /********************** Symbolic Link Support **************************/
 
@@ -195,7 +195,9 @@ index 0e7ebdf..d8e456a 100644
 +	  /* 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;
@@ -237,7 +239,7 @@ index 0e7ebdf..d8e456a 100644
  /* Create a symlink from FROMPATH to TOPATH. */
 
  extern "C" int
-@@ -2034,6 +2199,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
+@@ -2034,6 +2201,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
    return 0;
  }
 
@@ -322,7 +324,7 @@ index 0e7ebdf..d8e456a 100644
  int
  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)
+@@ -2101,6 +2346,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 07e2ec8f36d080e1f7443b2658d0b17d871a9307 Mon Sep 17 00:00:00 2001
+From 7c6318a0f68886a4174686c39ec8b89cb05b5d35 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 ccb8cb97309edd55bb8753073a6030bf20a9b643 Mon Sep 17 00:00:00 2001
+From 1cc5abc667219cae2200f1ef5384c57ae1151a8e 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 712d8de47182b4c4239051a288e0ffbb50a94cfe Mon Sep 17 00:00:00 2001
+From d3c18e8852b5da7734a2a78a829c7f6e383d3927 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