diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch index e332c60ba36..42bc6545b77 100644 --- a/msys2-runtime/0001-Add-MSYS2-triplet.patch +++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch @@ -1,4 +1,4 @@ -From bdad035f0baf6fa584ca10913e9948c0aba2970e Mon Sep 17 00:00:00 2001 +From 61c7294e59c8f92f81f5f082425a82dbc386d541 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?= Date: Sun, 14 Apr 2019 20:40:45 +0300 diff --git a/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch b/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch index e486f75bddc..bba2a5c8b06 100644 --- a/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch +++ b/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch @@ -1,4 +1,4 @@ -From 900232bfff4076c483307b4af8f2bbf9b50a600f Mon Sep 17 00:00:00 2001 +From e6895db114ffaa2c877b38c22e7d7eede8b79de5 Mon Sep 17 00:00:00 2001 From: Kaleb Barrett Date: Sun, 14 Mar 2021 18:58:55 -0500 Subject: [PATCH 02/N] Fix msys library name in import libraries diff --git a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch index ab89665d1e1..8b200cf0cf8 100644 --- a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch +++ b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch @@ -1,4 +1,4 @@ -From 585fadf7eab7cc83f6445adcd30b5c2b2e9357f8 Mon Sep 17 00:00:00 2001 +From e501600b6d38a8698be4e6b6d68f6caa9632d822 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?= 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 a560a3f..8590929 100644 +index 9accf3c..c734a4d 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -526,14 +526,14 @@ int exec_prepared_command (PWCHAR command) @@ -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 fb821a6..1c68287 100644 +index 0d1b17b..9787869 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 11033bc..2d7071b 100644 +index 83318d6..808e661 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) diff --git a/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch b/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch index 7f0abd2cd90..e8e89da11e1 100644 --- a/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch +++ b/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch @@ -1,4 +1,4 @@ -From d076660c2d88cc79897b73b53134b040d623c547 Mon Sep 17 00:00:00 2001 +From 70cdcbadb9512f5e636173fc96fee9aeb8687c25 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?= 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 1802e76..84851a1 100644 +index e6f4c3e..d2bdf7d 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -66,6 +66,7 @@ @@ -1010,7 +1010,7 @@ index 1802e76..84851a1 100644 #undef basename suffix_info stat_suffixes[] = -@@ -3870,6 +3871,74 @@ fchdir (int fd) +@@ -3872,6 +3873,74 @@ fchdir (int fd) return res; } diff --git a/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch b/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch index bace977b6d5..11db91ba200 100644 --- a/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch +++ b/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch @@ -1,4 +1,4 @@ -From 35a477b5cd63373397b0dc713de7b95d610ad300 Mon Sep 17 00:00:00 2001 +From d6cd58e21e1b8157e4b715af7a654a63f615b062 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?= Date: Sun, 14 Apr 2019 21:29:01 +0300 diff --git a/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch index 02ceef9d229..9f0650dfced 100644 --- a/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch +++ b/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch @@ -1,4 +1,4 @@ -From 41ed62e6f51e80b764de465ab9f9045552107813 Mon Sep 17 00:00:00 2001 +From e7d3c8f96ea04770599cca058bc1c622d7aa2df0 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?= Date: Sun, 14 Apr 2019 21:45:06 +0300 diff --git a/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch b/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch index c0cf1b51513..ce5bfb7cb76 100644 --- a/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch +++ b/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch @@ -1,4 +1,4 @@ -From 8096583fac66461dbe1414f210d998a3087c1ecc Mon Sep 17 00:00:00 2001 +From 8c5cc2861a2b7e42fe4cf862b56bbc7424e5b1ef 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?= Date: Sun, 14 Apr 2019 21:47:21 +0300 @@ -61,10 +61,10 @@ index d14ea59..0c21fa6 100644 bool winjitdebug = false; diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index 84851a1..8615386 100644 +index d2bdf7d..6ec06fb 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc -@@ -1682,6 +1682,89 @@ conv_path_list (const char *src, char *dst, size_t size, +@@ -1685,6 +1685,89 @@ conv_path_list (const char *src, char *dst, size_t size, /********************** Symbolic Link Support **************************/ @@ -154,7 +154,7 @@ index 84851a1..8615386 100644 /* Create a symlink from FROMPATH to TOPATH. */ extern "C" int -@@ -2219,6 +2302,77 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice) +@@ -2221,6 +2304,77 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice) } else /* wsym_type == WSYM_sysfile */ { diff --git a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch index bfb0970d6a4..43b1fa05201 100644 --- a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch +++ b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch @@ -1,4 +1,4 @@ -From 0ba54e8cc1940f94e9cde6b6c74cb6a8fb240d56 Mon Sep 17 00:00:00 2001 +From e9074291e7ecf75a70db8ab612da18b0da0953b8 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?= Date: Sun, 14 Apr 2019 21:48:54 +0300 diff --git a/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch b/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch index 96b74f17d89..63db2c8c625 100644 --- a/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch +++ b/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch @@ -1,4 +1,4 @@ -From e28b7422e206f39202a9f1f840a84cd7a59287c2 Mon Sep 17 00:00:00 2001 +From 8102cded4c93aae879027be150ec36fd04c37545 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?= Date: Sun, 14 Apr 2019 21:50:55 +0300 diff --git a/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch index afe9c593b45..ba08f75dfd0 100644 --- a/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch +++ b/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch @@ -1,4 +1,4 @@ -From 4a24304b8b1463097d2532f327eb9e44f272a303 Mon Sep 17 00:00:00 2001 +From c68f8fd84b0d5da778866a85f0b6c86b798359d3 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 23 Aug 2015 20:47:30 +0100 Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob diff --git a/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch index 2fa3fcfd770..83ac6bf0027 100644 --- a/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch +++ b/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch @@ -1,4 +1,4 @@ -From b3a4a5bd44740716566e221dba0625e117d92ab4 Mon Sep 17 00:00:00 2001 +From e6cc70d89e9410573b3fad0c16e69c7cc02277dc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 21 Aug 2015 09:52:47 +0100 Subject: [PATCH 11/N] Add debugging for strace make_command_line diff --git a/msys2-runtime/0012-strace-quiet-be-really-quiet.patch b/msys2-runtime/0012-strace-quiet-be-really-quiet.patch index 56991c5addc..036a14d252a 100644 --- a/msys2-runtime/0012-strace-quiet-be-really-quiet.patch +++ b/msys2-runtime/0012-strace-quiet-be-really-quiet.patch @@ -1,4 +1,4 @@ -From f8c098028cde692958bfed365c8877a038860d6c Mon Sep 17 00:00:00 2001 +From e25ab8660e6040a9526ca985edec430625b47b5c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 17 May 2017 18:13:32 +0200 Subject: [PATCH 12/N] strace --quiet: be *really* quiet diff --git a/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch b/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch index aff060ca1c8..f1daf099a6c 100644 --- a/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch +++ b/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch @@ -1,4 +1,4 @@ -From c4d9d83ede9abf0c47949bd3ac6f91fd3325dc64 Mon Sep 17 00:00:00 2001 +From 8e182331c4c06b839da9f0e71aa5098df7d564ea 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?= Date: Sun, 14 Apr 2019 22:13:51 +0300 @@ -31,7 +31,7 @@ Signed-off-by: Johannes Schindelin 1 file changed, 7 insertions(+) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index 8615386..b1a088a 100644 +index 6ec06fb..5412101 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -709,6 +709,12 @@ path_conv::check (const char *src, unsigned opt, @@ -47,7 +47,7 @@ index 8615386..b1a088a 100644 path_end = tail; /* Scan path_copy from right to left looking either for a symlink -@@ -1248,6 +1254,7 @@ path_conv::check (const char *src, unsigned opt, +@@ -1251,6 +1257,7 @@ path_conv::check (const char *src, unsigned opt, cfree (wide_path); wide_path = NULL; } diff --git a/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch b/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch index 249ff27acb7..92ab2c0056d 100644 --- a/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch +++ b/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch @@ -1,4 +1,4 @@ -From 1c5a6e869c61b66c9924c38a9948413667e3ee44 Mon Sep 17 00:00:00 2001 +From 0c102ea21bf0ad8ac591e46eddf29b02d3ef2fd3 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 8 Nov 2022 16:24:20 +0100 Subject: [PATCH 14/N] When converting to a Unix path, avoid double trailing diff --git a/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch b/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch index c6423f6cf52..61854bc4342 100644 --- a/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch +++ b/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch @@ -1,4 +1,4 @@ -From 8b5e9b55a1021d73b91a49cc640f2817394a5bb5 Mon Sep 17 00:00:00 2001 +From 8ed6549f805a813ca3f89c950f65899be4fc8510 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 20 Nov 2022 13:57:36 +0100 Subject: [PATCH 15/N] msys2_path_conv: pass PC_NOFULL to path_conv diff --git a/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch b/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch index bb379bbf1d9..1bd75855ed3 100644 --- a/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch +++ b/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch @@ -1,4 +1,4 @@ -From b09fb7fd5a22f32b58938da80aff0d02193c64c2 Mon Sep 17 00:00:00 2001 +From 853cc5411c9c3562e23d4fccae7ef12d70d7a4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= Date: Wed, 17 Jun 2015 09:30:41 +0200 Subject: [PATCH 16/N] path-conversion: Introduce ability to switch off diff --git a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch index 8fa51417ec1..4de8a12d900 100644 --- a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch +++ b/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch @@ -1,4 +1,4 @@ -From b2391806dbe3f72235fe1431940631f26757a2f0 Mon Sep 17 00:00:00 2001 +From 5d54a247cde553b9558c6fab449591e296c6e563 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 21 Aug 2015 12:52:09 +0100 Subject: [PATCH 17/N] dcrt0.cc: Untangle allow_glob from winshell diff --git a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch index 946e8201161..f3974042365 100644 --- a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch +++ b/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch @@ -1,4 +1,4 @@ -From 1e94f3ee1dc663bc0292324bef65be88c74c30fa Mon Sep 17 00:00:00 2001 +From d85da3a918acc954b267cd39d0e94bb732f2a102 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 24 Aug 2015 00:48:06 +0100 Subject: [PATCH 18/N] dcrt0.cc (globify): Don't quote literal strings diff --git a/msys2-runtime/0019-Add-debugging-for-build_argv.patch b/msys2-runtime/0019-Add-debugging-for-build_argv.patch index 3dd4d4cca0e..3bf3ae9f494 100644 --- a/msys2-runtime/0019-Add-debugging-for-build_argv.patch +++ b/msys2-runtime/0019-Add-debugging-for-build_argv.patch @@ -1,4 +1,4 @@ -From e6c5e3ec30c0c99d797b69314d5721eaca2d752b Mon Sep 17 00:00:00 2001 +From a3e7629f84a2cc2831007ee308c148f60b101fe9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 21 Aug 2015 12:18:52 +0100 Subject: [PATCH 19/N] Add debugging for build_argv diff --git a/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch index 65a75f30b87..c40a8666e47 100644 --- a/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch +++ b/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch @@ -1,4 +1,4 @@ -From d44fc10030e02b339fe4253b2cf3d6d3e72e5c92 Mon Sep 17 00:00:00 2001 +From ca226ec37bb466a1b15674b0dcb441b08232458f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 10 Apr 2016 21:47:41 +0100 Subject: [PATCH 20/N] environ.cc: New facility/environment variable @@ -129,10 +129,10 @@ index 4220f62..5446654 100644 (See "How to: Set a Thread Name in Native Code" diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index b1a088a..39819dc 100644 +index 5412101..1b90500 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc -@@ -4051,7 +4051,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions, +@@ -4053,7 +4053,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions, return arg_result; } diff --git a/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch b/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch index db4ca25c8be..1671cae2312 100644 --- a/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch +++ b/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch @@ -1,4 +1,4 @@ -From 98c164175f51d79bc91caaad905b386e8d45615b Mon Sep 17 00:00:00 2001 +From 89f8cacab1b0a9870859aeeaa438e805438e0509 Mon Sep 17 00:00:00 2001 From: SquallATF Date: Mon, 10 Sep 2018 11:32:18 +0300 Subject: [PATCH 21/N] Fix native symbolic link spawn passing wrong arg0 diff --git a/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch index 4c584b8cad8..84799c68c2f 100644 --- a/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch +++ b/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch @@ -1,4 +1,4 @@ -From d12ab6d59cbc9473f29afdf2bd12318a1a5f09ea Mon Sep 17 00:00:00 2001 +From a46c7539a1826461434525905688b95334fb1fdf Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 May 2020 13:49:37 +0200 Subject: [PATCH 22/N] Introduce the `enable_pcon` value for `MSYS` 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 index 9e6a64d8aea..c2b3cd3290d 100644 --- 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 @@ -1,4 +1,4 @@ -From 865ad5d64ececf728b8027043684b5e2a4e9ae2a Mon Sep 17 00:00:00 2001 +From 5f0df244ed792a0aa09e6ff2accb018579ba5f8c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 5 Jun 2020 20:09:11 +0200 Subject: [PATCH 23/N] popen: call /usr/bin/sh instead of /bin/sh @@ -17,10 +17,10 @@ in this scenario, so this maybe should be extended to all of them. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc -index 2d7071b..e584e96 100644 +index 808e661..7e8f356 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc -@@ -4425,7 +4425,7 @@ popen (const char *command, const char *in_type) +@@ -4423,7 +4423,7 @@ popen (const char *command, const char *in_type) fcntl (stdchild, F_SETFD, stdchild_state | FD_CLOEXEC); /* Start a shell process to run the given command without forking. */ diff --git a/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch index 2c4def8fb2e..455d00e49f6 100644 --- a/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch +++ b/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch @@ -1,4 +1,4 @@ -From 080e2b0f6abe07f4eab5e44bf689f3f48efc7b61 Mon Sep 17 00:00:00 2001 +From 6d0c6370ed5c45de01fb6041813e00005d1a2c11 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 12 Aug 2020 12:22:38 +0200 Subject: [PATCH 24/N] Expose full command-lines to other Win32 processes by diff --git a/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch index cb02914dfa8..b4e2af4a55b 100644 --- a/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch +++ b/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch @@ -1,4 +1,4 @@ -From 9f45f58388505943f06fff68c8695dd5f17d2a67 Mon Sep 17 00:00:00 2001 +From 0e5a7de4fcc8c207b1dd2180c7d16a2888f25a8c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 16 Apr 2018 14:59:39 +0200 Subject: [PATCH 25/N] Add a helper to obtain a function's address in diff --git a/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch index cb9b24f5b8f..c0164147097 100644 --- a/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch +++ b/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch @@ -1,4 +1,4 @@ -From f6f7e2c92880e56d0c4b8712630941aa72257f4d Mon Sep 17 00:00:00 2001 +From 98632e154dbb564454ffbe97f223ce9ab21e876d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Mar 2015 09:56:28 +0000 Subject: [PATCH 26/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C @@ -93,7 +93,7 @@ Signed-off-by: Johannes Schindelin create mode 100644 winsup/cygwin/include/cygwin/exit_process.h diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc -index 8590929..469052a 100644 +index c734a4d..1cce7c8 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -29,6 +29,7 @@ details. */ @@ -104,7 +104,7 @@ index 8590929..469052a 100644 /* Define macros for CPU-agnostic register access. The _CX_foo macros are for access into CONTEXT, the _MC_foo ones for access into -@@ -1605,10 +1606,25 @@ exit_sig: +@@ -1595,10 +1596,25 @@ exit_sig: dosig: if (have_execed) { diff --git a/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch index 5eb25cc9c0e..e9bb9725fba 100644 --- a/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch +++ b/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch @@ -1,4 +1,4 @@ -From 86cd50d151515388c06d5f0e860cf002480d94fd Mon Sep 17 00:00:00 2001 +From c890b0cc1613c1343c35beb005c59f2ef3120a82 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Mar 2015 10:01:50 +0000 Subject: [PATCH 27/N] kill: kill Win32 processes more gently diff --git a/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch index 7d1c93daee7..1238c797f64 100644 --- a/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch +++ b/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch @@ -1,4 +1,4 @@ -From 4b228ef2e491970f967aaed3339ce807c282d73c Mon Sep 17 00:00:00 2001 +From 5ab3720b4f5c47411643a1c4cb5b408c18bd288f Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Thu, 22 Jul 2021 11:59:16 -0700 Subject: [PATCH 28/N] Cygwin: make option for native inner link handling. @@ -37,10 +37,10 @@ index b3b77de..ab2c205 100644 /* Taken from BSD libc: This variable is zero until a process has created a pthread. It is used diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index 39819dc..b0c45fa 100644 +index 1b90500..d0c97ad 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc -@@ -3722,7 +3722,8 @@ restart: +@@ -3724,7 +3724,8 @@ restart: differ, return the final path as symlink content and set symlen to a negative value. This forces path_conv::check to restart symlink evaluation with the new path. */ diff --git a/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch index c7ffe4d1174..f7061e96c4c 100644 --- a/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch +++ b/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch @@ -1,4 +1,4 @@ -From 6e0c3b56c7c232ad7a20a2a93fd1679ca58e4a2c Mon Sep 17 00:00:00 2001 +From 1fcaaa3ff2d03311fa5aa04585280421a7b39543 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 8 Nov 2021 14:20:07 +0100 Subject: [PATCH 29/N] docs: skip building texinfo and PDF files diff --git a/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch b/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch index 9a44e03ebce..94c77cf43c8 100644 --- a/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch +++ b/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch @@ -1,4 +1,4 @@ -From ecf50e64ce03f2840dc08605e087c2f3f361c14b Mon Sep 17 00:00:00 2001 +From bbd5897e690ce050ca41ff48f2738db8bd8a55eb Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 8 Nov 2021 16:22:57 +0100 Subject: [PATCH 30/N] install-libs: depend on the "toollibs" diff --git a/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch index e7c94d6870e..848d27d72a0 100644 --- a/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch +++ b/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch @@ -1,4 +1,4 @@ -From 8cb4ff2c0ecb196f77686ada7f3c165b7183d380 Mon Sep 17 00:00:00 2001 +From 7e40bdfb022b6a7e8ae6df7e2267e9163d23b7ca Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 23 Nov 2015 20:03:11 +0100 Subject: [PATCH 31/N] POSIX-ify the SHELL variable diff --git a/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch index 760b4115a04..97e2f8f4922 100644 --- a/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch +++ b/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch @@ -1,4 +1,4 @@ -From 1f6020c6bfa115ac641881aadeece5ee40eb02bc Mon Sep 17 00:00:00 2001 +From 4c80b59ea393c6248a6e17e37a2c00628c4aaf70 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 21 Mar 2017 13:18:38 +0100 Subject: [PATCH 32/N] Handle ORIGINAL_PATH just like PATH diff --git a/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch index 452dc2d7835..14d18a30bb3 100644 --- a/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch +++ b/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch @@ -1,4 +1,4 @@ -From 79e3880244c30efecd2221a0bc90d452a62d873e Mon Sep 17 00:00:00 2001 +From 0c124b9088fd6e3a00517b3b5b65f689dee825c2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 3 Jul 2022 22:39:32 +0200 Subject: [PATCH 33/N] uname: allow setting the system name to CYGWIN diff --git a/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch b/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch index e2806abc918..9e058923e6d 100644 --- a/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch +++ b/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch @@ -1,4 +1,4 @@ -From ef59c45434b5296d18f7aab785ca2db13f1be8d7 Mon Sep 17 00:00:00 2001 +From 54d1ac996bca6999cee71cc0f4d9a35e821792ac Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 18 Feb 2015 12:32:17 +0000 Subject: [PATCH 34/N] Pass environment variables with empty values diff --git a/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch index 67d2aefd523..746c3614bff 100644 --- a/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch +++ b/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch @@ -1,4 +1,4 @@ -From c347d6c26b4722c12051ef0d19257323dafbd75b Mon Sep 17 00:00:00 2001 +From 6fe00e22de4a5ee84bb519dfa70e35990fc2e00e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 6 Sep 2022 10:40:58 +0200 Subject: [PATCH 35/N] Optionally disallow empty environment values again diff --git a/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch index ccb36940eac..d0095569f90 100644 --- a/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch +++ b/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch @@ -1,4 +1,4 @@ -From 210e5f3c4d43efc6f6aa140cb28f3cbaf261593d Mon Sep 17 00:00:00 2001 +From 82d1e3b556949c920997adbdb73bc19ec0874d19 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 6 Sep 2022 12:18:18 +0200 Subject: [PATCH 36/N] build_env(): respect the `MSYS` environment variable diff --git a/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch b/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch index 7ce163c4a2c..a453dd76319 100644 --- a/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch +++ b/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch @@ -1,4 +1,4 @@ -From bef1e6ba82fb0a7992caeee892721fe4214b64ab Mon Sep 17 00:00:00 2001 +From 855f33f4b940bb73cf749bdde31c81a157b7e6ae Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 17 Dec 2022 20:14:49 +0100 Subject: [PATCH 37/N] Revert "Cygwin: Enable dynamicbase on the Cygwin DLL by diff --git a/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch index f50d8bc2e21..f0fa749deca 100644 --- a/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch +++ b/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch @@ -1,4 +1,4 @@ -From 6e10b1bdd96863136dd3c0e1e71b9c7895def917 Mon Sep 17 00:00:00 2001 +From f840e12ed789d12122691d6de8a08c0971cd1992 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 30 Jan 2023 23:22:22 +0100 Subject: [PATCH 38/N] Avoid sharing cygheaps across Cygwin versions @@ -50,7 +50,7 @@ Signed-off-by: Johannes Schindelin 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/winsup/configure.ac b/winsup/configure.ac -index b88f3ad..eb9890a 100644 +index b88f3ad..3aa2b16 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -57,6 +57,34 @@ AC_CHECK_TOOL(RANLIB, ranlib, ranlib) @@ -72,7 +72,7 @@ index b88f3ad..eb9890a 100644 + then + MSYS2_RUNTIME_COMMIT_HEX="0x$(expr "$MSYS2_RUNTIME_COMMIT" : '\(.\{,8\}\)')ull" + else -+ AC_MSG_WARN([Could not determine msys2-runtime commit"]) ++ AC_MSG_WARN([Could not determine msys2-runtime commit]) + MSYS2_RUNTIME_COMMIT= + MSYS2_RUNTIME_COMMIT_HEX=0 + fi @@ -116,10 +116,10 @@ index 0a5c817..351d32d 100644 strace.activate (false); res = NULL; diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc -index 58a9e5a..cf43aa9 100644 +index 2759d16..858a7fd 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc -@@ -836,7 +836,7 @@ int child_info::retry_count = 0; +@@ -835,7 +835,7 @@ int child_info::retry_count = 0; child_info::child_info (unsigned in_cb, child_info_types chtype, bool need_subproc_ready): msv_count (0), cb (in_cb), intro (PROC_MAGIC_GENERIC), diff --git a/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch b/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch index fa0b62086fe..2538563b4e0 100644 --- a/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch +++ b/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch @@ -1,4 +1,4 @@ -From f61f7fb71aaa15a8d6ccfc1b08dfca83b4118458 Mon Sep 17 00:00:00 2001 +From 905cab18b56559691f5648b5bdfe26320a9f2d5e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 21 Feb 2023 16:36:36 +0100 Subject: [PATCH 39/N] uname: report msys2-runtime commit hash, too @@ -17,7 +17,7 @@ Signed-off-by: Johannes Schindelin 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/winsup/configure.ac b/winsup/configure.ac -index eb9890a..0fc607a 100644 +index 3aa2b16..4dd5ccb 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -65,24 +65,30 @@ AC_ARG_WITH([msys2-runtime-commit], @@ -34,7 +34,7 @@ index eb9890a..0fc607a 100644 + MSYS2_RUNTIME_COMMIT_SHORT="$(expr "$MSYS2_RUNTIME_COMMIT" : '\(.\{,8\}\)')" + MSYS2_RUNTIME_COMMIT_HEX="0x${MSYS2_RUNTIME_COMMIT_SHORT}ul" else - AC_MSG_WARN([Could not determine msys2-runtime commit"]) + AC_MSG_WARN([Could not determine msys2-runtime commit]) MSYS2_RUNTIME_COMMIT= + MSYS2_RUNTIME_COMMIT_SHORT= MSYS2_RUNTIME_COMMIT_HEX=0 diff --git a/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch b/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch index b605c20a9a7..85864d8aab8 100644 --- a/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch +++ b/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch @@ -1,4 +1,4 @@ -From debafbf93f8c7099eb9147d40db596af221fed19 Mon Sep 17 00:00:00 2001 +From 856e9498336066f8a96fef1dadeb0d9fe0c700b4 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 13 Feb 2024 16:47:51 +0100 Subject: [PATCH 40/N] Cygwin: find_fast_cwd: don't run assembler checking @@ -23,10 +23,10 @@ Signed-off-by: Johannes Schindelin 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index b0c45fa..f8afd4c 100644 +index d0c97ad..1021005 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc -@@ -4826,29 +4826,27 @@ find_fast_cwd_pointer () +@@ -4828,29 +4828,27 @@ find_fast_cwd_pointer () static fcwd_access_t ** find_fast_cwd () { diff --git a/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch b/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch index bf63c3f7ccd..ea004abd5c0 100644 --- a/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch +++ b/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch @@ -1,4 +1,4 @@ -From 2c55ca50eeb8532432f51391c2ec28a14fc4e510 Mon Sep 17 00:00:00 2001 +From c94b46ba0328dcba25f6a541f1c60ab53c06754e Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Mon, 11 Nov 2024 20:09:49 -0800 Subject: [PATCH 41/N] cygthread: suspend thread before terminating. @@ -85,7 +85,7 @@ index a5f5d6e..4bb1946 100644 } diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc -index cf43aa9..4260f88 100644 +index 858a7fd..a6d06a8 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -413,7 +413,11 @@ proc_terminate () @@ -101,7 +101,7 @@ index cf43aa9..4260f88 100644 chld_procs[i].wait_thread->terminate_thread (); /* Release memory associated with this process unless it is 'myself'. 'myself' is only in the chld_procs table when we've execed. We -@@ -1199,7 +1203,11 @@ remove_proc (int ci) +@@ -1198,7 +1202,11 @@ remove_proc (int ci) { if (have_execed) { diff --git a/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch b/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch index d152b8a71b7..d21e5066b6e 100644 --- a/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch +++ b/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch @@ -1,4 +1,4 @@ -From e5dc132b3fa1c6a06867e73c7f67c81a502e3993 Mon Sep 17 00:00:00 2001 +From 62f6088206fcf4c9cbd74b23a869b7547f640c65 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Thu, 21 Nov 2024 22:13:42 -0800 Subject: [PATCH 42/N] Cygwin: revert use of CancelSyncronousIo on @@ -42,7 +42,7 @@ index 4bb1946..a5f5d6e 100644 } diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc -index 4260f88..cf43aa9 100644 +index a6d06a8..858a7fd 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -413,11 +413,7 @@ proc_terminate () @@ -58,7 +58,7 @@ index 4260f88..cf43aa9 100644 chld_procs[i].wait_thread->terminate_thread (); /* Release memory associated with this process unless it is 'myself'. 'myself' is only in the chld_procs table when we've execed. We -@@ -1203,11 +1199,7 @@ remove_proc (int ci) +@@ -1202,11 +1198,7 @@ remove_proc (int ci) { if (have_execed) { diff --git a/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch b/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch index 9771f33ccb9..874f0fc896b 100644 --- a/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch +++ b/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch @@ -1,4 +1,4 @@ -From 5453f9fab649b5fc02b2d6cdb8411c8fbd0b7409 Mon Sep 17 00:00:00 2001 +From 7f3ae80791561c7dbed811e6e316d40ee9af3406 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Wed, 27 Nov 2024 11:22:49 -0800 Subject: [PATCH 43/N] Cygwin: cache IsWow64Process2 host arch in wincap. @@ -49,10 +49,10 @@ index c148727..250866f 100644 #define IMPLEMENT(cap) cap() const { return ((wincaps *) this->caps)->cap; } diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index f8afd4c..5d2f0a5 100644 +index 1021005..b634c40 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc -@@ -4826,14 +4826,12 @@ find_fast_cwd_pointer () +@@ -4828,14 +4828,12 @@ find_fast_cwd_pointer () static fcwd_access_t ** find_fast_cwd () { diff --git a/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch b/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch index d4c0f16fdef..c72427740d7 100644 --- a/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch +++ b/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch @@ -1,4 +1,4 @@ -From 985e2654b8498dea90f240be8af40f1ddc9bb7a8 Mon Sep 17 00:00:00 2001 +From 7da06fd0ea09d64f1c15adc18c0e6274a22cf41b Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Wed, 27 Nov 2024 11:26:50 -0800 Subject: [PATCH 44/N] Cygwin: uname: add host machine tag to sysname. diff --git a/msys2-runtime/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch new file mode 100644 index 00000000000..4f473539848 --- /dev/null +++ b/msys2-runtime/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch @@ -0,0 +1,83 @@ +From 2c0e426da70f161af3776ffaa3559498b81c9df4 Mon Sep 17 00:00:00 2001 +From: Johannes Schindelin +Date: Mon, 27 Jan 2025 20:49:14 +0100 +Subject: [PATCH 45/N] fixup! Instead of creating Cygwin symlinks, use deep + copy by default + +In Cygwin v3.5.6, the `isdevice()` method was dropped, and the commit +message of 002aad0410 (Cygwin: path_conv: simplify, rearrange, rename +combined device checks, 2025-01-21), which is the commit that dropped +it, explains: + + Drop the isdevice() check in favor of a new isondisk() check. + +On the face of it, the message is clear: we should use `isondisk()` +instead of `isdevice()`. + +As it turns out, MSYS2's code that pretends to create a symbolic link +upon `ln -s` but instead makes a deep copy used to call `isdevice()`: + + if (!src_path.isdevice () && !src_path.is_fs_special ()) + // do a deep copy and return + + // otherwise fall back to creating a sysfile link + +A deep dive into the issue reveals that in this instance, the condition +is actually equivalent to: + + if (!src_path.isspecial() || + (src_path.isfifo() && !src_path.isondisk())) + +Further study (by trying it out) reveals that replacing this condition +with `src_path.isondisk()` fails to produce the expected result. Here is +the expected result, which we receive whether we use MSYS2 runtime +v3.5.5 or the version with `src_path.isspecial()`: + + $ mknod foo c 1 3 + $ ln -s foo foolnk + $ ls -l foo* + crw-rw-rw- 1 x None 1, 3 Jan 27 10:43 foo + lrwxrwxrwx 1 x None 3 Jan 27 10:43 foolnk -> foo + +and with `isondisk()`, this happens instead: + + $ mknod foo c 1 3 + $ ln -s foo foolnk + $ ls -l foo* + crw-rw-rw- 1 x None 1, 3 Jan 27 10:41 foo + -r--r--r-- 1 x None 126 Jan 27 10:41 foolnk + +Further experimentation reveals that FIFOs are handled without bothering +with the `isfifo() && !isondisk()` condition, merely testing +`!isspecial()` is enough (and recapitulates the behavior of v3.5.5): + + $ mkfifo fifo + $ ln -s fifo fifolnk + $ ls -l fifo fifolnk + prw-rw-rw- 1 None 0 Jan 27 20:44 fifo + lrwxrwxrwx 1 None 4 Jan 27 20:44 fifolnk -> fifo + +Therefore, let's just go with the sweet-and-simple `!isspecial()`. + +This commit will live un-autosquashed in the `msys2-3.5.6` branch to +allow for all of the above to be documented in the commit history. + +Helped-by: Jeremy Drake +Signed-off-by: Johannes Schindelin +--- + winsup/cygwin/path.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc +index b634c40..c49025a 100644 +--- a/winsup/cygwin/path.cc ++++ b/winsup/cygwin/path.cc +@@ -2320,7 +2320,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice) + set_errno (src_path.error); + __leave; + } +- if (!src_path.isdevice () && !src_path.is_fs_special ()) ++ if (!src_path.isspecial ()) + { + /* MSYS copy file instead make symlink */ + diff --git a/msys2-runtime/0045-Handle-8-bit-characters-under-LOCALE-C.patch b/msys2-runtime/0046-Handle-8-bit-characters-under-LOCALE-C.patch similarity index 88% rename from msys2-runtime/0045-Handle-8-bit-characters-under-LOCALE-C.patch rename to msys2-runtime/0046-Handle-8-bit-characters-under-LOCALE-C.patch index 5f8b8c46ee3..8fcd0d81092 100644 --- a/msys2-runtime/0045-Handle-8-bit-characters-under-LOCALE-C.patch +++ b/msys2-runtime/0046-Handle-8-bit-characters-under-LOCALE-C.patch @@ -1,7 +1,7 @@ -From cac55e8ee551009389c14b4d2ba4624a629d7f4d Mon Sep 17 00:00:00 2001 +From a9819806471518fce831640d34b71277db3632a1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Feb 2015 13:56:22 +0000 -Subject: [PATCH 45/N] Handle 8-bit characters under LOCALE=C +Subject: [PATCH 46/N] Handle 8-bit characters under LOCALE=C 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 diff --git a/msys2-runtime/0046-Mention-the-extremely-useful-small_printf-function.patch b/msys2-runtime/0047-Mention-the-extremely-useful-small_printf-function.patch similarity index 89% rename from msys2-runtime/0046-Mention-the-extremely-useful-small_printf-function.patch rename to msys2-runtime/0047-Mention-the-extremely-useful-small_printf-function.patch index 1161473b1e1..4c9f9ff18ed 100644 --- a/msys2-runtime/0046-Mention-the-extremely-useful-small_printf-function.patch +++ b/msys2-runtime/0047-Mention-the-extremely-useful-small_printf-function.patch @@ -1,7 +1,7 @@ -From 6990ce7e94d985ccaf4c1b83de6e612af503e172 Mon Sep 17 00:00:00 2001 +From 4d26e520c6958bc14fc8700e130f0ba1b993b731 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Feb 2015 11:54:47 +0000 -Subject: [PATCH 46/N] Mention the extremely useful small_printf() function +Subject: [PATCH 47/N] Mention the extremely useful small_printf() function It came in real handy while debugging an issue that strace 'fixed'. diff --git a/msys2-runtime/0047-Fixed-path-converting-with-non-ascii-char.patch b/msys2-runtime/0048-Fixed-path-converting-with-non-ascii-char.patch similarity index 89% rename from msys2-runtime/0047-Fixed-path-converting-with-non-ascii-char.patch rename to msys2-runtime/0048-Fixed-path-converting-with-non-ascii-char.patch index 50cce1564df..a824805dae2 100644 --- a/msys2-runtime/0047-Fixed-path-converting-with-non-ascii-char.patch +++ b/msys2-runtime/0048-Fixed-path-converting-with-non-ascii-char.patch @@ -1,7 +1,7 @@ -From 8b2144fadccafcbc790ec71137b72932adda49dc Mon Sep 17 00:00:00 2001 +From b8aab4a2e7e322247f4c1c4bf3f077beab11ec94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= Date: Mon, 9 Mar 2015 16:24:43 +0100 -Subject: [PATCH 47/N] Fixed path converting with non ascii char. +Subject: [PATCH 48/N] Fixed path converting with non ascii char. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/msys2-runtime/0048-Allow-native-symlinks-to-non-existing-targets-in-nat.patch b/msys2-runtime/0049-Allow-native-symlinks-to-non-existing-targets-in-nat.patch similarity index 91% rename from msys2-runtime/0048-Allow-native-symlinks-to-non-existing-targets-in-nat.patch rename to msys2-runtime/0049-Allow-native-symlinks-to-non-existing-targets-in-nat.patch index b27d5716dbd..a2e40020688 100644 --- a/msys2-runtime/0048-Allow-native-symlinks-to-non-existing-targets-in-nat.patch +++ b/msys2-runtime/0049-Allow-native-symlinks-to-non-existing-targets-in-nat.patch @@ -1,7 +1,7 @@ -From 64dfcd63798a42eeed61b8028aeaf372472312d0 Mon Sep 17 00:00:00 2001 +From 995ba4a37cbff8d22df2fb9f098353dc48c79b90 Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Wed, 20 May 2015 16:32:52 +0200 -Subject: [PATCH 48/N] Allow native symlinks to non-existing targets in +Subject: [PATCH 49/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 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index 5d2f0a5..3623aec 100644 +index c49025a..438fdb9 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc -@@ -1865,7 +1865,7 @@ symlink_native (const char *oldpath, path_conv &win32_newpath) +@@ -1868,7 +1868,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,7 +42,7 @@ index 5d2f0a5..3623aec 100644 if (isabspath (oldpath)) { -@@ -1926,14 +1926,39 @@ symlink_native (const char *oldpath, path_conv &win32_newpath) +@@ -1929,14 +1929,39 @@ symlink_native (const char *oldpath, path_conv &win32_newpath) wcpcpy (e_old, c_old); } } @@ -89,7 +89,7 @@ index 5d2f0a5..3623aec 100644 } /* Don't allow native symlinks to Cygwin special files. However, the caller shoud know because this case shouldn't be covered by the -@@ -1962,7 +1987,6 @@ symlink_native (const char *oldpath, path_conv &win32_newpath) +@@ -1965,7 +1990,6 @@ symlink_native (const char *oldpath, path_conv &win32_newpath) final_oldpath->Buffer[1] = L'\\'; } /* Try to create native symlink. */ diff --git a/msys2-runtime/0049-Make-paths-WCS-MBS-conversion-explicit.patch b/msys2-runtime/0050-Make-paths-WCS-MBS-conversion-explicit.patch similarity index 97% rename from msys2-runtime/0049-Make-paths-WCS-MBS-conversion-explicit.patch rename to msys2-runtime/0050-Make-paths-WCS-MBS-conversion-explicit.patch index bc957491e90..af7838c4795 100644 --- a/msys2-runtime/0049-Make-paths-WCS-MBS-conversion-explicit.patch +++ b/msys2-runtime/0050-Make-paths-WCS-MBS-conversion-explicit.patch @@ -1,7 +1,7 @@ -From e05ee9217c75a5910d111b407f2026e439e67daf Mon Sep 17 00:00:00 2001 +From 2148f68b0379c670916c6f356516dfe892193ac3 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 18 Dec 2015 20:19:57 +0100 -Subject: [PATCH 49/N] Make paths' WCS->MBS conversion explicit +Subject: [PATCH 50/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 @@ -456,7 +456,7 @@ index f57465a..57af967 100644 } } diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc -index 5d2f0a5..f89e631 100644 +index c49025a..d211e30 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -621,7 +621,8 @@ path_conv::check (const UNICODE_STRING *src, unsigned opt, @@ -469,7 +469,7 @@ index 5d2f0a5..f89e631 100644 path_conv::check (path, opt, suffixes); } -@@ -2550,7 +2551,7 @@ symlink_info::check_shortcut (HANDLE h) +@@ -2552,7 +2553,7 @@ symlink_info::check_shortcut (HANDLE h) if (*(PWCHAR) cp == 0xfeff) /* BOM */ { char *tmpbuf = tp.c_get (); @@ -478,7 +478,7 @@ index 5d2f0a5..f89e631 100644 > SYMLINK_MAX) return 0; res = posixify (tmpbuf); -@@ -2631,7 +2632,7 @@ symlink_info::check_sysfile (HANDLE h) +@@ -2633,7 +2634,7 @@ symlink_info::check_sysfile (HANDLE h) else srcbuf += 2; char *tmpbuf = tp.c_get (); @@ -487,7 +487,7 @@ index 5d2f0a5..f89e631 100644 > SYMLINK_MAX) debug_printf ("symlink string too long"); else -@@ -2899,8 +2900,8 @@ symlink_info::check_reparse_point (HANDLE h, bool remote) +@@ -2901,8 +2902,8 @@ symlink_info::check_reparse_point (HANDLE h, bool remote) path_flags |= ret; if (ret & PATH_SYMLINK) { @@ -498,7 +498,7 @@ index 5d2f0a5..f89e631 100644 /* A symlink is never a directory. */ fileattr &= ~FILE_ATTRIBUTE_DIRECTORY; return posixify (srcbuf); -@@ -2934,7 +2935,7 @@ symlink_info::check_nfs_symlink (HANDLE h) +@@ -2936,7 +2937,7 @@ symlink_info::check_nfs_symlink (HANDLE h) { PWCHAR spath = (PWCHAR) (pffei->EaName + pffei->EaNameLength + 1); @@ -507,7 +507,7 @@ index 5d2f0a5..f89e631 100644 spath, pffei->EaValueLength); path_flags |= PATH_SYMLINK; } -@@ -4151,7 +4152,7 @@ cygwin_conv_path (cygwin_conv_path_t what, const void *from, void *to, +@@ -4153,7 +4154,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 (); @@ -516,7 +516,7 @@ index 5d2f0a5..f89e631 100644 up->Buffer, up->Length / sizeof (WCHAR)); /* Convert native path to standard DOS path. */ if (!strncmp (buf, "\\??\\", 4)) -@@ -4164,11 +4165,11 @@ cygwin_conv_path (cygwin_conv_path_t what, const void *from, void *to, +@@ -4166,11 +4167,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. */ @@ -530,7 +530,7 @@ index 5d2f0a5..f89e631 100644 up->Buffer, up->Length / sizeof (WCHAR)); } lsiz = strlen (buf) + 1; -@@ -4478,8 +4479,8 @@ cygwin_conv_path_list (cygwin_conv_path_t what, const void *from, void *to, +@@ -4480,8 +4481,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: @@ -541,7 +541,7 @@ index 5d2f0a5..f89e631 100644 return -1; what = (what & ~CCP_CONVTYPE_MASK) | CCP_WIN_A_TO_POSIX; from = (const void *) winp; -@@ -5253,9 +5254,9 @@ cwdstuff::get_error_desc () const +@@ -5255,9 +5256,9 @@ cwdstuff::get_error_desc () const void cwdstuff::reset_posix (wchar_t *w_cwd) { @@ -553,7 +553,7 @@ index 5d2f0a5..f89e631 100644 } char * -@@ -5280,7 +5281,7 @@ cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen) +@@ -5282,7 +5283,7 @@ cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen) if (!need_posix) { tocopy = tp.c_get (); diff --git a/msys2-runtime/0050-Use-MB_CUR_MAX-6-by-default.patch b/msys2-runtime/0051-Use-MB_CUR_MAX-6-by-default.patch similarity index 90% rename from msys2-runtime/0050-Use-MB_CUR_MAX-6-by-default.patch rename to msys2-runtime/0051-Use-MB_CUR_MAX-6-by-default.patch index 10c03c6c2d4..fa5b61bb950 100644 --- a/msys2-runtime/0050-Use-MB_CUR_MAX-6-by-default.patch +++ b/msys2-runtime/0051-Use-MB_CUR_MAX-6-by-default.patch @@ -1,7 +1,7 @@ -From 2ff02fd6f3328e48d6ebe6991b5ec282a75f1afe Mon Sep 17 00:00:00 2001 +From 8f39b1c0e529e2980add70e90a103af0be715ba0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 21 Nov 2019 14:21:01 +0100 -Subject: [PATCH 50/N] Use MB_CUR_MAX == 6 by default +Subject: [PATCH 51/N] Use MB_CUR_MAX == 6 by default Internally, Cygwin already uses __utf8_mbtowc(), even if it still claims to use the "ASCII" charset. diff --git a/msys2-runtime/0051-Change-the-default-base-address-for-x86_64.patch b/msys2-runtime/0052-Change-the-default-base-address-for-x86_64.patch similarity index 92% rename from msys2-runtime/0051-Change-the-default-base-address-for-x86_64.patch rename to msys2-runtime/0052-Change-the-default-base-address-for-x86_64.patch index f40003f08b9..b6970fe6d16 100644 --- a/msys2-runtime/0051-Change-the-default-base-address-for-x86_64.patch +++ b/msys2-runtime/0052-Change-the-default-base-address-for-x86_64.patch @@ -1,7 +1,7 @@ -From e1c6154bd29c01f6d5efee7630c3d5feb70833e1 Mon Sep 17 00:00:00 2001 +From bcccc1ff10bf314b5b19e42c71db3457c90c81e2 Mon Sep 17 00:00:00 2001 From: Mikael Larsson <95430516+chirpnot@users.noreply.github.com> Date: Thu, 10 Mar 2022 17:26:42 +0000 -Subject: [PATCH 51/N] Change the default base address for x86_64 +Subject: [PATCH 52/N] Change the default base address for x86_64 This might break things, but it turns out several Windows libraries like to be loaded at 0x180000000. diff --git a/msys2-runtime/0052-msys2-runtime-restore-fast-path-for-current-user-pri.patch b/msys2-runtime/0053-msys2-runtime-restore-fast-path-for-current-user-pri.patch similarity index 97% rename from msys2-runtime/0052-msys2-runtime-restore-fast-path-for-current-user-pri.patch rename to msys2-runtime/0053-msys2-runtime-restore-fast-path-for-current-user-pri.patch index f15da24a7d0..06d3b735618 100644 --- a/msys2-runtime/0052-msys2-runtime-restore-fast-path-for-current-user-pri.patch +++ b/msys2-runtime/0053-msys2-runtime-restore-fast-path-for-current-user-pri.patch @@ -1,7 +1,7 @@ -From 9ba6664c8b10045fc621e5f86bd1e105cda4f222 Mon Sep 17 00:00:00 2001 +From bd1ebe7fa788e7fbc37dfe30cd0e61cd5857af24 Mon Sep 17 00:00:00 2001 From: Richard Glidden Date: Thu, 24 Aug 2023 13:36:10 -0400 -Subject: [PATCH 52/N] msys2-runtime: restore fast path for current user +Subject: [PATCH 53/N] msys2-runtime: restore fast path for current user primary group Commit a5bcfe616c7e removed an optimization that fetches the @@ -55,7 +55,7 @@ index b6acdf7..b38cb9d 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 9e7c239..71234c1 100644 +index 81d9529..f0046cf 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -637,6 +637,11 @@ cygheap_pwdgrp::nss_init_line (const char *line) @@ -117,7 +117,7 @@ index 9e7c239..71234c1 100644 if ((val = cldap->get_account_name ())) wcscpy (name, val); diff --git a/winsup/doc/ntsec.xml b/winsup/doc/ntsec.xml -index 6877890..fd5b472 100644 +index ae9270e..768c75a 100644 --- a/winsup/doc/ntsec.xml +++ b/winsup/doc/ntsec.xml @@ -930,7 +930,16 @@ The two lines starting with the keywords passwd: and diff --git a/msys2-runtime/0054-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch b/msys2-runtime/0054-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch deleted file mode 100644 index b7c341655a5..00000000000 --- a/msys2-runtime/0054-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 33799c250f0a7d353cfc34961c7bba26d3a4219a Mon Sep 17 00:00:00 2001 -From: Takashi Yano -Date: Mon, 23 Dec 2024 10:33:25 +0900 -Subject: [PATCH 54/N] Cygwin: signal: Do not handle signal when - __SIGFLUSHFAST is sent - -After the commit d243e51ef1d3, zsh sometimes hangs at startup. This -occurs because SIGCHLD, which should trigger sigsuspend(), is handled -in cygwait() that is used to wait for a wakeup event in sig_send(), -even when __SIGFLUSHFAST is sent. Despite __SIGFLUSHFAST being -required to return before handling the signal, this does not happen. -With this patch, if the signal currently being sent is __SIGFLUSHFAST, -do not handle the received signal and keep it asserted after the -cygwait() for the wakeup event. Apply the same logic to the cygwait() -in the retrying loop for WriteFile() as well. - -Applied-from: https://inbox.sourceware.org/cygwin-patches/20241223013332.1269-1-takashi.yano@nifty.ne.jp -Addresses: https://cygwin.com/pipermail/cygwin/2024-December/256954.html -Fixes: d243e51ef1d3 ("Cygwin: signal: Fix deadlock between main thread and sig thread") -Reported-by: Daisuke Fujimura -Reviewed-by: -Signed-off-by: Takashi Yano -Signed-off-by: Johannes Schindelin ---- - winsup/cygwin/release/3.5.6 | 5 +++++ - winsup/cygwin/sigproc.cc | 20 +++++++++++++++----- - 2 files changed, 20 insertions(+), 5 deletions(-) - create mode 100644 winsup/cygwin/release/3.5.6 - -diff --git a/winsup/cygwin/release/3.5.6 b/winsup/cygwin/release/3.5.6 -new file mode 100644 -index 0000000..643d58e ---- /dev/null -+++ b/winsup/cygwin/release/3.5.6 -@@ -0,0 +1,5 @@ -+Fixes: -+------ -+ -+- Fix zsh hang at startup. -+ Addresses: https://cygwin.com/pipermail/cygwin/2024-December/256954.html -diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc -index cf43aa9..c298527 100644 ---- a/winsup/cygwin/sigproc.cc -+++ b/winsup/cygwin/sigproc.cc -@@ -751,10 +751,14 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - res = WriteFile (sendsig, leader, packsize, &nb, NULL); - if (!res || packsize == nb) - break; -- if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED) -+ if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED -+ && pack.si.si_signo != __SIGFLUSHFAST) - _my_tls.call_signal_handler (); - res = 0; - } -+ /* Re-assert signal_arrived which has been cleared in cygwait(). */ -+ if (_my_tls.sig) -+ _my_tls.set_signal_arrived (); - - if (!res) - { -@@ -785,7 +789,16 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - if (wait_for_completion) - { - sigproc_printf ("Waiting for pack.wakeup %p", pack.wakeup); -- rc = cygwait (pack.wakeup, WSSC); -+ do -+ { -+ rc = cygwait (pack.wakeup, WSSC, cw_sig_eintr); -+ if (rc == WAIT_SIGNALED && pack.si.si_signo != __SIGFLUSHFAST) -+ _my_tls.call_signal_handler (); -+ } -+ while (rc != WAIT_OBJECT_0 && rc != WAIT_TIMEOUT); -+ /* Re-assert signal_arrived which has been cleared in cygwait(). */ -+ if (_my_tls.sig) -+ _my_tls.set_signal_arrived (); - ForceCloseHandle (pack.wakeup); - } - else -@@ -806,9 +819,6 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - rc = -1; - } - -- if (wait_for_completion && si.si_signo != __SIGFLUSHFAST) -- _my_tls.call_signal_handler (); -- - out: - if (communing && rc) - { diff --git a/msys2-runtime/0053-Fix-SSH-hangs.patch b/msys2-runtime/0054-Fix-SSH-hangs.patch similarity index 92% rename from msys2-runtime/0053-Fix-SSH-hangs.patch rename to msys2-runtime/0054-Fix-SSH-hangs.patch index 1054ab19505..40e87c81954 100644 --- a/msys2-runtime/0053-Fix-SSH-hangs.patch +++ b/msys2-runtime/0054-Fix-SSH-hangs.patch @@ -1,7 +1,7 @@ -From 67bdfc7ab0448278166f94d6fc9c529f6ae796ce Mon Sep 17 00:00:00 2001 +From 6ff968d8e27292ee33bc81ac16276092ef559c37 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 10 Oct 2024 19:52:47 +0200 -Subject: [PATCH 53/N] Fix SSH hangs +Subject: [PATCH 54/N] Fix SSH hangs It was reported in https://github.com/git-for-windows/git/issues/5199 that as of v3.5.4, cloning or fetching via SSH is hanging indefinitely. @@ -32,10 +32,10 @@ Signed-off-by: Johannes Schindelin 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc -index bc02c3f..2c09b14 100644 +index 48e811e..95c12ef 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc -@@ -776,7 +776,7 @@ out: +@@ -784,7 +784,7 @@ out: } ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT | PDA_WRITE); select_printf ("write: %s, n %d", fh->get_name (), n); @@ -44,7 +44,7 @@ index bc02c3f..2c09b14 100644 if (n < 0 && s->except_selected) gotone += s->except_ready = true; } -@@ -990,7 +990,7 @@ out: +@@ -998,7 +998,7 @@ out: ssize_t n = pipe_data_available (s->fd, fh, fh->get_handle (), PDA_SELECT | PDA_WRITE); select_printf ("write: %s, n %d", fh->get_name (), n); @@ -53,7 +53,7 @@ index bc02c3f..2c09b14 100644 if (n < 0 && s->except_selected) gotone += s->except_ready = true; } -@@ -1416,7 +1416,7 @@ out: +@@ -1424,7 +1424,7 @@ out: { ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT | PDA_WRITE); select_printf ("write: %s, n %d", fh->get_name (), n); diff --git a/msys2-runtime/0055-fixup-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime/0055-fixup-Avoid-sharing-cygheaps-across-Cygwin-versions.patch deleted file mode 100644 index efab85ffbd8..00000000000 --- a/msys2-runtime/0055-fixup-Avoid-sharing-cygheaps-across-Cygwin-versions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0202cf91276afa70860bdf948553cc03a1179b55 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Thu, 26 Dec 2024 11:40:02 +0100 -Subject: [PATCH 55/N] fixup! Avoid sharing cygheaps across Cygwin versions - -There was a spurious double-quote in the error message that is shown -when the commit could not be determined. - -Signed-off-by: Johannes Schindelin ---- - winsup/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/winsup/configure.ac b/winsup/configure.ac -index 0fc607a..4dd5ccb 100644 ---- a/winsup/configure.ac -+++ b/winsup/configure.ac -@@ -74,7 +74,7 @@ yes|auto) - MSYS2_RUNTIME_COMMIT_SHORT="$(expr "$MSYS2_RUNTIME_COMMIT" : '\(.\{,8\}\)')" - MSYS2_RUNTIME_COMMIT_HEX="0x${MSYS2_RUNTIME_COMMIT_SHORT}ul" - else -- AC_MSG_WARN([Could not determine msys2-runtime commit"]) -+ AC_MSG_WARN([Could not determine msys2-runtime commit]) - MSYS2_RUNTIME_COMMIT= - MSYS2_RUNTIME_COMMIT_SHORT= - MSYS2_RUNTIME_COMMIT_HEX=0 diff --git a/msys2-runtime/0056-fixup-Cygwin-signal-Do-not-handle-signal-when-__SIGF.patch b/msys2-runtime/0056-fixup-Cygwin-signal-Do-not-handle-signal-when-__SIGF.patch deleted file mode 100644 index dc16a50fee1..00000000000 --- a/msys2-runtime/0056-fixup-Cygwin-signal-Do-not-handle-signal-when-__SIGF.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7ad033fa4834dae3c44a6baeaa6a697c080bc5d2 Mon Sep 17 00:00:00 2001 -From: Takashi Yano -Date: Tue, 21 Jan 2025 12:15:33 +0900 -Subject: [PATCH 56/N] fixup! Cygwin: signal: Do not handle signal when - __SIGFLUSHFAST is sent - -This reverts commit a22a0ad7c4f0 to apply a new patch for the same -purpose. - -Signed-off-by: Takashi Yano ---- - winsup/cygwin/release/3.5.6 | 5 ----- - winsup/cygwin/sigproc.cc | 20 +++++--------------- - 2 files changed, 5 insertions(+), 20 deletions(-) - delete mode 100644 winsup/cygwin/release/3.5.6 - -diff --git a/winsup/cygwin/release/3.5.6 b/winsup/cygwin/release/3.5.6 -deleted file mode 100644 -index 643d58e..0000000 ---- a/winsup/cygwin/release/3.5.6 -+++ /dev/null -@@ -1,5 +0,0 @@ --Fixes: -------- -- --- Fix zsh hang at startup. -- Addresses: https://cygwin.com/pipermail/cygwin/2024-December/256954.html -diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc -index c298527..cf43aa9 100644 ---- a/winsup/cygwin/sigproc.cc -+++ b/winsup/cygwin/sigproc.cc -@@ -751,14 +751,10 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - res = WriteFile (sendsig, leader, packsize, &nb, NULL); - if (!res || packsize == nb) - break; -- if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED -- && pack.si.si_signo != __SIGFLUSHFAST) -+ if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED) - _my_tls.call_signal_handler (); - res = 0; - } -- /* Re-assert signal_arrived which has been cleared in cygwait(). */ -- if (_my_tls.sig) -- _my_tls.set_signal_arrived (); - - if (!res) - { -@@ -789,16 +785,7 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - if (wait_for_completion) - { - sigproc_printf ("Waiting for pack.wakeup %p", pack.wakeup); -- do -- { -- rc = cygwait (pack.wakeup, WSSC, cw_sig_eintr); -- if (rc == WAIT_SIGNALED && pack.si.si_signo != __SIGFLUSHFAST) -- _my_tls.call_signal_handler (); -- } -- while (rc != WAIT_OBJECT_0 && rc != WAIT_TIMEOUT); -- /* Re-assert signal_arrived which has been cleared in cygwait(). */ -- if (_my_tls.sig) -- _my_tls.set_signal_arrived (); -+ rc = cygwait (pack.wakeup, WSSC); - ForceCloseHandle (pack.wakeup); - } - else -@@ -819,6 +806,9 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - rc = -1; - } - -+ if (wait_for_completion && si.si_signo != __SIGFLUSHFAST) -+ _my_tls.call_signal_handler (); -+ - out: - if (communing && rc) - { diff --git a/msys2-runtime/0057-Cygwin-cygwait-Make-cygwait-reentrant.patch b/msys2-runtime/0057-Cygwin-cygwait-Make-cygwait-reentrant.patch deleted file mode 100644 index 4c017838858..00000000000 --- a/msys2-runtime/0057-Cygwin-cygwait-Make-cygwait-reentrant.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 28e4e5594d8f838c39dd307b08e5e7d2d577bc97 Mon Sep 17 00:00:00 2001 -From: Takashi Yano -Date: Mon, 20 Jan 2025 23:54:56 +0900 -Subject: [PATCH 57/N] Cygwin: cygwait: Make cygwait() reentrant - -To allow cygwait() to be called in the signal handler, a locally -created timer is used instead of _cygtls::locals.cw_timer if it is -in use. - -Co-Authored-By: Corinna Vinschen -Signed-off-by: Takashi Yano -(cherry picked from commit ea1914000adcbed5c16fc0ba2676173b2f6016c4) ---- - winsup/cygwin/cygtls.cc | 2 ++ - winsup/cygwin/cygwait.cc | 22 +++++++++++++++------- - winsup/cygwin/local_includes/cygtls.h | 3 ++- - winsup/cygwin/select.cc | 10 +++++++++- - 4 files changed, 28 insertions(+), 9 deletions(-) - -diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc -index afaee8e..b8b5a01 100644 ---- a/winsup/cygwin/cygtls.cc -+++ b/winsup/cygwin/cygtls.cc -@@ -64,6 +64,7 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, void *)) - initialized = CYGTLS_INITIALIZED; - errno_addr = &(local_clib._errno); - locals.cw_timer = NULL; -+ locals.cw_timer_inuse = false; - locals.pathbufs.clear (); - - if ((void *) func == (void *) cygthread::stub -@@ -85,6 +86,7 @@ _cygtls::fixup_after_fork () - signal_arrived = NULL; - locals.select.sockevt = NULL; - locals.cw_timer = NULL; -+ locals.cw_timer_inuse = false; - locals.pathbufs.clear (); - wq.thread_ev = NULL; - } -diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc -index dbbe1db..bb653f6 100644 ---- a/winsup/cygwin/cygwait.cc -+++ b/winsup/cygwin/cygwait.cc -@@ -58,16 +58,20 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) - } - - DWORD timeout_n; -+ HANDLE local_timer = NULL; -+ HANDLE &wait_timer = -+ _my_tls.locals.cw_timer_inuse ? local_timer : _my_tls.locals.cw_timer; - if (!timeout) - timeout_n = WAIT_TIMEOUT + 1; - else - { -+ if (!_my_tls.locals.cw_timer_inuse) -+ _my_tls.locals.cw_timer_inuse = true; - timeout_n = WAIT_OBJECT_0 + num++; -- if (!_my_tls.locals.cw_timer) -- NtCreateTimer (&_my_tls.locals.cw_timer, TIMER_ALL_ACCESS, NULL, -- NotificationTimer); -- NtSetTimer (_my_tls.locals.cw_timer, timeout, NULL, NULL, FALSE, 0, NULL); -- wait_objects[timeout_n] = _my_tls.locals.cw_timer; -+ if (!wait_timer) -+ NtCreateTimer (&wait_timer, TIMER_ALL_ACCESS, NULL, NotificationTimer); -+ NtSetTimer (wait_timer, timeout, NULL, NULL, FALSE, 0, NULL); -+ wait_objects[timeout_n] = wait_timer; - } - - while (1) -@@ -100,7 +104,7 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) - { - TIMER_BASIC_INFORMATION tbi; - -- NtQueryTimer (_my_tls.locals.cw_timer, TimerBasicInformation, &tbi, -+ NtQueryTimer (wait_timer, TimerBasicInformation, &tbi, - sizeof tbi, NULL); - /* if timer expired, TimeRemaining is negative and represents the - system uptime when signalled */ -@@ -108,7 +112,11 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) - timeout->QuadPart = tbi.SignalState || tbi.TimeRemaining.QuadPart < 0LL - ? 0LL : tbi.TimeRemaining.QuadPart; - } -- NtCancelTimer (_my_tls.locals.cw_timer, NULL); -+ NtCancelTimer (wait_timer, NULL); -+ if (local_timer) -+ NtClose(local_timer); -+ else -+ _my_tls.locals.cw_timer_inuse = false; - } - - if (res == WAIT_CANCELED && is_cw_cancel_self) -diff --git a/winsup/cygwin/local_includes/cygtls.h b/winsup/cygwin/local_includes/cygtls.h -index e4e3889..4bd79c3 100644 ---- a/winsup/cygwin/local_includes/cygtls.h -+++ b/winsup/cygwin/local_includes/cygtls.h -@@ -135,6 +135,7 @@ struct _local_storage - - /* thread.cc */ - HANDLE cw_timer; -+ bool cw_timer_inuse; - - tls_pathbuf pathbufs; - char ttybuf[32]; -@@ -180,7 +181,7 @@ public: /* Do NOT remove this public: line, it's a marker for gentls_offsets. */ - siginfo_t *sigwait_info; - HANDLE signal_arrived; - bool will_wait_for_signal; --#if 0 -+#if 1 - long __align; /* Needed to align context to 16 byte. */ - #endif - /* context MUST be aligned to 16 byte, otherwise RtlCaptureContext fails. -diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc -index 2c09b14..95c12ef 100644 ---- a/winsup/cygwin/select.cc -+++ b/winsup/cygwin/select.cc -@@ -385,10 +385,14 @@ next_while:; - to create the timer once per thread. Since WFMO checks the handles - in order, we append the timer as last object, otherwise it's preferred - over actual events on the descriptors. */ -- HANDLE &wait_timer = _my_tls.locals.cw_timer; -+ HANDLE local_timer = NULL; -+ HANDLE &wait_timer = -+ _my_tls.locals.cw_timer_inuse ? local_timer : _my_tls.locals.cw_timer; - if (us > 0LL) - { - NTSTATUS status; -+ if (!_my_tls.locals.cw_timer_inuse) -+ _my_tls.locals.cw_timer_inuse = true; - if (!wait_timer) - { - status = NtCreateTimer (&wait_timer, TIMER_ALL_ACCESS, NULL, -@@ -431,6 +435,10 @@ next_while:; - { - BOOLEAN current_state; - NtCancelTimer (wait_timer, ¤t_state); -+ if (local_timer) -+ NtClose (local_timer); -+ else -+ _my_tls.locals.cw_timer_inuse = false; - } - - wait_states res; diff --git a/msys2-runtime/0058-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch b/msys2-runtime/0058-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch deleted file mode 100644 index 4c8293e85cb..00000000000 --- a/msys2-runtime/0058-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 36734c9f0cf9b0230091db8523dc637ef6dfa82f Mon Sep 17 00:00:00 2001 -From: Takashi Yano -Date: Tue, 21 Jan 2025 00:13:04 +0900 -Subject: [PATCH 58/N] Cygwin: signal: Do not handle signal when - __SIGFLUSHFAST is sent - -The commit a22a0ad7c4f0 was not entirely correct. Even with the patch, -some hangs still occur. This patch overrides the previous commit along -with the patch that makes cygwait() reentrant, to fix these hangs. - -Addresses: https://cygwin.com/pipermail/cygwin/2024-December/256954.html -Fixes: d243e51ef1d3 ("Cygwin: signal: Fix deadlock between main thread and sig thread") -Reported-by: Daisuke Fujimura -Reviewed-by: Corinna Vinschen -Signed-off-by: Takashi Yano -(cherry picked from commit 83afe3e238cd12fb7d4799ba6b3c77e9e3618d91) ---- - winsup/cygwin/sigproc.cc | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc -index cf43aa9..858a7fd 100644 ---- a/winsup/cygwin/sigproc.cc -+++ b/winsup/cygwin/sigproc.cc -@@ -742,6 +742,9 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - memcpy (p, si._si_commune._si_str, n); p += n; - } - -+ unsigned cw_mask; -+ cw_mask = pack.si.si_signo == __SIGFLUSHFAST ? 0 : cw_sig_restart; -+ - DWORD nb; - BOOL res; - /* Try multiple times to send if packsize != nb since that probably -@@ -751,8 +754,7 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - res = WriteFile (sendsig, leader, packsize, &nb, NULL); - if (!res || packsize == nb) - break; -- if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED) -- _my_tls.call_signal_handler (); -+ cygwait (NULL, 10, cw_mask); - res = 0; - } - -@@ -785,7 +787,7 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - if (wait_for_completion) - { - sigproc_printf ("Waiting for pack.wakeup %p", pack.wakeup); -- rc = cygwait (pack.wakeup, WSSC); -+ rc = cygwait (pack.wakeup, WSSC, cw_mask); - ForceCloseHandle (pack.wakeup); - } - else -@@ -806,9 +808,6 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) - rc = -1; - } - -- if (wait_for_completion && si.si_signo != __SIGFLUSHFAST) -- _my_tls.call_signal_handler (); -- - out: - if (communing && rc) - { diff --git a/msys2-runtime/0059-Cygwin-signal-Avoid-frequent-TLS-lock-unlock-for-SIG.patch b/msys2-runtime/0059-Cygwin-signal-Avoid-frequent-TLS-lock-unlock-for-SIG.patch deleted file mode 100644 index f7eceaffdb4..00000000000 --- a/msys2-runtime/0059-Cygwin-signal-Avoid-frequent-TLS-lock-unlock-for-SIG.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 1da3384967da7dd6daa127cafdc853efc6680727 Mon Sep 17 00:00:00 2001 -From: Takashi Yano -Date: Sat, 18 Jan 2025 19:03:23 +0900 -Subject: [PATCH 59/N] Cygwin: signal: Avoid frequent TLS lock/unlock for - SIGCONT processing - -It seems that current _cygtls::handle_SIGCONT() code sometimes falls -into a deadlock due to frequent TLS lock/unlock operation in the -yield() loop. With this patch, the yield() in the wait loop is placed -outside the TLS lock to avoid frequent TLS lock/unlock. - -Fixes: 9ae51bcc51a7 ("Cygwin: signal: Fix another deadlock between main and sig thread") -Reviewed-by: Corinna Vinschen -Signed-off-by: Takashi Yano ---- - winsup/cygwin/exceptions.cc | 36 ++++++++++----------------- - winsup/cygwin/local_includes/cygtls.h | 4 +-- - 2 files changed, 15 insertions(+), 25 deletions(-) - -diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc -index 469052a..1cce7c8 100644 ---- a/winsup/cygwin/exceptions.cc -+++ b/winsup/cygwin/exceptions.cc -@@ -1420,7 +1420,7 @@ api_fatal_debug () - - /* Attempt to carefully handle SIGCONT when we are stopped. */ - void --_cygtls::handle_SIGCONT (threadlist_t * &tl_entry) -+_cygtls::handle_SIGCONT () - { - if (NOTSTATE (myself, PID_STOPPED)) - return; -@@ -1431,23 +1431,17 @@ _cygtls::handle_SIGCONT (threadlist_t * &tl_entry) - Make sure that any pending signal is handled before trying to - send a new one. Then make sure that SIGCONT has been recognized - before exiting the loop. */ -- bool sigsent = false; -- while (1) -- if (sig) /* Assume that it's ok to just test sig outside of a -- lock since setup_handler does it this way. */ -- { -- cygheap->unlock_tls (tl_entry); -- yield (); /* Attempt to schedule another thread. */ -- tl_entry = cygheap->find_tls (_main_tls); -- } -- else if (sigsent) -- break; /* SIGCONT has been recognized by other thread */ -- else -- { -- sig = SIGCONT; -- set_signal_arrived (); /* alert sig_handle_tty_stop */ -- sigsent = true; -- } -+ while (sig) /* Assume that it's ok to just test sig outside of a */ -+ yield (); /* lock since setup_handler does it this way. */ -+ -+ lock (); -+ sig = SIGCONT; -+ set_signal_arrived (); /* alert sig_handle_tty_stop */ -+ unlock (); -+ -+ while (sig == SIGCONT) -+ yield (); -+ - /* Clear pending stop signals */ - sig_clear (SIGSTOP, false); - sig_clear (SIGTSTP, false); -@@ -1479,11 +1473,7 @@ sigpacket::process () - myself->rusage_self.ru_nsignals++; - - if (si.si_signo == SIGCONT) -- { -- tl_entry = cygheap->find_tls (_main_tls); -- _main_tls->handle_SIGCONT (tl_entry); -- cygheap->unlock_tls (tl_entry); -- } -+ _main_tls->handle_SIGCONT (); - - /* SIGKILL is special. It always goes through. */ - if (si.si_signo == SIGKILL) -diff --git a/winsup/cygwin/local_includes/cygtls.h b/winsup/cygwin/local_includes/cygtls.h -index 4bd79c3..328912f 100644 ---- a/winsup/cygwin/local_includes/cygtls.h -+++ b/winsup/cygwin/local_includes/cygtls.h -@@ -195,7 +195,7 @@ public: /* Do NOT remove this public: line, it's a marker for gentls_offsets. */ - class cygthread *_ctinfo; - class san *andreas; - waitq wq; -- int sig; -+ volatile int sig; - unsigned incyg; - volatile unsigned spinning; - volatile unsigned stacklock; -@@ -276,7 +276,7 @@ public: /* Do NOT remove this public: line, it's a marker for gentls_offsets. */ - { - will_wait_for_signal = false; - } -- void handle_SIGCONT (threadlist_t * &); -+ void handle_SIGCONT (); - static void cleanup_early(struct _reent *); - private: - void call2 (DWORD (*) (void *, void *), void *, void *); diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD index 246a1a7ac89..8878786e103 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=msys2-runtime pkgname=('msys2-runtime' 'msys2-runtime-devel') -pkgver=3.5.5 -pkgrel=3 +pkgver=3.5.6 +pkgrel=1 pkgdesc="Cygwin POSIX emulation engine" arch=('x86_64') url="https://www.cygwin.com/" @@ -71,82 +71,72 @@ source=('msys2-runtime'::git+https://github.com/cygwin/cygwin#tag=cygwin-${pkgve 0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch 0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch 0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch - 0045-Handle-8-bit-characters-under-LOCALE-C.patch - 0046-Mention-the-extremely-useful-small_printf-function.patch - 0047-Fixed-path-converting-with-non-ascii-char.patch - 0048-Allow-native-symlinks-to-non-existing-targets-in-nat.patch - 0049-Make-paths-WCS-MBS-conversion-explicit.patch - 0050-Use-MB_CUR_MAX-6-by-default.patch - 0051-Change-the-default-base-address-for-x86_64.patch - 0052-msys2-runtime-restore-fast-path-for-current-user-pri.patch - 0053-Fix-SSH-hangs.patch - 0054-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch - 0055-fixup-Avoid-sharing-cygheaps-across-Cygwin-versions.patch - 0056-fixup-Cygwin-signal-Do-not-handle-signal-when-__SIGF.patch - 0057-Cygwin-cygwait-Make-cygwait-reentrant.patch - 0058-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch - 0059-Cygwin-signal-Avoid-frequent-TLS-lock-unlock-for-SIG.patch) -sha256sums=('b946762515173a45371a88060e9e672a4aaa290541fd6400660bf35a286a375f' - 'dba1028d2e161ce034b066acacade0280a4ddbded90636bd0cde8881cd78ede4' - '76e37d572d2aba473aab8f5a1984af2084e6069f9195795c71bc45778edbd1eb' - '5c79b09f9337cc8a5f993db6dd1f54df269f8390ab3348a94e5a139a5d060e39' - 'ad84aab9a9f88b5f7510f04b33b77bbe380ce48e29a9a4feb54b485a3def3114' - '89efe4ed3c93ae1508376d33cd775bd4275b2c02c51b754d4f29f6f9bbeeb1c5' - 'ea9df2911864c80cc70ff1c8026b22d47cbabcdcbad82ff072188b0d651eeb34' - 'a5984a95c83c782e02f1db14ff0789c79474a6197d33ecf849fab5dda95e581a' - 'c0172da962a94e5d2f1ba325967a91c5f037cc00f6aeffaeeebec7858931c2a9' - 'cd600a8b45ee7fe14c932f81b27c4e051b1ea8244258bf0172788df863011963' - '1668b401e4ca68257663623fa7de7994b4499b0c183c495a6b07a71c81d4ff64' - '6d03e2d13e2e5b87eb9d58fdcc9b61917da170a5052e1cba048e484f736b8604' - 'e2f2bcb5c3ea0d46e33b4eb938f858e7e302e7d3d45d5bf638a3522db57c3dc1' - '4e24df7714b810c7451a90eb27f8d7c94eeefa42e314019517445f2963672d62' - '77fd82e00ece7cced83494ca92b78b1c2df4fd903f4b5263e2d3bc3de557c03d' - 'ef149a162cdb6cca098640aaae73b270e0df08e016a8f66c5c666d7e69f1495e' - '2a12a835c30ea729830df30e45135ef83476e2fb9cf5ba3969d65a9ba7a901ca' - '0dcff7c8a47d79f6a7b432623475f5cf241221176a58acbc9438c5d0f6dd0640' - '3c8baa45e81b329ac2737dd09861910cd42435b05ae49c2b343c62564c6f1b6d' - 'ead4e40ad7a5efe0ff4f2c0ece682ea8bbc0e5b2013c7c1bbc41c1160a79818d' - '6149aa6901bad4c4b62ebb1b270ca13506491e299d60ae5f327a81882f791a4f' - '3a686b4baae983fed1996109ec86f78091bbd65a3163ffe0a73e3e283004baf7' - 'ffd7319e19839cabe6d048775d258818b82631eeaa62475850220ba63062447a' - '020ef4fd46dc3c48a9c3d7f4914860363d8d1012c27fc935cae0d2ac638cb211' - '3b473683e9f1de616f41542e2e46dbf3212d45a62f1cca34daba6a618d235756' - '91b46b4f1b79024b50e75113089612248336e07733930960fff5e6cddb3bbff0' - '6e4e2e0ed960fd014d11f92a8a4b8ca96bf1a47249f104809fd549b7ee1b7129' - '6c5bdca8f8c3655db90216a13405bf38c4bc504ccf6bc60ab277fc859d99776d' - 'a992b1fb7243c5b3e0cf6a7848dd5d4b6a5fa6bfd85ac13b744a09b812770c1f' - '08540ea1bf7d23cff0d239c99771ab231927576845187f3b55ebbae3abc2e1a4' - 'd163f7e899099964b0c67af7597bc08d4e887813ccba1a08610bbcb06beacda1' - '6c958541e116200d5cc2d407bdabf14825a66d11e80f8937ec4dbdcb7f9bc570' - 'd0b701bf91d8cd70f4e8ef2f753f03668d176ae5b5b41b7304d666d9a4b09cb4' - 'd2be4b5d9449711b1b52fe81aa8b41f71e1071cff19e5db43a6ed9e7cd6b2e19' - '0752d0df9c493be8eabcfb6bd3fd49e3cddb3828b38c3ae828945dcb8681744e' - 'a6660ecb7a7f02a3e23ef0bfef234d477412da54e56446c24db39dc1faf50c88' - 'd499d11b94c71201945915107c2ed55384dae60a5c6284a5bb685798fe58276c' - '08207bdb9af01cffacb859be228dfa9a7574deb26a7d08fcf7e86a0c551db059' - '4ce0b8c8e05d52030a1411f36b5b4075db90d3450380663c4f46ffbc28553b9e' - '7bb4f2d31cc77492c0df7ea16114edefbb8c79e305eae22610c0298759704626' - 'e8f0340048346be4ef0e49f24433087c4ff2eff0aac4803cb42dc85a76ddaf1c' - 'a7dc3d4b8a170338e2fea44b3efb7f9b299d1846edb8f6a6ba9375a6d53e88f1' - 'eac80fb3b54dced1e982c01a755c1914eccd1f8d74b7b88a0af43819ab317a2f' - '29c3412a1c7b0e4e719b64337ba5508b141037884ba96e9bee5f8ea253811aa3' - '7064362256cb558fe443469b5f9988ca927667b7cf13f1c1020aca98e616f900' - 'fb6c38381eb4f36338a5184f79c98e6046c9ff741da37f2f38f4757c8714ca92' - 'ff935aabac6e2f62cae187d6158245987af7e4892d0c5d74766843cff25a43d4' - '821819aa379206d9e076d7b9467b9de22ed7250cc563369d2ad10962b9dc9687' - 'f23feb78db734874c810b91af34cbc16e31506795d6b457b259d3d98187a7ce5' - '74ae329a3ff7b4d80e99443879e8699b6b56a5e251261c017624d99b9fbbf82c' - 'c7f9f6d1c9d23e12eac9e23c0bbaa3af1425863c0343498fa138e75f52de6daf' - '19c2698dc55fc9f17346430aa580b8ae444e679d0839516b597ee72e4c60be94' - 'f1d45c6e5dc5ad094a9ed7c8da0120d3878d750cb484b4dc47fc3952331e0d62' - '0bb8eda3871e4f639b933b5a5cdae089d70b55d9f52a9d5980d3c7ffec51dd17' - '4e8127cea653273e44ef04a565d51a01c3d0e72307ccb6e374a6ff3c1dedd2a5' - '20da59f62c2d4d051758e857eb78aa143821816f762bf1e84b5d1946d1ab1b03' - 'c3adb9d99255a025cd402c40b4a9923464818131fbe41c8df8d56747f6c4bf5e' - '97a7992a66b505eacf9203dc55d1746228089c96a2089801a623124a198fe238' - '7983913f1df1d744093c279d6f4e209dcb6ff97a56ecbfbcc39be961ef89546d' - '740740dbfcc73ae486c00f4de28fc94ef12149ca914f7777950936a482470969' - '7cecad758eae70038a4beaa611cbfcd403d3e2840dc2fb4a69de722f84df0cd7') + 0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch + 0046-Handle-8-bit-characters-under-LOCALE-C.patch + 0047-Mention-the-extremely-useful-small_printf-function.patch + 0048-Fixed-path-converting-with-non-ascii-char.patch + 0049-Allow-native-symlinks-to-non-existing-targets-in-nat.patch + 0050-Make-paths-WCS-MBS-conversion-explicit.patch + 0051-Use-MB_CUR_MAX-6-by-default.patch + 0052-Change-the-default-base-address-for-x86_64.patch + 0053-msys2-runtime-restore-fast-path-for-current-user-pri.patch + 0054-Fix-SSH-hangs.patch) +sha256sums=('1aa116a990cb80aa93874ac40288d3c2e4446b22c0a7243a4ec001c292a7e1ff' + '03c861cab8c69238eb32a6f0631773566f5921ee9b3954195751f3ccab5a455a' + '4d9d6129996fc892423dd60fd514fc2cecc60f93d2fed1b8d72fd2a82a5afc16' + 'e55d880a60e0892e53d78b26527e127f58e4fac810b207e190047ac80fe0ca79' + '2495f387d6ad710ee8b332fb8314b82a9b4385a5e5db370bcd2921e712317866' + '3c5e89ed37babacfed6a3c97d2ceeb8c2ad82690fadce9d16715829e11d4efc1' + '2ad9cc463746f4721fc9f484b30ee538e9500183a18ffd3ce76683965da7cbf0' + 'f764ef5b1e2f17078962d71940f8864ae42fc383f05d8d774e74c2368a32da21' + 'a1cf49a723674218d79bbc48eaf0d8597545f59975870afcf9a26c70b8a37764' + 'ead7ea131ea4302e891fee321aff226c2f588fe6be9e9b7f41ddb75f6da9041c' + '9f0c9d14ffa56f38912ac7fb4231bf42566f406a96af09c8e386199d35221456' + '2d92d1f6627e233fa8609b394ddb69c1c728ffbb6140bc1edce99c5bbdf01ba2' + '712723b6064340db9e6d24ac13bedf4910c8d73c772a65d28c19b342b3015762' + '570e64abea846f178d67684e32351b91e26486cc0b65ea306f10bc5ac44a326c' + '465593bbb17728269af88b2b02a26e93925637a20672486ba933771e455948e2' + '3a1e9ea0788715df94e23f9840236d5868f64f608fd1e9eeafcf4bacaf32301e' + '3f4bc4edcbfe3daf0fbd3532fb061ece7bba793dd933cc439a0a3ab8f032f217' + '95c6c9db4f6cb34a3d8bfaabec72ba8304a6aa422bddeb86ce4af5aa247ff568' + '674a02bba18d551a79be65b57b64f301d04e477e6d1c8328e123ae9d755f5ac1' + '5aea7b8233767d28beb429cd421cc36a5f60922c2a47e98a48a7dda3470abd3e' + 'bd2e42a471eefc6a5f183c3702fe7b445b2f856e9dcc88c5d64c1bdefce6f7f0' + 'a6308256684ed7d5870524c4510cd56107f7a8d1c04760ad2eceed474ba49197' + 'abf962400c92812e8bfa532e580598183d5862b2c7567ef1abf29f9d6dcacf42' + '3d9d64b1cb418593f993b40733f8ae185348ed58bfc2334f36f65433f8a43a35' + '0dd22ac8d64ec4b03c50d2711fb00c79229cc32dbf1dae480f70dffe5f22e55d' + '5ed0f39dbcee791fda02ebbded283b7499783dd01fcd1553e807638bbe044beb' + 'ececbb13e83615c3f9976b96ecc0995ea7f56afee54a2cd0789d4e6212020b63' + 'e3354337b0ae053d0dc0d36a8574142f2a38242508bc6278f41041bb32271c63' + '49ddf1d0643e07a269f02b097f8485b2a015314984603d0086a2993fc5dd11b7' + '4e75f48b41bd408a210100a8d8e5c156ccdba961e2e0a618976cef0570944449' + 'f92b9e718294c7de4a25d1068060c99823d8085e134a7f01bacfb5425c6b2a3b' + 'fabe5d1cdec4a2061fb3f39f4192c8d981fb6af6d457f449b8d103441d09488c' + '94011b74f84f4cb0c0b532258bfdf98e98db2352fd753a116b800c866e14cf71' + 'f2ea4c8201dad51ccd6e3e4555efb11bf88c67d964e47f5dd6b022bee4f7545f' + '789934f015312e8a37bdce2fafb3942a47fec6d71745173d250d94465c56a9d1' + '030466b160394aa46cad53ff5173c533328de53df00b7556942ea27aeae33c61' + '5ce12bf75970111f7444ddbb3f7830665eb255c7db983d79d2e9a714c5833365' + 'd1464b20b494685e7a614a35299c0c56f9841e95d6ef5ac4d6f76eaf62297c41' + '2fbf033ae55d9455e8d274ae64dcbec6275c4451ab16e28165a979ab6a5c2cbf' + '388b3a6b7220431e815c1a0ff9c93a80cfc6cefe6e113f02ab8dd40ffa6da583' + 'db575e96a72489d4d0f210d1c19e0f3a985ad7395384dd492900c4a0fff9db9c' + '5cb4b6241697d96d32f1f201fb0d3e862525ed4673d9c5f1ceb755ce4c4e136e' + '0c080dfa9f97e176fbbb0f6d0c534a43c3f04578710d8db3be52326df0615c39' + 'fb75643be37fbfc13c502d5a00374aba51bec31159281fd7dc46b35d4194b14c' + '02b61d28f0bd16269ec40db99a3d959b76f2127c26b460203015052be50e6d9a' + 'b6349ec52a0756e301dd89e9004091ec8cbdb28186ef7e31eaf362fd0512659d' + '37f67039c055f232645190fd1bf4feb023bf5bec0a45475dc5aab3224b63ce0f' + 'ce79f7ce28b1b77f89fc32d551cbcec9b80e4e6f111244f8dc329bdc82c01293' + '2b9aca113092eeeaba5f66127cadcd85460b2a192f3f5b3b2d850a800fbf609c' + '98e72beb7a9b3f364f57648a7150f120b758aa23a5d66354d837e3c4308d30e3' + '87b1d9ef85fb93f74117ef8297db7f1419c33bc4f35448e2d3f4ef93dca9cc0a' + '9519def279d2c56b3121cfa3f7a927511cf4c11f45cee2bae4a415f8e3347fdb' + 'cf3b3e1ae5cc270438e407f1b1fc5ed9d39b5b8d107248d37008ac39e6caddb8' + '3c6fd1b3d93717da30495fd6a4b25a33acfdb89942368dd10eb2cd8f424f1513' + '5503c9042b31d9206e9acb238ceb8cb9e932e035a99e3dfee07b1a20b5c28188' + '2264d2003c85f43cc23d55f9020dbc8e2f64f10531bca4711a3c5ac1e566605d') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -245,21 +235,16 @@ prepare() { 0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch \ 0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch \ 0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch \ - 0045-Handle-8-bit-characters-under-LOCALE-C.patch \ - 0046-Mention-the-extremely-useful-small_printf-function.patch \ - 0047-Fixed-path-converting-with-non-ascii-char.patch \ - 0048-Allow-native-symlinks-to-non-existing-targets-in-nat.patch \ - 0049-Make-paths-WCS-MBS-conversion-explicit.patch \ - 0050-Use-MB_CUR_MAX-6-by-default.patch \ - 0051-Change-the-default-base-address-for-x86_64.patch \ - 0052-msys2-runtime-restore-fast-path-for-current-user-pri.patch \ - 0053-Fix-SSH-hangs.patch \ - 0054-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch \ - 0055-fixup-Avoid-sharing-cygheaps-across-Cygwin-versions.patch \ - 0056-fixup-Cygwin-signal-Do-not-handle-signal-when-__SIGF.patch \ - 0057-Cygwin-cygwait-Make-cygwait-reentrant.patch \ - 0058-Cygwin-signal-Do-not-handle-signal-when-__SIGFLUSHFA.patch \ - 0059-Cygwin-signal-Avoid-frequent-TLS-lock-unlock-for-SIG.patch + 0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch \ + 0046-Handle-8-bit-characters-under-LOCALE-C.patch \ + 0047-Mention-the-extremely-useful-small_printf-function.patch \ + 0048-Fixed-path-converting-with-non-ascii-char.patch \ + 0049-Allow-native-symlinks-to-non-existing-targets-in-nat.patch \ + 0050-Make-paths-WCS-MBS-conversion-explicit.patch \ + 0051-Use-MB_CUR_MAX-6-by-default.patch \ + 0052-Change-the-default-base-address-for-x86_64.patch \ + 0053-msys2-runtime-restore-fast-path-for-current-user-pri.patch \ + 0054-Fix-SSH-hangs.patch } build() { diff --git a/msys2-runtime/msys2-runtime.commit b/msys2-runtime/msys2-runtime.commit index b1986fe40c1..a207501c7fe 100644 --- a/msys2-runtime/msys2-runtime.commit +++ b/msys2-runtime/msys2-runtime.commit @@ -1 +1 @@ -1da3384967da7dd6daa127cafdc853efc6680727 +2a3a6df191a924913cc1610d960a370b0c4fa5c2