Skip to content

Commit a3eadff

Browse files
dschodscho
authored
Merge pull request #248 from git-for-windows/msys2-runtime-b9f03e965a96c2c7e2e091fb4f10d2eafa8bd3cf
msys2-runtime: update to 3.6.4-1
2 parents 9d520c2 + 9258ea5 commit a3eadff

File tree

58 files changed

+317
-2036
lines changed

Some content is hidden

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

58 files changed

+317
-2036
lines changed

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

Lines changed: 0 additions & 849 deletions
This file was deleted.

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

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

66
Cygwin's speclib doesn't handle dashes or dots. However, we are about to
77
rename the output file name from `cygwin1.dll` to `msys-2.0.dll`.

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

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From d9b4e1decb9999a9e1577eafeea8ae337d44924b Mon Sep 17 00:00:00 2001
1+
From 50d9d80db4a6a941a03d99d82afb760c4ab4101f 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
5-
Subject: [PATCH 03/N] Rename dll from cygwin to msys
5+
Subject: [PATCH 02/N] Rename dll from cygwin to msys
66

77
---
88
winsup/cygserver/transport_pipes.h | 4 +++
@@ -16,7 +16,7 @@ Subject: [PATCH 03/N] Rename dll from cygwin to msys
1616
winsup/cygwin/dtable.cc | 6 +++++
1717
winsup/cygwin/exceptions.cc | 4 +--
1818
winsup/cygwin/fhandler/pipe.cc | 4 +++
19-
winsup/cygwin/fhandler/pty.cc | 20 ++++++++++++++
19+
winsup/cygwin/fhandler/pty.cc | 26 ++++++++++++++++++
2020
winsup/cygwin/hookapi.cc | 4 +++
2121
winsup/cygwin/include/cygwin/cygwin_dll.h | 10 +++----
2222
winsup/cygwin/include/cygwin/version.h | 8 ++++++
@@ -38,7 +38,7 @@ Subject: [PATCH 03/N] Rename dll from cygwin to msys
3838
winsup/utils/mingw/strace.cc | 9 +++----
3939
winsup/utils/path.cc | 12 ++++-----
4040
winsup/utils/ssp.c | 8 +++---
41-
33 files changed, 174 insertions(+), 72 deletions(-)
41+
33 files changed, 180 insertions(+), 72 deletions(-)
4242

4343
diff --git a/winsup/cygserver/transport_pipes.h b/winsup/cygserver/transport_pipes.h
4444
index e101623..66272bc 100644
@@ -57,7 +57,7 @@ index e101623..66272bc 100644
5757

5858
/* Named pipes based transport, for security on NT */
5959
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
60-
index d47a1a2..c1f9921 100644
60+
index 383f4f3..981877d 100644
6161
--- a/winsup/cygwin/Makefile.am
6262
+++ b/winsup/cygwin/Makefile.am
6363
@@ -37,12 +37,12 @@ newlib_build=$(target_builddir)/newlib
@@ -78,7 +78,7 @@ index d47a1a2..c1f9921 100644
7878

7979
#
8080
# sources
81-
@@ -587,16 +587,16 @@ LIBSERVER = $(cygserver_blddir)/libcygserver.a
81+
@@ -589,16 +589,16 @@ LIBSERVER = $(cygserver_blddir)/libcygserver.a
8282
$(LIBSERVER):
8383
$(MAKE) -C $(cygserver_blddir) libcygserver.a
8484

