Merge pull request #263 from git-for-windows/msys2-runtime-22c9553388114c3178f1f3e0e24db123c68d313a

msys2-runtime: update to 3.6.5-1

Author: dscho

msys2-runtime/0040-Mention-the-extremely-useful-small_printf-function.patch renamed to msys2-runtime/0001-Mention-the-extremely-useful-small_printf-function.patch

@@ -1,7 +1,7 @@
-From cf305cf5097436c7dd5177d6b0fe56a114adec0a Mon Sep 17 00:00:00 2001
+From cb48c880ca4517d70f334a61c9ddf286c738a86f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Fri, 20 Feb 2015 11:54:47 +0000
-Subject: [PATCH 40/N] Mention the extremely useful small_printf() function
+Subject: [PATCH 01/N] Mention the extremely useful small_printf() function
 
 It came in real handy while debugging an issue that strace 'fixed'.
 

msys2-runtime/0042-Allow-native-symlinks-to-non-existing-targets-in-nat.patch renamed to msys2-runtime/0002-Allow-native-symlinks-to-non-existing-targets-in-nat.patch

@@ -1,7 +1,7 @@
-From bf72b247b4594788664969c03809b365f316f1c0 Mon Sep 17 00:00:00 2001
+From c6e68dc5bbca2e3bb99215338573ddc4983cc664 Mon Sep 17 00:00:00 2001
 From: Karsten Blees <[email protected]>
 Date: Wed, 20 May 2015 16:32:52 +0200
-Subject: [PATCH 42/N] Allow native symlinks to non-existing targets in
+Subject: [PATCH 02/N] Allow native symlinks to non-existing targets in
  'nativestrict' mode
 
 Windows native symlinks must match the type of their target (file or
@@ -30,10 +30,10 @@ Signed-off-by: Johannes Schindelin <[email protected]>
  1 file changed, 33 insertions(+), 9 deletions(-)
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index ead7d16..d8aed28 100644
+index 8aff97a..3b9cba9 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -2014,7 +2014,7 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
+@@ -1839,7 +1839,7 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
    path_conv win32_oldpath;
    PUNICODE_STRING final_oldpath, final_newpath;
    UNICODE_STRING final_oldpath_buf;
@@ -42,8 +42,8 @@ index ead7d16..d8aed28 100644
 
    if (resolve_symlink_target (oldpath, win32_newpath, win32_oldpath))
      final_oldpath = win32_oldpath.get_nt_native_path ();
-@@ -2073,14 +2073,39 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
- 	  wcpcpy (e_old, c_old);
+@@ -1901,14 +1901,39 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
+ 	    wcpcpy (e_old, c_old);
  	}
      }
 -  /* If the symlink target doesn't exist, don't create native symlink.
@@ -89,7 +89,7 @@ index ead7d16..d8aed28 100644
      }
    /* Don't allow native symlinks to Cygwin special files.  However, the
       caller shoud know because this case shouldn't be covered by the
-@@ -2109,7 +2134,6 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
+@@ -1937,7 +1962,6 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
  	final_oldpath->Buffer[1] = L'\\';
      }
    /* Try to create native symlink. */

msys2-runtime/0039-Handle-8-bit-characters-under-LOCALE-C.patch renamed to msys2-runtime/0003-WIP-Handle-8-bit-characters-under-LOCALE-C.patch

@@ -1,7 +1,11 @@
-From 0db37522bc130e69a48d4ba6505b88c24cf946c0 Mon Sep 17 00:00:00 2001
+From 2a9d34f306dd4562bbbd32b10870412ee8126e5d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Fri, 20 Feb 2015 13:56:22 +0000
-Subject: [PATCH 39/N] Handle 8-bit characters under LOCALE=C
+Subject: [PATCH 03/N] WIP Handle 8-bit characters under LOCALE=C
+
+TODO!!! Verify that this is still needed, as it seems to be no longer
+necessary to pass Git's test suite because the official MSYS2 runtime
+lacks this patch yet is sufficient to let Git's test suite succeed.
 
 Even when the character set is specified as ASCII, we should handle data
 outside the 7-bit range gracefully by simply copying it, even if it is
@@ -15,18 +19,18 @@ Signed-off-by: Johannes Schindelin <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc
-index cb7911c..a022b61 100644
+index eb657605..4542003 100644
 --- a/winsup/cygwin/strfuncs.cc
 +++ b/winsup/cygwin/strfuncs.cc
