msys2-runtime: Update to Cygwin's 2.11.1 release

2018-09-07 09:12:49 +03:00
parent a4207f5fcd
commit b7ec2196aa
25 changed files with 984 additions and 1063 deletions
--- a/msys2-runtime/0001-Add-MSYS-triplets.patch
+++ b/msys2-runtime/0001-Add-MSYS-triplets.patch
--- a/msys2-runtime/0002-Rename-DLL-from-cygwin-to-msys.patch
+++ b/msys2-runtime/0002-Rename-DLL-from-cygwin-to-msys.patch
@@ -1,64 +1,62 @@
-From bf3f71557bdd0d52ec7a6ce6dbf6014050d9305b Mon Sep 17 00:00:00 2001
+From c6e852c312b4055dda07543ebc12b6f3ea00769f Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Tue, 5 Apr 2016 10:15:20 +0300
 Subject: [PATCH 02/23] Rename DLL from cygwin to msys

 ---
 winsup/Makefile.in                        |  4 +--
- winsup/cygserver/Makefile.in              |  6 ++---
+ winsup/cygserver/Makefile.in              |  6 ++--
 winsup/cygserver/transport_pipes.h        |  4 +++
- winsup/cygwin/Makefile.in                 | 38 ++++++++++++++-------------
+ winsup/cygwin/Makefile.in                 | 38 ++++++++++----------
 winsup/cygwin/common.din                  |  4 +--
 winsup/cygwin/configure                   |  4 +--
 winsup/cygwin/configure.ac                |  4 +--
- winsup/cygwin/crt0.c                      |  8 ++++++
+ winsup/cygwin/crt0.c                      |  8 +++++
 winsup/cygwin/cyglsa.h                    |  4 +++
 winsup/cygwin/cygserver_setpwd.h          |  4 +++
 winsup/cygwin/cygthread.cc                |  2 +-
- winsup/cygwin/cygwin.sc.in                | 21 ++++++++++-----
- winsup/cygwin/dcrt0.cc                    | 20 ++++++++------
- winsup/cygwin/devices.cc                  |  2 +-
- winsup/cygwin/devices.in                  |  2 +-
- winsup/cygwin/dlfcn.cc                    |  5 ++++
- winsup/cygwin/dll_init.cc                 |  8 ++++++
- winsup/cygwin/dtable.cc                   |  6 +++++
+ winsup/cygwin/cygwin.sc.in                | 21 +++++++----
+ winsup/cygwin/dcrt0.cc                    | 20 ++++++-----
+ winsup/cygwin/dlfcn.cc                    |  5 +++
+ winsup/cygwin/dll_init.cc                 |  8 +++++
+ winsup/cygwin/dtable.cc                   |  6 ++++
 winsup/cygwin/exceptions.cc               |  4 +--
- winsup/cygwin/fhandler_tty.cc             | 12 +++++++++
+ winsup/cygwin/fhandler_tty.cc             | 12 +++++++
 winsup/cygwin/fork.cc                     |  2 +-
 winsup/cygwin/hookapi.cc                  |  4 +++
- winsup/cygwin/i686.din                    |  6 ++---
- winsup/cygwin/include/cygwin/cygwin_dll.h | 14 +++++-----
- winsup/cygwin/include/cygwin/version.h    |  8 ++++++
+ winsup/cygwin/i686.din                    |  6 ++--
+ winsup/cygwin/include/cygwin/cygwin_dll.h | 14 ++++----
+ winsup/cygwin/include/cygwin/version.h    |  8 +++++
 winsup/cygwin/lib/_cygwin_crt0_common.cc  |  4 +++
 winsup/cygwin/lib/crt0.h                  |  4 +++
- winsup/cygwin/lib/cygwin_attach_dll.c     |  8 ++++++
- winsup/cygwin/lib/cygwin_crt0.c           |  8 ++++++
- winsup/cygwin/mkvers.sh                   |  6 ++---
+ winsup/cygwin/lib/cygwin_attach_dll.c     |  8 +++++
+ winsup/cygwin/lib/cygwin_crt0.c           |  8 +++++
+ winsup/cygwin/mkvers.sh                   |  6 ++--
 winsup/cygwin/pinfo.cc                    |  4 +--
 winsup/cygwin/pipe.cc                     |  4 +++
 winsup/cygwin/pseudo-reloc.cc             |  2 +-
- winsup/cygwin/sec_auth.cc                 | 10 +++----
+ winsup/cygwin/sec_auth.cc                 | 10 +++---
 winsup/cygwin/syscalls.cc                 |  4 +--
 winsup/cygwin/syslog.cc                   |  4 +++
- winsup/cygwin/winsup.h                    |  3 +++
+ winsup/cygwin/winsup.h                    |  4 +++
 winsup/cygwin/winver.rc                   |  2 +-
 winsup/cygwin/x86_64.din                  |  2 +-
 winsup/lsaauth/cyglsa.c                   |  2 +-
 winsup/testsuite/Makefile.in              |  2 +-
- winsup/testsuite/config/default.exp       |  8 +++---
- winsup/testsuite/cygrun.c                 |  6 ++---
- winsup/testsuite/winsup.api/cygload.cc    | 12 ++++-----
+ winsup/testsuite/config/default.exp       |  8 ++---
+ winsup/testsuite/cygrun.c                 |  6 ++--
+ winsup/testsuite/winsup.api/cygload.cc    | 12 +++----
 winsup/testsuite/winsup.api/cygload.exp   |  2 +-
 winsup/testsuite/winsup.api/cygload.h     |  2 +-
 winsup/testsuite/winsup.api/winsup.exp    |  2 +-
- winsup/utils/Makefile.in                  |  8 +++---
- winsup/utils/cygcheck.cc                  | 43 +++++++++++++++----------------
+ winsup/utils/Makefile.in                  |  8 ++---
+ winsup/utils/cygcheck.cc                  | 43 +++++++++++------------
 winsup/utils/ldd.cc                       |  2 +-
- winsup/utils/loadlib.h                    |  6 ++---
- winsup/utils/path.cc                      | 12 ++++-----
- winsup/utils/ssp.c                        |  8 +++---
- winsup/utils/strace.cc                    | 11 ++++----
- 54 files changed, 249 insertions(+), 138 deletions(-)
+ winsup/utils/loadlib.h                    |  6 ++--
+ winsup/utils/path.cc                      | 12 +++----
+ winsup/utils/ssp.c                        |  8 ++---
+ winsup/utils/strace.cc                    | 11 +++---
+ 52 files changed, 248 insertions(+), 136 deletions(-)

 diff --git a/winsup/Makefile.in b/winsup/Makefile.in
 index 148d98531..81ce93c70 100644
@@ -117,7 +115,7 @@ index e101623d2..66272bc86 100644
 
 /* Named pipes based transport, for security on NT */
 diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
-index b75774ace..88d5c4936 100644
+index 966460da8..beedc7c5e 100644
 --- a/winsup/cygwin/Makefile.in
 +++ b/winsup/cygwin/Makefile.in
@@ -106,17 +106,17 @@ RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
@@ -153,7 +151,7 @@ index b75774ace..88d5c4936 100644
 	--exclude='(?i:dll)' \
 	--exclude='reloc' \
 	--exclude='^main$$' \
-@@ -540,7 +541,7 @@ endif
+@@ -543,7 +544,7 @@ endif
 
 API_VER:=$(srcdir)/include/cygwin/version.h
 
@@ -162,7 +160,7 @@ index b75774ace..88d5c4936 100644
 SUBLIBS:=libpthread.a libutil.a ${CURDIR}/libm.a ${CURDIR}/libc.a libdl.a libresolv.a librt.a libacl.a libssp.a
 EXTRALIBS:=libautomode.a libbinmode.a libtextmode.a libtextreadmode.a
 INSTOBJS:=automode.o binmode.o textmode.o textreadmode.o