@@ -98,7 +98,7 @@ index d47a1a2..c1f9921 100644
9898
# Set PE and export table header timestamps to zero for reproducible builds.
9999
$(NEW_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
100100
$(newlib_build)/libm.a $(newlib_build)/libc.a
101-
@@ -605,18 +605,18 @@ $(NEW_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
101+
@@ -607,18 +607,18 @@ $(NEW_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
102102
-Wl,--gc-sections -nostdlib -Wl,-T$(LDSCRIPT) \
103103
-Wl,--dynamicbase -static \
104104
$${SOURCE_DATE_EPOCH:+-Wl,--no-insert-timestamp} \
@@ -120,7 +120,7 @@ index d47a1a2..c1f9921 100644
120120
toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@
121121

122122
$(DEF_FILE): scripts/gendef cygwin.din
123-
@@ -629,13 +629,14 @@ sigfe.s: $(DEF_FILE) tlsoffsets
123+
@@ -631,13 +631,14 @@ sigfe.s: $(DEF_FILE) tlsoffsets
124124

125125
LIBCOS=$(addsuffix .o,$(basename $(LIB_FILES)))
126126
$(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(NEW_DLL_NAME)
@@ -136,7 +136,7 @@ index d47a1a2..c1f9921 100644
136136
--exclude='(?i:dll)' \
137137
--exclude='reloc' \
138138
--exclude='^main$$' \
139-
@@ -685,7 +686,7 @@ all-local: $(LIB_NAME) $(SUBLIBS)
139+
@@ -687,7 +688,7 @@ all-local: $(LIB_NAME) $(SUBLIBS)
140140
clean-local:
141141
-rm -f $(BUILT_SOURCES)
142142
-rm -f $(DEF_FILE) sigfe.s
@@ -223,10 +223,10 @@ index f4c09be..e19b7d3 100644
223223
static int _fmode;
224224

225225
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
226-
index 9b6bb55..2d0bae5 100644
226+
index e06616d..40d99dd 100644
227227
--- a/winsup/cygwin/dlfcn.cc
228228
+++ b/winsup/cygwin/dlfcn.cc
229-
@@ -147,8 +147,13 @@ collect_basenames (pathfinder::basenamelist & basenames,
229+
@@ -148,8 +148,13 @@ collect_basenames (pathfinder::basenamelist & basenames,
230230
/* If the basename starts with "lib", ... */
231231
if (!strncmp (basename, "lib", 3))
232232
{
@@ -277,7 +277,7 @@ 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 876b79e..466abdd 100644
280+
index f79978f..e724e37 100644
281281
--- a/winsup/cygwin/exceptions.cc
282282
+++ b/winsup/cygwin/exceptions.cc
283283
@@ -528,14 +528,14 @@ int exec_prepared_command (PWCHAR command)
@@ -298,10 +298,10 @@ index 876b79e..466abdd 100644
298298
break;
299299
}
300300
diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
301-
index e35d523..506dd09 100644
301+
index 2ff5dfa..11ef78c 100644
302302
--- a/winsup/cygwin/fhandler/pipe.cc
303303
+++ b/winsup/cygwin/fhandler/pipe.cc
304-
@@ -790,7 +790,11 @@ fhandler_pipe::close (int flag)
304+
@@ -798,7 +798,11 @@ fhandler_pipe::close (int flag)
305305
return ret;
306306
}
307307

@@ -314,10 +314,10 @@ index e35d523..506dd09 100644
314314
/* Create a pipe, and return handles to the read and write ends,
315315
just like CreatePipe, but ensure that the write end permits
316316
diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
317-
index 3128b92..0969b2f 100644
317+
index 36fddbb..8154fcc 100644
318318
--- a/winsup/cygwin/fhandler/pty.cc
319319
+++ b/winsup/cygwin/fhandler/pty.cc
320-
@@ -875,7 +875,11 @@ fhandler_pty_slave::open (int flags, mode_t)
320+
@@ -882,7 +882,11 @@ fhandler_pty_slave::open (int flags, mode_t)
321321
pipe_reply repl;
322322
DWORD len;
323323

@@ -329,7 +329,7 @@ index 3128b92..0969b2f 100644
329329
&cygheap->installation_key, get_minor ());
330330
termios_printf ("dup handles via master control pipe %s", buf);
331331
if (!CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl,
332-
@@ -1137,7 +1141,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
332+
@@ -1144,7 +1148,11 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
333333
{
334334
char pipe[MAX_PATH];
335335
__small_sprintf (pipe,
@@ -339,9 +339,25 @@ index 3128b92..0969b2f 100644
339339
"\\\\.\\pipe\\cygwin-%S-pty%d-master-ctl",
340340
+#endif
341341
&cygheap->installation_key, get_minor ());
342-
pipe_request req = { GetCurrentProcessId () };
342+
pipe_request req = { GET_HANDLES, GetCurrentProcessId () };
343343
pipe_reply repl;
344-
@@ -2024,7 +2032,11 @@ fhandler_pty_master::close (int flag)
344+
@@ -1605,9 +1613,15 @@ fhandler_pty_slave::tcflush (int queue)
345+
if (queue == TCIFLUSH || queue == TCIOFLUSH)
346+
{
347+
char pipe[MAX_PATH];
348+
+#ifdef __MSYS__
349+
+ __small_sprintf (pipe,
350+
+ "\\\\.\\pipe\\msys-%S-pty%d-master-ctl",
351+
+ &cygheap->installation_key, get_minor ());
352+
+#else
353+
__small_sprintf (pipe,
354+
"\\\\.\\pipe\\cygwin-%S-pty%d-master-ctl",
355+
&cygheap->installation_key, get_minor ());
356+
+#endif
357+
pipe_request req = { FLUSH_INPUT, GetCurrentProcessId () };
358+
pipe_reply repl;
359+
DWORD n;
360+
@@ -2039,7 +2053,11 @@ fhandler_pty_master::close (int flag)
345361
pipe_reply repl;
346362
DWORD len;
347363

@@ -353,7 +369,7 @@ index 3128b92..0969b2f 100644
353369
&cygheap->installation_key, get_minor ());
354370
acquire_output_mutex (mutex_timeout);
355371
if (master_ctl)
356-
@@ -2930,7 +2942,11 @@ fhandler_pty_master::setup ()
372+
@@ -2950,7 +2968,11 @@ fhandler_pty_master::setup ()
357373

358374
/* Create master control pipe which allows the master to duplicate
359375
the pty pipe handles to processes which deserve it. */
@@ -365,7 +381,7 @@ index 3128b92..0969b2f 100644
365381
&cygheap->installation_key, unit);
366382
master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
367383
| FILE_FLAG_FIRST_PIPE_INSTANCE,
368-
@@ -3819,7 +3835,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
384+
@@ -3840,7 +3862,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
369385
{
370386
char pipe[MAX_PATH];
371387
__small_sprintf (pipe,
@@ -375,7 +391,7 @@ index 3128b92..0969b2f 100644
375391
"\\\\.\\pipe\\cygwin-%S-pty%d-master-ctl",
376392
+#endif
377393
&cygheap->installation_key, ttyp->get_minor ());
378-
pipe_request req = { GetCurrentProcessId () };
394+
pipe_request req = { GET_HANDLES, GetCurrentProcessId () };
379395
pipe_reply repl;
380396
diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc
381397
index ee2edba..9f31a71 100644
@@ -436,7 +452,7 @@ index 1e4cf98..b77598b 100644
436452
} \
437453
} \
438454
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
439-
index 961a98c..aafb811 100644
455+
index 89c1e1f..b85e8c3 100644
440456
--- a/winsup/cygwin/include/cygwin/version.h
441457
+++ b/winsup/cygwin/include/cygwin/version.h
442458
@@ -510,7 +510,11 @@ details. */

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From 02128e4ad21c12aba2edbc183518f9de44750f47 Mon Sep 17 00:00:00 2001
1+
From f95036ca2c8c6275eb073914b6ceb80f99800c9a 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
5-
Subject: [PATCH 04/N] Add functionality for converting UNIX paths in
5+
Subject: [PATCH 03/N] Add functionality for converting UNIX paths in
66
arguments and environment variables to Windows form for native Win32
77
applications.
88

@@ -22,10 +22,10 @@ Subject: [PATCH 04/N] Add functionality for converting UNIX paths in
2222
create mode 100644 winsup/cygwin/msys2_path_conv.h
2323

2424
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
25-
index c1f9921..f3662b9 100644
25+
index 981877d..54ae637 100644
2626
--- a/winsup/cygwin/Makefile.am
2727
+++ b/winsup/cygwin/Makefile.am
28-
@@ -312,6 +312,7 @@ DLL_FILES= \
28+
@@ -314,6 +314,7 @@ DLL_FILES= \
2929
miscfuncs.cc \
3030
mktemp.cc \
3131
msg.cc \
@@ -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 42919a7..cb01afc 100644
1002+
index ed08398..8ef347c 100644
10031003
--- a/winsup/cygwin/path.cc
10041004
+++ b/winsup/cygwin/path.cc
10051005
@@ -66,6 +66,7 @@
@@ -1010,7 +1010,7 @@ index 42919a7..cb01afc 100644
10101010
#undef basename
10111011

10121012
suffix_info stat_suffixes[] =
1013-
@@ -3884,6 +3885,74 @@ fchdir (int fd)
1013+
@@ -3895,6 +3896,74 @@ fchdir (int fd)
10141014
return res;
10151015
}
10161016

@@ -1086,7 +1086,7 @@ index 42919a7..cb01afc 100644
10861086

10871087
/* Cover functions to the path conversion routines.
10881088
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
1089-
index ef175e7..33a947d 100644
1089+
index cb58b6e..3ff2187 100644
10901090
--- a/winsup/cygwin/spawn.cc
10911091
+++ b/winsup/cygwin/spawn.cc
10921092
@@ -286,6 +286,27 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From f5641c9f116e711014cce0b034c46577e76fdc50 Mon Sep 17 00:00:00 2001
1+
From 10bdfe7d2cde9d14411e141ed9837c1904c57496 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
5-
Subject: [PATCH 05/N] Add functionality for changing OS name via MSYSTEM
5+
Subject: [PATCH 04/N] Add functionality for changing OS name via MSYSTEM
66
environment variables.
77

88
---

msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch renamed to msys2-runtime/0005-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,8 +1,8 @@
1-
From 834af426d590c5eafa5a31454bb3e96d1b66bd06 Mon Sep 17 00:00:00 2001
1+
From 8b9860bde46b2d516d942fdd58b49eab4b9bedc0 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
5-
Subject: [PATCH 06/N] - Move root to /usr. - Change sorting mount points. -
5+
Subject: [PATCH 05/N] - Move root to /usr. - Change sorting mount points. -
66
By default mount without ACLs. - Can read /etc/fstab with short mount point
77
format.
88

@@ -35,7 +35,7 @@ index 163b475..15e9a34 100644
3535
public:
3636
void init (bool);
3737
diff --git a/winsup/cygwin/mm/cygheap.cc b/winsup/cygwin/mm/cygheap.cc
38-
index 4cc8517..c4f15d5 100644
38+
index 3388864..5409a6b 100644
3939
--- a/winsup/cygwin/mm/cygheap.cc
4040
+++ b/winsup/cygwin/mm/cygheap.cc
4141
@@ -220,14 +220,22 @@ init_cygheap::init_installation_root ()

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From a7a80da72303405b0932f8c1529ea22b5ea511cd Mon Sep 17 00:00:00 2001
1+
From 242443bf1f2cfabbcb0ea5202f1b5f7d196fd24c 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
5-
Subject: [PATCH 07/N] Instead of creating Cygwin symlinks, use deep copy by
5+
Subject: [PATCH 06/N] Instead of creating Cygwin symlinks, use deep copy by
66
default
77

88
The new `winsymlinks` mode `deepcopy` (which is made the default) lets
@@ -62,7 +62,7 @@ index d8e058f..b7e0e21 100644
6262
bool winjitdebug = false;
6363

6464
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
65-
index cb01afc..a3e4de2 100644
65+
index 8ef347c..aae10fe 100644
6666
--- a/winsup/cygwin/path.cc
6767
+++ b/winsup/cygwin/path.cc
6868
@@ -1722,6 +1722,173 @@ conv_path_list (const char *src, char *dst, size_t size,
@@ -239,7 +239,7 @@ index cb01afc..a3e4de2 100644
239239
/* Create a symlink from FROMPATH to TOPATH. */
240240

241241
extern "C" int
242-
@@ -2034,6 +2201,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
242+
@@ -2045,6 +2212,84 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath)
243243
return 0;
244244
}
245245

