Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

msys2-runtime: Update to 3.3.5

Browse Source
This commit is contained in:
Christoph Reiter 2022-05-13 15:34:40 +02:00
parent 8ab7cc0110
commit b88f5ff9b8
47 changed files with 170 additions and 1071 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msys2-runtime/0001-Add-MSYS2-triplet.patch
View File

@ -1,4 +1,4 @@
From f9643916d1c8599a1ed9129e782c49ea97ffd665 Mon Sep 17 00:00:00 2001 From 6ab46fff520ce09128b528168d40f646174f1949 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 20:40:45 +0300 Date: Sun, 14 Apr 2019 20:40:45 +0300
@ -2709,5 +2709,5 @@ index eb2a870..3bf9d9f 100755
lt_cv_dlopen_libs= lt_cv_dlopen_libs=
;; ;;
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From ca24be6425a87061467ace932ca3aa498f0fbc87 Mon Sep 17 00:00:00 2001 From 14e3f594d46b387dc04a202901301e85daf683b8 Mon Sep 17 00:00:00 2001
From: Kaleb Barrett <dev.ktbarrett@gmail.com> From: Kaleb Barrett <dev.ktbarrett@gmail.com>
Date: Sun, 14 Mar 2021 18:58:55 -0500 Date: Sun, 14 Mar 2021 18:58:55 -0500
Subject: [PATCH 02/N] Fix msys library name in import libraries Subject: [PATCH 02/N] Fix msys library name in import libraries
@ -25,5 +25,5 @@ index b900960..617a9c2 100755
my ($file, $member, $symbol) = m%^([^:]*):([^:]*(?=:))?.* T (.*)%o; my ($file, $member, $symbol) = m%^([^:]*):([^:]*(?=:))?.* T (.*)%o;
next if !defined($symbol) || $symbol =~ $exclude_regex; next if !defined($symbol) || $symbol =~ $exclude_regex;
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From 7c11d96c3e9e55cc58800ed074bb844203940005 Mon Sep 17 00:00:00 2001 From c07794392eba323a14ba9b4ca8220f2313ecbfd9 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:09:17 +0300 Date: Sun, 14 Apr 2019 21:09:17 +0300
@ -97,7 +97,7 @@ index e101623..66272bc 100644
/* Named pipes based transport, for security on NT */ /* Named pipes based transport, for security on NT */
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 2b8e87f..5b8c255 100644 index ca499bc..72471ea 100644
--- a/winsup/cygwin/Makefile.am --- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am
@@ -37,15 +37,15 @@ newlib_build=$(target_builddir)/newlib @@ -37,15 +37,15 @@ newlib_build=$(target_builddir)/newlib
@ -345,7 +345,7 @@ index 293d2ab..264e240 100644
BYTE(0) /* d */ BYTE(0) /* d */
BYTE(0) /* b */ BYTE(0) /* b */
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 31dfd6f..0d99d84 100644 index 28b5146..ee75d3b 100644
--- a/winsup/cygwin/dcrt0.cc --- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc
@@ -378,21 +378,21 @@ check_sanity_and_sync (per_process *p) @@ -378,21 +378,21 @@ check_sanity_and_sync (per_process *p)
@ -465,10 +465,10 @@ index 6a4ed26..6f69b60 100644
HANDLE retaddr; HANDLE retaddr;
if (_my_tls.isinitialized ()) if (_my_tls.isinitialized ())
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index d57cbb3..42f308c 100644 index ce5f641..bad7bd1 100644
--- a/winsup/cygwin/dtable.cc --- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc
@@ -980,9 +980,15 @@ handle_to_fn (HANDLE h, char *posix_fn) @@ -981,9 +981,15 @@ handle_to_fn (HANDLE h, char *posix_fn)
if (wcsncasecmp (w32, DEV_NAMED_PIPE, DEV_NAMED_PIPE_LEN) == 0) if (wcsncasecmp (w32, DEV_NAMED_PIPE, DEV_NAMED_PIPE_LEN) == 0)
{ {
w32 += DEV_NAMED_PIPE_LEN; w32 += DEV_NAMED_PIPE_LEN;
@ -485,7 +485,7 @@ index d57cbb3..42f308c 100644
w32len = cygheap->installation_key.Length / sizeof (WCHAR); w32len = cygheap->installation_key.Length / sizeof (WCHAR);
if (w32len if (w32len
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index a914110..c638044 100644 index f946bed..5fe6b4d 100644
--- a/winsup/cygwin/exceptions.cc --- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc
@@ -502,14 +502,14 @@ try_to_debug () @@ -502,14 +502,14 @@ try_to_debug ()
@ -506,10 +506,10 @@ index a914110..c638044 100644
break; break;
} }
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 71635cc..e4b71b5 100644 index 82c1ed3..89f7729 100644
--- a/winsup/cygwin/fhandler_pipe.cc --- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc +++ b/winsup/cygwin/fhandler_pipe.cc
@@ -676,7 +676,11 @@ fhandler_pipe::close () @@ -690,7 +690,11 @@ fhandler_pipe::close ()
return ret; return ret;
} }
@ -522,10 +522,10 @@ index 71635cc..e4b71b5 100644
/* Create a pipe, and return handles to the read and write ends, /* Create a pipe, and return handles to the read and write ends,
just like CreatePipe, but ensure that the write end permits just like CreatePipe, but ensure that the write end permits
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 7bef695..10566ac 100644 index 0cd69f3..d1a7fe0 100644
--- a/winsup/cygwin/fhandler_tty.cc --- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc
@@ -910,7 +910,11 @@ fhandler_pty_slave::open (int flags, mode_t) @@ -923,7 +923,11 @@ fhandler_pty_slave::open (int flags, mode_t)
pipe_reply repl; pipe_reply repl;
DWORD len; DWORD len;
@ -537,7 +537,7 @@ index 7bef695..10566ac 100644
&cygheap->installation_key, get_minor ()); &cygheap->installation_key, get_minor ());
termios_printf ("dup handles via master control pipe %s", buf); termios_printf ("dup handles via master control pipe %s", buf);
if (!CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl, if (!CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl,
@@ -1172,7 +1176,11 @@ fhandler_pty_slave::reset_switch_to_pcon (void) @@ -1200,7 +1204,11 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
{ {
char pipe[MAX_PATH]; char pipe[MAX_PATH];
__small_sprintf (pipe, __small_sprintf (pipe,
@ -549,7 +549,7 @@ index 7bef695..10566ac 100644
&cygheap->installation_key, get_minor ()); &cygheap->installation_key, get_minor ());
pipe_request req = { GetCurrentProcessId () }; pipe_request req = { GetCurrentProcessId () };
pipe_reply repl; pipe_reply repl;
@@ -2106,7 +2114,11 @@ fhandler_pty_master::close () @@ -2154,7 +2162,11 @@ fhandler_pty_master::close ()
pipe_reply repl; pipe_reply repl;
DWORD len; DWORD len;
@ -561,7 +561,7 @@ index 7bef695..10566ac 100644
&cygheap->installation_key, get_minor ()); &cygheap->installation_key, get_minor ());
acquire_output_mutex (mutex_timeout); acquire_output_mutex (mutex_timeout);
if (master_ctl) if (master_ctl)
@@ -3013,7 +3025,11 @@ fhandler_pty_master::setup () @@ -3049,7 +3061,11 @@ fhandler_pty_master::setup ()
/* Create master control pipe which allows the master to duplicate /* Create master control pipe which allows the master to duplicate
the pty pipe handles to processes which deserve it. */ the pty pipe handles to processes which deserve it. */
@ -573,7 +573,7 @@ index 7bef695..10566ac 100644
&cygheap->installation_key, unit); &cygheap->installation_key, unit);
master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
| FILE_FLAG_FIRST_PIPE_INSTANCE, | FILE_FLAG_FIRST_PIPE_INSTANCE,
@@ -3856,7 +3872,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp, @@ -3902,7 +3918,11 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
{ {
char pipe[MAX_PATH]; char pipe[MAX_PATH];
__small_sprintf (pipe, __small_sprintf (pipe,
@ -697,7 +697,7 @@ index 56b4363..6bc948a 100644
#endif /* __CYGWIN_CYGWIN_DLL_H__ */ #endif /* __CYGWIN_CYGWIN_DLL_H__ */
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 8625512..d783447 100644 index 10dc1db..ba645e4 100644
--- a/winsup/cygwin/include/cygwin/version.h --- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h
@@ -533,7 +533,11 @@ details. */ @@ -533,7 +533,11 @@ details. */
@ -826,10 +826,10 @@ index b2db73c..ee99dd0 100755
"END_CYGWIN_VERSION_INFO\n\0"; "END_CYGWIN_VERSION_INFO\n\0";
cygwin_version_info cygwin_version = cygwin_version_info cygwin_version =
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index bce743b..6b6e570 100644 index 5e04ea3..39b0c59 100644
--- a/winsup/cygwin/pinfo.cc --- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc
@@ -187,7 +187,7 @@ pinfo::maybe_set_exit_code_from_windows () @@ -192,7 +192,7 @@ pinfo::maybe_set_exit_code_from_windows ()
GetExitCodeProcess (hProcess, &x); GetExitCodeProcess (hProcess, &x);
set_exit_code (x); set_exit_code (x);
} }
@ -852,7 +852,7 @@ index d015cc5..cd4dff8 100644
va_list args; va_list args;
diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index 83fb39b..b216634 100644 index e44b70b..2b94d03 100644
--- a/winsup/cygwin/sec_auth.cc --- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc
@@ -848,7 +848,7 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern) @@ -848,7 +848,7 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
@ -895,7 +895,7 @@ index 83fb39b..b216634 100644
ts.SourceIdentifier.HighPart = 0; ts.SourceIdentifier.HighPart = 0;
ts.SourceIdentifier.LowPart = 0x0103; ts.SourceIdentifier.LowPart = 0x0103;
@@ -1526,7 +1526,7 @@ s4uauth (bool logon, PCWSTR domain, PCWSTR user, NTSTATUS &ret_status) @@ -1529,7 +1529,7 @@ s4uauth (bool logon, PCWSTR domain, PCWSTR user, NTSTATUS &ret_status)
{ {
/* Register as logon process. */ /* Register as logon process. */
debug_printf ("Impersonation requested"); debug_printf ("Impersonation requested");
@ -904,7 +904,7 @@ index 83fb39b..b216634 100644
status = LsaRegisterLogonProcess (&name, &lsa_hdl, &sec_mode); status = LsaRegisterLogonProcess (&name, &lsa_hdl, &sec_mode);
} }
else else
@@ -1565,11 +1565,11 @@ s4uauth (bool logon, PCWSTR domain, PCWSTR user, NTSTATUS &ret_status) @@ -1568,11 +1568,11 @@ s4uauth (bool logon, PCWSTR domain, PCWSTR user, NTSTATUS &ret_status)
} }
/* Create origin. */ /* Create origin. */
@ -1442,5 +1442,5 @@ index 4c98eef..ad35d23 100644
"The \"-b\" means 'skip the help pages'. You can omit this until you're\n" "The \"-b\" means 'skip the help pages'. You can omit this until you're\n"
"familiar with the report layout. The gprof documentation explains\n" "familiar with the report layout. The gprof documentation explains\n"
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From 7aa11f8cc8691e1eb22ed7ae565b6d9678ba3d9e Mon Sep 17 00:00:00 2001 From 03929e0952ba0d460b0348046c9354fcacce0b78 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:17:46 +0300 Date: Sun, 14 Apr 2019 21:17:46 +0300
@ -22,7 +22,7 @@ Subject: [PATCH 04/N] Add functionality for converting UNIX paths in
create mode 100644 winsup/cygwin/msys2_path_conv.h create mode 100644 winsup/cygwin/msys2_path_conv.h
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 5b8c255..8002714 100644 index 72471ea..23a3c23 100644
--- a/winsup/cygwin/Makefile.am --- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am
@@ -283,6 +283,7 @@ DLL_FILES= \ @@ -283,6 +283,7 @@ DLL_FILES= \
@ -109,7 +109,7 @@ index 74413a8..6adf620 100644
if (envp) if (envp)
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index ac55ab0..b410cbe 100644 index c9d4599..70fd3e7 100644
--- a/winsup/cygwin/include/sys/cygwin.h --- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h
@@ -83,6 +83,12 @@ extern ssize_t cygwin_conv_path_list (cygwin_conv_path_t what, const void *from, @@ -83,6 +83,12 @@ extern ssize_t cygwin_conv_path_list (cygwin_conv_path_t what, const void *from,
@ -926,7 +926,7 @@ index 0000000..67d85ec
+#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */ +#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */
+ +
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 87ac240..fe3df12 100644 index eceafbb..a9f71db 100644
--- a/winsup/cygwin/path.cc --- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
@ -937,7 +937,7 @@ index 87ac240..fe3df12 100644
#undef basename #undef basename
suffix_info stat_suffixes[] = suffix_info stat_suffixes[] =
@@ -3818,6 +3819,74 @@ fchdir (int fd) @@ -3834,6 +3835,74 @@ fchdir (int fd)
return res; return res;
} }
@ -1013,12 +1013,12 @@ index 87ac240..fe3df12 100644
/* Cover functions to the path conversion routines. /* Cover functions to the path conversion routines.
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 81dba5a..1af1f3d 100644 index c9e1fb6..b4dc8c6 100644
--- a/winsup/cygwin/spawn.cc --- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc
@@ -297,6 +297,27 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -283,6 +283,27 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
} bool rc;
} int res = -1;
+ /* Environment variable MSYS2_ARG_CONV_EXCL contains a list + /* Environment variable MSYS2_ARG_CONV_EXCL contains a list
+ of ';' separated argument prefixes to pass un-modified.. + of ';' separated argument prefixes to pass un-modified..
@ -1044,7 +1044,7 @@ index 81dba5a..1af1f3d 100644
/* Check if we have been called from exec{lv}p or spawn{lv}p and mask /* Check if we have been called from exec{lv}p or spawn{lv}p and mask
mode to keep only the spawn mode. */ mode to keep only the spawn mode. */
bool p_type_exec = !!(mode & _P_PATH_TYPE_EXEC); bool p_type_exec = !!(mode & _P_PATH_TYPE_EXEC);
@@ -406,9 +427,23 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -397,9 +418,23 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
moreinfo->argc = newargv.argc; moreinfo->argc = newargv.argc;
moreinfo->argv = newargv; moreinfo->argv = newargv;
} }
@ -1070,7 +1070,7 @@ index 81dba5a..1af1f3d 100644
{ {
res = -1; res = -1;
__leave; __leave;
@@ -542,7 +577,8 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -533,7 +568,8 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
moreinfo->envp = build_env (envp, envblock, moreinfo->envc, moreinfo->envp = build_env (envp, envblock, moreinfo->envc,
real_path.iscygexec (), real_path.iscygexec (),
switch_user ? ::cygheap->user.primary_token () switch_user ? ::cygheap->user.primary_token ()
@ -1096,5 +1096,5 @@ index e3a65f8..1aeec8d 100644
{ {
for (int i = calloced; i < argc; i++) for (int i = calloced; i < argc; i++)
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From 3d15b852e5046a1bc395873959902fd084050c76 Mon Sep 17 00:00:00 2001 From 77261f7d781b92ddca920da884daa06464473ff1 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:29:01 +0300 Date: Sun, 14 Apr 2019 21:29:01 +0300
@ -191,5 +191,5 @@ index 3502166..daed73f 100644
/* Add a hint to the sysname, that we're running under WOW64. This might /* Add a hint to the sysname, that we're running under WOW64. This might
give an early clue if somebody encounters problems. */ give an early clue if somebody encounters problems. */
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From d47a06e488ca5e9c40b10659833358118b2ba83c Mon Sep 17 00:00:00 2001 From 45fd39e78c9d07922eca6e2a846033990b6e7868 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:45:06 +0300 Date: Sun, 14 Apr 2019 21:45:06 +0300
@ -397,5 +397,5 @@ index 6aae33c..5736ffb 100644
free (gecos); free (gecos);
if (home) if (home)
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From a670005c0cfae22dad92c741818efc029e98ba55 Mon Sep 17 00:00:00 2001 From 0ecbb9c1c8e21e5c7c240e68848dca5a7ca32be0 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:47:21 +0300 Date: Sun, 14 Apr 2019 21:47:21 +0300
@ -40,7 +40,7 @@ index f746841..296c890 100644
/* The structure below is used to set up an array which is used to /* The structure below is used to set up an array which is used to
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index 48fb312..72e8f8f 100644 index 5687a1e..1b8d8e2 100644
--- a/winsup/cygwin/globals.cc --- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc +++ b/winsup/cygwin/globals.cc
@@ -59,6 +59,7 @@ enum winsym_t @@ -59,6 +59,7 @@ enum winsym_t
@ -61,7 +61,7 @@ index 48fb312..72e8f8f 100644
bool NO_COPY in_forkee; bool NO_COPY in_forkee;
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index fe3df12..c9876c5 100644 index a9f71db..b8af6d5 100644
--- a/winsup/cygwin/path.cc --- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc
@@ -1682,6 +1682,89 @@ conv_path_list (const char *src, char *dst, size_t size, @@ -1682,6 +1682,89 @@ conv_path_list (const char *src, char *dst, size_t size,
@ -233,5 +233,5 @@ index fe3df12..c9876c5 100644
buf = tp.t_get (); buf = tp.t_get ();
cp = stpcpy (buf, SYMLINK_COOKIE); cp = stpcpy (buf, SYMLINK_COOKIE);
-- --
2.35.3 2.36.1

4
msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
View File

@ -1,4 +1,4 @@
From fc13a82e72e42ea65e3baf0fb89e1cf08277a9ab Mon Sep 17 00:00:00 2001 From f1b4626781f5fcc09896ef418baf9eb54c5aa692 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:48:54 +0300 Date: Sun, 14 Apr 2019 21:48:54 +0300
@ -35,5 +35,5 @@ index 296c890..2e290a8 100644
else if (*newp == 'M' && strncmp (newp, "MSYS=", 5) == 0) else if (*newp == 'M' && strncmp (newp, "MSYS=", 5) == 0)
parse_options (newp + 5); parse_options (newp + 5);
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From 54d87bc5f723a16f96be62e9e817c7cfe2552ac6 Mon Sep 17 00:00:00 2001 From f9c5a292e92cfd6485144a2bf54ca1f97abad665 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 21:50:55 +0300 Date: Sun, 14 Apr 2019 21:50:55 +0300
@ -10,10 +10,10 @@ Strace is a Windows program so MSYS2 will convert all arguments and environment
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 1af1f3d..cc2e030 100644 index b4dc8c6..0c65000 100644
--- a/winsup/cygwin/spawn.cc --- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc
@@ -574,11 +574,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -565,11 +565,13 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
bool switch_user = ::cygheap->user.issetuid () bool switch_user = ::cygheap->user.issetuid ()
&& (::cygheap->user.saved_uid && (::cygheap->user.saved_uid
!= ::cygheap->user.real_uid); != ::cygheap->user.real_uid);
@ -29,5 +29,5 @@ index 1af1f3d..cc2e030 100644
{ {
set_errno (E2BIG); set_errno (E2BIG);
-- --
2.35.3 2.36.1

6
msys2-runtime/0010-Special-case-for-converting-root-directory-to-have-t.patch
View File

@ -1,4 +1,4 @@
From 3707c635b371d96e243a3a19df1fb6d6aed73db7 Mon Sep 17 00:00:00 2001 From dbc74bed0febbb5c3d71bf851882d409e545384f 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?= 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?= <alexey.pawlow@gmail.com> =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
Date: Sun, 14 Apr 2019 22:13:51 +0300 Date: Sun, 14 Apr 2019 22:13:51 +0300
@ -10,7 +10,7 @@ Subject: [PATCH 10/N] Special case for converting root directory to have
1 file changed, 16 insertions(+), 9 deletions(-) 1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index c9876c5..7f7ded4 100644 index b8af6d5..3bf429e 100644
--- a/winsup/cygwin/path.cc --- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc
@@ -709,6 +709,12 @@ path_conv::check (const char *src, unsigned opt, @@ -709,6 +709,12 @@ path_conv::check (const char *src, unsigned opt,
@ -54,5 +54,5 @@ index c9876c5..7f7ded4 100644
} }
-- --
2.35.3 2.36.1

6
msys2-runtime/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
View File

@ -1,4 +1,4 @@
From 110b516ad61b31a417aee12305379ca6ddcd8172 Mon Sep 17 00:00:00 2001 From 8da0f352999b22ef4fcadfd0fb123d20fdcf3742 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com> From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 21 Aug 2015 12:52:09 +0100 Date: Fri, 21 Aug 2015 12:52:09 +0100
Subject: [PATCH 11/N] dcrt0.cc: Untangle allow_glob from winshell Subject: [PATCH 11/N] dcrt0.cc: Untangle allow_glob from winshell
@ -11,7 +11,7 @@ a Cygwin program.
1 file changed, 8 insertions(+), 7 deletions(-) 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 0d99d84..1562e27 100644 index ee75d3b..d652b32 100644
--- a/winsup/cygwin/dcrt0.cc --- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc
@@ -154,12 +154,12 @@ isquote (char c) @@ -154,12 +154,12 @@ isquote (char c)
@ -76,5 +76,5 @@ index 0d99d84..1562e27 100644
/* Convert argv[0] to posix rules if it's currently blatantly /* Convert argv[0] to posix rules if it's currently blatantly
-- --
2.35.3 2.36.1

6
msys2-runtime/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
View File

@ -1,4 +1,4 @@
From 1ed5efd950a19f75d4d36644ae996dae8aa8f1b4 Mon Sep 17 00:00:00 2001 From bb5f409b67d222805f3fda6d40fbb5f56bbeaaed Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com> From: Ray Donnelly <mingw.android@gmail.com>
Date: Mon, 24 Aug 2015 00:48:06 +0100 Date: Mon, 24 Aug 2015 00:48:06 +0100
Subject: [PATCH 12/N] dcrt0.cc (globify): Don't quote literal strings Subject: [PATCH 12/N] dcrt0.cc (globify): Don't quote literal strings
@ -30,7 +30,7 @@ the expense of sensible forward-slash-containing input.
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 1562e27..3d7974e 100644 index d652b32..f75ba5f 100644
--- a/winsup/cygwin/dcrt0.cc --- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc
@@ -236,10 +236,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen) @@ -236,10 +236,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
@ -56,5 +56,5 @@ index 1562e27..3d7974e 100644
size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX); size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
if (cnt <= 1 || cnt == (size_t)-1) if (cnt <= 1 || cnt == (size_t)-1)
-- --
2.35.3 2.36.1

4
msys2-runtime/0013-strace.cc-Don-t-set-MSYS-noglob.patch
View File

@ -1,4 +1,4 @@
From 2336464e19637eabc4e4c7cbbf9962a409d88f22 Mon Sep 17 00:00:00 2001 From e93812d6be190709afc905d7a83d70f3037bc9c0 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com> From: Ray Donnelly <mingw.android@gmail.com>
Date: Sun, 23 Aug 2015 20:47:30 +0100 Date: Sun, 23 Aug 2015 20:47:30 +0100
Subject: [PATCH 13/N] strace.cc: Don't set MSYS=noglob Subject: [PATCH 13/N] strace.cc: Don't set MSYS=noglob
@ -68,5 +68,5 @@ index de4abc4..3dbce3b 100644
NULL, /* Security */ NULL, /* Security */
NULL, /* thread */ NULL, /* thread */
-- --
2.35.3 2.36.1

6
msys2-runtime/0014-Add-debugging-for-build_argv.patch
View File

@ -1,4 +1,4 @@
From eede69db25295d637864a1c6d8da1fa5811472b8 Mon Sep 17 00:00:00 2001 From 30759e9f938e7bb89ea655d286247eff3685fab0 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com> From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 21 Aug 2015 12:18:52 +0100 Date: Fri, 21 Aug 2015 12:18:52 +0100
Subject: [PATCH 14/N] Add debugging for build_argv Subject: [PATCH 14/N] Add debugging for build_argv
@ -8,7 +8,7 @@ Subject: [PATCH 14/N] Add debugging for build_argv
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 3d7974e..3434316 100644 index f75ba5f..4dc8be8 100644
--- a/winsup/cygwin/dcrt0.cc --- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc
@@ -310,6 +310,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob) @@ -310,6 +310,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob)
@ -21,5 +21,5 @@ index 3d7974e..3434316 100644
while (*cmd) while (*cmd)
{ {
-- --
2.35.3 2.36.1

4
msys2-runtime/0015-Add-debugging-for-strace-make_command_line.patch
View File

@ -1,4 +1,4 @@
From 72a34b304df327550972ed21d6dbf4f396060b69 Mon Sep 17 00:00:00 2001 From 1c6ba9dff903cbc222349295961072abee0b7abb Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com> From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 21 Aug 2015 09:52:47 +0100 Date: Fri, 21 Aug 2015 09:52:47 +0100
Subject: [PATCH 15/N] Add debugging for strace make_command_line Subject: [PATCH 15/N] Add debugging for strace make_command_line
@ -20,5 +20,5 @@ index 3dbce3b..4e5d24c 100644
SetConsoleCtrlHandler (NULL, 0); SetConsoleCtrlHandler (NULL, 0);
/* Commit message for this code was: /* Commit message for this code was:
-- --
2.35.3 2.36.1

16
msys2-runtime/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch
View File

@ -1,4 +1,4 @@
From 125291daa27cff1eedb991e740933cc64cb052ea Mon Sep 17 00:00:00 2001 From 9de4fa8cbfc379b863aee7e0eb798cdf381fdbed Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com> From: Ray Donnelly <mingw.android@gmail.com>
Date: Sun, 10 Apr 2016 21:47:41 +0100 Date: Sun, 10 Apr 2016 21:47:41 +0100
Subject: [PATCH 16/N] environ.cc: New facility/environment variable Subject: [PATCH 16/N] environ.cc: New facility/environment variable
@ -130,10 +130,10 @@ index 47cef6f..b3d1a6b 100644
extern inline void extern inline void
transform_chars (PUNICODE_STRING upath, USHORT start_idx) transform_chars (PUNICODE_STRING upath, USHORT start_idx)
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 7f7ded4..88fd815 100644 index 3bf429e..b46bd0e 100644
--- a/winsup/cygwin/path.cc --- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc
@@ -3999,7 +3999,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions, @@ -4015,7 +4015,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
return arg_result; return arg_result;
} }
@ -142,11 +142,11 @@ index 7f7ded4..88fd815 100644
{ {
/* Since we've got regex linked we should maybe switch to that, but /* Since we've got regex linked we should maybe switch to that, but
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index cc2e030..abe7b60 100644 index 0c65000..65eb04a 100644
--- a/winsup/cygwin/spawn.cc --- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc
@@ -298,8 +298,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -284,8 +284,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
} int res = -1;
/* Environment variable MSYS2_ARG_CONV_EXCL contains a list /* Environment variable MSYS2_ARG_CONV_EXCL contains a list
- of ';' separated argument prefixes to pass un-modified.. - of ';' separated argument prefixes to pass un-modified..
@ -155,7 +155,7 @@ index cc2e030..abe7b60 100644
A value of * means don't convert any arguments. */ A value of * means don't convert any arguments. */
char* msys2_arg_conv_excl_env = getenv("MSYS2_ARG_CONV_EXCL"); char* msys2_arg_conv_excl_env = getenv("MSYS2_ARG_CONV_EXCL");
char* msys2_arg_conv_excl = NULL; char* msys2_arg_conv_excl = NULL;
@@ -308,14 +307,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -294,14 +293,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
{ {
msys2_arg_conv_excl = (char*)alloca (strlen(msys2_arg_conv_excl_env)+1); msys2_arg_conv_excl = (char*)alloca (strlen(msys2_arg_conv_excl_env)+1);
strcpy (msys2_arg_conv_excl, msys2_arg_conv_excl_env); strcpy (msys2_arg_conv_excl, msys2_arg_conv_excl_env);
@ -172,5 +172,5 @@ index cc2e030..abe7b60 100644
/* Check if we have been called from exec{lv}p or spawn{lv}p and mask /* Check if we have been called from exec{lv}p or spawn{lv}p and mask
-- --
2.35.3 2.36.1

8
msys2-runtime/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
View File

@ -1,4 +1,4 @@
From a4090bf778884272effb36a9f98716cac2b03efb Mon Sep 17 00:00:00 2001 From 210d271d3e56de5571747ca698cb7cf16a8eabb0 Mon Sep 17 00:00:00 2001
From: SquallATF <squallatf@gmail.com> From: SquallATF <squallatf@gmail.com>
Date: Mon, 10 Sep 2018 11:32:18 +0300 Date: Mon, 10 Sep 2018 11:32:18 +0300
Subject: [PATCH 17/N] Fix native symbolic link spawn passing wrong arg0 Subject: [PATCH 17/N] Fix native symbolic link spawn passing wrong arg0
@ -8,10 +8,10 @@ Subject: [PATCH 17/N] Fix native symbolic link spawn passing wrong arg0
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index abe7b60..698cf8f 100644 index 65eb04a..f354f18 100644
--- a/winsup/cygwin/spawn.cc --- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc
@@ -50,7 +50,7 @@ perhaps_suffix (const char *prog, path_conv& buf, int& err, unsigned opt) @@ -51,7 +51,7 @@ perhaps_suffix (const char *prog, path_conv& buf, int& err, unsigned opt)
err = 0; err = 0;
debug_printf ("prog '%s'", prog); debug_printf ("prog '%s'", prog);
@ -21,5 +21,5 @@ index abe7b60..698cf8f 100644
if (buf.isdir ()) if (buf.isdir ())
-- --
2.35.3 2.36.1

4
msys2-runtime/0018-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
View File

@ -1,4 +1,4 @@
From 57c449341d42fe769d8b6bcc19d13201ff1bf777 Mon Sep 17 00:00:00 2001 From 47ea73cc21051f95deeab86e23295893dfb4c587 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com> From: Alexey Pavlov <alexpux@gmail.com>
Date: Fri, 24 May 2019 13:41:47 +0300 Date: Fri, 24 May 2019 13:41:47 +0300
Subject: [PATCH 18/N] QueryUnbiasedInterruptTime must be load from Subject: [PATCH 18/N] QueryUnbiasedInterruptTime must be load from
@ -22,5 +22,5 @@ index e254397..2a03ac1 100644
LoadDLLfunc (VirtualAlloc2, 28, KernelBase) LoadDLLfunc (VirtualAlloc2, 28, KernelBase)
-- --
2.35.3 2.36.1

4
msys2-runtime/0019-strace-quiet-be-really-quiet.patch
View File

@ -1,4 +1,4 @@
From e893c7b58cea345181f2621e0aa36392764471ea Mon Sep 17 00:00:00 2001 From 099ccbb4587bc0ad6c2926f53a1e33506d9aaa3a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 17 May 2017 18:13:32 +0200 Date: Wed, 17 May 2017 18:13:32 +0200
Subject: [PATCH 19/N] strace --quiet: be *really* quiet Subject: [PATCH 19/N] strace --quiet: be *really* quiet
@ -36,5 +36,5 @@ index 4e5d24c..a4713a2 100644
SetConsoleCtrlHandler (NULL, 0); SetConsoleCtrlHandler (NULL, 0);
/* Commit message for this code was: /* Commit message for this code was:
-- --
2.35.3 2.36.1

6
msys2-runtime/0020-Default-to-disable_pcon.patch
View File

@ -1,4 +1,4 @@
From 83ef4040f5983de74b2c873ac5185ad2f340dad3 Mon Sep 17 00:00:00 2001 From b74f834aa69dc0b188d1b971fbd2014f5f4593bc Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 19 May 2020 13:24:55 +0200 Date: Tue, 19 May 2020 13:24:55 +0200
Subject: [PATCH 20/N] Default to `disable_pcon` Subject: [PATCH 20/N] Default to `disable_pcon`
@ -37,7 +37,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index 72e8f8f..eda7af5 100644 index 1b8d8e2..29ca896 100644
--- a/winsup/cygwin/globals.cc --- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc +++ b/winsup/cygwin/globals.cc
@@ -74,7 +74,7 @@ bool pipe_byte; @@ -74,7 +74,7 @@ bool pipe_byte;
@ -50,5 +50,5 @@ index 72e8f8f..eda7af5 100644
bool NO_COPY in_forkee; bool NO_COPY in_forkee;
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From c2726e74a894e75c47e6078831eba03e3f83ce26 Mon Sep 17 00:00:00 2001 From 76648c9e5186297c55cc7c9c9c6c884df518ef6f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 19 May 2020 13:49:37 +0200 Date: Tue, 19 May 2020 13:49:37 +0200
Subject: [PATCH 21/N] Introduce the `enable_pcon` value for `MSYS` Subject: [PATCH 21/N] Introduce the `enable_pcon` value for `MSYS`
@ -53,5 +53,5 @@ index 49631d6..daaa1ec 100644
*k->setting.x &= ~k->values[istrue].i; *k->setting.x &= ~k->values[istrue].i;
if (istrue || (eq && strtol (eq, NULL, 0))) if (istrue || (eq && strtol (eq, NULL, 0)))
-- --
2.35.3 2.36.1

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

@ -1,4 +1,4 @@
From 055a8a31e23b7382636c4bdf61a4a38dcd6fb176 Mon Sep 17 00:00:00 2001 From 1333709d998a367c871ac26980a3e15251ff6078 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com> From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 5 Jun 2020 20:09:11 +0200 Date: Fri, 5 Jun 2020 20:09:11 +0200
Subject: [PATCH 22/N] popen: call /usr/bin/sh instead of /bin/sh Subject: [PATCH 22/N] popen: call /usr/bin/sh instead of /bin/sh
@ -30,5 +30,5 @@ index 99ddbce..55fea8c 100644
/* Reinstate the close-on-exec state */ /* Reinstate the close-on-exec state */
-- --
2.35.3 2.36.1

4
msys2-runtime/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch
View File

@ -1,4 +1,4 @@
From b4f09af08e12d76b92e97d2e8a53ad313bd8998c Mon Sep 17 00:00:00 2001 From 146f1a717360c4f96dd330adc1abe4b49e93d43e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com> From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 9 Aug 2020 14:02:51 +0200 Date: Sun, 9 Aug 2020 14:02:51 +0200
Subject: [PATCH 23/N] CI: add a GHA for doing a basic build test Subject: [PATCH 23/N] CI: add a GHA for doing a basic build test
@ -51,5 +51,5 @@ index 0000000..4e1d498
+ name: install + name: install
+ path: _dest/ + path: _dest/
-- --
2.35.3 2.36.1

4
msys2-runtime/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
View File

@ -1,4 +1,4 @@
From c4438da53f45d28057df9b224c601ea1a35977ec Mon Sep 17 00:00:00 2001 From 477d12f0ec3764602dcb4d45fd6ca2c0a480a2de Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 22 Nov 2019 11:20:22 +0100 Date: Fri, 22 Nov 2019 11:20:22 +0100
Subject: [PATCH 24/N] Set up a GitHub Action to keep in sync with Cygwin Subject: [PATCH 24/N] Set up a GitHub Action to keep in sync with Cygwin
@ -42,5 +42,5 @@ index 0000000..57bd30e
+ run: | + run: |
+ git push https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY refs/heads/cygwin/master 'refs/tags/*:refs/tags/*' + git push https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY refs/heads/cygwin/master 'refs/tags/*:refs/tags/*'
-- --
2.35.3 2.36.1

6
msys2-runtime/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch
View File

@ -1,4 +1,4 @@
From 7bafcb508292f6fb4cb083b2f20de8c38468f8eb Mon Sep 17 00:00:00 2001 From b911cd8690a2dc8ee81947d1c3376dd3985cfc37 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 12 Aug 2020 12:22:38 +0200 Date: Wed, 12 Aug 2020 12:22:38 +0200
Subject: [PATCH 25/N] Expose full command-lines to other Win32 processes by Subject: [PATCH 25/N] Expose full command-lines to other Win32 processes by
@ -26,7 +26,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index eda7af5..7d82f80 100644 index 29ca896..b4a0c87 100644
--- a/winsup/cygwin/globals.cc --- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc +++ b/winsup/cygwin/globals.cc
@@ -72,7 +72,7 @@ bool allow_glob = true; @@ -72,7 +72,7 @@ bool allow_glob = true;
@ -52,5 +52,5 @@ index 649084d..28056e6 100644
<listitem> <listitem>
-- --
2.35.3 2.36.1

4
msys2-runtime/0026-Disable-the-cygwin-GitHub-workflow.patch
View File

@ -1,4 +1,4 @@
From cd01859899187b626ba0c3ccd4a322622d438c10 Mon Sep 17 00:00:00 2001 From f9fe9e693227d279aa809ba0264edb0f93b6e58e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 17 Mar 2021 17:41:02 +0100 Date: Wed, 17 Mar 2021 17:41:02 +0100
Subject: [PATCH 26/N] Disable the 'cygwin' GitHub workflow Subject: [PATCH 26/N] Disable the 'cygwin' GitHub workflow
@ -31,5 +31,5 @@ index f9a9a7a..4b541a8 100644
jobs: jobs:
fedora-build: fedora-build:
-- --
2.35.3 2.36.1

10
msys2-runtime/0027-Do-not-show-Error-dialogs-by-default.patch
View File

@ -1,4 +1,4 @@
From 32be09faa66e3506cb51e51a9c7e26fb4d548934 Mon Sep 17 00:00:00 2001 From d67cd1068d552c1c0e491016af05dfc032dfd822 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 31 Mar 2021 11:38:41 +0200 Date: Wed, 31 Mar 2021 11:38:41 +0200
Subject: [PATCH 27/N] Do not show Error dialogs by default Subject: [PATCH 27/N] Do not show Error dialogs by default
@ -39,7 +39,7 @@ index daaa1ec..f4e2c68 100644
}; };
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index 7d82f80..a9c7e1c 100644 index b4a0c87..5c111ab 100644
--- a/winsup/cygwin/globals.cc --- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc +++ b/winsup/cygwin/globals.cc
@@ -75,6 +75,7 @@ bool reset_com; @@ -75,6 +75,7 @@ bool reset_com;
@ -51,10 +51,10 @@ index 7d82f80..a9c7e1c 100644
bool NO_COPY in_forkee; bool NO_COPY in_forkee;
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 698cf8f..d7ee5fe 100644 index f354f18..19de51e 100644
--- a/winsup/cygwin/spawn.cc --- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc
@@ -464,7 +464,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, @@ -455,7 +455,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
get the default error mode instead of inheriting the mode Cygwin get the default error mode instead of inheriting the mode Cygwin
uses. This allows things like Windows Error Reporting/JIT debugging uses. This allows things like Windows Error Reporting/JIT debugging
to work with processes launched from a Cygwin shell. */ to work with processes launched from a Cygwin shell. */
@ -64,5 +64,5 @@ index 698cf8f..d7ee5fe 100644
/* We're adding the CREATE_BREAKAWAY_FROM_JOB flag here to workaround /* We're adding the CREATE_BREAKAWAY_FROM_JOB flag here to workaround
-- --
2.35.3 2.36.1

4
msys2-runtime/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
View File

@ -1,4 +1,4 @@
From 1d6275df3797edd823333f72163537d65bfa5816 Mon Sep 17 00:00:00 2001 From 65fa01a7c8c028065513361db64de57524b52810 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 16 Apr 2018 14:59:39 +0200 Date: Mon, 16 Apr 2018 14:59:39 +0200
Subject: [PATCH 28/N] Add a helper to obtain a function's address in Subject: [PATCH 28/N] Add a helper to obtain a function's address in
@ -381,5 +381,5 @@ index 0000000..25814c7
+ return 0; + return 0;
+} +}
-- --
2.35.3 2.36.1

16
msys2-runtime/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
View File

@ -1,4 +1,4 @@
From eab174266ee10ff0c2b6612ffcfdaba4557c6111 Mon Sep 17 00:00:00 2001 From 3ef504360259c25283aa576a0dbe46ce0c7c305e Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 20 Mar 2015 09:56:28 +0000 Date: Fri, 20 Mar 2015 09:56:28 +0000
Subject: [PATCH 29/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C Subject: [PATCH 29/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
@ -87,13 +87,13 @@ also correctly, which mean we should kill all the process using
Co-authored-by: Naveen M K <naveen@syrusdark.website> Co-authored-by: Naveen M K <naveen@syrusdark.website>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
--- ---
winsup/cygwin/exceptions.cc | 20 +- winsup/cygwin/exceptions.cc | 24 +-
winsup/cygwin/include/cygwin/exit_process.h | 364 ++++++++++++++++++++ winsup/cygwin/include/cygwin/exit_process.h | 364 ++++++++++++++++++++
2 files changed, 382 insertions(+), 2 deletions(-) 2 files changed, 384 insertions(+), 4 deletions(-)
create mode 100644 winsup/cygwin/include/cygwin/exit_process.h create mode 100644 winsup/cygwin/include/cygwin/exit_process.h
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index c638044..86e154d 100644 index 5fe6b4d..ed4b427 100644
--- a/winsup/cygwin/exceptions.cc --- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc
@@ -29,6 +29,7 @@ details. */ @@ -29,6 +29,7 @@ details. */
@ -104,11 +104,13 @@ index c638044..86e154d 100644
/* Definitions for code simplification */ /* Definitions for code simplification */
#ifdef __x86_64__ #ifdef __x86_64__
@@ -1555,8 +1556,23 @@ exit_sig: @@ -1580,10 +1581,25 @@ exit_sig:
dosig: dosig:
if (have_execed) if (have_execed)
{ {
- sigproc_printf ("terminating captive process"); - sigproc_printf ("terminating captive process");
- if (::cygheap->ctty)
- ::cygheap->ctty->cleanup_before_exit ();
- TerminateProcess (ch_spawn, sigExeced = si.si_signo); - TerminateProcess (ch_spawn, sigExeced = si.si_signo);
+ switch (si.si_signo) + switch (si.si_signo)
+ { + {
@ -124,6 +126,8 @@ index c638044..86e154d 100644
+ goto done; + goto done;
+ default: + default:
+ sigproc_printf ("terminating captive process"); + sigproc_printf ("terminating captive process");
+ if (::cygheap->ctty)
+ ::cygheap->ctty->cleanup_before_exit ();
+ rc = exit_process_tree (ch_spawn, 128 + (sigExeced = si.si_signo)); + rc = exit_process_tree (ch_spawn, 128 + (sigExeced = si.si_signo));
+ goto done; + goto done;
+ } + }
@ -501,5 +505,5 @@ index 0000000..0486a0c
+ +
+#endif +#endif
-- --
2.35.3 2.36.1

4
msys2-runtime/0030-kill-kill-Win32-processes-more-gently.patch
View File

@ -1,4 +1,4 @@
From fc51dc797b78217ca727bf9cb4accd37573d34f8 Mon Sep 17 00:00:00 2001 From fcf9fbe488c508fe6de33c93e2c6abc09862a7d5 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 20 Mar 2015 10:01:50 +0000 Date: Fri, 20 Mar 2015 10:01:50 +0000
Subject: [PATCH 30/N] kill: kill Win32 processes more gently Subject: [PATCH 30/N] kill: kill Win32 processes more gently
@ -50,5 +50,5 @@ index d0fb547..ad718c3 100644
} }
-- --
2.35.3 2.36.1

8
msys2-runtime/0031-Cygwin-make-option-for-native-inner-link-handling.patch
View File

@ -1,4 +1,4 @@
From ab1bb9b981d6d12fce16d86d808f7e99735a457e Mon Sep 17 00:00:00 2001 From e71dc3c088213cdf2f526db7dbc1d22e04ed9dfb Mon Sep 17 00:00:00 2001
From: Jeremy Drake <github@jdrake.com> From: Jeremy Drake <github@jdrake.com>
Date: Thu, 22 Jul 2021 11:59:16 -0700 Date: Thu, 22 Jul 2021 11:59:16 -0700
Subject: [PATCH 31/N] Cygwin: make option for native inner link handling. Subject: [PATCH 31/N] Cygwin: make option for native inner link handling.
@ -25,7 +25,7 @@ index f4e2c68..18c37ee 100644
}; };
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index a9c7e1c..6faf38d 100644 index 5c111ab..6c15138 100644
--- a/winsup/cygwin/globals.cc --- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc +++ b/winsup/cygwin/globals.cc
@@ -76,6 +76,7 @@ bool wincmdln = true; @@ -76,6 +76,7 @@ bool wincmdln = true;
@ -37,7 +37,7 @@ index a9c7e1c..6faf38d 100644
bool NO_COPY in_forkee; bool NO_COPY in_forkee;
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 88fd815..ca65127 100644 index b46bd0e..c4f74fb 100644
--- a/winsup/cygwin/path.cc --- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc
@@ -3645,7 +3645,8 @@ restart: @@ -3645,7 +3645,8 @@ restart:
@ -51,5 +51,5 @@ index 88fd815..ca65127 100644
PWCHAR fpbuf = tp.w_get (); PWCHAR fpbuf = tp.w_get ();
DWORD ret; DWORD ret;
-- --
2.35.3 2.36.1

4
msys2-runtime/0032-docs-skip-building-texinfo-and-PDF-files.patch
View File

@ -1,4 +1,4 @@
From 0a97711e0b9fbdcfc3015829eb5ea7851fee376c Mon Sep 17 00:00:00 2001 From 506a54e4254ab0e6ac3ba375c3049882e2789498 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 8 Nov 2021 14:20:07 +0100 Date: Mon, 8 Nov 2021 14:20:07 +0100
Subject: [PATCH 32/N] docs: skip building texinfo and PDF files Subject: [PATCH 32/N] docs: skip building texinfo and PDF files
@ -45,5 +45,5 @@ index 534d674..d448ede 100644
uninstall-extra-man: uninstall-extra-man:
for i in *.1 ; do \ for i in *.1 ; do \
-- --
2.35.3 2.36.1

6
msys2-runtime/0033-install-libs-depend-on-the-toollibs.patch
View File

@ -1,4 +1,4 @@
From 49847239192f7af25b550a4280c20bf4810084bd Mon Sep 17 00:00:00 2001 From 91bc72c56ce4ef19c3415d1792ea52e568193ba2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 8 Nov 2021 16:22:57 +0100 Date: Mon, 8 Nov 2021 16:22:57 +0100
Subject: [PATCH 33/N] install-libs: depend on the "toollibs" Subject: [PATCH 33/N] install-libs: depend on the "toollibs"
@ -14,7 +14,7 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 8002714..d1d6116 100644 index 23a3c23..f1fe01d 100644
--- a/winsup/cygwin/Makefile.am --- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am
@@ -727,7 +727,7 @@ man_MANS = regex/regex.3 regex/regex.7 @@ -727,7 +727,7 @@ man_MANS = regex/regex.3 regex/regex.7
@ -27,5 +27,5 @@ index 8002714..d1d6116 100644
$(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(DESTDIR)$(bindir)/$(DLL_NAME) $(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(DESTDIR)$(bindir)/$(DLL_NAME)
@$(MKDIR_P) $(DESTDIR)$(toollibdir) @$(MKDIR_P) $(DESTDIR)$(toollibdir)
-- --
2.35.3 2.36.1

4
msys2-runtime/0034-POSIX-ify-the-SHELL-variable.patch
View File

@ -1,4 +1,4 @@
From 648860426f2e8e81edd5f0c24348653dca0d421f Mon Sep 17 00:00:00 2001 From 8bb4359ac2b3866467697e69e0142341b00e70b1 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 23 Nov 2015 20:03:11 +0100 Date: Mon, 23 Nov 2015 20:03:11 +0100
Subject: [PATCH 34/N] POSIX-ify the SHELL variable Subject: [PATCH 34/N] POSIX-ify the SHELL variable
@ -107,5 +107,5 @@ index 71c3f22..f33740d 100644
const char * get_native () const {return native ? native + namelen : NULL;} const char * get_native () const {return native ? native + namelen : NULL;}
const char * get_posix () const {return posix ? posix : NULL;} const char * get_posix () const {return posix ? posix : NULL;}
-- --
2.35.3 2.36.1

4
msys2-runtime/0035-Handle-ORIGINAL_PATH-just-like-PATH.patch
View File

@ -1,4 +1,4 @@
From c0250d576e39d603248d10e7bb2f396c9bc6a56c Mon Sep 17 00:00:00 2001 From 991a73778838b67d32a53bb1c2fb2edda750953b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de> From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 21 Mar 2017 13:18:38 +0100 Date: Tue, 21 Mar 2017 13:18:38 +0100
Subject: [PATCH 35/N] Handle ORIGINAL_PATH just like PATH Subject: [PATCH 35/N] Handle ORIGINAL_PATH just like PATH
@ -47,5 +47,5 @@ index 5c197a6..5afac8d 100644
/* P Q R S T U V W */ /* P Q R S T U V W */
WC, 0, 0, WC, WC, 0, 0, 0, WC, 0, 0, WC, WC, 0, 0, 0,
-- --
2.35.3 2.36.1

51
msys2-runtime/0036-Cygwin-console-Maintain-ENABLE_-INSERT-QUICK_EDIT-_M.patch
View File

@ -1,51 +0,0 @@
From c8568e060566b623e5c20be7692882bdc16a4862 Mon Sep 17 00:00:00 2001
From: Mitchell Hentges <mhentges@mozilla.com>
Date: Thu, 10 Feb 2022 10:38:08 -0500
Subject: [PATCH 36/N] Cygwin: console: Maintain
ENABLE_(INSERT|QUICK_EDIT)_MODE flags.
- Currently, ENABLE_INSERT_MODE and ENABLE_QUICK_EDIT_MODE are cleared
if cygwin is started in console. These flags will not be recovered
even when exiting from cygwin. Also note that if ENABLE_EXTENDED_FLAGS
is once unset, then the flag ENABLE_QUICK_EDIT_MODE it's associated
with will no longer be preserved. Unfortunately, we're accidentally
stepping on this in fhandler_console::set_input_mode().
This patch solves this by carrying forward these flags in the place
where it had been ignoring them. Since the previous behaviour of
leaving these flags unset would essentially maintain their existing
state, adding the carry-over of the flags now should not alter console
behaviour.
---
winsup/cygwin/fhandler_console.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index da1d2e8..7d59dd2 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -458,16 +458,18 @@ void
fhandler_console::set_input_mode (tty::cons_mode m, const termios *t,
const handle_set_t *p)
{
- DWORD flags = 0, oflags;
+ DWORD oflags;
WaitForSingleObject (p->input_mutex, mutex_timeout);
GetConsoleMode (p->input_handle, &oflags);
+ DWORD flags = oflags
+ & (ENABLE_EXTENDED_FLAGS | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE);
switch (m)
{
case tty::restore:
- flags = ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT;
+ flags |= ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT;
break;
case tty::cygwin:
- flags = ENABLE_WINDOW_INPUT;
+ flags |= ENABLE_WINDOW_INPUT;
if (wincap.has_con_24bit_colors () && !con_is_legacy)
flags |= ENABLE_VIRTUAL_TERMINAL_INPUT;
else
--
2.35.3

120
msys2-runtime/0037-Cygwin-pty-console-Fix-Ctrl-C-handling-for-non-cygwi.patch
View File

@ -1,120 +0,0 @@
From 4f54570fab07be5947b973af652b6183f3b29fcd Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Thu, 10 Feb 2022 16:53:47 +0900
Subject: [PATCH 37/N] Cygwin: pty, console: Fix Ctrl-C handling for
non-cygwin apps.
- Currently, if cat is started from cmd.exe which is started in cygwin
console, Ctrl-C terminates not only cat but also cmd.exe. This also
happens in pty in which pseudo console is disabled. This patch fixes
the issue.
---
winsup/cygwin/fhandler_console.cc | 28 +++++++++++++++++++++++
winsup/cygwin/fhandler_termios.cc | 38 +++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 7d59dd2..996561b 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -238,6 +238,33 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
char c = (char) wc;
bool processed = false;
termios &ti = ttyp->ti;
+ pinfo pi (ttyp->getpgid ());
+ if (pi && pi->ctty == ttyp->ntty
+ && (pi->process_state & PID_NOTCYGWIN)
+ && input_rec[i].EventType == KEY_EVENT && c == '\003')
+ {
+ bool not_a_sig = false;
+ if (!CCEQ (ti.c_cc[VINTR], c)
+ && !CCEQ (ti.c_cc[VQUIT], c)
+ && !CCEQ (ti.c_cc[VSUSP], c))
+ not_a_sig = true;
+ if (input_rec[i].Event.KeyEvent.bKeyDown)
+ {
+ /* CTRL_C_EVENT does not work for the process started with
+ CREATE_NEW_PROCESS_GROUP flag, so send CTRL_BREAK_EVENT
+ instead. */
+ if (pi->process_state & PID_NEW_PG)
+ GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT,
+ pi->dwProcessId);
+ else
+ GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0);
+ if (not_a_sig)
+ goto skip_writeback;
+ }
+ processed = true;
+ if (not_a_sig)
+ goto remove_record;
+ }
switch (input_rec[i].EventType)
{
case KEY_EVENT:
@@ -310,6 +337,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
processed = true;
break;
}
+remove_record:
if (processed)
{ /* Remove corresponding record. */
memmove (input_rec + i, input_rec + i + 1,
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index 3461d17..fe10215 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -147,6 +147,8 @@ tty_min::kill_pgrp (int sig)
_pinfo *p = pids[i];
if (!p || !p->exists () || p->ctty != ntty || p->pgid != pgid)
continue;
+ if (p->process_state & PID_NOTCYGWIN)
+ continue;
if (p == myself)
killself = sig != __SIGSETPGRP && !exit_state;
else
@@ -326,6 +328,42 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
if (ti.c_iflag & ISTRIP)
c &= 0x7f;
+ winpids pids ((DWORD) 0);
+ if (get_ttyp ()->pcon_input_state_eq (tty::to_nat))
+ {
+ bool need_discard_input = false;
+ for (unsigned i = 0; i < pids.npids; i++)
+ {
+ _pinfo *p = pids[i];
+ if (c == '\003' && p && p->ctty == tc ()->ntty
+ && p->pgid == tc ()->getpgid ()
+ && (p->process_state & PID_NOTCYGWIN))
+ {
+ /* CTRL_C_EVENT does not work for the process started with
+ CREATE_NEW_PROCESS_GROUP flag, so send CTRL_BREAK_EVENT
+ instead. */
+ if (p->process_state & PID_NEW_PG)
+ GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT,
+ p->dwProcessId);
+ else
+ GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0);
+ need_discard_input = true;
+ }
+ }
+ if (need_discard_input
+ && !CCEQ (ti.c_cc[VINTR], c)
+ && !CCEQ (ti.c_cc[VQUIT], c)
+ && !CCEQ (ti.c_cc[VSUSP], c))
+ {
+ if (!(ti.c_lflag & NOFLSH))
+ {
+ eat_readahead (-1);
+ discard_input ();
+ }
+ ti.c_lflag &= ~FLUSHO;
+ continue;
+ }
+ }
if (ti.c_lflag & ISIG)
{
int sig;
--
2.35.3

67
msys2-runtime/0038-Cygwin-pty-Pass-Ctrl-Z-EOF-to-non-cygwin-apps-with-d.patch
View File

@ -1,67 +0,0 @@
From 69e9facbd4909e77bc1f991076867740eb07ad3a Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Sat, 12 Feb 2022 17:51:55 +0900
Subject: [PATCH 38/N] Cygwin: pty: Pass Ctrl-Z (EOF) to non-cygwin apps with
disable_pcon.
- Previously, non-cygwin app running in pty started without pseudo
console support was suspended by Ctrl-Z rather than sending EOF.
Even worse, suspended app could not be resumed by fg command. With
this patch, Ctrl-Z (EOF for non-cygwin apps) is passed to non-cygwin
app instead of suspending that app. This patch also handles Ctrl-\
(QUIT) and Ctrl-D (EOF) as well.
---
winsup/cygwin/fhandler_termios.cc | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index fe10215..b935a70 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -329,6 +329,7 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
if (ti.c_iflag & ISTRIP)
c &= 0x7f;
winpids pids ((DWORD) 0);
+ bool need_check_sigs = get_ttyp ()->pcon_input_state_eq (tty::to_cyg);
if (get_ttyp ()->pcon_input_state_eq (tty::to_nat))
{
bool need_discard_input = false;
@@ -349,11 +350,15 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0);
need_discard_input = true;
}
+ if (p->ctty == get_ttyp ()->ntty
+ && p->pgid == get_ttyp ()->getpgid () && !p->cygstarted)
+ need_check_sigs = true;
}
- if (need_discard_input
- && !CCEQ (ti.c_cc[VINTR], c)
+ if (!CCEQ (ti.c_cc[VINTR], c)
&& !CCEQ (ti.c_cc[VQUIT], c)
&& !CCEQ (ti.c_cc[VSUSP], c))
+ need_check_sigs = false;
+ if (need_discard_input && !need_check_sigs)
{
if (!(ti.c_lflag & NOFLSH))
{
@@ -364,7 +369,7 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
continue;
}
}
- if (ti.c_lflag & ISIG)
+ if ((ti.c_lflag & ISIG) && need_check_sigs)
{
int sig;
if (CCEQ (ti.c_cc[VINTR], c))
@@ -469,7 +474,7 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti,
}
continue;
}
- else if (CCEQ (ti.c_cc[VEOF], c))
+ else if (CCEQ (ti.c_cc[VEOF], c) && need_check_sigs)
{
termios_printf ("EOF");
accept_input ();
--
2.35.3

34
msys2-runtime/0039-Cygwin-pty-Prevent-deadlock-on-echo-output.patch
View File

@ -1,34 +0,0 @@
From 9d5dfc73fd91cffbd4b4de0cb969e6e474072de4 Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Thu, 10 Feb 2022 17:22:11 +0900
Subject: [PATCH 39/N] Cygwin: pty: Prevent deadlock on echo output.
- If the slave process writes a lot of text output, doecho() can
cause deadlock. This is because output_mutex is held in slave::
write() and if WriteFile() is blocked due to pipe full, doecho()
tries to acquire output_mutex and gets into deadlock. With this
patch, the deadlock is prevented on the sacrifice of atomicity
of doecho().
---
winsup/cygwin/fhandler_tty.cc | 2 --
1 file changed, 2 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 10566ac..c1c2c1d 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -496,11 +496,9 @@ void
fhandler_pty_master::doecho (const void *str, DWORD len)
{
ssize_t towrite = len;
- acquire_output_mutex (mutex_timeout);
if (!process_opost_output (echo_w, str, towrite, true,
get_ttyp (), is_nonblocking ()))
termios_printf ("Write to echo pipe failed, %E");
- release_output_mutex ();
}
int
--
2.35.3

99
msys2-runtime/0040-Cygwin-pty-Revise-the-code-to-wait-for-completion-of.patch
View File

@ -1,99 +0,0 @@
From 223769c731c7d83b254c911b4fa5c671ebe79e64 Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Thu, 10 Feb 2022 17:47:51 +0900
Subject: [PATCH 40/N] Cygwin: pty: Revise the code to wait for completion of
forwarding.
- With this patch, the code to wait for completion of forwarding of
output from non-cygwin app is revised so that it can more reliably
detect the completion.
---
winsup/cygwin/fhandler_tty.cc | 5 ++++-
winsup/cygwin/tty.cc | 11 ++++++-----
winsup/cygwin/tty.h | 3 ++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index c1c2c1d..6217883 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1122,7 +1122,7 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
if (WaitForSingleObject (h_gdb_process, 0) == WAIT_TIMEOUT)
{
if (isHybrid)
- get_ttyp ()->wait_pcon_fwd (false);
+ get_ttyp ()->wait_pcon_fwd ();
}
else
{
@@ -2717,6 +2717,9 @@ fhandler_pty_master::pty_master_fwd_thread (const master_fwd_thread_param_t *p)
for (;;)
{
p->ttyp->pcon_last_time = GetTickCount ();
+ DWORD n;
+ p->ttyp->pcon_fwd_not_empty =
+ ::bytes_available (n, p->from_slave_nat) && n;
if (!ReadFile (p->from_slave_nat, outbuf, NT_MAX_PATH, &rlen, NULL))
{
termios_printf ("ReadFile for forwarding failed, %E");
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index 7895288..da75b8d 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -240,6 +240,7 @@ tty::init ()
pcon_pid = 0;
term_code_page = 0;
pcon_last_time = 0;
+ pcon_fwd_not_empty = false;
pcon_start = false;
pcon_start_pid = 0;
pcon_cap_checked = false;
@@ -367,7 +368,7 @@ tty_min::setpgid (int pid)
}
void
-tty::wait_pcon_fwd (bool init)
+tty::wait_pcon_fwd ()
{
/* The forwarding in pseudo console sometimes stops for
16-32 msec even if it already has data to transfer.
@@ -377,11 +378,11 @@ tty::wait_pcon_fwd (bool init)
thread when the last data is transfered. */
const int sleep_in_pcon = 16;
const int time_to_wait = sleep_in_pcon * 2 + 1/* margine */;
- if (init)
- pcon_last_time = GetTickCount ();
- while (GetTickCount () - pcon_last_time < time_to_wait)
+ int elapsed;
+ while (pcon_fwd_not_empty
+ || (elapsed = GetTickCount () - pcon_last_time) < time_to_wait)
{
- int tw = time_to_wait - (GetTickCount () - pcon_last_time);
+ int tw = pcon_fwd_not_empty ? 10 : (time_to_wait - elapsed);
cygwait (tw);
}
}
diff --git a/winsup/cygwin/tty.h b/winsup/cygwin/tty.h
index 519d7c0..2cd12a6 100644
--- a/winsup/cygwin/tty.h
+++ b/winsup/cygwin/tty.h
@@ -116,6 +116,7 @@ private:
DWORD pcon_pid;
UINT term_code_page;
DWORD pcon_last_time;
+ bool pcon_fwd_not_empty;
HANDLE h_pcon_write_pipe;
HANDLE h_pcon_condrv_reference;
HANDLE h_pcon_conhost_process;
@@ -166,7 +167,7 @@ public:
void set_master_ctl_closed () {master_pid = -1;}
static void __stdcall create_master (int);
static void __stdcall init_session ();
- void wait_pcon_fwd (bool init = true);
+ void wait_pcon_fwd ();
bool pcon_input_state_eq (xfer_dir x) { return pcon_input_state == x; }
bool pcon_fg (pid_t pgid);
friend class fhandler_pty_common;
--
2.35.3

31
msys2-runtime/0041-Cygwin-pty-Discard-input-in-from_master_nat-pipe-on-.patch
View File

@ -1,31 +0,0 @@
From fa46a437767f1ac66742a41f56b4e4b1f052ccef Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Sun, 13 Feb 2022 02:16:32 +0900
Subject: [PATCH 41/N] Cygwin: pty: Discard input in from_master_nat pipe on
signal as well.
- Currently, pty discards input only in from_master pipe on signal.
Due to this, if pty is started without pseudo console support and
start a non-cygwin process from cmd.exe, type adhead input is not
discarded on signals such as Ctrl-C. This patch fixes the issue.
---
winsup/cygwin/fhandler_tty.cc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 6217883..d80b530 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -438,6 +438,9 @@ fhandler_pty_master::discard_input ()
while (::bytes_available (bytes_in_pipe, from_master) && bytes_in_pipe)
ReadFile (from_master, buf, sizeof(buf), &n, NULL);
ResetEvent (input_available_event);
+ if (!get_ttyp ()->pcon_activated)
+ while (::bytes_available (bytes_in_pipe, from_master_nat) && bytes_in_pipe)
+ ReadFile (from_master_nat, buf, sizeof(buf), &n, NULL);
get_ttyp ()->discard_input = true;
ReleaseMutex (input_mutex);
}
--
2.35.3

29
msys2-runtime/0042-Cygwin-pty-Fix-a-bug-in-tty_min-segpgid.patch
View File

@ -1,29 +0,0 @@
From 9b90fed7c54215a1b958806f11825650e6196aa6 Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Sun, 13 Feb 2022 05:12:18 +0900
Subject: [PATCH 42/N] Cygwin: pty: Fix a bug in tty_min::segpgid().
- In tty_min::setpgid(), a pointer to fhandler instance is casted to
fhandler_pty_slave and accessed even if terminal is not a pty slave.
This patch fixes the issue.
---
winsup/cygwin/tty.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index da75b8d..c0015ac 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -309,7 +309,8 @@ tty_min::setpgid (int pid)
fhandler_pty_slave *ptys = NULL;
cygheap_fdenum cfd (false);
while (cfd.next () >= 0 && ptys == NULL)
- if (cfd->get_device () == getntty ())
+ if (cfd->get_device () == getntty ()
+ && cfd->get_major () == DEV_PTYS_MAJOR)
ptys = (fhandler_pty_slave *) (fhandler_base *) cfd;
if (ptys)
--
2.35.3

286
msys2-runtime/0043-Cygwin-console-Fix-console-mode-for-non-cygwin-infer.patch
View File

@ -1,286 +0,0 @@
From f5649ceeaccfd53b55127819a142cf20f15a2a3e Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Sun, 13 Feb 2022 12:03:45 +0900
Subject: [PATCH 43/N] Cygwin: console: Fix console mode for non-cygwin
inferior of GDB.
- Currently, there is no chance to change console mode for non-cygwin
inferior of GDB. With this patch, the console mode is changed to
tty::native in CreateProcess() and ContinueDebugEvent() hooked in
fhandler_console.
---
winsup/cygwin/fhandler.h | 2 +
winsup/cygwin/fhandler_console.cc | 39 +++++++++
winsup/cygwin/fhandler_tty.cc | 128 +++++++++++++++---------------
3 files changed, 107 insertions(+), 62 deletions(-)
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 4226bfd..c2d91ea 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1941,6 +1941,8 @@ class fhandler_termios: public fhandler_base
fh->copy_from (this);
return fh;
}
+ static bool path_iscygexec_a (LPCSTR n, LPSTR c);
+ static bool path_iscygexec_w (LPCWSTR n, LPWSTR c);
};
enum ansi_intensity
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 996561b..17de688 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -32,6 +32,7 @@ details. */
#include "sync.h"
#include "child_info.h"
#include "cygwait.h"
+#include "winf.h"
/* Don't make this bigger than NT_MAX_PATH as long as the temporary buffer
is allocated using tmp_pathbuf!!! */
@@ -3585,10 +3586,32 @@ set_console_title (char *title)
debug_printf ("title '%W'", buf);
}
+static bool NO_COPY gdb_inferior_noncygwin = false;
+static void
+set_console_mode_to_native ()
+{
+ cygheap_fdenum cfd (false);
+ while (cfd.next () >= 0)
+ if (cfd->get_major () == DEV_CONS_MAJOR)
+ {
+ fhandler_console *cons = (fhandler_console *) (fhandler_base *) cfd;
+ if (cons->get_device () == cons->tc ()->getntty ())
+ {
+ termios *cons_ti = &((tty *) cons->tc ())->ti;
+ fhandler_console::set_input_mode (tty::native, cons_ti,
+ cons->get_handle_set ());
+ fhandler_console::set_output_mode (tty::native, cons_ti,
+ cons->get_handle_set ());
+ break;
+ }
+ }
+}
+
#define DEF_HOOK(name) static __typeof__ (name) *name##_Orig
/* CreateProcess() is hooked for GDB etc. */
DEF_HOOK (CreateProcessA);
DEF_HOOK (CreateProcessW);
+DEF_HOOK (ContinueDebugEvent);
static BOOL WINAPI
CreateProcessA_Hooked
@@ -3598,6 +3621,9 @@ CreateProcessA_Hooked
{
if (f & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS))
mutex_timeout = 0; /* to avoid deadlock in GDB */
+ gdb_inferior_noncygwin = !fhandler_termios::path_iscygexec_a (n, c);
+ if (gdb_inferior_noncygwin)
+ set_console_mode_to_native ();
return CreateProcessA_Orig (n, c, pa, ta, inh, f, e, d, si, pi);
}
@@ -3609,9 +3635,21 @@ CreateProcessW_Hooked
{
if (f & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS))
mutex_timeout = 0; /* to avoid deadlock in GDB */
+ gdb_inferior_noncygwin = !fhandler_termios::path_iscygexec_w (n, c);
+ if (gdb_inferior_noncygwin)
+ set_console_mode_to_native ();
return CreateProcessW_Orig (n, c, pa, ta, inh, f, e, d, si, pi);
}
+static BOOL WINAPI
+ContinueDebugEvent_Hooked
+ (DWORD p, DWORD t, DWORD s)
+{
+ if (gdb_inferior_noncygwin)
+ set_console_mode_to_native ();
+ return ContinueDebugEvent_Orig (p, t, s);
+}
+
void
fhandler_console::fixup_after_fork_exec (bool execing)
{
@@ -3631,6 +3669,7 @@ fhandler_console::fixup_after_fork_exec (bool execing)
/* CreateProcess() is hooked for GDB etc. */
DO_HOOK (NULL, CreateProcessA);
DO_HOOK (NULL, CreateProcessW);
+ DO_HOOK (NULL, ContinueDebugEvent);
}
// #define WINSTA_ACCESS (WINSTA_READATTRIBUTES | STANDARD_RIGHTS_READ | STANDARD_RIGHTS_WRITE | WINSTA_CREATEDESKTOP | WINSTA_EXITWINDOWS)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index d80b530..a35cee0 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -157,6 +157,66 @@ set_switch_to_pcon (HANDLE *in, HANDLE *out, HANDLE *err, bool iscygwin)
*err = replace_err->get_output_handle_nat ();
}
+static bool
+path_iscygexec_a_w (LPCSTR na, LPSTR ca, LPCWSTR nw, LPWSTR cw)
+{
+ path_conv path;
+ tmp_pathbuf tp;
+ char *prog =tp.c_get ();
+ if (na)
+ {
+ __small_sprintf (prog, "%s", na);
+ find_exec (prog, path);
+ }
+ else if (nw)
+ {
+ __small_sprintf (prog, "%W", nw);
+ find_exec (prog, path);
+ }
+ else
+ {
+ if (ca)
+ __small_sprintf (prog, "%s", ca);
+ else if (cw)
+ __small_sprintf (prog, "%W", cw);
+ else
+ return true;
+ char *p = prog;
+ char *p1;
+ do
+ if ((p1 = strchr (p, ' ')) || (p1 = p + strlen (p)))
+ {
+ p = p1;
+ if (*p == ' ')
+ {
+ *p = '\0';
+ find_exec (prog, path);
+ *p = ' ';
+ p ++;
+ }
+ else if (*p == '\0')
+ find_exec (prog, path);
+ }
+ while (!path.exists() && *p);
+ }
+ const char *argv[] = {"", NULL}; /* Dummy */
+ av av1;
+ av1.setup ("", path, "", 1, argv, false);
+ return path.iscygexec ();
+}
+
+bool
+fhandler_termios::path_iscygexec_a (LPCSTR n, LPSTR c)
+{
+ return path_iscygexec_a_w (n, c, NULL, NULL);
+}
+
+bool
+fhandler_termios::path_iscygexec_w (LPCWSTR n, LPWSTR c)
+{
+ return path_iscygexec_a_w (NULL, NULL, n, c);
+}
+
static bool atexit_func_registered = false;
static bool debug_process = false;
@@ -220,37 +280,9 @@ CreateProcessA_Hooked
siov->hStdOutput = GetStdHandle (STD_OUTPUT_HANDLE);
siov->hStdError = GetStdHandle (STD_ERROR_HANDLE);
}
- path_conv path;
- tmp_pathbuf tp;
- char *prog =tp.c_get ();
- if (n)
- __small_sprintf (prog, "%s", n);
- else
- {
- __small_sprintf (prog, "%s", c);
- char *p = prog;
- char *p1;
- do
- if ((p1 = strchr (p, ' ')) || (p1 = p + strlen (p)))
- {
- p = p1;
- if (*p == ' ')
- {
- *p = '\0';
- find_exec (prog, path);
- *p = ' ';
- p ++;
- }
- else if (*p == '\0')
- find_exec (prog, path);
- }
- while (!path.exists() && *p);
- }
- const char *argv[] = {"", NULL}; /* Dummy */
- av av1;
- av1.setup ("", path, "", 1, argv, false);
+ bool path_iscygexec = fhandler_termios::path_iscygexec_a (n, c);
set_switch_to_pcon (&siov->hStdInput, &siov->hStdOutput, &siov->hStdError,
- path.iscygexec ());
+ path_iscygexec);
BOOL ret = CreateProcessA_Orig (n, c, pa, ta, inh, f, e, d, siov, pi);
h_gdb_process = pi->hProcess;
DuplicateHandle (GetCurrentProcess (), h_gdb_process,
@@ -259,7 +291,7 @@ CreateProcessA_Hooked
debug_process = !!(f & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS));
if (debug_process)
mutex_timeout = 0; /* to avoid deadlock in GDB */
- if (!atexit_func_registered && !path.iscygexec ())
+ if (!atexit_func_registered && !path_iscygexec)
{
atexit (atexit_func);
atexit_func_registered = true;
@@ -286,37 +318,9 @@ CreateProcessW_Hooked
siov->hStdOutput = GetStdHandle (STD_OUTPUT_HANDLE);
siov->hStdError = GetStdHandle (STD_ERROR_HANDLE);
}
- path_conv path;
- tmp_pathbuf tp;
- char *prog =tp.c_get ();
- if (n)
- __small_sprintf (prog, "%W", n);
- else
- {
- __small_sprintf (prog, "%W", c);
- char *p = prog;
- char *p1;
- do
- if ((p1 = strchr (p, ' ')) || (p1 = p + strlen (p)))
- {
- p = p1;
- if (*p == ' ')
- {
- *p = '\0';
- find_exec (prog, path);
- *p = ' ';
- p ++;
- }
- else if (*p == '\0')
- find_exec (prog, path);
- }
- while (!path.exists() && *p);
- }
- const char *argv[] = {"", NULL}; /* Dummy */
- av av1;
- av1.setup ("", path, "", 1, argv, false);
+ bool path_iscygexec = fhandler_termios::path_iscygexec_w (n, c);
set_switch_to_pcon (&siov->hStdInput, &siov->hStdOutput, &siov->hStdError,
- path.iscygexec ());
+ path_iscygexec);
BOOL ret = CreateProcessW_Orig (n, c, pa, ta, inh, f, e, d, siov, pi);
h_gdb_process = pi->hProcess;
DuplicateHandle (GetCurrentProcess (), h_gdb_process,
@@ -325,7 +329,7 @@ CreateProcessW_Hooked
debug_process = !!(f & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS));
if (debug_process)
mutex_timeout = 0; /* to avoid deadlock in GDB */
- if (!atexit_func_registered && !path.iscygexec ())
+ if (!atexit_func_registered && !path_iscygexec)
{
atexit (atexit_func);
atexit_func_registered = true;
--
2.35.3

56
msys2-runtime/0044-Cygwin-console-Set-console-mode-even-if-stdin-stdout.patch
View File

@ -1,56 +0,0 @@
From 2256476a14cb45c594013d33934ed1ac83240f50 Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Sun, 13 Feb 2022 17:11:02 +0900
Subject: [PATCH 44/N] Cygwin: console: Set console mode even if stdin/stdout
is redirected.
- When non-cygwin app is started in console, console mode is set to
tty::native. However, if stdin is redirected, current code does not
set the input mode of the console. In this case, if the app opens
"CONIN$", the console mode will not be appropriate for non-cygwin
app. This patch fixes the issue.
Addresses:
https://github.com/GitCredentialManager/git-credential-manager/issues/576
---
winsup/cygwin/spawn.cc | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index d7ee5fe..434a4a0 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -657,23 +657,18 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
}
else if (fh && fh->get_major () == DEV_CONS_MAJOR)
{
- fhandler_console *cons = (fhandler_console *) fh;
- if (!iscygwin ())
+ if (!iscygwin () && cons_native == NULL)
{
- if (cons_native == NULL)
- {
- cons_native = cons;
- cons_ti = &((tty *)cons->tc ())->ti;
- cons_owner = cons->get_owner ();
- }
+ fhandler_console *cons = (fhandler_console *) fh;
+ cons_native = cons;
+ cons_ti = &((tty *)cons->tc ())->ti;
+ cons_owner = cons->get_owner ();
tty::cons_mode conmode =
(ctty_pgid && ctty_pgid == myself->pgid) ?
tty::native : tty::restore;
- if (fd == 0)
- fhandler_console::set_input_mode (conmode,
+ fhandler_console::set_input_mode (conmode,
cons_ti, cons->get_handle_set ());
- else if (fd == 1 || fd == 2)
- fhandler_console::set_output_mode (conmode,
+ fhandler_console::set_output_mode (conmode,
cons_ti, cons->get_handle_set ());
}
}
--
2.35.3

63
msys2-runtime/0045-Cygwin-Fix-build-with-w32api-10.0.0.patch
View File

@ -1,63 +0,0 @@
From 764df7171adfcc1c1c662e5d3cb778f14f0f3cad Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 12 Apr 2022 11:41:13 +0100
Subject: [PATCH 45/N] Cygwin: Fix build with w32api 10.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
> ../../../../src/winsup/cygwin/sec_auth.cc:1240:16: error: redefinition of ‘struct _MSV1_0_S4U_LOGON’
> 1240 | typedef struct _MSV1_0_S4U_LOGON
> | ^~~~~~~~~~~~~~~~~
> In file included from ../../../../src/winsup/cygwin/ntsecapi.h:10,
> from ../../../../src/winsup/cygwin/sec_auth.cc:13:
> /usr/include/w32api/ntsecapi.h:1425:18: note: previous definition of ‘struct _MSV1_0_S4U_LOGON’
> 1425 | typedef struct _MSV1_0_S4U_LOGON {
> | ^~~~~~~~~~~~~~~~~
> ../../../../src/winsup/cygwin/sec_auth.cc:1246:3: error: conflicting declaration ‘typedef int MSV1_0_S4U_LOGON’
> 1246 | } MSV1_0_S4U_LOGON, *PMSV1_0_S4U_LOGON;
> | ^~~~~~~~~~~~~~~~
> In file included from ../../../../src/winsup/cygwin/ntsecapi.h:10,
> from ../../../../src/winsup/cygwin/sec_auth.cc:13:
> /usr/include/w32api/ntsecapi.h:1430:5: note: previous declaration as ‘typedef struct _MSV1_0_S4U_LOGON MSV1_0_S4U_LOGON’
> 1430 | } MSV1_0_S4U_LOGON, *PMSV1_0_S4U_LOGON;
> | ^~~~~~~~~~~~~~~~
> ../../../../src/winsup/cygwin/sec_auth.cc:1246:22: error: conflicting declaration ‘typedef int* PMSV1_0_S4U_LOGON’
> 1246 | } MSV1_0_S4U_LOGON, *PMSV1_0_S4U_LOGON;
> | ^~~~~~~~~~~~~~~~~
> In file included from ../../../../src/winsup/cygwin/ntsecapi.h:10,
> from ../../../../src/winsup/cygwin/sec_auth.cc:13:
> /usr/include/w32api/ntsecapi.h:1430:24: note: previous declaration as ‘typedef struct _MSV1_0_S4U_LOGON* PMSV1_0_S4U_LOGON’
> 1430 | } MSV1_0_S4U_LOGON, *PMSV1_0_S4U_LOGON;
---
winsup/cygwin/sec_auth.cc | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index b216634..2fe890b 100644
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -1475,8 +1475,9 @@ out:
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* In Mingw-w64, MsV1_0S4ULogon and MSV1_0_S4U_LOGON are only defined
- in ddk/ntifs.h. We can't include this. */
+/* In w32api prior to 10.0.0, MsV1_0S4ULogon and MSV1_0_S4U_LOGON are only
+ defined in ddk/ntifs.h, which we can't include. */
+#if (__MINGW64_VERSION_MAJOR < 10)
#define MsV1_0S4ULogon ((MSV1_0_LOGON_SUBMIT_TYPE) 12)
@@ -1491,6 +1492,8 @@ typedef struct _MSV1_0_S4U_LOGON
/* Missing in Mingw-w64 */
#define KERB_S4U_LOGON_FLAG_IDENTITY 0x08
+#endif
+
/* If logon is true we need an impersonation token. Otherwise we just
need an identification token, e. g. to fetch the group list. */
HANDLE
--
2.35.3