-@@ -590,7 +591,8 @@ install-libs: $(TARGET_LIBS)
+@@ -593,7 +594,8 @@ install-libs: $(TARGET_LIBS)
 	for i in $^; do \
 	    $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/lib/`basename $$i` ; \
 	done
@@ -172,7 +170,7 @@ index b75774ace..88d5c4936 100644
 
 install-headers:
 	cd $(srcdir); \
-@@ -655,7 +657,7 @@ uninstall-man:
+@@ -658,7 +660,7 @@ uninstall-man:
 	done
 
 clean distclean realclean:
@@ -181,7 +179,7 @@ index b75774ace..88d5c4936 100644
 	-@$(MAKE) -C ${cygserver_blddir} libclean
 
 maintainer-clean: clean
-@@ -668,29 +670,29 @@ maintainer-clean: clean
+@@ -671,29 +673,29 @@ maintainer-clean: clean
 $(LDSCRIPT): $(LDSCRIPT).in
 	$(CC) -E - -P < $^ -o $@
 
@@ -220,10 +218,10 @@ index b75774ace..88d5c4936 100644
 $(LIBSERVER): ${cygserver_blddir}/Makefile
 	$(MAKE) -C ${cygserver_blddir} libcygserver.a
 diff --git a/winsup/cygwin/common.din b/winsup/cygwin/common.din
-index 6e8bf9185..f6ddc0b2a 100644
+index d1d955542..0e003dfa8 100644
 --- a/winsup/cygwin/common.din
 +++ b/winsup/cygwin/common.din
-@@ -372,8 +372,8 @@ cygwin_attach_handle_to_fd SIGFE
+@@ -382,8 +382,8 @@ cygwin_attach_handle_to_fd SIGFE
 cygwin_conv_path SIGFE
 cygwin_conv_path_list SIGFE
 cygwin_create_path SIGFE
@@ -468,32 +466,6 @@ index af5eaaca7..7a23e0320 100644
     small_printf ("%05u ***** %s : %10d\n", GetCurrentProcessId (), s, strace.microseconds ());
 }
 #endif
-diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc
-index c2df919d4..537bf3554 100644
--- a/winsup/cygwin/devices.cc
-+++ b/winsup/cygwin/devices.cc
-@@ -308,7 +308,7 @@ const _RDATA _device dev_storage[] =
-   {"/dev/fd14", BRACK(FHDEV(DEV_FLOPPY_MAJOR, 14)), "\\Device\\Floppy14", exists_ntdev, S_IFBLK, true},
-   {"/dev/fd15", BRACK(FHDEV(DEV_FLOPPY_MAJOR, 15)), "\\Device\\Floppy15", exists_ntdev, S_IFBLK, true},
-   {"/dev/full", BRACK(FH_FULL), "\\Device\\Null", exists_ntdev, S_IFCHR, true},
-  {"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg", exists_ntdev, S_IFCHR, true},
-+  {"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\msys\\dev\\kmsg", exists_ntdev, S_IFCHR, true},
-   {"/dev/nst0", BRACK(FHDEV(DEV_TAPE_MAJOR, 128)), "\\Device\\Tape0", exists_ntdev, S_IFBLK, true},
-   {"/dev/nst1", BRACK(FHDEV(DEV_TAPE_MAJOR, 129)), "\\Device\\Tape1", exists_ntdev, S_IFBLK, true},
-   {"/dev/nst2", BRACK(FHDEV(DEV_TAPE_MAJOR, 130)), "\\Device\\Tape2", exists_ntdev, S_IFBLK, true},
-diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in
-index 3ec32493b..3d2eaf342 100644
--- a/winsup/cygwin/devices.in
-+++ b/winsup/cygwin/devices.in
-@@ -166,7 +166,7 @@ const _device dev_error_storage =
- "/dev/fd%(0-15)d", BRACK(FHDEV(DEV_FLOPPY_MAJOR, {$1})), "\\Device\\Floppy{$1}", exists_ntdev, S_IFBLK
- "/dev/scd%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", exists_ntdev, S_IFBLK
- "/dev/sr%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", exists_ntdev, S_IFBLK
-"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg", exists_ntdev, S_IFCHR
-+"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\msys\\dev\\kmsg", exists_ntdev, S_IFCHR
- %other	{return	NULL;}
- %%
- #undef BRACK
 diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
 index 7ef7dfd32..eeec7fbe7 100644
 --- a/winsup/cygwin/dlfcn.cc
@@ -540,7 +512,7 @@ index 549e5cccd..cbb79576a 100644
   HANDLE retaddr;
   if (_my_tls.isinitialized ())
 diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
-index f46461823..e6f560f91 100644
+index 0ebeef058..3d6ebc06f 100644
 --- a/winsup/cygwin/dtable.cc
 +++ b/winsup/cygwin/dtable.cc
@@ -965,9 +965,15 @@ handle_to_fn (HANDLE h, char *posix_fn)
@@ -560,7 +532,7 @@ index f46461823..e6f560f91 100644
 	  w32len = cygheap->installation_key.Length / sizeof (WCHAR);
 	  if (w32len
 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
-index 47782e45b..2ba14602c 100644
+index 419b0976f..2cdfed770 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
@@ -500,14 +500,14 @@ try_to_debug (bool waitloop)
@@ -581,7 +553,7 @@ index 47782e45b..2ba14602c 100644
 	  break;
 	}
 diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
-index 1505b8c2b..96a3210fd 100644
+index 7fe46ebef..81618b15b 100644
 --- a/winsup/cygwin/fhandler_tty.cc
 +++ b/winsup/cygwin/fhandler_tty.cc
@@ -464,7 +464,11 @@ fhandler_pty_slave::open (int flags, mode_t)
@@ -621,7 +593,7 @@ index 1505b8c2b..96a3210fd 100644
   master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX
 				     | FILE_FLAG_FIRST_PIPE_INSTANCE,
 diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
-index bcbef12d8..2a9567cec 100644
+index c6fef6755..fbac1f904 100644
 --- a/winsup/cygwin/fork.cc
 +++ b/winsup/cygwin/fork.cc
