diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch
index 52641827..83a89a8c 100644
--- a/msys2-runtime/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime/0001-Add-MSYS2-triplet.patch
@@ -1,4 +1,4 @@
-From e2a645064a2101d6fae5f3e35bc01113eb784e59 Mon Sep 17 00:00:00 2001
+From 47b4b9e038ec9e75025dcc1c5e45d68b560e6a9e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 20:40:45 +0300
@@ -940,7 +940,7 @@ index d6c3372..2ab4d75 100755
      lt_cv_dlopen_libs=
      ;;
 diff --git a/newlib/configure.host b/newlib/configure.host
-index a84c0c8..fe4346e 100644
+index e3dbbc7..fbef339 100644
 --- a/newlib/configure.host
 +++ b/newlib/configure.host
 @@ -191,7 +191,7 @@ case "${host_cpu}" in
@@ -952,7 +952,7 @@ index a84c0c8..fe4346e 100644
  		libm_machine_dir=i386
  		machine_dir=i386
  		;;
-@@ -395,7 +395,7 @@ fi
+@@ -398,7 +398,7 @@ fi
  
  if [ "x${newlib_mb}" = "x" ]; then
  	case "${host}" in
@@ -961,7 +961,7 @@ index a84c0c8..fe4346e 100644
  		newlib_mb=yes
  	  	;;
  	esac
-@@ -429,7 +429,7 @@ esac
+@@ -432,7 +432,7 @@ esac
  # THIS TABLE IS ALPHA SORTED.  KEEP IT THAT WAY.
  
  case "${host}" in
@@ -970,7 +970,7 @@ index a84c0c8..fe4346e 100644
  	posix_dir=posix
  	stdio64_dir=stdio64
  	xdr_dir=xdr
-@@ -633,7 +633,7 @@ esac
+@@ -636,7 +636,7 @@ esac
  # THIS TABLE IS ALPHA SORTED.  KEEP IT THAT WAY.
  
  case "${host}" in
@@ -2468,10 +2468,10 @@ index 87b04df..068cb55 100755
      lt_cv_dlopen_libs=
      ;;
 diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure
-index 1578d31..b31d192 100755
+index 36ea37d..c22ff8e 100755
 --- a/newlib/libm/machine/configure
 +++ b/newlib/libm/machine/configure
-@@ -3904,7 +3904,7 @@ if test "${use_libtool}" = "yes"; then
+@@ -3907,7 +3907,7 @@ if test "${use_libtool}" = "yes"; then
  enable_win32_dll=yes
  
  case $host in
@@ -2480,7 +2480,7 @@ index 1578d31..b31d192 100755
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
-@@ -5730,7 +5730,7 @@ else
+@@ -5733,7 +5733,7 @@ else
      lt_cv_sys_max_cmd_len=-1;
      ;;
  
@@ -2489,7 +2489,7 @@ index 1578d31..b31d192 100755
      # On Win9x/ME, this test blows up -- it succeeds, but takes
      # about 5 minutes as the teststring grows exponentially.
      # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -6069,7 +6069,7 @@ bsdi[45]*)
+@@ -6072,7 +6072,7 @@ bsdi[45]*)
    lt_cv_file_magic_test_file=/shlib/libc.so
    ;;
  
@@ -2498,7 +2498,7 @@ index 1578d31..b31d192 100755
    # func_win32_libid is a shell function defined in ltmain.sh
    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
    lt_cv_file_magic_cmd='func_win32_libid'
-@@ -6649,7 +6649,7 @@ case $host_os in
+@@ -6652,7 +6652,7 @@ case $host_os in
  aix*)
    symcode='[BCDT]'
    ;;
@@ -2507,7 +2507,7 @@ index 1578d31..b31d192 100755
    symcode='[ABCDGISTW]'
    ;;
  hpux*)
-@@ -8530,7 +8530,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8533,7 +8533,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        # PIC is the default for these OSes.
        ;;
  
@@ -2516,7 +2516,7 @@ index 1578d31..b31d192 100755
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -8612,7 +8612,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8615,7 +8615,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        fi
        ;;
  
@@ -2525,7 +2525,7 @@ index 1578d31..b31d192 100755
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9074,7 +9074,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9077,7 +9077,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
    extract_expsyms_cmds=
  
    case $host_os in
@@ -2534,7 +2534,7 @@ index 1578d31..b31d192 100755
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
      # When not using gcc, we currently assume that we are using
      # Microsoft Visual C++.
-@@ -9189,7 +9189,7 @@ _LT_EOF
+@@ -9192,7 +9192,7 @@ _LT_EOF
        fi
        ;;
  
@@ -2543,7 +2543,7 @@ index 1578d31..b31d192 100755
        # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
-@@ -9620,7 +9620,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9623,7 +9623,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        export_dynamic_flag_spec=-rdynamic
        ;;
  
@@ -2552,7 +2552,7 @@ index 1578d31..b31d192 100755
        # When not using gcc, we currently assume that we are using
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -10521,14 +10521,14 @@ bsdi[45]*)
+@@ -10524,14 +10524,14 @@ bsdi[45]*)
    # libtool to hard-code these into programs
    ;;
  
@@ -2569,7 +2569,7 @@ index 1578d31..b31d192 100755
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10550,6 +10550,12 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10553,6 +10553,12 @@ cygwin* | mingw* | pw32* | cegcc*)
        # Cygwin DLLs use 'cyg' prefix rather than 'lib'
        soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  
@@ -2582,7 +2582,7 @@ index 1578d31..b31d192 100755
        sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
        ;;
      mingw* | cegcc*)
-@@ -11188,7 +11194,7 @@ else
+@@ -11191,7 +11197,7 @@ else
      lt_cv_dlopen_libs=
      ;;
  
@@ -2817,5 +2817,5 @@ index ff12dc2..cb45983 100644
      install_host="install_host"
      ;;
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch
index 2e198f8e..ca76be75 100644
--- a/msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch
+++ b/msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch
@@ -1,4 +1,4 @@
-From f5e12e8dfc087d37613485f40bde95aed927589c Mon Sep 17 00:00:00 2001
+From 27d4b88a73f35c63cdde7de8cd277a8da93cca4c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:09:17 +0300
@@ -116,7 +116,7 @@ index e101623..66272bc 100644
  
  /* Named pipes based transport, for security on NT */
 diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