-@@ -1146,7 +1146,11 @@ _sys_mbstowcs (mbtowc_p f_mbtowc, wchar_t *dst, size_t dlen, const char *src,
- 	     to store them in a symmetric way. */
- 	  bytes = 1;
- 	  if (dst)
+@@ -1189,7 +1189,11 @@ _sys_mbstowcs (mbtowc_p f_mbtowc, wchar_t *dst, size_t dlen, const char *src,
+ 	    {
+ 	      bytes = 1;
+ 	      if (dst)
 +#ifdef STRICTLY_7BIT_ASCII
- 	    *ptr = L'\xf000' | *pmbs;
+ 		*ptr = L'\xf000' | *pmbs;
 +#else
-+	    *ptr = *pmbs;
++		*ptr = *pmbs;
 +#endif
+ 	    }
  	  memset (&ps, 0, sizeof ps);
  	}
- 

msys2-runtime/0043-Make-paths-WCS-MBS-conversion-explicit.patch renamed to msys2-runtime/0004-Make-paths-WCS-MBS-conversion-explicit.patch

@@ -1,7 +1,7 @@
-From 12471a5de6b1da5cafe9288fa68185e304caae21 Mon Sep 17 00:00:00 2001
+From 7721d4267a9478f789f2235e8761a29421663fc3 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Fri, 18 Dec 2015 20:19:57 +0100
-Subject: [PATCH 43/N] Make paths' WCS->MBS conversion explicit
+Subject: [PATCH 04/N] Make paths' WCS->MBS conversion explicit
 
 	* dcrt0.cc (dll_crt0_1), dtable.cc (handle_to_fn), environ.cc
 	(environ_init, getwinenveq, build_env), external.cc
@@ -159,10 +159,10 @@ Signed-off-by: Johannes Schindelin <[email protected]>
  13 files changed, 62 insertions(+), 59 deletions(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 33cad1e..61ecb75 100644
+index f4c09be..57d4b88 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
-@@ -912,9 +912,9 @@ dll_crt0_1 (void *)
+@@ -900,9 +900,9 @@ dll_crt0_1 (void *)
    if (!__argc)
      {
        PWCHAR wline = GetCommandLineW ();
@@ -175,10 +175,10 @@ index 33cad1e..61ecb75 100644
        /* Scan the command line and build argv.  Expand wildcards if not
  	 called from another cygwin process. */
 diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
-index 6ccc19a..44ce756 100644
+index 7303f7e..b99c80b 100644
 --- a/winsup/cygwin/dtable.cc
 +++ b/winsup/cygwin/dtable.cc
-@@ -1027,7 +1027,7 @@ handle_to_fn (HANDLE h, char *posix_fn)
+@@ -1021,7 +1021,7 @@ handle_to_fn (HANDLE h, char *posix_fn)
        if (wcsncasecmp (w32, DEVICE_PREFIX, DEVICE_PREFIX_LEN) != 0
  	  || !QueryDosDeviceW (NULL, fnbuf, sizeof (fnbuf) / sizeof (WCHAR)))
  	{
@@ -188,10 +188,10 @@ index 6ccc19a..44ce756 100644
  	}
 
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 4e04921..529535a 100644
+index d4cedcb..7077595 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
-@@ -918,7 +918,7 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)
+@@ -873,7 +873,7 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)
       eventually want to use them).  */
    for (i = 0, w = rawenv; *w != L'\0'; w = wcschr (w, L'\0') + 1, i++)
      {
@@ -200,7 +200,7 @@ index 4e04921..529535a 100644
        if (i >= envc)
          envp = (char **) realloc (envp, (4 + (envc += 100)) * sizeof (char *));
        envp[i] = newp;
-@@ -978,7 +978,7 @@ getwinenveq (const char *name, size_t namelen, int x)
+@@ -919,7 +919,7 @@ getwinenveq (const char *name, size_t namelen, int x)
    int totlen = GetEnvironmentVariableW (name0, valbuf, 32768);
    if (totlen > 0)
      {
@@ -209,7 +209,7 @@ index 4e04921..529535a 100644
        if (x == HEAP_1_STR)
  	totlen += namelen;
        else
-@@ -986,7 +986,7 @@ getwinenveq (const char *name, size_t namelen, int x)
+@@ -927,7 +927,7 @@ getwinenveq (const char *name, size_t namelen, int x)
        char *p = (char *) cmalloc_abort ((cygheap_types) x, totlen);
        if (namelen)
  	strcpy (p, name);
@@ -218,7 +218,7 @@ index 4e04921..529535a 100644
        debug_printf ("using value from GetEnvironmentVariable for '%W'", name0);
        return p;
      }
-@@ -1144,7 +1144,7 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
+@@ -1084,7 +1084,7 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
  	  for (winnum = 0, var = cwinenv;
  	       *var;
  	       ++winnum, var = wcschr (var, L'\0') + 1)
@@ -228,7 +228,7 @@ index 4e04921..529535a 100644
        DestroyEnvironmentBlock (cwinenv);
        /* Eliminate variables which are already available in envp, as well as
 diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
-index a20ea07..fa9d696 100644
+index 50a5af2..945b9b8 100644
 --- a/winsup/cygwin/external.cc
 +++ b/winsup/cygwin/external.cc
 @@ -92,7 +92,7 @@ fillout_pinfo (pid_t pid, int winpid)
@@ -393,10 +393,10 @@ index 606559a..c6ec5d8 100644
    return _sys_wcstombs_alloc (dst_p, type, src, nwc, false);
  }
 diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
-index ff02793..ceb3864 100644
+index 1cfee5c..61f06d0 100644
 --- a/winsup/cygwin/mount.cc
 +++ b/winsup/cygwin/mount.cc
-@@ -506,7 +506,7 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
+@@ -508,7 +508,7 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
      {
        /* The filesystem name is only used in fillout_mntent and only if
  	 the filesystem isn't one of the well-known filesystems anyway. */
@@ -405,16 +405,16 @@ index ff02793..ceb3864 100644
  		    ffai_buf.ffai.FileSystemNameLength / sizeof (WCHAR));
        strlwr (fsn);
      }