@@ -160,7 +160,7 @@ frok::child (volatile char * volatile here)
@@ -650,7 +622,7 @@ index 4078e65bd..3c992bb6b 100644
       if (!fn)
 	{
 diff --git a/winsup/cygwin/i686.din b/winsup/cygwin/i686.din
-index f3cd2fd37..417a8270f 100644
+index 934243bbc..515e8e63f 100644
 --- a/winsup/cygwin/i686.din
 +++ b/winsup/cygwin/i686.din
@@ -1,4 +1,4 @@
@@ -659,7 +631,7 @@ index f3cd2fd37..417a8270f 100644
 
 EXPORTS
 #Exported variables
-@@ -598,7 +598,7 @@ cygwin32_conv_to_full_posix_path = cygwin_conv_to_full_posix_path SIGFE
+@@ -596,7 +596,7 @@ cygwin32_conv_to_full_posix_path = cygwin_conv_to_full_posix_path SIGFE
 cygwin32_conv_to_full_win32_path = cygwin_conv_to_full_win32_path SIGFE
 cygwin32_conv_to_posix_path = cygwin_conv_to_posix_path SIGFE
 cygwin32_conv_to_win32_path = cygwin_conv_to_win32_path SIGFE
@@ -668,7 +640,7 @@ index f3cd2fd37..417a8270f 100644
 cygwin32_internal = cygwin_internal SIGFE
 cygwin32_posix_path_list_p = cygwin_posix_path_list_p NOSIGFE
 cygwin32_posix_to_win32_path_list = cygwin_posix_to_win32_path_list SIGFE
-@@ -616,7 +616,7 @@ cygwin_posix_to_win32_path_list_buf_size SIGFE
+@@ -614,7 +614,7 @@ cygwin_posix_to_win32_path_list_buf_size SIGFE
 cygwin_win32_to_posix_path_list SIGFE
 cygwin_win32_to_posix_path_list_buf_size SIGFE
 dll_entry@12 NOSIGFE
@@ -732,10 +704,10 @@ index 56b4363ce..6bc948a08 100644
 
 #endif /* __CYGWIN_CYGWIN_DLL_H__ */
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index fa9137d05..5c130cfc6 100644
+index 5a53a1d86..82a80fc12 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
-@@ -511,7 +511,11 @@ details. */
+@@ -516,7 +516,11 @@ details. */
    names include the CYGWIN_VERSION_SHARED_DATA version as well as this
    identifier. */
 
@@ -747,7 +719,7 @@ index fa9137d05..5c130cfc6 100644
 
 /* The Cygwin mount table interface in the Win32 registry also has a version
    number associated with it in case that is changed in a non-backwards
-@@ -527,7 +531,11 @@ details. */
+@@ -532,7 +536,11 @@ details. */
 
 /* Identifiers used in the Win32 registry. */
 
@@ -861,7 +833,7 @@ index 5aecb141b..15eddda81 100755
   "END_CYGWIN_VERSION_INFO\n\0";
 cygwin_version_info cygwin_version =
 diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
-index e4eef8b3c..f7893a208 100644
+index 6b6986c9e..f4ca03299 100644
 --- a/winsup/cygwin/pinfo.cc
 +++ b/winsup/cygwin/pinfo.cc
@@ -188,7 +188,7 @@ pinfo::maybe_set_exit_code_from_windows ()
@@ -956,10 +928,10 @@ index d4c2701da..600129928 100644
   ts.SourceIdentifier.LowPart = 0x0103;
 
 diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index 31b7629e8..f256af254 100644
+index 6d1085539..a81ce6ebd 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
-@@ -367,7 +367,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
+@@ -331,7 +331,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
   /* Create hopefully unique filename.
      Since we have to stick to the current directory on remote shares, make
      the new filename at least very unlikely to match by accident.  It starts
@@ -968,7 +940,7 @@ index 31b7629e8..f256af254 100644
      starting at U+dc00.  Use plain ASCII chars on filesystems not supporting
      Unicode.  The rest of the filename is the inode number in hex encoding
      and a hash of the full NT path in hex.  The combination allows to remove
-@@ -376,7 +376,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
+@@ -340,7 +340,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
   RtlAppendUnicodeToString (&recycler,
 			    (pc.fs_flags () & FILE_UNICODE_ON_DISK
 			     && !pc.fs_is_samba ())
@@ -978,10 +950,10 @@ index 31b7629e8..f256af254 100644
   /* Note: Modern Samba versions apparently don't like buffer sizes of more
      than 65535 in some NtQueryInformationFile/NtSetInformationFile calls.
 diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc
-index 81717c645..36d1a1ad0 100644
+index 6a295501f..431f9d239 100644
 --- a/winsup/cygwin/syslog.cc
 +++ b/winsup/cygwin/syslog.cc
-@@ -25,7 +25,11 @@ details. */
+@@ -26,7 +26,11 @@ details. */
 #include "cygtls.h"
 #include "tls_pbuf.h"
 
@@ -994,7 +966,7 @@ index 81717c645..36d1a1ad0 100644
 static struct
 {
 diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
-index fcb08e213..1cee57f05 100644
+index d5babd6cd..ff4d778e5 100644
 --- a/winsup/cygwin/winsup.h
 +++ b/winsup/cygwin/winsup.h
@@ -162,7 +162,11 @@ extern "C" void _pei386_runtime_relocator (per_process *);
@@ -1225,7 +1197,7 @@ index be525d07f..b9cc98511 100644
 
 .PHONY: warn_dumper
 diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
-index 2d5cda382..d34392a35 100644
+index d5972c0cf..6d6189182 100644
 --- a/winsup/utils/cygcheck.cc
 +++ b/winsup/utils/cygcheck.cc
@@ -69,8 +69,7 @@ static const char *known_env_vars[] = {
@@ -1338,7 +1310,7 @@ index 2d5cda382..d34392a35 100644
       scan_registry (0, HKEY_CURRENT_USER,
 		     (char *) "HKEY_CURRENT_USER", 0, false);
       scan_registry (0, HKEY_LOCAL_MACHINE,
-@@ -1872,7 +1871,7 @@ dump_sysinfo ()
+@@ -1868,7 +1867,7 @@ dump_sysinfo ()
   printf ("\n");
 
   if (givehelp)
@@ -1347,7 +1319,7 @@ index 2d5cda382..d34392a35 100644
   int cygwin_dll_count = 0;
   char cygdll_path[32768];
   for (pathlike *pth = paths; pth->dir; pth++)
-@@ -1889,10 +1888,10 @@ dump_sysinfo ()
+@@ -1885,10 +1884,10 @@ dump_sysinfo ()
 	  wcstombs (f, ffinfo.cFileName, sizeof f);
 	  if (strcasecmp (f + strlen (f) - 4, ".dll") == 0)
 	    {
@@ -1360,7 +1332,7 @@ index 2d5cda382..d34392a35 100644
 		    {
 		      if (!cygwin_dll_count)
 			strcpy (cygdll_path, pth->dir);
-@@ -1916,9 +1915,9 @@ dump_sysinfo ()
+@@ -1912,9 +1911,9 @@ dump_sysinfo ()
       FindClose (ff);
     }
   if (cygwin_dll_count > 1)
@@ -1372,7 +1344,7 @@ index 2d5cda382..d34392a35 100644
 
   dump_dodgy_apps (verbose);
 
-@@ -2165,8 +2164,8 @@ static char opts[] = "cdsrvkflphV";
+@@ -2161,8 +2160,8 @@ static char opts[] = "cdsrvkflphV";
 static void
 print_version ()
 {
@@ -1383,7 +1355,7 @@ index 2d5cda382..d34392a35 100644
 	  "Copyright (C) 1998 - %s Cygwin Authors\n"
 	  "This is free software; see the source for copying conditions.  "
 	  "There is NO\n"
-@@ -2198,7 +2197,7 @@ load_cygwin (int& argc, char **&argv)
+@@ -2194,7 +2193,7 @@ load_cygwin (int& argc, char **&argv)
 {
   HMODULE h;
 
@@ -1430,7 +1402,7 @@ index c83b76478..42ffbfdc0 100644
   wcscpy (dllpath, sysdir);
   wcscpy (dllpath + sysdir_len, dll);
 diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
-index a76cf765f..4da42885c 100644
+index 17ea3524d..d0d4cab83 100644
 --- a/winsup/utils/path.cc
 +++ b/winsup/utils/path.cc
@@ -598,14 +598,14 @@ read_mounts ()
@@ -1495,7 +1467,7 @@ index 548b89ac8..09ee26d01 100644
     "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"
 diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
-index ae62cdc5f..3c1868c82 100644
+index 21c0835d4..bf507981a 100644
 --- a/winsup/utils/strace.cc
 +++ b/winsup/utils/strace.cc
@@ -283,7 +283,7 @@ load_cygwin ()
@@ -1538,5 +1510,5 @@ index ae62cdc5f..3c1868c82 100644
     }
   if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0003-Add-functionality-for-converting-UNIX-paths-in-argum.patch
+++ b/msys2-runtime/0003-Add-functionality-for-converting-UNIX-paths-in-argum.patch
@@ -1,4 +1,4 @@
-From 0b7ec9ae687bb74123c567c1676a141d8832dfdb Mon Sep 17 00:00:00 2001
+From a43140231840fceeb9d0263e808214f1f8d4edaf Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Thu, 12 Mar 2015 13:58:27 +0300
 Subject: [PATCH 03/23] Add functionality for converting UNIX paths in
@@ -11,9 +11,9 @@ Subject: [PATCH 03/23] Add functionality for converting UNIX paths in
 winsup/cygwin/environ.h            |   2 +-
 winsup/cygwin/external.cc          |   2 +-
 winsup/cygwin/include/sys/cygwin.h |   6 +
- winsup/cygwin/msys2_path_conv.cc   | 619 +++++++++++++++++++++++++++++++++++++
- winsup/cygwin/msys2_path_conv.h    | 146 +++++++++
- winsup/cygwin/path.cc              |  64 ++++
+ winsup/cygwin/msys2_path_conv.cc   | 619 +++++++++++++++++++++++++++++
+ winsup/cygwin/msys2_path_conv.h    | 146 +++++++
+ winsup/cygwin/path.cc              |  64 +++
 winsup/cygwin/spawn.cc             |  48 ++-
 winsup/cygwin/winf.h               |   4 +
 10 files changed, 899 insertions(+), 9 deletions(-)
@@ -21,10 +21,10 @@ Subject: [PATCH 03/23] Add functionality for converting UNIX paths in
 create mode 100644 winsup/cygwin/msys2_path_conv.h

 diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
-index 88d5c4936..ebb92e674 100644
+index beedc7c5e..b7ef34b3a 100644
 --- a/winsup/cygwin/Makefile.in
 +++ b/winsup/cygwin/Makefile.in
-@@ -335,6 +335,7 @@ DLL_OFILES:= \
+@@ -338,6 +338,7 @@ DLL_OFILES:= \
 	mmap.o \
 	msg.o \
 	msgcat.o \
@@ -33,10 +33,10 @@ index 88d5c4936..ebb92e674 100644
 	net.o \
 	netdb.o \
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 43225341c..e26812d2e 100644
+index 67ead1dde..851922d37 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
-@@ -1012,7 +1012,7 @@ env_compare (const void *key, const void *memb)
+@@ -1043,7 +1043,7 @@ env_compare (const void *key, const void *memb)
    to the child. */
 char ** __reg3
 build_env (const char * const *envp, PWCHAR &envblock, int &envc,
@@ -45,7 +45,7 @@ index 43225341c..e26812d2e 100644
 {
   PWCHAR cwinenv = NULL;
   size_t winnum = 0;
-@@ -1100,6 +1100,11 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
+@@ -1136,6 +1136,11 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
   for (srcp = envp, dstp = newenv, pass_dstp = pass_env; *srcp; srcp++)
     {
       bool calc_tl = !no_envblock;
@@ -57,7 +57,7 @@ index 43225341c..e26812d2e 100644
       /* Look for entries that require special attention */
       for (unsigned i = 0; i < SPENVS_SIZE; i++)
 	if (!saw_spenv[i] && (*dstp = spenvs[i].retrieve (no_envblock, *srcp)))
-@@ -1220,6 +1225,15 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
+@@ -1256,6 +1261,15 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
 		  saw_PATH = true;
 		}
 	    }
@@ -894,18 +894,18 @@ index 000000000..e1e5e8781
 +#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */
 +
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index cf6422341..2113bb27e 100644
+index 6d8f76db5..cd544e0d8 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -68,6 +68,7 @@
- #include "cygtls.h"
+@@ -66,6 +66,7 @@
+ #include "shared_info.h"
 #include "tls_pbuf.h"
 #include "environ.h"
 +#include "msys2_path_conv.h"
- #include <assert.h>
- #include <ntdll.h>
- #include <wchar.h>
-@@ -3333,6 +3334,69 @@ fchdir (int fd)
+ #undef basename
+ 
+ suffix_info stat_suffixes[] =
+@@ -3357,6 +3358,69 @@ fchdir (int fd)
   return res;
 }
 
@@ -1065,5 +1065,5 @@ index e3a65f8cc..1aeec8d9c 100644
   {
     for (int i = calloced; i < argc; i++)
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0004-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
+++ b/msys2-runtime/0004-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
@@ -1,4 +1,4 @@
-From 8f9aee548cf655416a3fb484355499ee7e4a2a24 Mon Sep 17 00:00:00 2001
+From 434bb6abf274521bfc5ff86d11f9c6d69efbc6a0 Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Thu, 12 Mar 2015 13:58:27 +0300
 Subject: [PATCH 04/23] Add functionality for changing OS name via MSYSTEM
@@ -6,9 +6,9 @@ Subject: [PATCH 04/23] Add functionality for changing OS name via MSYSTEM

 ---
 winsup/cygserver/cygserver-config   |  4 ++--
- winsup/cygwin/environ.cc            | 36 ++++++++++++++++++++++++++++++++----
+ winsup/cygwin/environ.cc            | 36 +++++++++++++++++++++++++----
 winsup/cygwin/include/sys/utsname.h |  2 +-
- winsup/cygwin/uname.cc              |  6 ++++++
+ winsup/cygwin/uname.cc              |  6 +++++
 4 files changed, 41 insertions(+), 7 deletions(-)

 diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
@@ -34,10 +34,10 @@ index 373bfd24d..c902857ea 100755
         echo
 	echo "Installation of cygserver as service failed.  Please check the"
 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index e26812d2e..8770661e2 100644
+index 851922d37..06aff56dd 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
-@@ -188,7 +188,11 @@ parse_options (const char *inbuf)
+@@ -189,7 +189,11 @@ parse_options (const char *inbuf)
       if (export_settings)
 	{
 	  debug_printf ("%s", newbuf + 1);
@@ -49,7 +49,7 @@ index e26812d2e..8770661e2 100644
 	}
       return;
     }
-@@ -632,7 +636,7 @@ _addenv (const char *name, const char *value, int overwrite)
+@@ -643,7 +647,7 @@ _addenv (const char *name, const char *value, int overwrite)
   win_env *spenv;
   if ((spenv = getwinenv (envhere)))
     spenv->add_cache (value);
@@ -58,7 +58,7 @@ index e26812d2e..8770661e2 100644
     parse_options (value);
 
   return 0;
-@@ -716,6 +720,9 @@ static struct renv {
+@@ -747,6 +751,9 @@ static struct renv {
 } renv_arr[] = {
 	{ NL("COMMONPROGRAMFILES=") },		// 0
 	{ NL("COMSPEC=") },
@@ -68,7 +68,7 @@ index e26812d2e..8770661e2 100644
 	{ NL("PATH=") },			// 2
 	{ NL("PROGRAMFILES=") },
 	{ NL("SYSTEMDRIVE=") },			// 4
-@@ -727,10 +734,21 @@ static struct renv {
+@@ -758,10 +765,21 @@ static struct renv {
 #define RENV_SIZE (sizeof (renv_arr) / sizeof (renv_arr[0]))
 
 /* Set of first characters of the above list of variables. */
@@ -92,7 +92,7 @@ index e26812d2e..8770661e2 100644
 
 /* Turn environment variable part of a=b string into uppercase - for some
    environment variables only. */
-@@ -805,7 +823,11 @@ environ_init (char **envp, int envc)
+@@ -836,7 +854,11 @@ environ_init (char **envp, int envc)
       update_envptrs ();
       if (envp_passed_in)
 	{
@@ -104,7 +104,7 @@ index e26812d2e..8770661e2 100644
 	  if (p)
 	    parse_options (p);
 	}
-@@ -851,8 +873,13 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)
+@@ -882,8 +904,13 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)
       ucenv (newp, eq);    /* uppercase env vars which need it */
       if (*newp == 'T' && strncmp (newp, "TERM=", 5) == 0)
         sawTERM = 1;
@@ -118,7 +118,7 @@ index e26812d2e..8770661e2 100644
       if (*eq && posify)
         posify_maybe (envp + i, *++eq ? eq : --eq, tmpbuf);
       debug_printf ("%p: %s", envp[i], envp[i]);
-@@ -919,12 +946,13 @@ struct spenv
+@@ -950,12 +977,13 @@ struct spenv
 static NO_COPY spenv spenvs[] =
 {
 #ifdef DEBUGGING
@@ -147,10 +147,10 @@ index e9dd019df..670cd2ead 100644
   char release[20];
   char version[20];
 diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
-index 479cc442a..3dabbaf5c 100644
+index 778ca5738..cd5362b8a 100644
 --- a/winsup/cygwin/uname.cc
 +++ b/winsup/cygwin/uname.cc
-@@ -26,7 +26,13 @@ uname (struct utsname *name)
+@@ -24,7 +24,13 @@ uname (struct utsname *name)
       char *snp = strstr  (cygwin_version.dll_build_date, "SNP");
 
       memset (name, 0, sizeof (*name));
@@ -165,5 +165,5 @@ index 479cc442a..3dabbaf5c 100644
       /* Add a hint to the sysname, that we're running under WOW64.  This might
 	 give an early clue if somebody encounters problems. */
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-Do-no.patch
+++ b/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-Do-no.patch
@@ -1,4 +1,4 @@
-From 6990cc5e3cf4225871f0e9d3ad78d542e6087634 Mon Sep 17 00:00:00 2001
+From ea182f0920703fe0e4dff365a34b5f24fa3aa665 Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Thu, 12 Mar 2015 14:09:29 +0300
 Subject: [PATCH 05/23] - Move root to /usr. - Change sorting mount points. -
@@ -8,7 +8,7 @@ Subject: [PATCH 05/23] - Move root to /usr. - Change sorting mount points. -
 ---
 winsup/cygwin/cygheap.cc |  12 ++-
 winsup/cygwin/globals.cc |   2 +-
- winsup/cygwin/mount.cc   | 189 ++++++++++++++++++++++++++++++++++++++++-------
+ winsup/cygwin/mount.cc   | 189 +++++++++++++++++++++++++++++++++------
 winsup/cygwin/mount.h    |   3 +-
 winsup/cygwin/uinfo.cc   |   2 +-
 5 files changed, 177 insertions(+), 31 deletions(-)
@@ -58,7 +58,7 @@ index 87a5eb964..d6dc063e5 100644
 
 void __stdcall
 diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
-index d94a4f844..8a208a87c 100644
+index 7c84eb637..9841c0e46 100644
 --- a/winsup/cygwin/globals.cc
 +++ b/winsup/cygwin/globals.cc
@@ -65,7 +65,7 @@ int NO_COPY dynamically_loaded;
@@ -402,10 +402,10 @@ index 0b392ca85..e6ca7fd82 100644
  public:
   void init (bool);
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index 286105057..05a0c698b 100644
+index c2f4803ce..0223265ed 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
-@@ -2656,7 +2656,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
+@@ -2780,7 +2780,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
 		     dom, name,
 		     sid.string ((char *) sidstr),
 		     home ?: "/home/", home ? L"" : name,
@@ -415,5 +415,5 @@ index 286105057..05a0c698b 100644
     free (gecos);
   if (home)
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0006-Do-not-create-cygwin-symlinks.-Instead-use-deep-copy.patch
+++ b/msys2-runtime/0006-Do-not-create-cygwin-symlinks.-Instead-use-deep-copy.patch
@@ -1,18 +1,18 @@
-From 53c33d1b3c35cb3355d1f533b63e34ba3354a970 Mon Sep 17 00:00:00 2001
+From 66d843342c067e61baedaff97bf7db0b0e78626f Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Thu, 12 Mar 2015 14:09:29 +0300
 Subject: [PATCH 06/23] Do not create cygwin symlinks. Instead use deep copy of
 files/folders.

 ---
- winsup/cygwin/path.cc | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ winsup/cygwin/path.cc | 147 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 2113bb27e..4c43a2508 100644
+index cd544e0d8..b14a49ec4 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -1567,6 +1567,86 @@ conv_path_list (const char *src, char *dst, size_t size,
+@@ -1581,6 +1581,86 @@ conv_path_list (const char *src, char *dst, size_t size,
 
 /********************** Symbolic Link Support **************************/
 
@@ -99,7 +99,7 @@ index 2113bb27e..4c43a2508 100644
 /* Create a symlink from FROMPATH to TOPATH. */
 
 extern "C" int
-@@ -1995,6 +2075,73 @@ symlink_worker (const char *oldpath, const char *newpath, bool isdevice)
+@@ -2009,6 +2089,73 @@ symlink_worker (const char *oldpath, const char *newpath, bool isdevice)
 	}
       else
 	{
@@ -174,5 +174,5 @@ index 2113bb27e..4c43a2508 100644
 	  buf = tp.t_get ();
 	  cp = stpcpy (buf, SYMLINK_COOKIE);
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
+++ b/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
@@ -1,4 +1,4 @@
-From 679be181af86c0ab4d1558fc3b91fc92ce1f28a4 Mon Sep 17 00:00:00 2001
+From a8c3f3c5a6051ec98367fe3f1d7ca313734944d2 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 24 Mar 2015 14:09:29 +0300
 Subject: [PATCH 07/23] Automatically rewrite TERM=msys to TERM=cygwin
@@ -14,10 +14,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 10 insertions(+), 1 deletion(-)

 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index 8770661e2..cdfd3a4d9 100644
+index 06aff56dd..dc93fd59b 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
-@@ -872,7 +872,16 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)
+@@ -903,7 +903,16 @@ win32env_to_cygenv (PWCHAR rawenv, bool posify)
       char *eq = strchrnul (newp, '=');
       ucenv (newp, eq);    /* uppercase env vars which need it */
       if (*newp == 'T' && strncmp (newp, "TERM=", 5) == 0)
@@ -36,5 +36,5 @@ index 8770661e2..cdfd3a4d9 100644
       else if (*newp == 'M' && strncmp (newp, "MSYS=", 5) == 0)
         parse_options (newp + 5);
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0008-Do-not-convert-environment-for-strace.patch
+++ b/msys2-runtime/0008-Do-not-convert-environment-for-strace.patch
@@ -1,4 +1,4 @@
-From a18c56f7e9b4a42bd59df11fa9638c28285418ca Mon Sep 17 00:00:00 2001
+From 59144bd562e776de0dd9e4dc4516a5a40668598f Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Fri, 6 Mar 2015 14:09:29 +0300
 Subject: [PATCH 08/23] Do not convert environment for strace
@@ -30,5 +30,5 @@ index d94167507..07b9e87c0 100644
 	{
 	  set_errno (E2BIG);
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0009-convert-be-more-careful-to-stay-within-the-buffer.patch
+++ b/msys2-runtime/0009-convert-be-more-careful-to-stay-within-the-buffer.patch
@@ -1,4 +1,4 @@
-From 24a9571385433361b9e1b7d77ea79c6139c70243 Mon Sep 17 00:00:00 2001
+From a3b2abeb7ae47c5ab6a3226cfa7dfbcc45166a1a Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 2 Mar 2015 14:09:29 +0300
 Subject: [PATCH 09/23] convert(): be more careful to stay within the buffer
@@ -35,5 +35,5 @@ index 74ebd2e0b..8a7b7e26d 100644
             *dst += 1;
         }
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0010-convert-check-safely-whether-we-could-allocate-the-b.patch
+++ b/msys2-runtime/0010-convert-check-safely-whether-we-could-allocate-the-b.patch
@@ -1,4 +1,4 @@
-From 36659331b068ac4ccd65ede71d8863f3cc5c245c Mon Sep 17 00:00:00 2001
+From 38579dc718d7d20fcd7ab7a84ff12684acf18ef3 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 2 Mar 2015 14:09:29 +0300
 Subject: [PATCH 10/23] convert(): check safely whether we could allocate the
@@ -10,10 +10,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 4c43a2508..22135c573 100644
+index b14a49ec4..c5b0547a9 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3512,12 +3512,12 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3536,12 +3536,12 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
 
   size_t stack_len = arglen + MAX_PATH;
   char * stack_path = (char *)malloc (stack_len);
@@ -29,5 +29,5 @@ index 4c43a2508..22135c573 100644
   debug_printf ("convert()'ed: %s (length %d)\n.....->: %s", arg, arglen, stack_path);
   // Don't allocate memory if no conversion happened.
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0011-convert-use-the-elegant-realloc-call.patch
+++ b/msys2-runtime/0011-convert-use-the-elegant-realloc-call.patch
@@ -1,4 +1,4 @@
-From 6e77e0c46c58f632e7fa278f88ea171411e12374 Mon Sep 17 00:00:00 2001
+From ef05b0f5d322b09adfdb644be8b9b26fe9da7cbc Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 2 Mar 2015 14:09:29 +0300
 Subject: [PATCH 11/23] convert(): use the elegant realloc() call
@@ -11,10 +11,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 22135c573..2ded99d5c 100644
+index c5b0547a9..1910011fb 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3525,8 +3525,7 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3549,8 +3549,7 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
     {
       return ((char *)arg);
     }
@@ -25,5 +25,5 @@ index 22135c573..2ded99d5c 100644
   char* semisemi = strstr(arg_result, ";;");
   while (semisemi)
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0012-convert-plug-potential-memory-leak.patch
+++ b/msys2-runtime/0012-convert-plug-potential-memory-leak.patch
@@ -1,4 +1,4 @@
-From 0983f44ecccdbd8580e20942a1e04648388b52eb Mon Sep 17 00:00:00 2001
+From ec9cf3b9b520c14d026c6fd9f16199d387a44b01 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 2 Mar 2015 14:09:29 +0300
 Subject: [PATCH 12/23] convert(): plug potential memory leak
@@ -12,10 +12,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 4 insertions(+)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 2ded99d5c..7cb2bd49f 100644
+index 1910011fb..907afbedc 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3523,6 +3523,10 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3547,6 +3547,10 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
   // Don't allocate memory if no conversion happened.
   if (!strcmp (arg, stack_path))
     {
@@ -27,5 +27,5 @@ index 2ded99d5c..7cb2bd49f 100644
     }
   arg_result = (char *)realloc (stack_path, strlen (stack_path)+1);
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0013-convert-warn-when-we-cut-off-a-path.patch
+++ b/msys2-runtime/0013-convert-warn-when-we-cut-off-a-path.patch
@@ -1,4 +1,4 @@
-From 62ffcfef403a613193aedccb85f67df78d2ada75 Mon Sep 17 00:00:00 2001
+From 201bba2db77149fc8a92071cb649158ef9c60c8f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 2 Mar 2015 14:09:29 +0300
 Subject: [PATCH 13/23] convert(): warn when we cut off a path
@@ -42,5 +42,5 @@ index 8a7b7e26d..34c4d26c5 100644
             **dst = ';';
             *dst += 1;
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0014-arg_heuristic-be-better-prepared-to-handle-path-list.patch
+++ b/msys2-runtime/0014-arg_heuristic-be-better-prepared-to-handle-path-list.patch
@@ -1,4 +1,4 @@
-From bdac655d7fbf6bff3841cad31323bd078aca43e7 Mon Sep 17 00:00:00 2001
+From 67bc3f2cfc0eb47f8ceb5ec323407a9f7498d287 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 2 Mar 2015 14:09:29 +0300
 Subject: [PATCH 14/23] arg_heuristic(): be better prepared to handle path
@@ -25,10 +25,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 7cb2bd49f..bf99e304b 100644
+index 907afbedc..39b5593cd 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3510,7 +3510,9 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3534,7 +3534,9 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
       exclusions += strlen (exclusions) + 1;
     }
 
@@ -40,5 +40,5 @@ index 7cb2bd49f..bf99e304b 100644
   if (!stack_path)
     {
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0015-Fix-converting-argument-looks-like-DVAR-str1-c-path1.patch
+++ b/msys2-runtime/0015-Fix-converting-argument-looks-like-DVAR-str1-c-path1.patch
@@ -1,4 +1,4 @@
-From a1d780246bf64dace4016b86fe1c59267dda3035 Mon Sep 17 00:00:00 2001
+From 4bbc1d4c4c5464469c2519c0ee3d915edb195da8 Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Fri, 20 Mar 2015 14:09:29 +0300
 Subject: [PATCH 15/23] Fix converting argument looks like
@@ -23,5 +23,5 @@ index 34c4d26c5..c347bd4cb 100644
     }
 
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0016-Special-case-for-converting-root-directory-to-have-t.patch
+++ b/msys2-runtime/0016-Special-case-for-converting-root-directory-to-have-t.patch
@@ -1,4 +1,4 @@
-From 8eae854a915db38d88ad30017537fb0c36e66d51 Mon Sep 17 00:00:00 2001
+From 9212a838f6a09f5a84b6609c7aac6bd8533621b0 Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Tue, 1 Mar 2016 13:19:18 +0300
 Subject: [PATCH 16/23] Special case for converting root directory to have
@@ -9,10 +9,10 @@ Subject: [PATCH 16/23] Special case for converting root directory to have
 1 file changed, 16 insertions(+), 9 deletions(-)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index bf99e304b..632dcf8ad 100644
+index 39b5593cd..5925e9693 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -732,6 +732,12 @@ path_conv::check (const char *src, unsigned opt,
+@@ -724,6 +724,12 @@ path_conv::check (const char *src, unsigned opt,
 	      need_directory = 1;
 	      *--tail = '\0';
 	    }
@@ -25,7 +25,7 @@ index bf99e304b..632dcf8ad 100644
 	  path_end = tail;
 
 	  /* Scan path_copy from right to left looking either for a symlink
-@@ -1219,16 +1225,17 @@ path_conv::check (const char *src, unsigned opt,
+@@ -1216,16 +1222,17 @@ path_conv::check (const char *src, unsigned opt,
 		cfree (wide_path);
 	      wide_path = NULL;
 	    }
@@ -53,5 +53,5 @@ index bf99e304b..632dcf8ad 100644
 	}
 
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
+++ b/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
@@ -1,4 +1,4 @@
-From 17721827f65393cf7220b66706321d97101c9565 Mon Sep 17 00:00:00 2001
+From da01adf76dc43696569c4c04c679a54c2138793f Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:52:09 +0100
 Subject: [PATCH 17/23] dcrt0.cc: Untangle allow_glob from winshell
@@ -76,5 +76,5 @@ index 7a23e0320..d70633a29 100644
 
       /* Convert argv[0] to posix rules if it's currently blatantly
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
+++ b/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
@@ -1,4 +1,4 @@
-From ca3053750517532cd8c30c011f4e2a49d14cf393 Mon Sep 17 00:00:00 2001
+From ae16b19c9d2a03efd7bd4c036eb453cc9bb82801 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 24 Aug 2015 00:48:06 +0100
 Subject: [PATCH 18/23] dcrt0.cc (globify): Don't quote literal strings
@@ -56,5 +56,5 @@ index d70633a29..7f69b33d4 100644
 	    size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
 	    if (cnt <= 1 || cnt == (size_t)-1)
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0019-strace.cc-Don-t-set-MSYS-noglob.patch
+++ b/msys2-runtime/0019-strace.cc-Don-t-set-MSYS-noglob.patch
@@ -1,4 +1,4 @@
-From 4b9a18c42cce0ab1bf47d9d4558a68607ee88f78 Mon Sep 17 00:00:00 2001
+From 3450a059b3604454d4df360ecc7648374f9de4d5 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 23 Aug 2015 20:47:30 +0100
 Subject: [PATCH 19/23] strace.cc: Don't set MSYS=noglob
@@ -26,7 +26,7 @@ See quoted () comment:
 1 file changed, 20 insertions(+), 1 deletion(-)

 diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
-index 3c1868c82..dd30507ee 100644
+index bf507981a..638b66293 100644
 --- a/winsup/utils/strace.cc
 +++ b/winsup/utils/strace.cc
@@ -353,10 +353,28 @@ create_child (char **argv)
@@ -68,5 +68,5 @@ index 3c1868c82..dd30507ee 100644
 		       NULL,	/* Security */
 		       NULL,	/* thread */
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0020-Add-debugging-for-build_argv.patch
+++ b/msys2-runtime/0020-Add-debugging-for-build_argv.patch
@@ -1,4 +1,4 @@
-From 0bc7196605dbadb3e3a40f4b89f775e92f853d1f Mon Sep 17 00:00:00 2001
+From 0c08a7f8af0e4a700caf43251c9e76ff9d818486 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:18:52 +0100
 Subject: [PATCH 20/23] Add debugging for build_argv
@@ -21,5 +21,5 @@ index 7f69b33d4..705817679 100644
   while (*cmd)
     {
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0021-Add-debugging-for-strace-make_command_line.patch
+++ b/msys2-runtime/0021-Add-debugging-for-strace-make_command_line.patch
@@ -1,4 +1,4 @@
-From cfbc26ed629cf7284f1efbb87e738e154a193612 Mon Sep 17 00:00:00 2001
+From fb738ad5e0e3a95f14e5a3d47242ba13fe0dbdaf Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 09:52:47 +0100
 Subject: [PATCH 21/23] Add debugging for strace make_command_line
@@ -8,7 +8,7 @@ Subject: [PATCH 21/23] Add debugging for strace make_command_line
 1 file changed, 1 insertion(+)

 diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
-index dd30507ee..d914f946c 100644
+index 638b66293..ca148c372 100644
 --- a/winsup/utils/strace.cc
 +++ b/winsup/utils/strace.cc
@@ -351,6 +351,7 @@ create_child (char **argv)
@@ -20,5 +20,5 @@ index dd30507ee..d914f946c 100644
   SetConsoleCtrlHandler (NULL, 0);
 /* Commit message for this code was:
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0022-environ.cc-New-facility-environment-variable-MSYS2_E.patch
+++ b/msys2-runtime/0022-environ.cc-New-facility-environment-variable-MSYS2_E.patch
@@ -1,4 +1,4 @@
-From 5c4af5c6fddd40c7ddb3a3e406205491726e7619 Mon Sep 17 00:00:00 2001
+From 83e3b116b22f16ab1e0aa212cc9b2a515d62865a Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 10 Apr 2016 21:47:41 +0100
 Subject: [PATCH 22/23] environ.cc: New facility/environment variable
@@ -25,10 +25,10 @@ it to another absolute path, R_HOME, forming an invalid path.
 5 files changed, 43 insertions(+), 15 deletions(-)

 diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
-index cdfd3a4d9..fd3445ad2 100644
+index dc93fd59b..22c7e3663 100644
 --- a/winsup/cygwin/environ.cc
 +++ b/winsup/cygwin/environ.cc
-@@ -1130,6 +1130,10 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
+@@ -1166,6 +1166,10 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
 
   int tl = 0;
   char **pass_dstp;
@@ -39,7 +39,7 @@ index cdfd3a4d9..fd3445ad2 100644
   char **pass_env = (char **) alloca (sizeof (char *)
 				      * (n + winnum + SPENVS_SIZE + 1));
   /* Iterate over input list, generating a new environment list and refreshing
-@@ -1138,9 +1142,18 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
+@@ -1174,9 +1178,18 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
     {
       bool calc_tl = !no_envblock;
 #ifdef __MSYS__
@@ -61,7 +61,7 @@ index cdfd3a4d9..fd3445ad2 100644
 #endif
       /* Look for entries that require special attention */
       for (unsigned i = 0; i < SPENVS_SIZE; i++)
-@@ -1264,7 +1277,8 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
+@@ -1300,7 +1313,8 @@ build_env (const char * const *envp, PWCHAR &envblock, int &envc,
 	    }
 #ifdef __MSYS__
 	  else if (!keep_posix) {
@@ -72,10 +72,10 @@ index cdfd3a4d9..fd3445ad2 100644
 	    p = cstrdup1(win_arg);
 	    if (win_arg != *srcp)
 diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
-index 3ad658739..6823ae96d 100644
+index b5dfffc7d..b1c98f7b3 100644
 --- a/winsup/cygwin/miscfuncs.cc
 +++ b/winsup/cygwin/miscfuncs.cc
-@@ -307,6 +307,27 @@ NT_readline::gets ()
+@@ -308,6 +308,27 @@ NT_readline::gets ()
     }
 }
 
@@ -104,7 +104,7 @@ index 3ad658739..6823ae96d 100644
 void * __reg1
 __import_address (void *imp)
 diff --git a/winsup/cygwin/miscfuncs.h b/winsup/cygwin/miscfuncs.h
-index 3960b5429..de8952bb5 100644
+index b983e6d81..928de89bf 100644
 --- a/winsup/cygwin/miscfuncs.h
 +++ b/winsup/cygwin/miscfuncs.h
@@ -88,6 +88,8 @@ void backslashify (const char *, char *, bool);
@@ -117,10 +117,10 @@ index 3960b5429..de8952bb5 100644
 extern inline void
 transform_chars (PUNICODE_STRING upath, USHORT start_idx)
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 632dcf8ad..021eb175a 100644
+index 5925e9693..f5c1902e8 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3507,7 +3507,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3531,7 +3531,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
     return arg_result;
   }
 
@@ -159,5 +159,5 @@ index 07b9e87c0..264249072 100644
 
   /* Check if we have been called from exec{lv}p or spawn{lv}p and mask
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0023-path.cc-Ignore-zero-length-exclusions.patch
+++ b/msys2-runtime/0023-path.cc-Ignore-zero-length-exclusions.patch
@@ -1,4 +1,4 @@
-From aeacb515cbb1410cbf964b8510c416554ec90e02 Mon Sep 17 00:00:00 2001
+From 8f80b47213877a8789577f17606ed9610db64919 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 15 May 2016 09:31:51 +0100
 Subject: [PATCH 23/23] path.cc: Ignore zero-length exclusions
@@ -8,10 +8,10 @@ Subject: [PATCH 23/23] path.cc: Ignore zero-length exclusions
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 021eb175a..e5d5bcc69 100644
+index f5c1902e8..da3fbe28a 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3511,7 +3511,7 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3535,7 +3535,7 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
     {
       /* Since we've got regex linked we should maybe switch to that, but
          running regexes for every argument could be too slow. */
@@ -21,5 +21,5 @@ index 021eb175a..e5d5bcc69 100644
       exclusions += strlen (exclusions) + 1;
     }
 -- 
-2.16.1
+2.18.0

--- a/msys2-runtime/0024-Cygwin-fix-build-with-GCC-7.patch
+++ b/msys2-runtime/0024-Cygwin-fix-build-with-GCC-7.patch
@@ -1,48 +0,0 @@
-From 67609efeb0bcb198463a952a6a214813794a9c2b Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Mon, 16 Apr 2018 22:46:11 -0500
-Subject: [PATCH 24/24] Cygwin: fix build with GCC 7
-
-GCC 7 is able to see straight through this trick, so use a more formal
-method to avoid the warning.
-
-Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
- winsup/cygwin/random.cc | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/winsup/cygwin/random.cc b/winsup/cygwin/random.cc
-index 802c33b8a..163fc040c 100644
--- a/winsup/cygwin/random.cc
-+++ b/winsup/cygwin/random.cc
-@@ -279,14 +279,6 @@ srandom(unsigned x)
- 		(void)random();
- }
- 
-/* Avoid a compiler warning when we really want to get at the junk in
-   an uninitialized variable. */
-static unsigned long
-dummy (unsigned volatile long *x)
-{
-  return *x;
-}
-
- /*
-  * srandomdev:
-  *
-@@ -313,7 +305,11 @@ srandomdev()
- 		unsigned long junk;
- 
- 		gettimeofday(&tv, NULL);
-		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ dummy(&junk));
-+		/* Avoid a compiler warning when we really want to get at the
-+		   junk in an uninitialized variable. */
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-+		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
-+#pragma GCC diagnostic pop
- 		return;
- 	}
- 
-- 
-2.16.2.windows.1
-
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -3,8 +3,8 @@

 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
-pkgver=2.10.0
-pkgrel=3
+pkgver=2.11.1
+pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -47,33 +47,31 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0021-Add-debugging-for-strace-make_command_line.patch
        0022-environ.cc-New-facility-environment-variable-MSYS2_E.patch
        0023-path.cc-Ignore-zero-length-exclusions.patch
-        0024-Cygwin-fix-build-with-GCC-7.patch
 )
 sha256sums=('SKIP'
-            '8aafdf4f62a52195a591ebe24ab671c35aa1d7c60381c8ff3526c4c1dd1fdf0e'
-            '0f95696e2bafc6120a60e66fe48884d516ca28fc5ee1ddf9e52f946e1234019d'
-            '735321f3f00e60af22dead4d319a73199d0f3839fed5566021d310a4697a5b6b'
-            '8c3aa163f2c5f65622e3b3067a8dd5eb9bf5ffe1314b877fd85505ee3fd54ada'
-            '884dcf771e3a6122f34029b1780511f180f2143db463c19a1c6051921e6ad267'
-            '2c5b74243d9d1b10447875ee8c1793c512da269cd33b069f6e478d304895abd2'
-            'a3708553ff2f3ba8608e4cff6488d0c1f61f1c1739f16127c398921cca944731'
-            'ee178aa40f3f9d3e197e87ac8b5cb646aef44ca59d4664e142fb571ab5128a19'
-            '601e2f7c99c8702061d89a79a1f9ffe3e85f77f75ee718a8186d91b5d1deac87'
-            'd8a060a752f703da0051ee4929a10d8ca72eaab3dd54da111b54c52f34177950'
-            '0cc775ee20bc1f5c947eadc7b1bfc022508bcc0f4eb6aae294184b024de55222'
-            'd299312cca28130823a6ca4e163e8c0bc32887c132c76c37e8cb0082c7d54e10'
-            '7cb032f609aeee26def614f4c8b7ffb3a41e63412c045ebeaa9385d58f53a5ba'
-            '3f176e0713024301a2497836caf5c5c7cc00212f2dbc164a9565a619980ed1bc'
-            '7a43506231fdedcb6fe01fee7094040fe4c2904af1d84ab18022b2aa0cc3ea13'
-            'd861b33b5396455959a009d935ffc73e81977d2eb50038753aee02c7e0d3d5c6'
-            '5be0cda0f574ad9a7408c28987b9884dd8e9e584db26abadbb3f7466543e65e2'
-            'fd8f188fe49549ca690f13abfe02eace268011fc39644bfdf5df6acf64aeb32f'
-            '06ba3acae156d3e409355cda6b81fc18f1f6f5839676c4f7d8d1970e2fd4d31c'
-            '09972073fe07623ad8bbfdec9c7c33fd75e12cd9d237aef3c04468a9aefa4afd'
-            'ac80823274db00b877f1e925426da1a709f00b211f77e30fe4448f5c6c31194a'
-            'a0fe210a8ae05f0a17a06ff79736d0908a6c3dc0fc6db444e5c4d050b84b779d'
-            '7cba394680f874b23fa77ea295d17f4b2a2a5f64bd376cd6afd6cf34b05f659b'
-            '6bf4d9abd0ec1cf3de0868df81792d3cdf4d857eb8002fd9dd8505f9541a8c29')
+            '3b16cf413fe49254902d18faf96787f206c1dbc992ffff9c4e4d4230485c1bf9'
+            '45484264acedba213c14a230137a10a937d4476e1930f66a6531c8fec9f2be37'
+            '57cfab9f43b12a7dc0fe120032d9c811ee0db6efdc6c88dc08c72d5f278a1d09'
+            'a35b0bd423a516a915651ec6474565eb70c8f52c04f6bbcfe63ad6f2e68a52d4'
+            'aeb7f3185277c81d8b0a7481588a531dcf3b04ae4336855fb7c692ca4b657d70'
+            'c05bf13f03f88c1bbaa25451319c7e81a74fb4f487deac337af6e12febc9d91d'
+            'd98ac11f1e483d2ed9adc30e6e9f4f70f2d8544f24ec79da0e15cb6a9fff272c'
+            '6c736e1efe35423bc6449374e2d33fac666ffa43ea2c8f5920c34e6fd74595a9'
+            'ac92806d9e413ad1bbcedbb2eb701067765413cd528107e90d070ed640af0a7e'
+            'e78cdb2410ed5c04c51fb28b4a0760ffb840f0ddf60b933de91d1da7dd5514e7'
+            '85e6eaf55fe052960913293e4a901812b9dddece2a398e97dcc4e2e64ea5be4b'
+            '80e4240155b5b93ffa87edde9eaffa2a47e6c0021d03858f99206aaa43403de0'
+            'b975234d6aedb25f61f7a27c4953b96fd12412e1b4e8c4bd5c6a9aaf1c24ae29'
+            '6a35ee32f7dd30553f735606d8efc9080a6d89f5972534545dd3e7097163f6b2'
+            '22a6b289fe7b2cc79254c08eb6a436e402ae67d7c0561ee790b73634ea22a8bb'
+            'a75f07bb64328a2ae814b17d3dbc894f164a9169d70a402aaf6499604bc5b466'
+            '2672c1abe34f43523d609cffce8db09c3e57dce15379acee70368421cc386f14'
+            'def566a9cf65b77cd017603aaa1f20e0969ee0cbdcfd5908bcbb44b4cd5d2474'
+            'bab265d3a67d38cac15b9cb260dfaf48778388a879cba21744de7900b406151e'
+            '4edfc95f0a8b2be0981cfbfea6be662312331915899734a19de96703f4c2b4c7'
+            '65cc92f23946f76552be855f60b00cc518f5abc387cb71bd180a6a1e96719fbd'
+            '16a87c39f043da71b5f7095eaa697a3631782957ccb034cbf1d1d6d53a6ec9b2'
+            'a3dfc8f8320bcd224072ec2901cc8eaaff2b756ef9d038d387ec1316bc77832e')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -128,8 +126,7 @@ prepare() {
  0020-Add-debugging-for-build_argv.patch \
  0021-Add-debugging-for-strace-make_command_line.patch \
  0022-environ.cc-New-facility-environment-variable-MSYS2_E.patch \
-  0023-path.cc-Ignore-zero-length-exclusions.patch \
-  0024-Cygwin-fix-build-with-GCC-7.patch
+  0023-path.cc-Ignore-zero-length-exclusions.patch

 }