-index ca0633e..11e0a78 100644
+index 9bbdf8c..24f3422 100644
 --- a/winsup/cygwin/Makefile.in
 +++ b/winsup/cygwin/Makefile.in
 @@ -106,17 +106,17 @@ RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
@@ -152,7 +152,7 @@ index ca0633e..11e0a78 100644
  	--exclude='(?i:dll)' \
  	--exclude='reloc' \
  	--exclude='^main$$' \
-@@ -551,7 +552,7 @@ endif
+@@ -553,7 +554,7 @@ endif
  
  API_VER:=$(srcdir)/include/cygwin/version.h
  
@@ -161,7 +161,7 @@ index ca0633e..11e0a78 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
-@@ -601,7 +602,8 @@ install-libs: $(TARGET_LIBS)
+@@ -605,7 +606,8 @@ install-libs: $(TARGET_LIBS)
  	for i in $^; do \
  	    $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/lib/`basename $$i` ; \
  	done
@@ -171,7 +171,7 @@ index ca0633e..11e0a78 100644
  
  install-headers:
  	cd $(srcdir); \
-@@ -666,7 +668,7 @@ uninstall-man:
+@@ -671,7 +673,7 @@ uninstall-man:
  
  clean distclean realclean:
  	-rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc *.exe *.d \
@@ -180,7 +180,7 @@ index ca0633e..11e0a78 100644
  	       globals.h localtime.patched.c
  	-@$(MAKE) -C ${cygserver_blddir} libclean
  
-@@ -679,29 +681,29 @@ maintainer-clean: clean
+@@ -685,29 +687,29 @@ maintainer-clean: clean
  $(LDSCRIPT): $(LDSCRIPT).in
  	$(CC) -E - -P < $^ -o $@
  
@@ -276,10 +276,10 @@ index cb45983..fe2b8e1 100644
  		DEF_DLL_ENTRY="dll_entry"
  		DIN_FILE="x86_64.din"
 diff --git a/winsup/cygwin/crt0.c b/winsup/cygwin/crt0.c
-index fee4b2e..cb28bd3 100644
+index ec7959a..cf74961 100644
 --- a/winsup/cygwin/crt0.c
 +++ b/winsup/cygwin/crt0.c
-@@ -14,15 +14,23 @@ details. */
+@@ -14,7 +14,11 @@ details. */
  
  extern int main (int argc, char **argv);
  
@@ -291,7 +291,7 @@ index fee4b2e..cb28bd3 100644
  
  #ifdef __i386__
  __attribute__ ((force_align_arg_pointer))
- #endif
+@@ -22,7 +26,11 @@ __attribute__ ((force_align_arg_pointer))
  void
  mainCRTStartup ()
  {
@@ -393,7 +393,7 @@ index 134ae3f..d390a51 100644
      BYTE(0)	/* d */
      BYTE(0)	/* b */
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 86ab725..aa6ed8b 100644
+index 5d8b4b7..e9387af 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -377,21 +377,21 @@ check_sanity_and_sync (per_process *p)
@@ -513,7 +513,7 @@ index 6a4ed26..6f69b60 100644
    HANDLE retaddr;
    if (_my_tls.isinitialized ())
 diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
-index 4652de9..93864e8 100644
+index e9e005b..3994345 100644
 --- a/winsup/cygwin/dtable.cc
 +++ b/winsup/cygwin/dtable.cc
 @@ -1006,9 +1006,15 @@ handle_to_fn (HANDLE h, char *posix_fn)
@@ -533,7 +533,7 @@ index 4652de9..93864e8 100644
  	  w32len = cygheap->installation_key.Length / sizeof (WCHAR);
  	  if (w32len
 diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
-index b331dc8..b390699 100644
+index bccedfa..13528a7 100644
 --- a/winsup/cygwin/exceptions.cc
 +++ b/winsup/cygwin/exceptions.cc
 @@ -503,14 +503,14 @@ try_to_debug (bool waitloop)
@@ -570,10 +570,10 @@ index edbaded..fea4bb7 100644
  /* Create a pipe, and return handles to the read and write ends,
     just like CreatePipe, but ensure that the write end permits
 diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
-index 153bdad..24b775e 100644
+index a611671..b6e2670 100644
 --- a/winsup/cygwin/fhandler_tty.cc
 +++ b/winsup/cygwin/fhandler_tty.cc
-@@ -880,7 +880,11 @@ fhandler_pty_slave::open (int flags, mode_t)
+@@ -910,7 +910,11 @@ fhandler_pty_slave::open (int flags, mode_t)
        pipe_reply repl;
        DWORD len;
  
@@ -585,7 +585,7 @@ index 153bdad..24b775e 100644
  		       &cygheap->installation_key, get_minor ());
        termios_printf ("dup handles via master control pipe %s", buf);
        if (!CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl,
-@@ -2370,7 +2374,11 @@ fhandler_pty_master::close ()
+@@ -2412,7 +2416,11 @@ fhandler_pty_master::close ()
  	  pipe_reply repl;
  	  DWORD len;
  
@@ -597,7 +597,7 @@ index 153bdad..24b775e 100644
  			   &cygheap->installation_key, get_minor ());
  	  acquire_output_mutex (INFINITE);
  	  if (master_ctl)
-@@ -3644,7 +3652,11 @@ fhandler_pty_master::setup ()
+@@ -3675,7 +3683,11 @@ fhandler_pty_master::setup ()
  
    /* Create master control pipe which allows the master to duplicate
       the pty pipe handles to processes which deserve it. */
@@ -623,7 +623,7 @@ index 691d081..9633816 100644
        small_printf ("Sleeping %d after fork, pid %u\n", atoi (buf), GetCurrentProcessId ());
        Sleep (atoi (buf));
 diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc
-index dcd9b1d..1ee7f99 100644
+index 1eb5fde..f15e6b4 100644
 --- a/winsup/cygwin/hookapi.cc
 +++ b/winsup/cygwin/hookapi.cc
 @@ -401,7 +401,11 @@ hook_or_detect_cygwin (const char *name, const void *fn, WORD& subsys, HANDLE h)
@@ -721,7 +721,7 @@ index 56b4363..6bc948a 100644
  
  #endif /* __CYGWIN_CYGWIN_DLL_H__ */
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 63a936d..dcc345b 100644
+index b9afd27..5f8a2a1 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
 @@ -530,7 +530,11 @@ details. */
@@ -749,7 +749,7 @@ index 63a936d..dcc345b 100644
  
  /* The default cygdrive prefix. */
 diff --git a/winsup/cygwin/lib/_cygwin_crt0_common.cc b/winsup/cygwin/lib/_cygwin_crt0_common.cc
-index c7e4eea..bd1d10c 100644
+index 025e2f2..aa5a85d 100644
 --- a/winsup/cygwin/lib/_cygwin_crt0_common.cc
 +++ b/winsup/cygwin/lib/_cygwin_crt0_common.cc
 @@ -87,7 +87,11 @@ struct per_process_cxx_malloc __cygwin_cxx_malloc =
@@ -981,10 +981,10 @@ index 6a29550..431f9d2 100644
  static struct
  {
 diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
-index 2916728..f95d87b 100644
+index fff7d18..5c90198 100644
 --- a/winsup/cygwin/winsup.h
 +++ b/winsup/cygwin/winsup.h
-@@ -162,7 +162,11 @@ extern "C" void _pei386_runtime_relocator (per_process *);
+@@ -167,7 +167,11 @@ extern "C" void _pei386_runtime_relocator (per_process *);
  
  #ifdef __i386__
  /* dynamically loaded dll initialization for non-cygwin apps */
@@ -1525,5 +1525,5 @@ index c8b2e2c..5e6eebd 100644
      }
    if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))
 -- 
