msys2-runtime: expose the "deep-copy" symlink behavior via a new mode

dscho · elieux · commit b1c8e2fbc5c4 · 2020-10-22T13:38:14.000+02:00
This patch synchronizes msys2/MSYS2-packages/msys2-runtime with msys2/msys2-runtime after merging msys2/msys2-runtime#16. We specifically override Cygwin's symlink() behavior to make deep copies instead of creating a special-crafted system file that Cygwin (MSYS2, and only those two) will recognize as symbolic link. The patch to override this behavior is incomplete, though: it hacks up the WSYM_sysfile code path, which causes all kinds of problems: - Contrary to the documentation, MSYS=winsymlinks:native won't fall back to creating Cygwin-style symbolic links. Instead, it (quite surprisingly) creates deep copies instead. - There is no way to opt into the original Cygwin behavior because that code path is now dead code. - The fact that the WSYM_sysfile code path is modified to do something very different from what it is intended to do means that all changes that Cygwin makes to that code path have to be inspected, and occasionally even more hacks have to be put on top, such as 44bb133, where we specifically had to disable Cygwin's code to try creating WSL symlinks before falling back to creating system files instead). Let's fix this by introducing a proper new mode: MSYS=winsymlinks:deepcopy. This mode is made the default so that users should be unaffected by this PR. Users wishing to let the MSYS2 runtime create Cygwin-style symbolic links can ask for that by setting MSYS=winsymlinks:sysfile. By fixing this issue, we can now stop disabling Cygwin's WSL symlink behavior, too: it is in the sysfile code path and won't affect the default behavior of the MSYS2 runtime. While at it, the indentation of the original patch is fixed, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@@ -2817,5 +2817,5 @@ index ff12dc2..cb45983 100644
      install_host="install_host"
      ;;
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch
@@ -1525,5 +1525,5 @@ index b96ad40..8ba5b9e 100644
      }
    if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0003-Add-functionality-for-converting-UNIX-paths-in-argum.patch b/msys2-runtime/0003-Add-functionality-for-converting-UNIX-paths-in-argum.patch