-@@ -547,7 +547,7 @@ mount_info::create_root_entry (const PWCHAR root)
+@@ -549,7 +549,7 @@ mount_info::create_root_entry (const PWCHAR root)
   /* Create a default root dir derived from the location of the Cygwin DLL.
      The entry is immutable, unless the "override" option is given in /etc/fstab. */
    char native_root[PATH_MAX];
 -  sys_wcstombs (native_root, PATH_MAX, root);
 +  sys_wcstombs_path (native_root, PATH_MAX, root);
    assert (*native_root != '\0');
    if (add_item (native_root, "/",
- 		MOUNT_SYSTEM | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC | MOUNT_NOACL)
-@@ -941,7 +941,7 @@ mount_info::conv_to_posix_path (PWCHAR src_path, char *posix_path,
+ 		MOUNT_SYSTEM | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC)
+@@ -942,7 +942,7 @@ mount_info::conv_to_posix_path (PWCHAR src_path, char *posix_path,
      }
    tmp_pathbuf tp;
    char *buf = tp.c_get ();
@@ -423,7 +423,7 @@ index ff02793..ceb3864 100644
    int ret = conv_to_posix_path (buf, posix_path, ccp_flags);
    if (changed)
      src_path[0] = L'C';
-@@ -1275,7 +1275,7 @@ mount_info::from_fstab_line (char *line, bool user)
+@@ -1263,7 +1263,7 @@ mount_info::from_fstab_line (char *line, bool user)
  	{
  	  tmp_pathbuf tp;
  	  char *mb_tmp = tp.c_get ();
@@ -432,7 +432,7 @@ index ff02793..ceb3864 100644
 
  	  mount_flags |= MOUNT_USER_TEMP;
  	  int res = mount_table->add_item (mb_tmp, posix_path, mount_flags);
-@@ -1890,7 +1890,7 @@ mount_info::cygdrive_getmntent ()
+@@ -1752,7 +1752,7 @@ mount_info::cygdrive_getmntent ()
    if (wide_path)
      {
        win32_path = tp.c_get ();
@@ -455,10 +455,10 @@ index f57465a..57af967 100644
      }
  }
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index ead7d16..66c829e 100644
+index 8aff97a..2c57e3f 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -653,7 +653,8 @@ path_conv::check (const UNICODE_STRING *src, unsigned opt,
+@@ -652,7 +652,8 @@ path_conv::check (const UNICODE_STRING *src, unsigned opt,
    char *path = tp.c_get ();
 
    user_shared->warned_msdos = true;
@@ -468,7 +468,7 @@ index ead7d16..66c829e 100644
    path_conv::check (path, opt, suffixes);
  }
 
-@@ -2692,7 +2693,7 @@ symlink_info::check_shortcut (HANDLE h)
+@@ -2435,7 +2436,7 @@ symlink_info::check_shortcut (HANDLE h)
        if (*(PWCHAR) cp == 0xfeff)	/* BOM */
  	{
  	  char *tmpbuf = tp.c_get ();
@@ -477,7 +477,7 @@ index ead7d16..66c829e 100644
  	      > SYMLINK_MAX)
  	    return 0;
  	  res = posixify (tmpbuf);
-@@ -2773,7 +2774,7 @@ symlink_info::check_sysfile (HANDLE h)
+@@ -2516,7 +2517,7 @@ symlink_info::check_sysfile (HANDLE h)
  	  else
  	    srcbuf += 2;
  	  char *tmpbuf = tp.c_get ();
@@ -486,7 +486,7 @@ index ead7d16..66c829e 100644
  	      > SYMLINK_MAX)
  	    debug_printf ("symlink string too long");
  	  else
-@@ -3041,8 +3042,8 @@ symlink_info::check_reparse_point (HANDLE h, bool remote)
+@@ -2784,8 +2785,8 @@ symlink_info::check_reparse_point (HANDLE h, bool remote)
    path_flags (path_flags () | ret);
    if (ret & PATH_SYMLINK)
      {
@@ -497,7 +497,7 @@ index ead7d16..66c829e 100644
        /* A symlink is never a directory. */
        fileattr (fileattr () & ~FILE_ATTRIBUTE_DIRECTORY);
        return posixify (srcbuf);
-@@ -3076,7 +3077,7 @@ symlink_info::check_nfs_symlink (HANDLE h)
+@@ -2819,7 +2820,7 @@ symlink_info::check_nfs_symlink (HANDLE h)
      {
        PWCHAR spath = (PWCHAR)
  		     (pffei->EaName + pffei->EaNameLength + 1);
@@ -506,7 +506,7 @@ index ead7d16..66c829e 100644
  			  spath, pffei->EaValueLength);
        path_flags (path_flags () | PATH_SYMLINK);
      }
-@@ -4275,7 +4276,7 @@ cygwin_conv_path (cygwin_conv_path_t what, const void *from, void *to,
+@@ -3950,7 +3951,7 @@ cygwin_conv_path (cygwin_conv_path_t what, const void *from, void *to,
  	      }
  	    PUNICODE_STRING up = p.get_nt_native_path ();
  	    buf = tp.c_get ();
@@ -515,7 +515,7 @@ index ead7d16..66c829e 100644
  			  up->Buffer, up->Length / sizeof (WCHAR));
  	    /* Convert native path to standard DOS path. */
  	    if (!strncmp (buf, "\\??\\", 4))
-@@ -4288,11 +4289,11 @@ cygwin_conv_path (cygwin_conv_path_t what, const void *from, void *to,
+@@ -3963,11 +3964,11 @@ cygwin_conv_path (cygwin_conv_path_t what, const void *from, void *to,
  	      {
  		/* Device name points to somewhere else in the NT namespace.
  		   Use GLOBALROOT prefix to convert to Win32 path. */
@@ -529,7 +529,7 @@ index ead7d16..66c829e 100644
  			      up->Buffer, up->Length / sizeof (WCHAR));
  	      }
  	    lsiz = strlen (buf) + 1;
-@@ -4604,8 +4605,8 @@ cygwin_conv_path_list (cygwin_conv_path_t what, const void *from, void *to,
+@@ -4279,8 +4280,8 @@ cygwin_conv_path_list (cygwin_conv_path_t what, const void *from, void *to,
    switch (what & CCP_CONVTYPE_MASK)
      {
      case CCP_WIN_W_TO_POSIX:
@@ -540,7 +540,7 @@ index ead7d16..66c829e 100644
  	return -1;
        what = (what & ~CCP_CONVTYPE_MASK) | CCP_WIN_A_TO_POSIX;
        from = (const void *) winp;
-@@ -5391,9 +5392,9 @@ cwdstuff::get_error_desc () const
+@@ -5054,9 +5055,9 @@ cwdstuff::get_error_desc () const
  void
  cwdstuff::reset_posix (wchar_t *w_cwd)
  {
@@ -552,7 +552,7 @@ index ead7d16..66c829e 100644
  }
 
  char *
-@@ -5418,7 +5419,7 @@ cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
+@@ -5081,7 +5082,7 @@ cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
    if (!need_posix)
      {
        tocopy = tp.c_get ();
@@ -562,7 +562,7 @@ index ead7d16..66c829e 100644
      }
    else
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index 4323cb1..9f2685a 100644
+index ffe71ee..d2c829a 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
 @@ -385,12 +385,12 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)

msys2-runtime/0044-Use-MB_CUR_MAX-6-by-default.patch renamed to msys2-runtime/0005-Use-MB_CUR_MAX-6-by-default.patch

@@ -1,7 +1,7 @@
-From 473511f5c6902ed97b7bf2bbb952b8aa85a9e51a Mon Sep 17 00:00:00 2001
+From 5c25e842e45c80f87ec018c4cbab4fe7191d78f0 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <[email protected]>
 Date: Thu, 21 Nov 2019 14:21:01 +0100
-Subject: [PATCH 44/N] Use MB_CUR_MAX == 6 by default
+Subject: [PATCH 05/N] Use MB_CUR_MAX == 6 by default
 
 Internally, Cygwin already uses __utf8_mbtowc(), even if it still claims
 to use the "ASCII" charset.

msys2-runtime/0046-msys2-runtime-restore-fast-path-for-current-user-pri.patch renamed to msys2-runtime/0006-msys2-runtime-restore-fast-path-for-current-user-pri.patch

@@ -1,7 +1,7 @@
-From daa35cff6160cb68c4817f35a0bd5893d04080a8 Mon Sep 17 00:00:00 2001
+From df2f7356ed0fd3f8e3f845905aad885d450f5487 Mon Sep 17 00:00:00 2001
 From: Richard Glidden <[email protected]>
 Date: Thu, 24 Aug 2023 13:36:10 -0400
-Subject: [PATCH 46/N] msys2-runtime: restore fast path for current user
+Subject: [PATCH 06/N] msys2-runtime: restore fast path for current user
  primary group
 
 Commit a5bcfe616c7e removed an optimization that fetches the
@@ -29,10 +29,10 @@ Signed-off-by: Richard Glidden <[email protected]>
  4 files changed, 46 insertions(+), 8 deletions(-)
 
 diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
-index 0e11a9b..5a99f75 100644
+index f5c90fe..676d974 100644
 --- a/winsup/cygwin/include/sys/cygwin.h
 +++ b/winsup/cygwin/include/sys/cygwin.h
-@@ -219,7 +219,8 @@ enum
+@@ -213,7 +213,8 @@ enum
  enum
  {
    NSS_SRC_FILES = 1,
@@ -43,7 +43,7 @@ index 0e11a9b..5a99f75 100644
 
  /* Enumeration source constants for CW_SETENT called from mkpasswd/mkgroup. */
 diff --git a/winsup/cygwin/local_includes/cygheap.h b/winsup/cygwin/local_includes/cygheap.h
-index fed87ec..821ccf7 100644
+index d9e936c..0b3fed2 100644
 --- a/winsup/cygwin/local_includes/cygheap.h
 +++ b/winsup/cygwin/local_includes/cygheap.h
 @@ -405,6 +405,7 @@ public:
@@ -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 4323cb1..15a9307 100644
+index ffe71ee..cff9789 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
 @@ -637,6 +637,11 @@ cygheap_pwdgrp::nss_init_line (const char *line)

msys2-runtime/0001-Fix-msys-library-name-in-import-libraries.patch renamed to msys2-runtime/0007-Fix-msys-library-name-in-import-libraries.patch

@@ -1,7 +1,7 @@
-From b662426d796ad9fa7593f17840f49282835fa876 Mon Sep 17 00:00:00 2001
+From 39b4a0d5f23f0593b1e4ad951ec22ab23a402e0c Mon Sep 17 00:00:00 2001
 From: Kaleb Barrett <[email protected]>
 Date: Sun, 14 Mar 2021 18:58:55 -0500
-Subject: [PATCH 01/N] Fix msys library name in import libraries
+Subject: [PATCH 07/N] Fix msys library name in import libraries
 
 Cygwin's speclib doesn't handle dashes or dots. However, we are about to
 rename the output file name from `cygwin1.dll` to `msys-2.0.dll`.