-2.26.2
+2.27.0
 
diff --git 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
index a0783fae..74b85296 100644
--- 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 1c6ee51365389a6ec56ebf249e5c81272dc6d3fe Mon Sep 17 00:00:00 2001
+From 91990dabdc3c09d1951325d601593cb31815da7c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:17:46 +0300
@@ -22,10 +22,10 @@ Subject: [PATCH 03/N] 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 11e0a78..553f66e 100644
+index 24f3422..7505afb 100644
 --- a/winsup/cygwin/Makefile.in
 +++ b/winsup/cygwin/Makefile.in
-@@ -345,6 +345,7 @@ DLL_OFILES:= \
+@@ -346,6 +346,7 @@ DLL_OFILES:= \
  	mmap_alloc.o \
  	msg.o \
  	msgcat.o \
@@ -96,7 +96,7 @@ index 269591a..71c3f22 100644
  char ** __reg2 win32env_to_cygenv (PWCHAR rawenv, bool posify);
  
 diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
-index 14a1dfb..07aa2fa 100644
+index 74413a8..6adf620 100644
 --- a/winsup/cygwin/external.cc
 +++ b/winsup/cygwin/external.cc
 @@ -141,7 +141,7 @@ create_winenv (const char * const *env)
@@ -926,7 +926,7 @@ index 0000000..67d85ec
 +#endif /* end of include guard: PATH_CONV_H_DB4IQBH3 */
 +
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 4da8884..bfc916a 100644
+index 36aa827..e56b69d 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -66,6 +66,7 @@
@@ -937,7 +937,7 @@ index 4da8884..bfc916a 100644
  #undef basename
  
  suffix_info stat_suffixes[] =
-@@ -3422,6 +3423,74 @@ fchdir (int fd)
+@@ -3602,6 +3603,74 @@ fchdir (int fd)
    return res;
  }
  