@@ -324,7 +324,7 @@ index cb01afc..a3e4de2 100644
324324
int
325325
symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
326326
{
327-
@@ -2101,6 +2346,13 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
327+
@@ -2112,6 +2357,13 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
328328
case WSYM_nfs:
329329
res = symlink_nfs (oldpath, win32_newpath);
330330
__leave;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From f671632ea5f1d8a5776afc19c6f55c5cb04574e0 Mon Sep 17 00:00:00 2001
1+
From 9e313a6cf7e8b875ed612d561a3e94b586d179b4 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
5-
Subject: [PATCH 08/N] Automatically rewrite TERM=msys to TERM=cygwin
5+
Subject: [PATCH 07/N] Automatically rewrite TERM=msys to TERM=cygwin
66

77
With MSys1, it was necessary to set the TERM variable to "msys". To
88
allow for a smooth transition from MSys1 to MSys2, let's simply handle

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
From 8f58dba7794555fe5fcdaaeb4c799031d475340b Mon Sep 17 00:00:00 2001
1+
From 3f325c89dc11e09091758cd82134f15383dc31de 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
5-
Subject: [PATCH 09/N] Do not convert environment for strace
5+
Subject: [PATCH 08/N] Do not convert environment for strace
66

77
Strace is a Windows program so MSYS2 will convert all arguments and environment vars and that makes debugging msys2 software with strace very tricky.
88
---
99
winsup/cygwin/spawn.cc | 4 +++-
1010
1 file changed, 3 insertions(+), 1 deletion(-)
1111

1212
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
13-
index 33a947d..8586ca1 100644
13+
index 3ff2187..8525285 100644
1414
--- a/winsup/cygwin/spawn.cc
1515
+++ b/winsup/cygwin/spawn.cc
1616
@@ -539,11 +539,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 055c3f431668f208cfbc35bd56c34e8ec7910f72 Mon Sep 17 00:00:00 2001
1+
From c657f7cda50bea6902f89849b4be128deec67c03 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Sun, 23 Aug 2015 20:47:30 +0100
4-
Subject: [PATCH 10/N] strace.cc: Don't set MSYS=noglob
4+
Subject: [PATCH 09/N] strace.cc: Don't set MSYS=noglob
55

66
Commit message for this code was:
77

0 commit comments

Comments
 (0)