35
msys2-runtime/0046-Cygwin-Fix-typo-KERB_S4U_LOGON_FLAG_IDENTITY-IDENTIF.patch
View File

@ -1,35 +0,0 @@
From 92b220b3a00105762e324bf4a02005c762b2b7ed Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue, 12 Apr 2022 11:48:54 +0100
Subject: [PATCH 46/N] Cygwin: Fix typo KERB_S4U_LOGON_FLAG_IDENTITY ->
IDENTIFY
---
winsup/cygwin/sec_auth.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index 2fe890b..2b94d03 100644
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -1490,7 +1490,7 @@ typedef struct _MSV1_0_S4U_LOGON
} MSV1_0_S4U_LOGON, *PMSV1_0_S4U_LOGON;
/* Missing in Mingw-w64 */
-#define KERB_S4U_LOGON_FLAG_IDENTITY 0x08
+#define KERB_S4U_LOGON_FLAG_IDENTIFY 0x08
#endif
@@ -1611,7 +1611,7 @@ s4uauth (bool logon, PCWSTR domain, PCWSTR user, NTSTATUS &ret_status)
RtlSecureZeroMemory (authinf, authinf_size);
s4u_logon = (KERB_S4U_LOGON *) authinf;
s4u_logon->MessageType = KerbS4ULogon;
- s4u_logon->Flags = logon ? 0 : KERB_S4U_LOGON_FLAG_IDENTITY;
+ s4u_logon->Flags = logon ? 0 : KERB_S4U_LOGON_FLAG_IDENTIFY;
/* Append user to login info */
RtlInitEmptyUnicodeString (&s4u_logon->ClientUpn,
(PWCHAR) (s4u_logon + 1),
--
2.35.3

112
msys2-runtime/PKGBUILD
View File

@ -3,8 +3,8 @@
pkgbase=msys2-runtime pkgbase=msys2-runtime
pkgname=('msys2-runtime' 'msys2-runtime-devel') pkgname=('msys2-runtime' 'msys2-runtime-devel')
pkgver=3.3.4 pkgver=3.3.5
pkgrel=2 pkgrel=1
pkgdesc="Cygwin POSIX emulation engine" pkgdesc="Cygwin POSIX emulation engine"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://www.cygwin.com/" url="https://www.cygwin.com/"
@ -59,65 +59,43 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
0032-docs-skip-building-texinfo-and-PDF-files.patch 0032-docs-skip-building-texinfo-and-PDF-files.patch
0033-install-libs-depend-on-the-toollibs.patch 0033-install-libs-depend-on-the-toollibs.patch
0034-POSIX-ify-the-SHELL-variable.patch 0034-POSIX-ify-the-SHELL-variable.patch
0035-Handle-ORIGINAL_PATH-just-like-PATH.patch 0035-Handle-ORIGINAL_PATH-just-like-PATH.patch)
0036-Cygwin-console-Maintain-ENABLE_-INSERT-QUICK_EDIT-_M.patch
0037-Cygwin-pty-console-Fix-Ctrl-C-handling-for-non-cygwi.patch
0038-Cygwin-pty-Pass-Ctrl-Z-EOF-to-non-cygwin-apps-with-d.patch
0039-Cygwin-pty-Prevent-deadlock-on-echo-output.patch
0040-Cygwin-pty-Revise-the-code-to-wait-for-completion-of.patch
0041-Cygwin-pty-Discard-input-in-from_master_nat-pipe-on-.patch
0042-Cygwin-pty-Fix-a-bug-in-tty_min-segpgid.patch
0043-Cygwin-console-Fix-console-mode-for-non-cygwin-infer.patch
0044-Cygwin-console-Set-console-mode-even-if-stdin-stdout.patch
0045-Cygwin-Fix-build-with-w32api-10.0.0.patch
0046-Cygwin-Fix-typo-KERB_S4U_LOGON_FLAG_IDENTITY-IDENTIF.patch)
sha256sums=('SKIP' sha256sums=('SKIP'
'61d44e17527d3ccea3e7e8bbfae958b888dc62c5ea91ec8aaf8d4b313dee7e44' '65805191a1c4944f9862e51157e7ea74fb2d31cb8364812c7ff02ebc94c68024'
'76bb6a975d1faca66e1cc44be9139556dc731501ade1af229b6e6fe5f47bb15c' 'a60df16d316b2209d885108d41a208c2f261351546a6000194f34de56c53479e'
'7325d07a0895819d49bc9541cb896b0884ed4c30ef81ca6e09a5d37f47bf0e31' '8f90fa74991b0141aef14e47479e83e43561d3f1ce84c5dad396fd529c8c3315'
'04469319c81343c06cf946b4e0a390928fa005edfc687c34ec757bf18f21ec70' '455ed3cfe7c42633c4ee5532bdfa9545b7429808e80c4df9af8cd837cd63c845'
'6a5337e1d38a02d41ad7ad304abe4a85881a2c80a51b19bdf11c86cc1a0b9be8' '230b47915bd302e467d290917167e688a52a74fe144fee1117aee6dcf69a63f0'
'b23f06173c09882f9bdb55d3a8deadf19919fe18a2406f41e416105b61b7fed6' '80fa0613347d5180374a2b0da7b8f7dcec6ce12d2bbdbcb7019fbcd9d915b4ad'
'b08b1d7254454698ae852157f9b159a3ca80e9c97182e5437087f6b3724cc88f' '5908989f5245cf8d9413b1a06db9030c048fa6e2bfa70539cadba60da2efab52'
'cb6896acc49351fcc19a572cda0d3349e7a89b5e2f5dcdb70b8e3ac4f0575b44' 'bd16f22db95bacbb8b1cc5b41af5f58fdbd2968520f04e690f4b7f90ff7cb326'
'a9f549a108fd5674223a9077e20f7a428b259cc582bbe290ed44b0201834178a' 'af459e55f67a3d39c4c22294f0d0166ca7f33608fe4e3ad38af0da8e7d633f53'
'6abe08304ceab8f44e39e7f26d8afbbe0b43234f8f80f696303f25b7960a384f' '637b60627a24294739091c13fc2c24c1a10f3201e4032bb32e20904087ef0abe'
'a5be86f427d5909e5316218fde29a5da63f31e5d8baf099fe564866329bff636' 'b4a9582261915f0ee8d1b89f798e81fdd65667f1a65a5c4a55b020cfff0eaf5b'
'329c9f5ba415256f2044a2b3ea59b2cb48bd4e0d3dbae5a23a9ee9764f1332c1' '2d39de2585835b36c057a4a1bf3d7e7b6e9a0aa6956a5570ff145be6fa52f7a1'
'c798c3bc051b4461fc75694ef5bd062ab0d94d4b46bfd69929926fb154694687' '61e4fc824b7341c4841803b01a0ea3ed8ec07052d926f28f8baa98809350d0ef'
'94f0e53371075077d3ba00bab8d51ee80ba990a23ecc8651f8e5aeb126bbabe0' '08503ecbb9efd4fd7d4f890a219eb93f3e99d289838a39252229bd77d3e6e916'
'6ba236f8f1dabf1b6fdc40366b07982b239f394760256af680e098b36d674d19' '531638ea7f621cacc3d715b30e125cb36c8f4e65973031be66e6fd0cb269ce01'
'e75ecfbef4a4ed184818b9ae59a7baf083226ba683b8e49dcded6195c5973162' 'eae17e4e3301ea2a78082122673ce8a2e574d4ad9a22220b201c09f9f2c742b6'
'790b723d92f55fef23a91b1ae739ebcc9052ba14c20640d85ea61c3fcdd73afd' '38e8f22c70c89c99ca801bab8560e71088056f80782a1f7bcd8534fdc97707d4'
'01e227e0a6daf56d6f291778b4879510e3251836181a1dd25fbea50b8b5c79fb' '487d432561fd6ac27742ab5de6ee76f688b1a38c3efb63b29f5c403c7f89b20d'
'1f494d420e34559e6b5236272560d7d54b23286bcc04c55e2d51623b0a46754e' '4bb5034dcace080eece103e54774961af690b8a3c1d1dcaa5302c7483cb82935'
'7f96864d11ed06ad428f4e1032f332d7e4a4862669029ece1492de1f319c9208' '6e99048925c65e869f0a04d2043321d0e41b140bf0431fbea984a709b5d66d65'
'fef66285fb3ad5ebbe2b2c5495d0b91d7ba7da0c428dcf87afe34d890a68c627' '8d47fff3641ef75fc347dc980936bf5c946fb7e3de40bb71c38652e272eabf65'
'f31d05080b743db8bc90c124bb4600d14d5cd0377c682ced740533260b76022d' '96323da3472d8511f033d8016f37a6170593b3272a392c15ca79aefd4d0eb24e'
'dfcef25a0a550eea87d7f65938f36f199d62ad53bebac64e7670e80a8458ba17' '9142acfe0a30a46881e1076d86cc9ee536ce20b9aca25892769b365d68ffa529'
'b9b4d423c08566b8e352b67bc894c73d8bbddfb6392b311de85e8de4ef39cafc' 'dfa7dc3cb7e1606205f32091988e58484f03a4e9624a1d6298e92be38e92e818'
'c4f76cf8dcff42a281ad2ece93c0180a748d110514e901165c903b00479d59de' '6a0480930b34aa16c9014b8495f221c69cd735cd685bff80095167ada894637e'
'169e54aa91b41fc794381a28b8d02984645447e457f2df5c0e0b817051c6ebd9' 'a0adf1acd902cb32d182122320a7425566af8ae0a39adcc6cf65628576f65f74'
'e01d62ee0830817b754f68964dcdb01aff38c73df3c30c207858aa71e5acd986' '9d40a417f196591dc244642a42bad0f285af58c0bb82dce1bd92ef741b1cdbb2'
'448cc20cbb9df301895351c0ec090a735e21112a6fd8f6a4f795ccaf63484172' 'de81495194ad95599cbde5d0ee3c869e44f7ff36271e2319836817c984f15af5'
'8783ce29ee0af9d2967be9e1232379909a5eccc4ce8b1bede5a34e2dd1718b34' 'f75c37d4d0137c3411a7034ff764587d3160aa4755024a858c52c62444b01176'
'129b800039f1f7fd12355ceda471b7196f5da327ad7cda2c1655ae0628d21813' 'bec6fdd057d056ec5270a5c9c546c653c44d1e90d9c0b26b0ed979e89980cb84'
'a1ae2e8cd77ca20093f39447d8146ce528dec860c43b003476e3f59e152f11c0' '85f4f8ce1ceb0ab9b92d074b166047a947bf82a2f10a9750c59a86458c12e8a5'
'deca3a5797349c3648b205c0a8d5b501fac517d987b767537e6a1315e55af07e' 'e86a059e14d51e3bb4983b1ea4d43d8adbfc62a0bbd790700a7fe72f21a523dc'
'3bcb80f61d048c9ccf9545ae9bbd19ec757d717828e69b704ae192fa88519ff4' '872521ba8f3898460b614655b52f1af363fbda4ba03d892fa6e53e5bfb1c4c59'
'2933e75c27bc52cb522f0b1cd7f8e5753bb05e6362d9ad2234daaf672dabc505' '503df3c230a230cb515c4e34cd87a9f8f4a6e94875c9501173ef047fe5c432aa'
'773f7a720c5b30861c75aca54cd20a705b8f22458d800fd6458ea3f0b0741b1a' '0bcfa1b201f2d273fc58fb0300bd17e46c6cd444e981bcc0fb0d35c2901d3c9a')
'1fa1cc394996ddc2ec9ef2a2c685ba95992ffea101100e79b6880517000268e7'
'a8dbbeb96fd01cf03780ac6e9b62e65a5d1457b6d0d18cd93a62adf5a5ccca3f'
'3d1bcb5985a59850505729f83068970160e20c74fc6f18cd587163999d74be63'
'b8b1d7402f7b0c86ffb0e60c52d7072d62a16932f431cd1c898735f541601212'
'47639ee79778a0fc57b1a2eb42d97507734b94be36dbf138b36883879992e6c1'
'2c94e88f8632947ef9e808cd0605a84fed7d6dc4a6ba63cbc4d7a9011e97dc91'
'0ab62508bc424e03c301f6ba0c30af6a53966f78afb73badeff394ec7d2ebfa2'
'ce751208e3bb383fc110c67ac023f37b2e38b82766616a42b7c08422afb19d27'
'bacab808e8fd327071a1f48d0362d67b7da2d4a269c5cf26d713bcacd345cd7e'
'5a655fe2eb6161a3452217970915ba64dba40e1cea74ea264a2e97d8eed0d1b5'
'4a97e30de8da68533e22b5627d586d98a04d8adceb527b8814019b2ce3b86f30')
# Helper macros to help make tasks easier # # Helper macros to help make tasks easier #
apply_patch_with_msg() { apply_patch_with_msg() {
@ -189,18 +167,7 @@ prepare() {
0032-docs-skip-building-texinfo-and-PDF-files.patch \ 0032-docs-skip-building-texinfo-and-PDF-files.patch \
0033-install-libs-depend-on-the-toollibs.patch \ 0033-install-libs-depend-on-the-toollibs.patch \
0034-POSIX-ify-the-SHELL-variable.patch \ 0034-POSIX-ify-the-SHELL-variable.patch \
0035-Handle-ORIGINAL_PATH-just-like-PATH.patch \ 0035-Handle-ORIGINAL_PATH-just-like-PATH.patch
0036-Cygwin-console-Maintain-ENABLE_-INSERT-QUICK_EDIT-_M.patch \
0037-Cygwin-pty-console-Fix-Ctrl-C-handling-for-non-cygwi.patch \
0038-Cygwin-pty-Pass-Ctrl-Z-EOF-to-non-cygwin-apps-with-d.patch \
0039-Cygwin-pty-Prevent-deadlock-on-echo-output.patch \
0040-Cygwin-pty-Revise-the-code-to-wait-for-completion-of.patch \
0041-Cygwin-pty-Discard-input-in-from_master_nat-pipe-on-.patch \
0042-Cygwin-pty-Fix-a-bug-in-tty_min-segpgid.patch \
0043-Cygwin-console-Fix-console-mode-for-non-cygwin-infer.patch \
0044-Cygwin-console-Set-console-mode-even-if-stdin-stdout.patch \
0045-Cygwin-Fix-build-with-w32api-10.0.0.patch \
0046-Cygwin-Fix-typo-KERB_S4U_LOGON_FLAG_IDENTITY-IDENTIF.patch
} }
build() { build() {
@ -243,7 +210,6 @@ package_msys2-runtime() {
options=('!strip') options=('!strip')
conflicts=('catgets' 'libcatgets') conflicts=('catgets' 'libcatgets')
replaces=('catgets' 'libcatgets') replaces=('catgets' 'libcatgets')
#install=msys2-runtime.install
mkdir -p "${pkgdir}"/usr mkdir -p "${pkgdir}"/usr
cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/ cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/