@@ -1102,5 +1102,5 @@ index e3a65f8..1aeec8d 100644
    {
      for (int i = calloced; i < argc; i++)
 -- 
-2.26.2
+2.27.0
 
diff --git 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
index fabfe241..a3b10242 100644
--- 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 3a2a73f1cab0edd9e48f9c7d165b49d652944fc3 Mon Sep 17 00:00:00 2001
+From 709e97e0c87675f00633673fd3aec128c3588250 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:29:01 +0300
@@ -187,5 +187,5 @@ index 3502166..28bcd63 100644
        /* Add a hint to the sysname, that we're running under WOW64.  This might
  	 give an early clue if somebody encounters problems. */
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
index fb882126..82e9466f 100644
--- a/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
+++ b/msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
@@ -1,4 +1,4 @@
-From 5c4b42275fa4cb8b3c8882e1da0bc08a9038b7d1 Mon Sep 17 00:00:00 2001
+From ce142c668419c27bae0c4eacd8d3a97f216b2798 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:45:06 +0300
@@ -14,7 +14,7 @@ Subject: [PATCH 05/N] - Move root to /usr. - Change sorting mount points. -
  4 files changed, 174 insertions(+), 28 deletions(-)
 
 diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
-index eb60cf2..5f6d27f 100644
+index 3a32c35..e997a70 100644
 --- a/winsup/cygwin/cygheap.cc
 +++ b/winsup/cygwin/cygheap.cc
 @@ -179,14 +179,22 @@ init_cygheap::init_installation_root ()
@@ -384,10 +384,10 @@ index 122a679..c447381 100644
   public:
    void init (bool);
 diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
-index bfcce00..4da0570 100644
+index e105248..f4fcfd0 100644
 --- a/winsup/cygwin/uinfo.cc
 +++ b/winsup/cygwin/uinfo.cc
-@@ -2791,7 +2791,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
+@@ -2783,7 +2783,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,
@@ -397,5 +397,5 @@ index bfcce00..4da0570 100644
      free (gecos);
    if (home)
 -- 
-2.26.2
+2.27.0
 
diff --git 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
index 8c320dcd..23aabeb9 100644
--- 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,4 +1,4 @@
-From 5396bbfebc7bdaec21692b63350ed1b929658144 Mon Sep 17 00:00:00 2001
+From b059d9b75183054ad2425fe249805627d14eda64 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:47:21 +0300
@@ -10,7 +10,7 @@ Subject: [PATCH 06/N] Do not create cygwin symlinks. Instead use deep copy of
  1 file changed, 147 insertions(+)
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index bfc916a..39b9c03 100644
+index e56b69d..9fbb894 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -1643,6 +1643,86 @@ conv_path_list (const char *src, char *dst, size_t size,
@@ -100,7 +100,7 @@ index bfc916a..39b9c03 100644
  /* Create a symlink from FROMPATH to TOPATH. */
  
  extern "C" int
-@@ -2071,6 +2151,73 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2175,6 +2255,73 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  	}
        else
  	{
@@ -175,5 +175,5 @@ index bfc916a..39b9c03 100644
  	  buf = tp.t_get ();
  	  cp = stpcpy (buf, SYMLINK_COOKIE);
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch b/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
index 8c0b8fcc..9960228a 100644
--- a/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
+++ b/msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
@@ -1,4 +1,4 @@
-From 894fc11600f8099366e9afb73f701015f337822e Mon Sep 17 00:00:00 2001
+From c7269ed9c65e5f30716e89398c1fdbe9278415df Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:48:54 +0300
@@ -35,5 +35,5 @@ index 87650cc..adc8884 100644
        else if (*newp == 'M' && strncmp (newp, "MSYS=", 5) == 0)
          parse_options (newp + 5);
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0008-Do-not-convert-environment-for-strace.patch b/msys2-runtime/0008-Do-not-convert-environment-for-strace.patch
index 8d9f94e2..040c4f62 100644
--- 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 7156663e55452398887c3d75de68239ee48655a8 Mon Sep 17 00:00:00 2001
+From 3a914a11d18af36f24e43c43281fe8c8050b0543 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 21:50:55 +0300
@@ -29,5 +29,5 @@ index cb83a37..77b75da 100644
  	{
  	  set_errno (E2BIG);
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch b/msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch
index 00bb0462..1280a3b9 100644
--- a/msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch
+++ b/msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch
@@ -1,4 +1,4 @@
-From 663bf2aa58617986a706abaa611ecff8f5c5cd71 Mon Sep 17 00:00:00 2001
+From 4e28c7cb86384c979cd1bb0b811d882ad55fec25 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?=
  =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <alexey.pawlow@gmail.com>
 Date: Sun, 14 Apr 2019 22:13:51 +0300
@@ -10,7 +10,7 @@ Subject: [PATCH 09/N] 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 39b9c03..9eeb011 100644
+index 9fbb894..eb457f5 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -701,6 +701,12 @@ path_conv::check (const char *src, unsigned opt,
@@ -54,5 +54,5 @@ index 39b9c03..9eeb011 100644
  	}
  
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
index 732048ca..8abc42d6 100644
--- a/msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
+++ b/msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
@@ -1,4 +1,4 @@
-From be6e708e4f7c43e48b1aa10bd46a200cca034af4 Mon Sep 17 00:00:00 2001
+From 7dec89da7af408b19e7fa9e4c7969dbd58d7a2ce 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 10/N] dcrt0.cc: Untangle allow_glob from winshell
@@ -11,7 +11,7 @@ a Cygwin program.
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index aa6ed8b..6b7814b 100644
+index e9387af..e850c0e 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -153,12 +153,12 @@ isquote (char c)
@@ -76,5 +76,5 @@ index aa6ed8b..6b7814b 100644
  
        /* Convert argv[0] to posix rules if it's currently blatantly
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
index b5ecca3b..93d9067c 100644
--- a/msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
+++ b/msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
@@ -1,4 +1,4 @@
-From 825082f2d4c08d34e36bff04bf3ec8dfefbbf017 Mon Sep 17 00:00:00 2001
+From b898ee64a799034918e28f008e5fc8687fbfe038 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 11/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(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 6b7814b..0878c4b 100644
+index e850c0e..0b62548 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -235,10 +235,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
@@ -56,5 +56,5 @@ index 6b7814b..0878c4b 100644
  	    size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
  	    if (cnt <= 1 || cnt == (size_t)-1)
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch
index 0f968e8b..409f5b90 100644
--- a/msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch
+++ b/msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch
@@ -1,4 +1,4 @@
-From 48fe1fdf0b85ae7a13c2034ddcb6e7a4e8b09ac2 Mon Sep 17 00:00:00 2001
+From f7df18ddf0532fc9d3d75cbd5dc4c770db095883 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 12/N] strace.cc: Don't set MSYS=noglob
@@ -68,5 +68,5 @@ index 5e6eebd..35953b8 100644
  		       NULL,	/* Security */
  		       NULL,	/* thread */
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0013-Add-debugging-for-build_argv.patch b/msys2-runtime/0013-Add-debugging-for-build_argv.patch
index 23f0e4dd..6816476f 100644
--- a/msys2-runtime/0013-Add-debugging-for-build_argv.patch
+++ b/msys2-runtime/0013-Add-debugging-for-build_argv.patch
@@ -1,4 +1,4 @@
-From 08e1f13d0ff5dd44e399fada306ffe9b98578fc7 Mon Sep 17 00:00:00 2001
+From d7a64e150927e96ee6ba4b813de5f89f78e2a3eb 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 13/N] Add debugging for build_argv
@@ -8,7 +8,7 @@ Subject: [PATCH 13/N] Add debugging for build_argv
  1 file changed, 2 insertions(+)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 0878c4b..8ed00dc 100644
+index 0b62548..1ad390e 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -309,6 +309,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob)
@@ -21,5 +21,5 @@ index 0878c4b..8ed00dc 100644
    while (*cmd)
      {
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch
index 4628b266..e3d14b6c 100644
--- a/msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch
+++ b/msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch
@@ -1,4 +1,4 @@
-From 9627a354f963b80225899e66372dab35d4cd7dd4 Mon Sep 17 00:00:00 2001
+From cf112c877c297322749a7f50f7c9d9f81665a90a 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 14/N] Add debugging for strace make_command_line
@@ -20,5 +20,5 @@ index 35953b8..6c94158 100644
    SetConsoleCtrlHandler (NULL, 0);
  /* Commit message for this code was:
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch
index dbf3c640..5957cb12 100644
--- a/msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch
+++ b/msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch
@@ -1,4 +1,4 @@
-From 485cb16802426b776bc8bb221ac9c97d179f20d4 Mon Sep 17 00:00:00 2001
+From 910547eb4b927fda2533e849fed23d7a1217d45e 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 15/N] environ.cc: New facility/environment variable
@@ -85,10 +85,10 @@ index adc8884..4b03836 100644
  	    p = cstrdup1(win_arg);
  	    if (win_arg != *srcp)
 diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
-index 0bbf497..b011f2d 100644
+index cba2140..40e443e 100644
 --- a/winsup/cygwin/miscfuncs.cc
 +++ b/winsup/cygwin/miscfuncs.cc
-@@ -308,6 +308,27 @@ NT_readline::gets ()
+@@ -309,6 +309,27 @@ NT_readline::gets ()
      }
  }
  
@@ -117,7 +117,7 @@ index 0bbf497..b011f2d 100644
  void * __reg1
  __import_address (void *imp)
 diff --git a/winsup/cygwin/miscfuncs.h b/winsup/cygwin/miscfuncs.h
-index d1e519f..fa6cc91 100644
+index 1ff7ee0..65605c8 100644
 --- a/winsup/cygwin/miscfuncs.h
 +++ b/winsup/cygwin/miscfuncs.h
 @@ -88,6 +88,8 @@ void backslashify (const char *, char *, bool);
@@ -130,10 +130,10 @@ index d1e519f..fa6cc91 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 9eeb011..602882f 100644
+index eb457f5..e8813c7 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -3596,7 +3596,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
+@@ -3776,7 +3776,6 @@ arg_heuristic_with_exclusions (char const * const arg, char const * exclusions,
      return arg_result;
    }
  
@@ -172,5 +172,5 @@ index 77b75da..bdf83c0 100644
  
    /* Check if we have been called from exec{lv}p or spawn{lv}p and mask
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch b/msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
index 7896faf3..49ac59d2 100644
--- a/msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
+++ b/msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
@@ -1,4 +1,4 @@
-From a28dd049f273aad32f2517ff2ab01aeea59a61a2 Mon Sep 17 00:00:00 2001
+From 29271c4410b26854f0a8676fd017cfcc59cea877 Mon Sep 17 00:00:00 2001
 From: SquallATF <squallatf@gmail.com>
 Date: Mon, 10 Sep 2018 11:32:18 +0300
 Subject: [PATCH 16/N] Fix native symbolic link spawn passing wrong arg0
@@ -21,5 +21,5 @@ index bdf83c0..0c7f645 100644
  
    if (buf.isdir ())
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch b/msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
index 7e059a5b..3d825d58 100644
--- a/msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
+++ b/msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
@@ -1,4 +1,4 @@
-From 4611822668f2df238c1b6d68a45c961437673776 Mon Sep 17 00:00:00 2001
+From ddaba6837a10ce7dfcff32c676ece3cbf7beddbd Mon Sep 17 00:00:00 2001
 From: Alexey Pavlov <alexpux@gmail.com>
 Date: Fri, 24 May 2019 13:41:47 +0300
 Subject: [PATCH 17/N] QueryUnbiasedInterruptTime must be load from
@@ -9,7 +9,7 @@ Subject: [PATCH 17/N] QueryUnbiasedInterruptTime must be load from
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
-index 454bf51..8ce23ea 100644
+index 613a019..61c2808 100644
 --- a/winsup/cygwin/autoload.cc
 +++ b/winsup/cygwin/autoload.cc
 @@ -595,7 +595,7 @@ LoadDLLfunc (SetThreadGroupAffinity, 12, kernel32)
@@ -21,7 +21,6 @@ index 454bf51..8ce23ea 100644
  LoadDLLfunc (QueryUnbiasedInterruptTimePrecise, 4, KernelBase)
  LoadDLLfunc (VirtualAlloc2, 28, kernelbase)
  
- LoadDLLfunc (NtMapViewOfSectionEx, 36, ntdll)
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch b/msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch
index 582670f4..d181e28d 100644
--- a/msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch
+++ b/msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch
@@ -1,4 +1,4 @@
-From 8eac6ec23b8d784674f691650f65520648be3cc8 Mon Sep 17 00:00:00 2001
+From 69c24dc4bdc585bf26eeff5c3efb631c5aea776e Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Sat, 16 May 2020 15:31:05 +0200
 Subject: [PATCH 18/N] fixup! Do not create cygwin symlinks. Instead use deep
@@ -12,10 +12,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  1 file changed, 1 insertion(+)
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 602882f..81448e3 100644
+index e8813c7..01e7c55 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
-@@ -2177,6 +2177,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2281,6 +2281,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
                   to the directory of the destination */
               {
                  /* Determine the character position of the last path component */
@@ -24,5 +24,5 @@ index 602882f..81448e3 100644
                  while (--pos >= 0)
                    if (isdirsep (newpath[pos]))
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0019-strace-quiet-be-really-quiet.patch b/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
index bd439e3f..d204347c 100644
--- a/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
+++ b/msys2-runtime/0019-strace-quiet-be-really-quiet.patch
@@ -1,4 +1,4 @@
-From e5a15d8e24f57bf9306f373cff0a34b371e5d4d0 Mon Sep 17 00:00:00 2001
+From ed39bf116b5573bde358886d1aa851b299ffb46b Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 17 May 2017 18:13:32 +0200
 Subject: [PATCH 19/N] strace --quiet: be *really* quiet
@@ -36,5 +36,5 @@ index 6c94158..e7291bb 100644
    SetConsoleCtrlHandler (NULL, 0);
  /* Commit message for this code was:
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0022-Default-to-disable_pcon.patch b/msys2-runtime/0020-Default-to-disable_pcon.patch
similarity index 93%
rename from msys2-runtime/0022-Default-to-disable_pcon.patch
rename to msys2-runtime/0020-Default-to-disable_pcon.patch
index 662dbb60..941dc4a4 100644
--- a/msys2-runtime/0022-Default-to-disable_pcon.patch
+++ b/msys2-runtime/0020-Default-to-disable_pcon.patch
@@ -1,7 +1,7 @@
-From 22ba7ac08035c470a3927fa53805bcdcdfe5fc21 Mon Sep 17 00:00:00 2001
+From a74d515dcfede02af60d7c68900671c83ed53eff Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 19 May 2020 13:24:55 +0200
-Subject: [PATCH 22/N] Default to `disable_pcon`
+Subject: [PATCH 20/N] Default to `disable_pcon`
 
 The pseudo console support is just a bit too buggy still:
 
@@ -50,5 +50,5 @@ index 942bd1c..da82320 100644
  bool NO_COPY in_forkee;
  
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0023-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
similarity index 93%
rename from msys2-runtime/0023-Introduce-the-enable_pcon-value-for-MSYS.patch
rename to msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
index 41fc4ca8..abaf0a89 100644
--- a/msys2-runtime/0023-Introduce-the-enable_pcon-value-for-MSYS.patch
+++ b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
@@ -1,7 +1,7 @@
-From 8a167e61d3312580a9c58742d5e5ec03c12a782e Mon Sep 17 00:00:00 2001
+From 244c7a80d66c1b3e4d5e62ab969f12914e8bda6d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 19 May 2020 13:49:37 +0200
-Subject: [PATCH 23/N] Introduce the `enable_pcon` value for `MSYS`
+Subject: [PATCH 21/N] Introduce the `enable_pcon` value for `MSYS`
 
 It is simply the negation of `disable_pcon`, i.e. `MSYS=enable_pcon` is
 equivalent to `MSYS=nodisable_pcon` (the former is slightly more
@@ -53,5 +53,5 @@ index 4b03836..3d57e34 100644
  		*k->setting.x &= ~k->values[istrue].i;
  		if (istrue || (eq && strtol (eq, NULL, 0)))
 -- 
-2.26.2
+2.27.0
 
diff --git a/msys2-runtime/0024-Don-t-create-WSL-symlinks-for-MSYS2.patch b/msys2-runtime/0022-Don-t-create-WSL-symlinks-for-MSYS2.patch
similarity index 79%
rename from msys2-runtime/0024-Don-t-create-WSL-symlinks-for-MSYS2.patch
rename to msys2-runtime/0022-Don-t-create-WSL-symlinks-for-MSYS2.patch
index 336527f7..a0213858 100644
--- a/msys2-runtime/0024-Don-t-create-WSL-symlinks-for-MSYS2.patch
+++ b/msys2-runtime/0022-Don-t-create-WSL-symlinks-for-MSYS2.patch
@@ -1,14 +1,14 @@
-From b8b2cf3200233d16f5b7261c92ef80ed0f1b273e Mon Sep 17 00:00:00 2001
+From ffdf71dabe36bc70c344635579d6c63b66b6ac0b Mon Sep 17 00:00:00 2001
 From: Alexey Pavlov <alexpux@gmail.com>
 Date: Tue, 2 Jun 2020 14:28:09 +0300
-Subject: [PATCH] Don't create WSL symlinks for MSYS2
+Subject: [PATCH 22/N] Don't create WSL symlinks for MSYS2
 
 ---
- winsup/cygwin/path.cc | 4 ++
+ winsup/cygwin/path.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
-index 01e7c5568..0648d0dc0 100644
+index 01e7c55..db2949c 100644
 --- a/winsup/cygwin/path.cc
 +++ b/winsup/cygwin/path.cc
 @@ -1955,6 +1955,7 @@ typedef struct _REPARSE_LX_SYMLINK_BUFFER
@@ -27,7 +27,7 @@ index 01e7c5568..0648d0dc0 100644
  
  int
  symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
-@@ -2109,6 +2109,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2109,6 +2111,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  	    }
  	  /* Otherwise, fall back to default symlink type. */
  	  wsym_type = WSYM_sysfile;
@@ -35,7 +35,7 @@ index 01e7c5568..0648d0dc0 100644
  	  /*FALLTHRU*/
  	case WSYM_sysfile:
  	  if (win32_newpath.fs_flags () & FILE_SUPPORTS_REPARSE_POINTS)
-@@ -2120,6 +2121,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
+@@ -2120,6 +2123,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
  	  /* On FSes not supporting reparse points, or in case of an error
  	     creating the WSL symlink, fall back to creating the plain old
  	     SYSTEM file symlink. */
diff --git a/msys2-runtime/0025-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
similarity index 88%
rename from msys2-runtime/0025-popen-call-usr-bin-sh-instead-of-bin-sh.patch
rename to msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
index 1fdb4807..5a73086d 100644
--- a/msys2-runtime/0025-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+++ b/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
@@ -1,7 +1,7 @@
-From 1f23459048c1fb35a94e9535846afc3a42541443 Mon Sep 17 00:00:00 2001
+From c5e972d5a3570848231672754cf6d2762d257ebe Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Fri, 5 Jun 2020 20:09:11 +0200
-Subject: [PATCH] popen: call /usr/bin/sh instead of /bin/sh
+Subject: [PATCH 23/N] popen: call /usr/bin/sh instead of /bin/sh
 
 We mount /usr/bin to /bin, but in a chroot this is broken and we
 have no /bin, so try to use the real path.
@@ -17,7 +17,7 @@ in this scenario, so this maybe should be extended to all of them.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index 186eeec5c..fdb49f3d4 100644
+index 186eeec..fdb49f3 100644
 --- a/winsup/cygwin/syscalls.cc
 +++ b/winsup/cygwin/syscalls.cc
 @@ -4556,7 +4556,7 @@ popen (const char *command, const char *in_type)
diff --git a/msys2-runtime/0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch b/msys2-runtime/0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch
new file mode 100644
index 00000000..07d3f236
--- /dev/null
+++ b/msys2-runtime/0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch
@@ -0,0 +1,44 @@
+From 1de7bb9fd8166d0d2cbb44ee47ad79774c8105d1 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 9 Aug 2020 14:02:51 +0200
+Subject: [PATCH 24/N] CI: add a GHA for doing a basic build test
+
+---
+ .github/workflows/build.yaml | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+ create mode 100644 .github/workflows/build.yaml
+
+diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
+new file mode 100644
+index 0000000..c7ed476
+--- /dev/null
++++ b/.github/workflows/build.yaml
+@@ -0,0 +1,24 @@
++name: build
++
++on: [push, pull_request]
++
++jobs:
++  build:
++    runs-on: windows-latest
++
++    steps:
++      - name: Checkout code
++        uses: actions/checkout@v2
++
++      - name: setup-msys2
++        uses: msys2/setup-msys2@v2
++        with:
++          msystem: MSYS
++          update: true
++          install: msys2-devel base-devel cocom diffutils gcc gettext-devel libiconv-devel make mingw-w64-cross-crt mingw-w64-cross-gcc mingw-w64-cross-zlib perl zlib-devel
++
++      - name: Build
++        shell: msys2 {0}
++        run: |
++          ./configure
++          make -j8
+\ No newline at end of file
+-- 
+2.27.0
+
diff --git a/msys2-runtime/0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch b/msys2-runtime/0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
new file mode 100644
index 00000000..7a1bc8ef
--- /dev/null
+++ b/msys2-runtime/0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
@@ -0,0 +1,43 @@
+From 4bbf0abdee039e5b4aa9d6c2a19a1433542ee944 Mon Sep 17 00:00:00 2001
+From: Johannes Schindelin <johannes.schindelin@gmx.de>
+Date: Fri, 22 Nov 2019 11:20:22 +0100
+Subject: [PATCH 25/N] Set up a GitHub Action to keep in sync with Cygwin
+
+This will help us by automating an otherwise tedious task.
+
+Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
+---
+ .github/workflows/sync-with-cygwin.yml | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+ create mode 100644 .github/workflows/sync-with-cygwin.yml
+
+diff --git a/.github/workflows/sync-with-cygwin.yml b/.github/workflows/sync-with-cygwin.yml
+new file mode 100644
+index 0000000..defcdf8
+--- /dev/null
++++ b/.github/workflows/sync-with-cygwin.yml
+@@ -0,0 +1,21 @@
++name: sync-with-cygwin
++
++# File: .github/workflows/repo-sync.yml
++
++on:
++  schedule:
++  - cron:  "42 * * * *"
++jobs:
++  repo-sync:
++    runs-on: ubuntu-latest
++    steps:
++    - name: Fetch Cygwin's latest master and tags
++      run: |
++        git init --bare
++        # Potentially use git://sourceware.org/git/newlib-cygwin.git directly, but GitHub seems more reliable
++        git fetch https://github.com/cygwin/cygwin master:refs/heads/cygwin/master 'refs/tags/*:refs/tags/*'
++    - name: Push to our fork
++      env:
++        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
++      run: |
++        git push https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY refs/heads/cygwin/master 'refs/tags/*:refs/tags/*'
+-- 
+2.27.0
+
diff --git a/msys2-runtime/0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch b/msys2-runtime/0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch
new file mode 100644
index 00000000..ae3f6cf6
--- /dev/null
+++ b/msys2-runtime/0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch
@@ -0,0 +1,37 @@
+From c41b1ed54029a0b1b1c9ea40a909ffa67c5ba8de Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 9 Aug 2020 13:43:50 +0200
+Subject: [PATCH 26/N] recursiveCopy: Always close the used handle with
+ FindClose()
+
+See https://github.com/msys2/MSYS2-packages/issues/2060
+---
+ winsup/cygwin/path.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
+index db2949c..0c54ecf 100644
+--- a/winsup/cygwin/path.cc
++++ b/winsup/cygwin/path.cc
+@@ -1657,7 +1657,7 @@ static int
+ recursiveCopy (char * src, char * dst, const char * origpath)
+ {
+   WIN32_FIND_DATA dHfile;
+-  HANDLE dH;
++  HANDLE dH = INVALID_HANDLE_VALUE;
+   BOOL findfiles;
+   int srcpos = strlen (src);
+   int dstpos = strlen (dst);
+@@ -1727,6 +1727,9 @@ recursiveCopy (char * src, char * dst, const char * origpath)
+ 
+ done:
+ 
++  if (dH != INVALID_HANDLE_VALUE)
++    FindClose (dH);
++
+   return res;
+ }
+ 
+-- 
+2.27.0
+
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index 6a0c110f..1ae6224e 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -5,7 +5,7 @@ PKGEXT='.pkg.tar.xz'
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=3.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -43,34 +43,40 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
         0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
         0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch
         0019-strace-quiet-be-really-quiet.patch
-        0022-Default-to-disable_pcon.patch
-        0023-Introduce-the-enable_pcon-value-for-MSYS.patch
-        0024-Don-t-create-WSL-symlinks-for-MSYS2.patch
-        0025-popen-call-usr-bin-sh-instead-of-bin-sh.patch)
+        0020-Default-to-disable_pcon.patch
+        0021-Introduce-the-enable_pcon-value-for-MSYS.patch
+        0022-Don-t-create-WSL-symlinks-for-MSYS2.patch
+        0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+        0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch
+        0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
+        0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch)
 sha256sums=('SKIP'
-            'f05c08ef2b6647a2f66c63bda5e077f1443cad7cd0edabfcf8d752021bc9aea6'
-            '7aaa0386382c77897ab7cff2417eb74e06dc58d878abff002b8c098738a17040'
-            'eab0333a201436f79996283260b58dcc2267bad4b7500f2d45d4a35772284195'
-            'f106ded5f17931afb72fc3b24f86b99ca81a2f4d70ae74e356e6d749d4d51a03'
-            'b9a61d14b2d7965f513f26cda7fc62d931af332388921ed6de5f4e626bdab6fa'
-            'c0c1b55cb84cf93fef757ae04c5d142bd871fd9b47b0565e7967c1f94ba64ef6'
-            '9562520215825b6aa8b8ea80ac578dc796cd5a21ad7b0ccad9b5018b92b6ca05'
-            '7e0ebf8797f5ea77ffcd8be89680122f65af85e0186aeeb624aa295c2a66886b'
-            '9ade2875b1cad19cb452ca94b9abd544be5008a9cad40101a51acc31a4059cc0'
-            '4f87ad3c0ab97d86ec6c5a3c8524a91f33d130c3831a7115a36b8b40f21463da'
-            'eb81165f0417d7760f1c4c18283241bcf074219d65cca2d3baf532e8c664e569'
-            '76190025a7b67b043c1aa8039d07c73ae98624d8eeabeea85edf5f292b3c8787'
-            '3edb4eeeafc1a3ad14c5a6f506371ddf455a0f691310695a97e813d69af70d8e'
-            '3c82587af9feb673b9290a6e85a784f93cf74a85acd5d4c1aa40da5da58d146f'
-            'e81c59bde16b9f063477795feef72641b2888929fa3095548c06404032341a48'
-            '16c6300aa283a7db894cd95e1973be2fbe6c06afeadc6fe49dc4a932cab77880'
-            '04aa0f7d9678bd33099fd513677c90a709fe72770bcfa5cf2229c57450eb97bd'
-            '84ddcb863ed12afafddea4693a66aa7a923742f02342316212b682c09c92376c'
-            'f5130841a101816fe4e45ff54e34aeead0568389d0833c4e4cc968af64a9c736'
-            '3cedd2577d450f3c0e9938079fb794bb72d4ab1e3787133d882c0004727bafb2'
-            'b6e94eebe4491fb1076b7f56793dc34ee678b63a5f0a112bd4c6a2e434d8b729'
-            '74ce13ae56f3b1dd82ebd2d6619e8bf014d09ce5ab7031a47cdc926068314d68'
-            '2ce504d0d9e8b138297c14dba6af8965f12862c99a42d3bafce663f658749e67')
+            '52c78022ec6504103a8daa334ed330472905ebbf58438d9379b33fc7a9841d23'
+            '590b7c9f9002d4d0d3dc8bd9bf2dd855aeb91de70ad9736361f25a5f7a4682c9'
+            '5a30e599a8df672c536ed468c3ff46c26184cad0e57f6493dccb09db7d94070c'
+            'a01689ba155f9436d38c109518f1837287e6cacbc59b7478bfc4b65bce456201'
+            'de61ec66384f897d404fac7724ce0b4a815ffdff189afa9b8507a8701c84e6bf'
+            '4ee6d03f416c4293ea46e5e4e1f03ed394445be8d156356007804fc9384a7276'
+            '1d3670d7d01a97c685bcb30009a329d0b51aa6101930b5d81aa1951c23f74b69'
+            'dceeddecd65fbe14e40685a6e4202b59ad71d37c84812a4fbc7da84157f4f26c'
+            'bc9c7ac7ec12ca5f9017116147dc6a6b1230dcc9fea4e0cb5c40295b44767f6a'
+            '409d70c160d28bfb4ecb084e3cad936a253205438dda34c0dec0425bd3c2f066'
+            '49fd75701ec2d50e4552bf23d742ac43b23b3feb52cc711db18160452c12cdfe'
+            'a0771a8e65ab511f1e85fbb1031f2e029806d28ba1efe76ed2109812d7d7f0dd'
+            'f84ed6fa41220e9dd23aac09101d3b44765679322bdac9877aa0616d7b8aff8e'
+            '5e91dd7dc50c021af5f19cadaffcfe8d3b053c883a5f55c7b13b38d478a20727'
+            '43a6f27b95c1873729fa2f0b1a519d860c8267c6b5fb7791aae803ac108c35c3'
+            '7327837b56642f485a02335ffca54486736173ee42a568dd03695a8a5029d99b'
+            '04adf25e96a5cb674cf8b191485fd2f8cd76372137799c9f5ed307a9c3524b11'
+            '1e8ccfadd4c9aa14a0f89ce54ca2c357f771b449fbdd682fe5d7db31f8162a4b'
+            '4ff36d01ada7a0706787003227012ba624cce10c5e7bdffd6c2f33afdc29cdfb'
+            '6c81ef46b75b575f2d579509ecbd2a8fcaf0b3a71a25cefcf1cc5e777eb0831e'
+            'fdf4a5e03263925ebc9cf571f4ae745b7d5b4ccac06d07fe3be403738de5da6c'
+            '4d6f3a111a23afb110acd38660c8a3d6c45cb5fca5503080e737fd529fab3a42'
+            'a1e2bf8dfb9ad47468b1295f11784f90820857e733ac352b7a9b35411134456e'
+            '2679dde3632a0fad925d6010ad81055dce1671b10a13ef288168594773ac4c1b'
+            'f1461123ed89e0cf0ff19eeb84179fe0652ebe72bf9930bcaf331ef41717b687'
+            '43bbe321dc90b58a2bb66ded2c7ab55d88a21536e99f88a97c4ec2644eeecee5')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -127,10 +133,13 @@ prepare() {
   0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch \
   0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch \
   0019-strace-quiet-be-really-quiet.patch \
-  0022-Default-to-disable_pcon.patch \
-  0023-Introduce-the-enable_pcon-value-for-MSYS.patch \
-  0024-Don-t-create-WSL-symlinks-for-MSYS2.patch \
-  0025-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+  0020-Default-to-disable_pcon.patch \
+  0021-Introduce-the-enable_pcon-value-for-MSYS.patch \
+  0022-Don-t-create-WSL-symlinks-for-MSYS2.patch \
+  0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch \
+  0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch \
+  0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch \
+  0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch
 }
 
 build() {