diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch index e3e5e4e4226..605643a5fce 100644 --- a/msys2-runtime/0001-Add-MSYS2-triplet.patch +++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch @@ -1,4 +1,4 @@ -From 13de2a173212340b0f85edc722c72d426bcd63e5 Mon Sep 17 00:00:00 2001 +From f51657ba5f587a296c90c4a14d002a21a1f57094 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 75bef84bedc..ab69033eda0 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 ba274e444eaa417da44ace62199834885c6507df Mon Sep 17 00:00:00 2001 +From 3155a8c5f98e97692a6d1dd0047e9ca0dd4c3030 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 f22542b5996..542a6bd7e00 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 e971c0bcf575b7775d1d0121ef2e6440a9ed669c Mon Sep 17 00:00:00 2001 +From d9b4e1decb9999a9e1577eafeea8ae337d44924b 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 @@ -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 622aaa9..a16c875 100644 +index 961a98c..aafb811 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -510,7 +510,11 @@ details. */ 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 fd2df467a31..4cec2e18c69 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 b4519b016bf9dd78d0621163a9872c3d6808d331 Mon Sep 17 00:00:00 2001 +From 02128e4ad21c12aba2edbc183518f9de44750f47 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 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 be710e8e3cf..d90cebb034a 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 7d9c64cfd77ba10c1cf5146a9ca5d021301a51ec Mon Sep 17 00:00:00 2001 +From f5641c9f116e711014cce0b034c46577e76fdc50 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 2d60e818f4f..32f0cf14fcf 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 83a114a82db7ac3ba5dc46c3424b383e0a4d5b65 Mon Sep 17 00:00:00 2001 +From 834af426d590c5eafa5a31454bb3e96d1b66bd06 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 @@ -384,10 +384,10 @@ index 1cfee5c..affb7e9 100644 root_idx = i; diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc -index 83883f9..7c2581d 100644 +index ffe71ee..4323cb1 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc -@@ -2815,7 +2815,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) +@@ -2811,7 +2811,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) dom, name, sid.string ((char *) sidstr), home ?: "/home/", home ? L"" : name, 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 e4a7639521d..bff721e9686 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 08cde45b834f536f05d9218c4bb0fe2e6b3549b2 Mon Sep 17 00:00:00 2001 +From a7a80da72303405b0932f8c1529ea22b5ea511cd 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 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 22803147515..3155a9cd966 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 7c6318a0f68886a4174686c39ec8b89cb05b5d35 Mon Sep 17 00:00:00 2001 +From f671632ea5f1d8a5776afc19c6f55c5cb04574e0 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 7779589ade0..8c8af6d256b 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 1cc5abc667219cae2200f1ef5384c57ae1151a8e Mon Sep 17 00:00:00 2001 +From 8f58dba7794555fe5fcdaaeb4c799031d475340b 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 6b6e1c53855..fa0f2a69e4b 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 d3c18e8852b5da7734a2a78a829c7f6e383d3927 Mon Sep 17 00:00:00 2001 +From 055c3f431668f208cfbc35bd56c34e8ec7910f72 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 16268ea3fb9..58d8bf5c739 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 9e7926693a30e8eed827f0cfaef0113d02fe4fc0 Mon Sep 17 00:00:00 2001 +From a83678048ab5d4b27c6b5fd0813f6c8dc41afce6 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 137315dd687..d9f08df52b0 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 9876a9ed9392203a26bb760570db71fa8fc6032b Mon Sep 17 00:00:00 2001 +From 16e335f3fd875d2481bcfbcaa56a7021381d4b72 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 8ace0ce480d..be73bf9046f 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 9123f19fff758906012e9c491107fc93d0dfa53f Mon Sep 17 00:00:00 2001 +From 0f9740069ec89de5e6c30ed73c2a0f20886542ba 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 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 22ad20d541f..4f2161d9550 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 11a478ce41484a6fb1bc50cbf540d5d6fe8105c9 Mon Sep 17 00:00:00 2001 +From 406cc5007a54620999e24c1cbdc0f4ae79590871 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 0f1978222bc..62b07b39839 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 12fc3431407356ace5c06e30647b8688e68b2c18 Mon Sep 17 00:00:00 2001 +From 665a09ba766997e513e3ecbbee36d4bda6629e15 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 bf84ce3da2e..0334977b1af 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 c3750d97d280573167ba0cf29fb6c0d666369437 Mon Sep 17 00:00:00 2001 +From b2f6fafe17fd043d5a47f840218463331fc78424 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 e3577595d3b..d1c79babe13 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 f0f97a586d6316325e72d511af17692e9cee0dc3 Mon Sep 17 00:00:00 2001 +From 38378c51ae08b036b1ddf1ef6cf93170ff3d9aac 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 6fb6941a2af..c8c71d57d93 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 f1b4d041cc3a440b36d57ba7cedf2d77fd8b344e Mon Sep 17 00:00:00 2001 +From b5312cbc07e0bf4f959d63219a4afd2c45610b04 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 d3e0b7c9bc8..669f0c47383 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 d6a3a54e98d9814a60cc2b836560edf0c25c1b9e Mon Sep 17 00:00:00 2001 +From 9ef526773bdf7c7677a9ac03610141a6f40c4f36 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 80292c9294d..c3792102e10 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 9ca61ea1a3bc20acd5ff25579d38f4a927e6b5e6 Mon Sep 17 00:00:00 2001 +From b9d70993b51871100ba96523474340d9594bd559 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 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 index 3283c61b1db..f962f237e17 100644 --- a/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch +++ b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch @@ -1,4 +1,4 @@ -From 11374ded9416ba1d0c44584707b32dd9cefb4dcb Mon Sep 17 00:00:00 2001 +From f43ffb1f66d6d58b123cc90610d67971674acdaf Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 May 2020 13:49:37 +0200 Subject: [PATCH 21/N] Introduce the `enable_pcon` value for `MSYS` diff --git a/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch index 9044421522d..996e77fdc46 100644 --- a/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch +++ b/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch @@ -1,4 +1,4 @@ -From 1199680444ab7030d58d17a2cfa6330fd9570a65 Mon Sep 17 00:00:00 2001 +From 65cf9f032554c2ed05d6b9e3c3ea4748df8ed5f5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 5 Jun 2020 20:09:11 +0200 Subject: [PATCH 22/N] popen: call /usr/bin/sh instead of /bin/sh diff --git a/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch index af05e9e902f..1cdcb72faf1 100644 --- a/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch +++ b/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch @@ -1,4 +1,4 @@ -From e98dd3da1b78dcbf5aff25c0bc21b1b9aca143d8 Mon Sep 17 00:00:00 2001 +From 1e2b8bc4ab0b4cd173c437fd552a41cd64b12446 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 12 Aug 2020 12:22:38 +0200 Subject: [PATCH 23/N] Expose full command-lines to other Win32 processes by diff --git a/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch index 7fbffa2c87c..dd9a399dd67 100644 --- a/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch +++ b/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch @@ -1,4 +1,4 @@ -From 6a56f892a76065ccc8bcd4adc01efe261059c15c Mon Sep 17 00:00:00 2001 +From 0e6a5b980d1ff5de93d81ae8a91bed9e888389b7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 16 Apr 2018 14:59:39 +0200 Subject: [PATCH 24/N] Add a helper to obtain a function's address in diff --git a/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch index c320330d4a1..d60d2036d34 100644 --- a/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch +++ b/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch @@ -1,4 +1,4 @@ -From bde54bf61d663dd6961ac772ef45152d604d67ee Mon Sep 17 00:00:00 2001 +From 803f2346ad6cd1ee05c8d25124678b0d282368f6 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Mar 2015 09:56:28 +0000 Subject: [PATCH 25/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C diff --git a/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch index 02d09a40979..482760f347c 100644 --- a/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch +++ b/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch @@ -1,4 +1,4 @@ -From 2b34729eb9f020d8ca7fa02ecfcacdbec67fe879 Mon Sep 17 00:00:00 2001 +From 4148d009cc1c5362101b6110d27918e39c965af9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Mar 2015 10:01:50 +0000 Subject: [PATCH 26/N] kill: kill Win32 processes more gently diff --git a/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch index 8fd7daf5b14..0a3b4c81947 100644 --- a/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch +++ b/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch @@ -1,4 +1,4 @@ -From 707761410163f4b33b8637c7882cf2c63b07cfe5 Mon Sep 17 00:00:00 2001 +From c6208de91ddbf64af43fff360797d9420a5adaa5 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Thu, 22 Jul 2021 11:59:16 -0700 Subject: [PATCH 27/N] Cygwin: make option for native inner link handling. diff --git a/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch index a5d956584c2..4b054bf1b9c 100644 --- a/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch +++ b/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch @@ -1,4 +1,4 @@ -From f34f9e3670478382340627523521713b517fdcd4 Mon Sep 17 00:00:00 2001 +From 1e065198eeabc0945c2e035d65ee4c614195d3b1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 8 Nov 2021 14:20:07 +0100 Subject: [PATCH 28/N] docs: skip building texinfo and PDF files diff --git a/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch b/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch index 310c45b44ba..7788d0c844e 100644 --- a/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch +++ b/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch @@ -1,4 +1,4 @@ -From af4a7b89b5a3638afd406627ef75b31c07bb6171 Mon Sep 17 00:00:00 2001 +From c325e7f4058c3d501ba301ee66ecac9cfa7dcef0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 8 Nov 2021 16:22:57 +0100 Subject: [PATCH 29/N] install-libs: depend on the "toollibs" diff --git a/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch index 7ac66cfba8d..781b9e011d8 100644 --- a/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch +++ b/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch @@ -1,4 +1,4 @@ -From 2fc902a8e31cc1c2b04a60f72b617f44b50aef6a Mon Sep 17 00:00:00 2001 +From 4b304dcdce500ad68b0c1bb0b788beb80d753b13 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 23 Nov 2015 20:03:11 +0100 Subject: [PATCH 30/N] POSIX-ify the SHELL variable diff --git a/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch index 291b73130b1..a382691914e 100644 --- a/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch +++ b/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch @@ -1,4 +1,4 @@ -From ee9feddd89dcfc5555124b97fa897ed21ce736e4 Mon Sep 17 00:00:00 2001 +From 129ee40f2f119cb11a7df0a2f96df3442c163657 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 21 Mar 2017 13:18:38 +0100 Subject: [PATCH 31/N] Handle ORIGINAL_PATH just like PATH diff --git a/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch index a0a29d863b3..9e452a6db66 100644 --- a/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch +++ b/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch @@ -1,4 +1,4 @@ -From 8f46d66228ccd9d5a35a76ae0ac59e8aa2bf759f Mon Sep 17 00:00:00 2001 +From 5f01a6f359f1ad9af7bec6fa393b2e2bbe3f7617 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 3 Jul 2022 22:39:32 +0200 Subject: [PATCH 32/N] uname: allow setting the system name to CYGWIN diff --git a/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch b/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch index 7b7b79431a3..7e9e83d642b 100644 --- a/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch +++ b/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch @@ -1,4 +1,4 @@ -From 4fcc938c082c937ac4ebf2b595c107a43712c29c Mon Sep 17 00:00:00 2001 +From 2897bc0c8bfe0e34224fb52cf89054798922f21a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 18 Feb 2015 12:32:17 +0000 Subject: [PATCH 33/N] Pass environment variables with empty values diff --git a/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch index 9b79b4ba269..c3ddcfaecc7 100644 --- a/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch +++ b/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch @@ -1,4 +1,4 @@ -From dc73cb92eafe5bf838cc7da8a2bc4bf6c2810bff Mon Sep 17 00:00:00 2001 +From 23846ef082f5a79ef8ccb1435c5c4a3cc9c789db Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 6 Sep 2022 10:40:58 +0200 Subject: [PATCH 34/N] Optionally disallow empty environment values again diff --git a/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch index 46cee5d85d5..a9b28f5aa07 100644 --- a/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch +++ b/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch @@ -1,4 +1,4 @@ -From 08a146bca3d1ec67172fdde840ea24d66295ddf4 Mon Sep 17 00:00:00 2001 +From 24df6e4c3fd34089559f9c4ffcc9ecfed1f3f97b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 6 Sep 2022 12:18:18 +0200 Subject: [PATCH 35/N] build_env(): respect the `MSYS` environment variable diff --git a/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch b/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch index 342f62a278a..13d3cdff5ea 100644 --- a/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch +++ b/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch @@ -1,4 +1,4 @@ -From 97086fdeca6681fc86f29dce02af10221d9c54ea Mon Sep 17 00:00:00 2001 +From 6bb8c6264034e5f4a66c368d31a4f42981859a7d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 17 Dec 2022 20:14:49 +0100 Subject: [PATCH 36/N] Revert "Cygwin: Enable dynamicbase on the Cygwin DLL by diff --git a/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch index 9a086f8c177..e1b17ac145f 100644 --- a/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch +++ b/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch @@ -1,4 +1,4 @@ -From baade52168a8c181eaa1f4e00b581ba574344f8c Mon Sep 17 00:00:00 2001 +From 5670c939d42401650e8eb97ac7739afe21c3b165 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 30 Jan 2023 23:22:22 +0100 Subject: [PATCH 37/N] Avoid sharing cygheaps across Cygwin versions diff --git a/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch b/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch index 8e0a2aa3c85..c4a626714d7 100644 --- a/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch +++ b/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch @@ -1,4 +1,4 @@ -From 642a5ae7f4c8f3e3e54f23a2c0716af2f5ba5222 Mon Sep 17 00:00:00 2001 +From 7b0c7aef996d148a4e5daa67c8033ceb85b7b039 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 21 Feb 2023 16:36:36 +0100 Subject: [PATCH 38/N] uname: report msys2-runtime commit hash, too diff --git a/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch b/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch index f677bbbe8d4..2a573e1d8fb 100644 --- a/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch +++ b/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch @@ -1,4 +1,4 @@ -From 24ff97bf040632306e7b99d86b55dd2e2374d7f0 Mon Sep 17 00:00:00 2001 +From e3e73edccb7c4060f65716b8b9a5d50362993636 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 22 May 2023 13:36:27 +0200 Subject: [PATCH 39/N] Cygwin: Adjust CWD magic to accommodate for the latest diff --git a/msys2-runtime/0040-Handle-8-bit-characters-under-LOCALE-C.patch b/msys2-runtime/0040-Handle-8-bit-characters-under-LOCALE-C.patch index 1a50345fe37..bc1b7f47847 100644 --- a/msys2-runtime/0040-Handle-8-bit-characters-under-LOCALE-C.patch +++ b/msys2-runtime/0040-Handle-8-bit-characters-under-LOCALE-C.patch @@ -1,4 +1,4 @@ -From e2d94d7426193d161eea5896eabcd7ed46a9414c Mon Sep 17 00:00:00 2001 +From 7cd580aa405413447cc48e95a68234afa827761d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Feb 2015 13:56:22 +0000 Subject: [PATCH 40/N] Handle 8-bit characters under LOCALE=C diff --git a/msys2-runtime/0041-Mention-the-extremely-useful-small_printf-function.patch b/msys2-runtime/0041-Mention-the-extremely-useful-small_printf-function.patch index 24c5fb752cd..f9ef9262421 100644 --- a/msys2-runtime/0041-Mention-the-extremely-useful-small_printf-function.patch +++ b/msys2-runtime/0041-Mention-the-extremely-useful-small_printf-function.patch @@ -1,4 +1,4 @@ -From 17915305fb76dd9484b1a9e75b05bb4a8e08a31f Mon Sep 17 00:00:00 2001 +From b2914cf710eed19df7fa81afb8c3e4cf80812ea9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 20 Feb 2015 11:54:47 +0000 Subject: [PATCH 41/N] Mention the extremely useful small_printf() function diff --git a/msys2-runtime/0042-Fixed-path-converting-with-non-ascii-char.patch b/msys2-runtime/0042-Fixed-path-converting-with-non-ascii-char.patch index bf386b08f80..734a5d046ef 100644 --- a/msys2-runtime/0042-Fixed-path-converting-with-non-ascii-char.patch +++ b/msys2-runtime/0042-Fixed-path-converting-with-non-ascii-char.patch @@ -1,4 +1,4 @@ -From 8e809e94dcf9c91abe0279fe3ddf5ba63c87ccd0 Mon Sep 17 00:00:00 2001 +From 0944d19d500850be868921207c42ee579994f1e7 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 42/N] Fixed path converting with non ascii char. diff --git a/msys2-runtime/0043-Allow-native-symlinks-to-non-existing-targets-in-nat.patch b/msys2-runtime/0043-Allow-native-symlinks-to-non-existing-targets-in-nat.patch index fed3e0a4183..92e56a3199e 100644 --- a/msys2-runtime/0043-Allow-native-symlinks-to-non-existing-targets-in-nat.patch +++ b/msys2-runtime/0043-Allow-native-symlinks-to-non-existing-targets-in-nat.patch @@ -1,4 +1,4 @@ -From 755bea826d332ff7e193a149f11cee5f342fd700 Mon Sep 17 00:00:00 2001 +From e5b7338d5a9207967f0eef53ba2691b65a15cb2c Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Wed, 20 May 2015 16:32:52 +0200 Subject: [PATCH 43/N] Allow native symlinks to non-existing targets in diff --git a/msys2-runtime/0044-Make-paths-WCS-MBS-conversion-explicit.patch b/msys2-runtime/0044-Make-paths-WCS-MBS-conversion-explicit.patch index e8c51b86ba7..49975b480a3 100644 --- a/msys2-runtime/0044-Make-paths-WCS-MBS-conversion-explicit.patch +++ b/msys2-runtime/0044-Make-paths-WCS-MBS-conversion-explicit.patch @@ -1,4 +1,4 @@ -From 0f660c9e25acc19e301013a2112d0119ff763208 Mon Sep 17 00:00:00 2001 +From 6f2afa8cfca5ff7bf893f2df0f753b9d9fe01740 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 18 Dec 2015 20:19:57 +0100 Subject: [PATCH 44/N] Make paths' WCS->MBS conversion explicit @@ -562,7 +562,7 @@ index 6f04658..79eb6f6 100644 } else diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc -index 7c2581d..f72fbe9 100644 +index 4323cb1..9f2685a 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -385,12 +385,12 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw) diff --git a/msys2-runtime/0045-Use-MB_CUR_MAX-6-by-default.patch b/msys2-runtime/0045-Use-MB_CUR_MAX-6-by-default.patch index 7728ad8733a..662d5e7d85e 100644 --- a/msys2-runtime/0045-Use-MB_CUR_MAX-6-by-default.patch +++ b/msys2-runtime/0045-Use-MB_CUR_MAX-6-by-default.patch @@ -1,4 +1,4 @@ -From 634644074851d1e09704aee11a7df8897616e691 Mon Sep 17 00:00:00 2001 +From 7e7c72beec88ec73a59bc89c6c22fb5b7ae198a7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 21 Nov 2019 14:21:01 +0100 Subject: [PATCH 45/N] Use MB_CUR_MAX == 6 by default diff --git a/msys2-runtime/0046-Change-the-default-base-address-for-x86_64.patch b/msys2-runtime/0046-Change-the-default-base-address-for-x86_64.patch index 0238eaf2a74..e254ce7bbc6 100644 --- a/msys2-runtime/0046-Change-the-default-base-address-for-x86_64.patch +++ b/msys2-runtime/0046-Change-the-default-base-address-for-x86_64.patch @@ -1,4 +1,4 @@ -From 2ebd67b5cdac2425643047bde17db10dd99ca2eb Mon Sep 17 00:00:00 2001 +From 423c4c3d271a832d646a0389b9be55b90093f22b 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 46/N] Change the default base address for x86_64 diff --git a/msys2-runtime/0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch b/msys2-runtime/0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch index 4759558ea1f..af0d9aedbfc 100644 --- a/msys2-runtime/0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch +++ b/msys2-runtime/0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch @@ -1,4 +1,4 @@ -From e0605d98a02d1639201a5499d075b79ba9e4fae1 Mon Sep 17 00:00:00 2001 +From 09097de2121f1057a2012043648eaade9b38e8bb Mon Sep 17 00:00:00 2001 From: Richard Glidden Date: Thu, 24 Aug 2023 13:36:10 -0400 Subject: [PATCH 47/N] msys2-runtime: restore fast path for current user @@ -55,7 +55,7 @@ index fed87ec..821ccf7 100644 inline bool nss_cygserver_caching () const { return caching; } inline void nss_disable_cygserver_caching () { caching = false; } diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc -index 7c2581d..820ee06 100644 +index 4323cb1..15a9307 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -637,6 +637,11 @@ cygheap_pwdgrp::nss_init_line (const char *line) @@ -78,7 +78,7 @@ index 7c2581d..820ee06 100644 char *shell = NULL; char *home = NULL; char *gecos = NULL; -@@ -2470,9 +2476,19 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) +@@ -2466,9 +2472,19 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) uid = posix_offset + sid_sub_auth_rid (sid); if (!is_group () && acc_type == SidTypeUser) { @@ -101,7 +101,7 @@ index 7c2581d..820ee06 100644 } if (is_domain_account) -@@ -2480,9 +2496,11 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) +@@ -2476,9 +2492,11 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) /* Skip this when creating group entries and for non-users. */ if (is_group() || acc_type != SidTypeUser) break; diff --git a/msys2-runtime/0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch b/msys2-runtime/0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch deleted file mode 100644 index dc43e067b53..00000000000 --- a/msys2-runtime/0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1a222c8a01c2981a9343611c0d3a6afdff55d87b Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Tue, 3 Jun 2025 08:53:57 +0200 -Subject: [PATCH 48/N] Cygwin: do retrieve AzureAD users' information again - -In 48e7d63268 (Cygwin: fetch_account_from_windows: skip LookupAccountSid -for SIDs known to fail, 2025-04-10), several SIDs acquired a shortcut -where a potentially expensive `LookupAccountSid()` call is avoided for -SIDs that "cannot be resolved". - -However, as reported by Robert Fensterman (and independently discovered -by myself), some of the SIDs that received this special shortcut _do_ -get resolved by `LookupAccountSid()` calls: AzureAD users' SIDs. - -With those SIDs, that newly-introduced shortcut actually does more harm -than good because there is no other way to retrieve the desired -information, resulting in permission problems. - -One symptom of this is that `mintty` can no longer access `/dev/ptmx` -and simply errors out with "Error: Could not fork child process: There -are no available terminals (-1)". - -Another symptom is that `tmux` is no longer able to create new sessions. -Yet another symptom is new files are unintentionally written with -restricted permissions (copying an `.exe` file, for example, disallows -the copied version to be executed). - -The most likely reason why AzureAD SIDs were included in above-mentioned -commit is that special AzureAD _group_ SIDs are not recognized by -`LookupAccountSid()`, as per the code comment for the `azure_grp_sid` -variable. It is plausible that this fact was mistaken to extend to all -AzureAD SIDs, a notion disproved by the counter example of my personal -experience with my own AzureAD user account. Unfortunately, the only way -to find out whether `LookupAccountSid()` works with a given AzureAD SID -or not is to call that function. - -To make regular AzureAD user accounts work again, let's just drop the -AzureAD part from that special shortcut. - -My understanding of the other SIDs handled by that shortcut (Capability -SIDs, IIS APPPOOL and Samba user/group SIDs) is insufficient to -determine whether they, too, can be resolved by `LookupAccountSid()` in -some cases (and would therefore equally need to be excluded from that -shortcut). At least as far as the Capability SIDs go, I am rather -confident from reading the context (the commit's message, as well as the -report that led to that commit) that the shortcut is safe, and I could -imagine that the same is true for IIS APPPOOL and Samba SIDs. Absent any -further insight, I therefore decided to leave the rest of 48e7d63268 -(Cygwin: fetch_account_from_windows: skip LookupAccountSid for SIDs -known to fail, 2025-04-10) intact. - -Reported-by: Robert Fensterman -Fixes: 48e7d63268 (Cygwin: fetch_account_from_windows: skip LookupAccountSid for SIDs known to fail, 2025-04-10) -Signed-off-by: Johannes Schindelin ---- - winsup/cygwin/uinfo.cc | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc -index 7c2581d..4323cb1 100644 ---- a/winsup/cygwin/uinfo.cc -+++ b/winsup/cygwin/uinfo.cc -@@ -1996,10 +1996,6 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) - if (sid_id_auth (sid) == 5 /* SECURITY_NT_AUTHORITY */ - && sid_sub_auth (sid, 0) == SECURITY_APPPOOL_ID_BASE_RID) - break; -- /* AzureAD SIDs */ -- if (sid_id_auth (sid) == 12 /* AzureAD ID */ -- && sid_sub_auth (sid, 0) == 1 /* Azure ID base RID */) -- break; - /* Samba user/group SIDs */ - if (sid_id_auth (sid) == 22) - break; diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD index 2d42fcffd53..180006e0010 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=msys2-runtime pkgname=('msys2-runtime' 'msys2-runtime-devel') -pkgver=3.6.2 -pkgrel=2 +pkgver=3.6.3 +pkgrel=1 pkgdesc="Cygwin POSIX emulation engine" arch=('x86_64') url="https://www.cygwin.com/" @@ -73,58 +73,56 @@ source=('msys2-runtime'::git+https://github.com/cygwin/cygwin#tag=cygwin-${pkgve 0044-Make-paths-WCS-MBS-conversion-explicit.patch 0045-Use-MB_CUR_MAX-6-by-default.patch 0046-Change-the-default-base-address-for-x86_64.patch - 0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch - 0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch) -sha256sums=('9fb4bbcbd498a207e07a0d05161f86efbc60466f10b96c33d0b76194bd40a806' - 'e94bccf1cafe0717d0a19df35f69bdfe122bcdfcffac47a107c18fb50b4a5911' - 'e4082aff332507d6d5fefa5b7da2fcbbaa8b593ca158dbb1fe026a26b0e09d91' - '1cd177791994917d0c4df391fdc96993c3275eddd2b5f475532c0f478b2be8eb' - '81d0f97d558b413c1b6fc592c7c0c7cac0b8f1c650e6fb13c01f4ee25b049fce' - '0f5ba9d723da51eca3b33926b5974a274130e5cb8a013b8b0e847fc5263671e7' - '41b69ef12d0609eee3c59ec60cf0c7abb84ab2d344dd4703ea2eeda9f9192a22' - '04b910e51e21bbac9f5995718c2b332ff6ef6ceb651a3665648c5e3e3fa5f2eb' - '748d384c9c7dacb8461d5522fa516be2cbd4277ce825bdbf91abc863dfc9a028' - '3dfacf35ed80c356de3aabd8a4264d1303a3e5f7a053ae662c40b5b345987a3a' - 'ce0fb0d9004afe458bb0aa0e3cca429b87bf4764fbd012bec2151895aecc1b83' - '10371ab7734fa99c4f9fa5ff0c62ed6051a5d90707ad04e06c13d5a008b47ade' - '1d6b14cae5ef4b785f9770fbec1d9ced4e154f2c1dde859af568374ea134413f' - 'ae39e2a3ad98b86dc163a5cc7de87220f5735d7277f05043eacbaafbfea0a421' - 'b025654f67d1678fc150900114c5406e8553aa0ff553a81e9741bb7dd3d7386a' - '129c8b838beb02da77d5ef79b3b851b0b66ec83f349d1472e81ce89b6512f594' - 'd94748ebc7d9f9b6845c620f15f0fd2076419036771e18d80b1473a7353c79ed' - '3d9d4fb6d25c4ff9270c6a04e97d4ca8156475912ca7801d036d7ca0e4a6c47b' - '62f18613e62a1c7dc6f3cfd5f05150af8cdc57ccb38c77e344617b6283bb1cad' - '5608744ac944ce213b044d9d85aa1500ec73132581b6ff3017be7c90b00ea1b1' - 'de0f847705ab0f31b937ed2e2ad2981d5b2dc8435f9fc07a742f056cea545eb2' - '5a90d74e5d3638c65c6b181ddcb3eb88eaa711f4c33b72d5e9c5adc3e0adcb39' - '15d0eae37f4ff6520a134c6f675f1513202a5e450290ce9a58816406ea774071' - '73d5ffc5227c096d9f5adb212cf2402b437004dd1dabaf4a56313e8cdd6b80fe' - '1515cf6fda14a6dfa7601fd954921a4e735ed99f77c6d07a0cc872700bdff762' - '91fd3f46ac105f861e00cad7218b1ff732d5dafc0dd9ae7307be86b45a0d8e48' - '392edc87336d41a7684273485c7738ab54bb02cf72dab1dbec70e35ef3ede179' - '051460bd08399d77ad34ccb577f170cf93ff4b5d55594c5fc6247e3f6bf8b2be' - '1f4936c3d3ff31d69cba9c7e85a7d9b31577de30d4be7f36f6a27872dae2ff03' - '4e69697249b749851a60a8b914fb5ca0b2e25d912ce6c45e73b4f235eed0e247' - '67a849079e676c49142b41a4f0d388006a0f9db0f904e231b050a6c8bdd9c087' - 'a501e97b6ffbf0925bd3cf161f5cdeea7f43b8cad4ab26eed6f0a81fc2eff377' - 'c97766499ac0a73416168af1d7c5daa2bc950fa5d0c0af0e331da95bdce6e2a9' - '2c5b0b7f6496192459e62e67d81d61ad44c3ec5752c5beabdb5253a34f0b1c23' - 'e89c149d2b5288e3ba7c52d9b2fdf6b37a8439a3938b4bc0138c9b99eb2b648a' - 'a9cf7a3f3eb9c68a5a54fee4f5cb5c4b51bfd4b55f3fe8b71aa4de8dfe85f3d7' - 'd29368428e74fb320052473d868bfcae9450a6efd371d160584676735ca4bd1a' - '3062f2d69088411c08c8f17fd82fe475dcdfb13acbe0d29ec6d2bfb15062a472' - 'cac365f158c05feccfcf52557adb6e5de62a269a0b673b16eb2046e7c574be8e' - 'fc982bdf206d2412dc999ea6042653841c3aa1bd062d8cef6e5ac3dae4ae5837' - '29d8d963f58295de6ceedb8be5f7c9f21c4fd14912e3ca06672ff26c51acdb66' - 'ac996ae0da27bb4047bbf8f8709dffd63e2cc2967b0d1b0c4031cc1d988f68c9' - '842c899e50b43ff4a8ea97326b3f44d67e6a3f02178db8c3a4321cad12832d65' - '25a04604b516fa57834ee9d954c611bc3d609f629ebfd76ab76f3d35804a239b' - '3ddaf6f140d5371180fc483836e6b9a2a7b1be6807252b998d7cca4136ac9388' - '18ee1eaa6ee1877536672fb02fc1a102b9cbbb65f5238b532c18ad4ea9b8910b' - '8507ce68f7c29cacf89994e08eb89e66d2907a65ce7793cd8019e01a2705e425' - 'bbdd536345d096ee80191d936c1638baa9bb2d76f6118d0cf34e63cee8eb5dde' - 'da5ae57f1603ae3e08f27cc68da690f68dbb44f2f84f9bbc7e4a6d2456832348' - '53d30f6e2a3fabfaf6dd928c5e1d4c37311410fce33146969365f9c36b0e1bad') + 0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch) +sha256sums=('53d2be8a2dcf58e7eae7823ef01a5b8ce0eba704b132d19167396eb162db378c' + '4a13f9eb11bbbdcb436ebb37e11697de3e1a2db86e6adc63969e3d5a130056b8' + '5538db757661949423563bab5e4f383dfa4ef0cf3301cf43f23b482392554b3b' + '2fb9b2b297797d20cd901eaee2de735e8cdda1c1e5836e9ff77856c0d1216860' + '780977d71e35bbe4c0dcda5272895267d68d635f311e224f7981858f7192a85e' + '49f3951de5af196c7d5193a879db7f464bb326e0da1411fe01b977c2d8042520' + '6554926f4366d8dbb0621aad27832931304183373655e0bdc2bc7c4a58419309' + '3bbb41f21e4f1d701d141e70e835077080a9ff4c171a969fe56b2c8205a94c77' + '96065bc7748b593ef1858fb3961f637e9100e608b4b937cc0c5acf51d2b21ccb' + 'f6c2af8d75a2a85bd37c319d37093eae5a7c47edb27d2e88237dca8d768d10db' + '45e91cf6baa54116c2ed54afb11f383e7d6c711d1c4845e3e0a93a91237a414f' + '72edb3383e983c29e9fbaa0880e652d71a20d9c33bcd4cd9d3afe0df7290051a' + '6a4164255ce02d2a73f3aac102ca28f37f58a3db68010823ccb5957df8bea33d' + 'eacc003fe3b57ebde0cbed2cfdd1816bf06164c921530718bb4adcc9ca0e3cef' + 'ee817a6799b9510809495373a3c5c19a948f777c1367c7da3965df8406e2eb3e' + 'be7613fb03f1c8b72ada024685997b20a6f5cfc55ce3059269d53f9dddd6686e' + '5709c1e951258933c259009b7117c382a67f02320145a0ac9442383431a72c5f' + '33ebf5db93b7354fc83c2627e25db1115821bbf7043816114991a723e2abbd3f' + '05e495dfd77cd653d28a14662cf72322d70233a75ea555927dc8ba7e358452e6' + 'ab1e7b54c6d5d9402fdbe1918169b4dff1d33f3f63c447bee3322a78ed5090a0' + 'e99eaeb1064518b0c56348b303560908d615c7578edcb0bbf2177c2290705cd6' + '96c56e12443fdc144554d61a2d2ddd707755758ced3f310a41f2c36fbcb020b1' + 'a31ad464e3afc7b63de83d64e382827cb13b969281fec9bb22f7e5aa78a64edd' + '9687bfe009dfafe46bfe63359959223577013e45226a84a12866e2dee6ce6c68' + 'fadb9ea6b830442dd55e9698b8ec146c3a53dc3d95185e572986c01af6db58ef' + 'fa2539671659839910ca345059f914f1d5de280bae1503205f890dd087dcd746' + 'd1e26fd0ded13d55a86cf2af674056215862451b32d5f19ecb46689ff51f0e4e' + 'c6fb087cee6385ac7f9c85c3ed997c051d7bf0229e04eb39cdfdb1112d19a4cf' + '5ceef009d6c59812d424987c290913867faba5e148e246ab14727449170f795f' + '13c7cc961a1eb67876f3fccfa6869670235a87a35b756e2ee88244becca3465a' + '4fa17ec74cd5f4e8b629c4a507f04e7f4bb86938bad0f68f78fa6178b4fd1ea5' + 'dd6dd7fdd4e0f7621d92ba18f67312c7e8b883b64e7dfb22951c3d9958e148c1' + 'fa8d5a48a2ffb3f25e94b88531adfbb342e4e8fe7b109c0d77ad07bd744f4a6b' + '9eff7ab161302780089d3f59f8b919591f713cf1b536ba1f495707f2f736a6c9' + '20b18c68911a6e9fa58f2a17b8501120fe975fb7ff7e1b84ce480d50e1cad9e9' + 'b964df5f121d4c74076cb1d214528809308b6051eefc2e456dc050d4a3a2851c' + '6829615a5d5ebaa88a3d665a9f7e28998fb3a0c1cdce80585a3657e400d70c53' + '081d6bcc119a7483d2e927504762170e6977543ad7d46e285624513aa95e54b5' + 'e2f58cba187f16b21df69dc3b7372f41bf2edfc543d136c62f85c83e0f22f3ad' + 'd8baf6e0e9c44a60d133f506fc91fa79043543266c6142918fad2c234cf4d0b5' + 'c5a5dd5645ce86f83824a2fe50ab3cc9df1211d2983bc18bbd11c608249e31b1' + '61973817f68a866e9cc5d8c651a4f76266883e30f5d4a59fdc7fe003073ebda2' + '48e56e25fc00b1a875339a8122df59d2f80709f3a234f126a480b8bc9865d21f' + '8918b61c802c401b2b45d86d698c279a5338d1d72828b88a8a27a503aedb5899' + '5d9aebff4a32e692ae49127c706335c435bfbfcb2b76a26fbd0bed3e391baf02' + 'a41a3bb4ccbe18063bcbf5b0dcd10c251937eb1ca24110f9abaa05bc9804f465' + '2eab02a9cc158d9f5fb33d66ae5e8f8fcfb67494d0387ae63f627f947a3ea957' + '8fbb38dc064d11599b2314311abfa632ec5a8da4786c716299e276abd29d7326' + '6db2e2a7e45125974de355fd685d3a652c1f17e5bd2a94606cbba33520d96624') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -225,8 +223,7 @@ prepare() { 0044-Make-paths-WCS-MBS-conversion-explicit.patch \ 0045-Use-MB_CUR_MAX-6-by-default.patch \ 0046-Change-the-default-base-address-for-x86_64.patch \ - 0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch \ - 0048-Cygwin-do-retrieve-AzureAD-users-information-again.patch + 0047-msys2-runtime-restore-fast-path-for-current-user-pri.patch } build() { diff --git a/msys2-runtime/msys2-runtime.commit b/msys2-runtime/msys2-runtime.commit index 7800bf3e6b0..626473bc7ce 100644 --- a/msys2-runtime/msys2-runtime.commit +++ b/msys2-runtime/msys2-runtime.commit @@ -1 +1 @@ -ceeecb01e13d0965a8993f04cf756096ba91dc35 +086201ea001090dfb0d42669e59c122da205ee6b