Skip to content

Commit e4d37ce

Browse files
authored
Merge pull request #234 from git-for-windows/msys2-runtime-0b9a01b6b59f03187dcf1b184addc93e8555415c
msys2-runtime: update to 3.6.2-1
2 parents dc3dd0e + 9e6d575 commit e4d37ce

File tree

53 files changed

+152
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+152
-419
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From be88bf581b370c45c96bf14f8286e02c61a4cf45 Mon Sep 17 00:00:00 2001
1+
From 13de2a173212340b0f85edc722c72d426bcd63e5 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 20:40:45 +0300

msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b00015672a4c3b7054c8d497bd5dfd5c20af97b6 Mon Sep 17 00:00:00 2001
1+
From ba274e444eaa417da44ace62199834885c6507df Mon Sep 17 00:00:00 2001
22
From: Kaleb Barrett <[email protected]>
33
Date: Sun, 14 Mar 2021 18:58:55 -0500
44
Subject: [PATCH 02/N] Fix msys library name in import libraries

msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c6ac7c6b6e57836b47e1e563660567d0f702de41 Mon Sep 17 00:00:00 2001
1+
From e971c0bcf575b7775d1d0121ef2e6440a9ed669c Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:09:17 +0300
@@ -223,7 +223,7 @@ index f4c09be..e19b7d3 100644
223223
static int _fmode;
224224