@@ -1102,5 +1102,5 @@ index e3a65f8..1aeec8d 100644
    {
      for (int i = calloced; i < argc; i++)
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0004-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch b/msys2-runtime/0004-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
@@ -187,5 +187,5 @@ index 3502166..28bcd63 100644
        /* Add a hint to the sysname, that we're running under WOW64.  This might
  	 give an early clue if somebody encounters problems. */
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
@@ -397,5 +397,5 @@ index c0a0f61..4c94d83 100644
      free (gecos);
    if (home)
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0006-Do-not-create-cygwin-symlinks.-Instead-use-deep-copy.patch b/msys2-runtime/0006-Do-not-create-cygwin-symlinks.-Instead-use-deep-copy.patch
@@ -175,5 +175,5 @@ index 7ffb5bc..9b908ea 100644
  	  buf = tp.t_get ();
  	  cp = stpcpy (buf, SYMLINK_COOKIE);
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch b/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
@@ -35,5 +35,5 @@ index 87650cc..adc8884 100644
        else if (*newp == 'M' && strncmp (newp, "MSYS=", 5) == 0)
          parse_options (newp + 5);
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0008-Do-not-convert-environment-for-strace.patch b/msys2-runtime/0008-Do-not-convert-environment-for-strace.patch
@@ -29,5 +29,5 @@ index e7a0810..426af44 100644
  	{
  	  set_errno (E2BIG);
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch b/msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch
@@ -54,5 +54,5 @@ index 9b908ea..f592cb8 100644
  	}
  
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
@@ -76,5 +76,5 @@ index b851727..c2da0cb 100644
  
        /* Convert argv[0] to posix rules if it's currently blatantly
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
@@ -56,5 +56,5 @@ index c2da0cb..7ac8bf0 100644
  	    size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
  	    if (cnt <= 1 || cnt == (size_t)-1)
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch
@@ -68,5 +68,5 @@ index 8ba5b9e..e7ac668 100644
  		       NULL,	/* Security */
  		       NULL,	/* thread */
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0013-Add-debugging-for-build_argv.patch b/msys2-runtime/0013-Add-debugging-for-build_argv.patch
@@ -21,5 +21,5 @@ index 7ac8bf0..4683972 100644
    while (*cmd)
      {
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch
@@ -20,5 +20,5 @@ index e7ac668..2fe3cac 100644
    SetConsoleCtrlHandler (NULL, 0);
  /* Commit message for this code was:
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch
@@ -172,5 +172,5 @@ index 426af44..d8fc19c 100644
  
    /* Check if we have been called from exec{lv}p or spawn{lv}p and mask
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch b/msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
@@ -21,5 +21,5 @@ index d8fc19c..0daac24 100644
  
    if (buf.isdir ())
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch b/msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
@@ -22,5 +22,5 @@ index 613a019..61c2808 100644
  LoadDLLfunc (VirtualAlloc2, 28, kernelbase)
  
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch b/msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch
@@ -24,5 +24,5 @@ index 573a9b7..927efd8 100644
                  while (--pos >= 0)
                    if (isdirsep (newpath[pos]))
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0019-strace-quiet-be-really-quiet.patch b/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
@@ -36,5 +36,5 @@ index 2fe3cac..25f8f6b 100644
    SetConsoleCtrlHandler (NULL, 0);
  /* Commit message for this code was:
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0020-Default-to-disable_pcon.patch b/msys2-runtime/0020-Default-to-disable_pcon.patch
@@ -50,5 +50,5 @@ index 942bd1c..da82320 100644
  bool NO_COPY in_forkee;
  
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
@@ -53,5 +53,5 @@ index 4b03836..3d57e34 100644
  		*k->setting.x &= ~k->values[istrue].i;
  		if (istrue || (eq && strtol (eq, NULL, 0)))
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0022-Don-t-create-WSL-symlinks-for-MSYS2.patch b/msys2-runtime/0022-Don-t-create-WSL-symlinks-for-MSYS2.patch
@@ -44,5 +44,5 @@ index 927efd8..2dfe0ef 100644
  	default:
  	  break;
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
@@ -30,5 +30,5 @@ index 186eeec..fdb49f3 100644
  
        /* Reinstate the close-on-exec state */
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch b/msys2-runtime/0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch
@@ -40,5 +40,5 @@ index 0000000..c7ed476
 +          make -j8
 \ No newline at end of file
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch b/msys2-runtime/0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
@@ -39,5 +39,5 @@ index 0000000..defcdf8
 +      run: |
 +        git push https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY refs/heads/cygwin/master 'refs/tags/*:refs/tags/*'
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch b/msys2-runtime/0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch
@@ -33,5 +33,5 @@ index 2dfe0ef..aa70113 100644
  }
  
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0027-fixup-Add-functionality-for-converting-UNIX-paths-in.patch b/msys2-runtime/0027-fixup-Add-functionality-for-converting-UNIX-paths-in.patch
@@ -43,5 +43,5 @@ index 0daac24..c77d629 100644
  
  
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0028-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0028-Expose-full-command-lines-to-other-Win32-processes-b.patch
@@ -52,5 +52,5 @@ index a52b6ac..de05270 100644
  
  <listitem>
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0029-Cygwin-pty-Prevent-garbled-output-when-pseudo-consol.patch b/msys2-runtime/0029-Cygwin-pty-Prevent-garbled-output-when-pseudo-consol.patch
@@ -28,5 +28,5 @@ index 43eebc1..b9cb45b 100644
  
  void
 -- 
-2.27.0
+2.28.0
 
diff --git a/msys2-runtime/0030-squash-Do-not-create-cygwin-symlinks.-Instead-use-de.patch b/msys2-runtime/0030-squash-Do-not-create-cygwin-symlinks.-Instead-use-de.patch
diff --git a/msys2-runtime/0031-fixup-Don-t-create-WSL-symlinks-for-MSYS2.patch b/msys2-runtime/0031-fixup-Don-t-create-WSL-symlinks-for-MSYS2.patch
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD

-Original file line number
+Diff line change
      install_host="install_host"
      ;;
 --
 -2.27.0
 +2.28.0
Original file line number	Diff line number	Diff line change
`@@ -1525,5 +1525,5 @@ index b96ad40..8ba5b9e 100644`
`1525`	`1525`	`}`
`1526`	`1526`	`if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))`
`1527`	`1527`	`--`
`1528`		`-2.27.0`
	`1528`	`+2.28.0`
`1529`	`1529`
Original file line number	Diff line number	Diff line change
`@@ -1102,5 +1102,5 @@ index e3a65f8..1aeec8d 100644`
`1102`	`1102`	`{`
`1103`	`1103`	`for (int i = calloced; i < argc; i++)`
`1104`	`1104`	`--`
`1105`		`-2.27.0`
	`1105`	`+2.28.0`
`1106`	`1106`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ index e7a0810..426af44 100644`
`29`	`29`	`{`
`30`	`30`	`set_errno (E2BIG);`
`31`	`31`	`--`
`32`		`-2.27.0`
	`32`	`+2.28.0`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@ index 9b908ea..f592cb8 100644`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`--`
`57`		`-2.27.0`
	`57`	`+2.28.0`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ index 7ac8bf0..4683972 100644`
`21`	`21`	`while (*cmd)`
`22`	`22`	`{`
`23`	`23`	`--`
`24`		`-2.27.0`
	`24`	`+2.28.0`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ index 2dfe0ef..aa70113 100644`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`--`
`36`		`-2.27.0`
	`36`	`+2.28.0`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,5 @@ index 0daac24..c77d629 100644`
`43`	`43`
`44`	`44`
`45`	`45`	`--`
`46`		`-2.27.0`
	`46`	`+2.28.0`
`47`	`47`