225225
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
226-
index 10bd0ac..f9c9fe2 100644
226+
index 9b6bb55..2d0bae5 100644
227227
--- a/winsup/cygwin/dlfcn.cc
228228
+++ b/winsup/cygwin/dlfcn.cc
229229
@@ -147,8 +147,13 @@ collect_basenames (pathfinder::basenamelist & basenames,
@@ -241,7 +241,7 @@ index 10bd0ac..f9c9fe2 100644
241241
/* ... using original basename with new suffix. */
242242
basenames.appendv (basename, baselen, ext, extlen, NULL);
243243
diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
244-
index b8f38b5..a62f65a 100644
244+
index 1369165..5488737 100644
245245
--- a/winsup/cygwin/dll_init.cc
246246
+++ b/winsup/cygwin/dll_init.cc
247247
@@ -903,7 +903,11 @@ dll_dllcrt0_1 (VOID *x)
@@ -277,10 +277,10 @@ index 7303f7e..6ccc19a 100644
277277
w32len = cygheap->installation_key.Length / sizeof (WCHAR);
278278
if (w32len
279279
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
280-
index 49fc166..a2a589e 100644
280+
index 876b79e..466abdd 100644
281281
--- a/winsup/cygwin/exceptions.cc
282282
+++ b/winsup/cygwin/exceptions.cc
283-
@@ -526,14 +526,14 @@ int exec_prepared_command (PWCHAR command)
283+
@@ -528,14 +528,14 @@ int exec_prepared_command (PWCHAR command)
284284
PWCHAR rawenv = GetEnvironmentStringsW () ;
285285
for (PWCHAR p = rawenv; *p != L'\0'; p = wcschr (p, L'\0') + 1)
286286
{
@@ -436,7 +436,7 @@ index 1e4cf98..b77598b 100644
436436
} \
437437
} \
438438
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
439-
index f4f908f..37122d4 100644
439+
index 622aaa9..a16c875 100644
440440
--- a/winsup/cygwin/include/cygwin/version.h
441441
+++ b/winsup/cygwin/include/cygwin/version.h
442442
@@ -510,7 +510,11 @@ details. */
@@ -617,7 +617,7 @@ index f9906a5..2361ae5 100644
617617
ts.SourceIdentifier.LowPart = kerberos_auth ? 0x0105 : 0x0106;
618618

619619
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
620-
index c93bf4c..ba02ff4 100644
620+
index d6a2c2d..affaa0d 100644
621621
--- a/winsup/cygwin/syscalls.cc
622622
+++ b/winsup/cygwin/syscalls.cc
623623
@@ -339,7 +339,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4bb3f5dcfa50bcf955df54d1975cfd3388306946 Mon Sep 17 00:00:00 2001
1+
From b4519b016bf9dd78d0621163a9872c3d6808d331 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:17:46 +0300
@@ -999,7 +999,7 @@ index 0000000..67d85ec
999999
+#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */
10001000
+
10011001
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
1002-
index d2aaed3..0e7ebdf 100644
1002+
index 42919a7..cb01afc 100644
10031003
--- a/winsup/cygwin/path.cc
10041004
+++ b/winsup/cygwin/path.cc
10051005
@@ -66,6 +66,7 @@

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2a7153d171a579324b2fc0c83e491952ed7764b2 Mon Sep 17 00:00:00 2001
1+
From 7d9c64cfd77ba10c1cf5146a9ca5d021301a51ec Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:29:01 +0300
@@ -13,7 +13,7 @@ Subject: [PATCH 05/N] Add functionality for changing OS name via MSYSTEM
1313
4 files changed, 49 insertions(+), 8 deletions(-)
1414

1515
diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
16-
index 373bfd2..c902857 100755
16+
index abda186..1f0603f 100755
1717
--- a/winsup/cygserver/cygserver-config
1818
+++ b/winsup/cygserver/cygserver-config
1919
@@ -86,7 +86,7 @@ done
@@ -24,7 +24,7 @@ index 373bfd2..c902857 100755
2424
+_nt=`expr "${_sys}" : "MSYS_NT"`
2525

2626
# Check for running cygserver processes first.
27-
if ps -ef | grep -v grep | grep -q ${service_name}
27+
if ps -e | grep -v grep | grep -q ${service_name}
2828
@@ -178,7 +178,7 @@ then
2929
echo "Do you want to install cygserver as service?"
3030
if request "(Say \"no\" if it's already installed as service)"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 25add3b86d2346d019e810a732bd05675c12cf19 Mon Sep 17 00:00:00 2001
1+
From 83a114a82db7ac3ba5dc46c3424b383e0a4d5b65 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:45:06 +0300
@@ -384,10 +384,10 @@ index 1cfee5c..affb7e9 100644
384384
root_idx = i;
385385

386386
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
387-
index 27dc289..12097de 100644
387+
index 83883f9..7c2581d 100644
388388
--- a/winsup/cygwin/uinfo.cc
389389
+++ b/winsup/cygwin/uinfo.cc
390-
@@ -2794,7 +2794,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
390+
@@ -2815,7 +2815,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
391391
dom, name,
392392
sid.string ((char *) sidstr),
393393
home ?: "/home/", home ? L"" : name,

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b127b7469e05d0d974ae0f89626522e01a138443 Mon Sep 17 00:00:00 2001
1+
From 08cde45b834f536f05d9218c4bb0fe2e6b3549b2 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:47:21 +0300
@@ -22,8 +22,8 @@ Co-authored-by: Jeremy Drake <[email protected]>
2222
---
2323
winsup/cygwin/environ.cc | 4 +
2424
winsup/cygwin/globals.cc | 3 +-
25-
winsup/cygwin/path.cc | 250 +++++++++++++++++++++++++++++++++++++++
26-
3 files changed, 256 insertions(+), 1 deletion(-)
25+
winsup/cygwin/path.cc | 252 +++++++++++++++++++++++++++++++++++++++
26+
3 files changed, 258 insertions(+), 1 deletion(-)
2727

2828
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
2929
index b9f7e05..5fb3f53 100644
@@ -62,10 +62,10 @@ index d8e058f..b7e0e21 100644
6262
bool winjitdebug = false;
6363

6464
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
65-
index 0e7ebdf..d8e456a 100644
65+
index cb01afc..a3e4de2 100644
6666
--- a/winsup/cygwin/path.cc
6767
+++ b/winsup/cygwin/path.cc
68-
@@ -1722,6 +1722,171 @@ conv_path_list (const char *src, char *dst, size_t size,
68+
@@ -1722,6 +1722,173 @@ conv_path_list (const char *src, char *dst, size_t size,
6969

7070
/********************** Symbolic Link Support **************************/
7171

@@ -195,7 +195,9 @@ index 0e7ebdf..d8e456a 100644
195195
+ /* Recurse into the child directory */
196196
+ /* avoids endless recursion */
197197
+ if (src->Length <= origsrclen ||
198-
+ !wcsncmp (src->Buffer, dst->Buffer, origdstlen / sizeof (WCHAR)))
198+
+ (!wcsncmp (src->Buffer, dst->Buffer, origdstlen / sizeof (WCHAR)) &&
199+
+ (!src->Buffer[origdstlen / sizeof (WCHAR)] ||
200+
+ iswdirsep(src->Buffer[origdstlen / sizeof (WCHAR)]))))
199201
+ {
200202
+ set_errno (ELOOP);
201203
+ goto done;
@@ -237,7 +239,7 @@ index 0e7ebdf..d8e456a 100644
237239
/* Create a symlink from FROMPATH to TOPATH. */
238240

239241
extern "C" int
240-
@@ -2034,6 +2199,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
242+
@@ -2034,6 +2201,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
241243
return 0;
242244
}
243245

@@ -322,7 +324,7 @@ index 0e7ebdf..d8e456a 100644
322324
int
323325
symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
324326
{
325-
@@ -2101,6 +2344,13 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
327+
@@ -2101,6 +2346,13 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
326328
case WSYM_nfs:
327329
res = symlink_nfs (oldpath, win32_newpath);
328330
__leave;

msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 07e2ec8f36d080e1f7443b2658d0b17d871a9307 Mon Sep 17 00:00:00 2001
1+
From 7c6318a0f68886a4174686c39ec8b89cb05b5d35 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:48:54 +0300

msys2-runtime/0009-Do-not-convert-environment-for-strace.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ccb8cb97309edd55bb8753073a6030bf20a9b643 Mon Sep 17 00:00:00 2001
1+
From 1cc5abc667219cae2200f1ef5384c57ae1151a8e Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 21:50:55 +0300

msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 712d8de47182b4c4239051a288e0ffbb50a94cfe Mon Sep 17 00:00:00 2001
1+
From d3c18e8852b5da7734a2a78a829c7f6e383d3927 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Sun, 23 Aug 2015 20:47:30 +0100
44
Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob

msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7d8e6ff67affa66acecb23c58f9b2dc59ac04465 Mon Sep 17 00:00:00 2001
1+
From 9e7926693a30e8eed827f0cfaef0113d02fe4fc0 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Fri, 21 Aug 2015 09:52:47 +0100
44
Subject: [PATCH 11/N] Add debugging for strace make_command_line

msys2-runtime/0012-strace-quiet-be-really-quiet.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d1562b1f32ceed1a394b85db238e3644ffcb0af3 Mon Sep 17 00:00:00 2001
1+
From 9876a9ed9392203a26bb760570db71fa8fc6032b Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Wed, 17 May 2017 18:13:32 +0200
44
Subject: [PATCH 12/N] strace --quiet: be *really* quiet

msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5f8a7772a55bc6dc88a09fae49061c7e016a1072 Mon Sep 17 00:00:00 2001
1+
From 9123f19fff758906012e9c491107fc93d0dfa53f Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
33
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]>
44
Date: Sun, 14 Apr 2019 22:13:51 +0300
@@ -31,7 +31,7 @@ Signed-off-by: Johannes Schindelin <[email protected]>
3131
1 file changed, 7 insertions(+)
3232

3333
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
34-
index d8e456a..2a578da 100644
34+
index a3e4de2..c2579c2 100644
3535
--- a/winsup/cygwin/path.cc
3636
+++ b/winsup/cygwin/path.cc
3737
@@ -742,6 +742,12 @@ path_conv::check (const char *src, unsigned opt,

msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2da574cb6c2dbb433fb8b85ca1de832c44125b0e Mon Sep 17 00:00:00 2001
1+
From 11a478ce41484a6fb1bc50cbf540d5d6fe8105c9 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Tue, 8 Nov 2022 16:24:20 +0100
44
Subject: [PATCH 14/N] When converting to a Unix path, avoid double trailing

msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7597c2d8d1290a8cb0f581a00c3398ab501a76ac Mon Sep 17 00:00:00 2001
1+
From 12fc3431407356ace5c06e30647b8688e68b2c18 Mon Sep 17 00:00:00 2001
22
From: Christoph Reiter <[email protected]>
33
Date: Sun, 20 Nov 2022 13:57:36 +0100
44
Subject: [PATCH 15/N] msys2_path_conv: pass PC_NOFULL to path_conv

msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3a163addd17bd1bf104ad93b776ea91f994e940d Mon Sep 17 00:00:00 2001
1+
From c3750d97d280573167ba0cf29fb6c0d666369437 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= <[email protected]>
33
Date: Wed, 17 Jun 2015 09:30:41 +0200
44
Subject: [PATCH 16/N] path-conversion: Introduce ability to switch off

msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From fcadb14aa9d5572f926f84ab30d3924aab308265 Mon Sep 17 00:00:00 2001
1+
From f0f97a586d6316325e72d511af17692e9cee0dc3 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Fri, 21 Aug 2015 12:52:09 +0100
44
Subject: [PATCH 17/N] dcrt0.cc: Untangle allow_glob from winshell

msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bfce9f9c91cf51b921eebae8afa9d3d5f0ce969a Mon Sep 17 00:00:00 2001
1+
From f1b4d041cc3a440b36d57ba7cedf2d77fd8b344e Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Mon, 24 Aug 2015 00:48:06 +0100
44
Subject: [PATCH 18/N] dcrt0.cc (globify): Don't quote literal strings

msys2-runtime/0019-Add-debugging-for-build_argv.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 00b5a1728581028dba41cd8c28bd074ce6c02fa4 Mon Sep 17 00:00:00 2001
1+
From d6a3a54e98d9814a60cc2b836560edf0c25c1b9e Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Fri, 21 Aug 2015 12:18:52 +0100
44
Subject: [PATCH 19/N] Add debugging for build_argv

msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a92a746c8e7e97b90c87541a0230658814ea45c1 Mon Sep 17 00:00:00 2001
1+
From 9ca61ea1a3bc20acd5ff25579d38f4a927e6b5e6 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Sun, 10 Apr 2016 21:47:41 +0100
44
Subject: [PATCH 20/N] environ.cc: New facility/environment variable
@@ -129,10 +129,10 @@ index 31080d0..f3bfba0 100644
129129

130130
(See "How to: Set a Thread Name in Native Code"
131131
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
132-
index 2a578da..4a80496 100644
132+
index c2579c2..4b1b9f8 100644
133133
--- a/winsup/cygwin/path.cc
134134
+++ b/winsup/cygwin/path.cc
135-
@@ -4161,7 +4161,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
135+
@@ -4163,7 +4163,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
136136
return arg_result;
137137
}
138138

msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 20498b634f6adb1e2c969f328c0db97bceb6d577 Mon Sep 17 00:00:00 2001
1+
From 11374ded9416ba1d0c44584707b32dd9cefb4dcb Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Tue, 19 May 2020 13:49:37 +0200
44
Subject: [PATCH 21/N] Introduce the `enable_pcon` value for `MSYS`

msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7abae1df03645827a28007f146d6c7622cc31b2c Mon Sep 17 00:00:00 2001
1+
From 1199680444ab7030d58d17a2cfa6330fd9570a65 Mon Sep 17 00:00:00 2001
22
From: Christoph Reiter <[email protected]>
33
Date: Fri, 5 Jun 2020 20:09:11 +0200
44
Subject: [PATCH 22/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.
1717
1 file changed, 1 insertion(+), 1 deletion(-)
1818

1919
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
20-
index ba02ff4..2a51a36 100644
20+
index affaa0d..76b37d6 100644
2121
--- a/winsup/cygwin/syscalls.cc
2222
+++ b/winsup/cygwin/syscalls.cc
23-
@@ -4534,7 +4534,7 @@ popen (const char *command, const char *in_type)
23+
@@ -4535,7 +4535,7 @@ popen (const char *command, const char *in_type)
2424
fcntl (stdchild, F_SETFD, stdchild_state | FD_CLOEXEC);
2525

2626
/* Start a shell process to run the given command without forking. */

msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 438abeec95d9bd63d384d7097379a2d54326ad6e Mon Sep 17 00:00:00 2001
1+
From e98dd3da1b78dcbf5aff25c0bc21b1b9aca143d8 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Wed, 12 Aug 2020 12:22:38 +0200
44
Subject: [PATCH 23/N] Expose full command-lines to other Win32 processes by

msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From feff0f074eeb2c886fdfcf80b40c655e231af599 Mon Sep 17 00:00:00 2001
1+
From 6a56f892a76065ccc8bcd4adc01efe261059c15c Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Mon, 16 Apr 2018 14:59:39 +0200
44
Subject: [PATCH 24/N] Add a helper to obtain a function's address in

msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c28861b52ac561cedf2df05f903be2833a71b8a3 Mon Sep 17 00:00:00 2001
1+
From bde54bf61d663dd6961ac772ef45152d604d67ee Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Fri, 20 Mar 2015 09:56:28 +0000
44
Subject: [PATCH 25/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
@@ -93,7 +93,7 @@ Signed-off-by: Johannes Schindelin <[email protected]>
9393
create mode 100644 winsup/cygwin/include/cygwin/exit_process.h
9494

9595
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
96-
index a2a589e..f7c6188 100644
96+
index 466abdd..caf9dfb 100644
9797
--- a/winsup/cygwin/exceptions.cc
9898
+++ b/winsup/cygwin/exceptions.cc
9999
@@ -29,6 +29,7 @@ details. */
@@ -104,7 +104,7 @@ index a2a589e..f7c6188 100644
104104

105105
/* Define macros for CPU-agnostic register access. The _CX_foo
106106
macros are for access into CONTEXT, the _MC_foo ones for access into
107-
@@ -1590,10 +1591,25 @@ exit_sig:
107+
@@ -1594,10 +1595,25 @@ exit_sig:
108108
dosig:
109109
if (have_execed)
110110
{

msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e6b56515f3bb24497be033225e118497fb2e65a7 Mon Sep 17 00:00:00 2001
1+
From 2b34729eb9f020d8ca7fa02ecfcacdbec67fe879 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Fri, 20 Mar 2015 10:01:50 +0000
44
Subject: [PATCH 26/N] kill: kill Win32 processes more gently

msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8efa86c46c02b0b56c0e9f217cf2c3ff611af5e5 Mon Sep 17 00:00:00 2001
1+
From 707761410163f4b33b8637c7882cf2c63b07cfe5 Mon Sep 17 00:00:00 2001
22
From: Jeremy Drake <[email protected]>
33
Date: Thu, 22 Jul 2021 11:59:16 -0700
44
Subject: [PATCH 27/N] Cygwin: make option for native inner link handling.
@@ -37,10 +37,10 @@ index 79f9476..30a2da1 100644
3737
/* Taken from BSD libc:
3838
This variable is zero until a process has created a pthread. It is used
3939
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
40-
index 4a80496..b5408e9 100644
40+
index 4b1b9f8..a1435a0 100644
4141
--- a/winsup/cygwin/path.cc
4242
+++ b/winsup/cygwin/path.cc
43-
@@ -3832,8 +3832,9 @@ restart:
43+
@@ -3834,8 +3834,9 @@ restart:
4444
differ, return the final path as symlink content and set symlen
4545
to a negative value. This forces path_conv::check to restart
4646
symlink evaluation with the new path. */

msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4e9b4bc884003fd5d7500b016c8729c4aa7e7cdd Mon Sep 17 00:00:00 2001
1+
From f34f9e3670478382340627523521713b517fdcd4 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Mon, 8 Nov 2021 14:20:07 +0100
44
Subject: [PATCH 28/N] docs: skip building texinfo and PDF files

msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 6b4aeb4cb51b433dfa759b4cef533ce81d2db9b8 Mon Sep 17 00:00:00 2001
1+
From af4a7b89b5a3638afd406627ef75b31c07bb6171 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Mon, 8 Nov 2021 16:22:57 +0100
44
Subject: [PATCH 29/N] install-libs: depend on the "toollibs"

msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From be8dc8973b50c6212191d85e1c66a2a2b393694f Mon Sep 17 00:00:00 2001
1+
From 2fc902a8e31cc1c2b04a60f72b617f44b50aef6a Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Mon, 23 Nov 2015 20:03:11 +0100
44
Subject: [PATCH 30/N] POSIX-ify the SHELL variable

msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e3f9d90c4f7bfd587075cc1ad05b1e2ebfaaff2b Mon Sep 17 00:00:00 2001
1+
From ee9feddd89dcfc5555124b97fa897ed21ce736e4 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <[email protected]>
33
Date: Tue, 21 Mar 2017 13:18:38 +0100
44
Subject: [PATCH 31/N] Handle ORIGINAL_PATH just like PATH

msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 204680f5f394f892c87136e1e578be68321b0231 Mon Sep 17 00:00:00 2001
1+
From 8f46d66228ccd9d5a35a76ae0ac59e8aa2bf759f Mon Sep 17 00:00:00 2001
22
From: Christoph Reiter <[email protected]>
33
Date: Sun, 3 Jul 2022 22:39:32 +0200
44
Subject: [PATCH 32/N] uname: allow setting the system name to CYGWIN

0 commit comments

Comments
 (0)