Merge pull request #3393 from lazka/runtime-3.4.1

msys2-runtime-3.4: Update to 3.4.1
2022-12-11 11:38:11 +01:00
parent 282cdc4180 0b2220df1b
commit 94ec3ec00b
40 changed files with 100 additions and 311 deletions
--- a/msys2-runtime-3.4/0001-Add-MSYS2-triplet.patch
+++ b/msys2-runtime-3.4/0001-Add-MSYS2-triplet.patch
@@ -1,4 +1,4 @@
-From 9a542d2dc06ab97d0f04ac0fabc621f10b121d77 Mon Sep 17 00:00:00 2001
+From b9d1e765bf5980761a296440455f4ef43c14327d 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
--- a/msys2-runtime-3.4/0002-Fix-msys-library-name-in-import-libraries.patch
+++ b/msys2-runtime-3.4/0002-Fix-msys-library-name-in-import-libraries.patch
@@ -1,4 +1,4 @@
-From 4e331e2ac0b254c72dde4a8ebf6098effcebb968 Mon Sep 17 00:00:00 2001
+From c00c3efc51874b7a0b870e3b69c88ffbf9cd033e Mon Sep 17 00:00:00 2001
 From: Kaleb Barrett <dev.ktbarrett@gmail.com>
 Date: Sun, 14 Mar 2021 18:58:55 -0500
 Subject: [PATCH 02/N] Fix msys library name in import libraries
--- a/msys2-runtime-3.4/0003-Rename-dll-from-cygwin-to-msys.patch
+++ b/msys2-runtime-3.4/0003-Rename-dll-from-cygwin-to-msys.patch
@@ -1,4 +1,4 @@
-From 332528c3af7669e5a25e85aa659bf84f194720d0 Mon Sep 17 00:00:00 2001
+From 90e47caebf5e3dc0320b7b79bd397d6b08351330 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
@@ -11,7 +11,7 @@ Subject: [PATCH 03/N] Rename dll from cygwin to msys
 winsup/cygwin/Makefile.am                     | 42 +++++++++---------
 winsup/cygwin/crt0.c                          |  8 ++++
 winsup/cygwin/cygthread.cc                    |  2 +-
- winsup/cygwin/cygwin.din                      |  4 +-
+ winsup/cygwin/cygwin.din                      |  6 +--
 winsup/cygwin/cygwin.sc.in                    |  4 ++
 winsup/cygwin/dcrt0.cc                        | 16 ++++---
 winsup/cygwin/dlfcn.cc                        |  5 +++
@@ -36,7 +36,6 @@ Subject: [PATCH 03/N] Rename dll from cygwin to msys
 winsup/cygwin/syscalls.cc                     |  4 +-
 winsup/cygwin/syslog.cc                       |  4 ++
 winsup/cygwin/winver.rc                       |  2 +-
- winsup/cygwin/x86_64.din                      | 14 ++++++
 winsup/testsuite/config/default.exp           |  8 ++--
 winsup/testsuite/cygrun.c                     |  6 +--
 winsup/testsuite/winsup.api/cygload.cc        | 12 +++---
@@ -49,8 +48,7 @@ Subject: [PATCH 03/N] Rename dll from cygwin to msys
 winsup/utils/mingw/strace.cc                  | 11 +++--
 winsup/utils/path.cc                          | 12 +++---
 winsup/utils/ssp.c                            |  8 ++--
- 44 files changed, 226 insertions(+), 109 deletions(-)
- create mode 100644 winsup/cygwin/x86_64.din
+ 43 files changed, 213 insertions(+), 110 deletions(-)

 diff --git a/winsup/Makefile.am b/winsup/Makefile.am
 index 9efdd4c..0946152 100644
@@ -95,7 +93,7 @@ index e101623..66272bc 100644
 
 /* Named pipes based transport, for security on NT */
 diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
-index 1d57e84..1a59ce1 100644
+index 8ba5ae2..56e72b2 100644
 --- a/winsup/cygwin/Makefile.am
 +++ b/winsup/cygwin/Makefile.am
@@ -37,15 +37,15 @@ newlib_build=$(target_builddir)/newlib
@@ -122,7 +120,7 @@ index 1d57e84..1a59ce1 100644
 
 #
 # sources
-@@ -550,32 +550,32 @@ LIBSERVER = $(cygserver_blddir)/libcygserver.a
+@@ -555,32 +555,32 @@ LIBSERVER = $(cygserver_blddir)/libcygserver.a
 $(LIBSERVER):
 	$(MAKE) -C $(cygserver_blddir) libcygserver.a
 
@@ -161,7 +159,7 @@ index 1d57e84..1a59ce1 100644
 $(DBG_DLL_NAME): $(PRE_DLL_NAME)
 	$(AM_V_GEN)$(OBJCOPY) --add-gnu-debuglink=/dev/null \
 			      --only-keep-debug \
-@@ -588,7 +588,7 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME)
+@@ -593,7 +593,7 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME)
 			      --add-gnu-debuglink=$(DBG_DLL_NAME) \
 			      $(PRE_DLL_NAME) $(NEW_DLL_NAME)
 
@@ -170,7 +168,7 @@ index 1d57e84..1a59ce1 100644
 toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@
 
 $(DEF_FILE): scripts/gendef cygwin.din
-@@ -601,17 +601,18 @@ sigfe.s: $(DEF_FILE) tlsoffsets
+@@ -606,17 +606,18 @@ sigfe.s: $(DEF_FILE) tlsoffsets
 
 LIBCOS=$(addsuffix .o,$(basename $(LIB_FILES)))
 $(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(NEW_DLL_NAME)
@@ -192,7 +190,7 @@ index 1d57e84..1a59ce1 100644
 	--exclude='(?i:dll)' \
 	--exclude='reloc' \
 	--exclude='^main$$' \
-@@ -658,7 +659,7 @@ all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
+@@ -663,7 +664,7 @@ all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
 clean-local:
 	-rm -f $(BUILT_SOURCES)
 	-rm -f $(DEF_FILE) sigfe.s
@@ -201,7 +199,7 @@ index 1d57e84..1a59ce1 100644
 	-rm -f $(PRE_DLL_NAME) $(DBG_DLL_NAME) $(NEW_DLL_NAME)
 	-rm -f $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
 	-rm -f version.cc
-@@ -680,6 +681,7 @@ install-libs:
+@@ -685,6 +686,7 @@ install-libs:
 	@$(MKDIR_P) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(NEW_DLL_NAME) $(DESTDIR)$(bindir)/$(DLL_NAME)
 	@$(MKDIR_P) $(DESTDIR)$(toollibdir)
@@ -209,7 +207,7 @@ index 1d57e84..1a59ce1 100644
 	(cd $(DESTDIR)$(toollibdir) && ln -sf $(LIB_NAME) libg.a)
 
 install-headers:
-@@ -702,7 +704,7 @@ install-ldif:
+@@ -707,7 +709,7 @@ install-ldif:
 uninstall-hook: uninstall-headers uninstall-ldif uninstall-libs
 
 uninstall-libs:
@@ -257,9 +255,15 @@ index 54918e7..518d11f 100644
   else
     thread_printf ("overflowed cygwin thread pool");
 diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
-index f1371af..d24c7d2 100644
+index f1371af..3167f04 100644
 --- a/winsup/cygwin/cygwin.din
 +++ b/winsup/cygwin/cygwin.din
+@@ -1,4 +1,4 @@
+-LIBRARY "cygwin1.dll" BASE=0x180040000
+LIBRARY "msys-2.0.dll" BASE=0x180040000
+ 
+ EXPORTS
+ # Exported variables
@@ -398,8 +398,8 @@ cygwin_attach_handle_to_fd SIGFE
 cygwin_conv_path SIGFE
 cygwin_conv_path_list SIGFE
@@ -426,10 +430,10 @@ index c3433ab..b154a3b 100644
 	  break;
 	}
 diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc
-index 720e4ef..2ba517b 100644
+index e231316..283319c 100644
 --- a/winsup/cygwin/fhandler/pipe.cc
 +++ b/winsup/cygwin/fhandler/pipe.cc
-@@ -657,7 +657,11 @@ fhandler_pipe::close ()
+@@ -671,7 +671,11 @@ fhandler_pipe::close ()
   return ret;
 }
 
@@ -577,7 +581,7 @@ index 1e4cf98..b77598b 100644
       }									      \
     }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index 4a9de4c..d09782a 100644
+index b05fcaf..032b6b0 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
@@ -495,7 +495,11 @@ details. */
@@ -834,26 +838,6 @@ index 980d512..58878d4 100644
       VALUE "ProductVersion", STRINGIFY(CYGWIN_VERSION)
       VALUE "APIVersion", CYGWIN_API_VERSION
       VALUE "SharedMemoryVersion", STRINGIFY(CYGWIN_VERSION_SHARED_DATA)
-diff --git a/winsup/cygwin/x86_64.din b/winsup/cygwin/x86_64.din
-new file mode 100644
-index 0000000..38332c7
--- /dev/null
-+++ b/winsup/cygwin/x86_64.din
-@@ -0,0 +1,14 @@
-+LIBRARY "msys-2.0.dll" BASE=0x180040000
-+
-+EXPORTS
-+#Exported variables
-+environ = __cygwin_environ DATA
-+
-+#Exported functions
-+__wrap__Znam NOSIGFE                # void *operator new[](std::size_t sz) throw (std::bad_alloc)
-+__wrap__ZnamRKSt9nothrow_t NOSIGFE  # void *operator new[](std::size_t sz, const std::nothrow_t &nt) throw()
-+__wrap__Znwm NOSIGFE                # void *operator new(std::size_t sz) throw (std::bad_alloc)
-+__wrap__ZnwmRKSt9nothrow_t NOSIGFE  # void *operator new(std::size_t sz, const std::nothrow_t &nt) throw()
-+_alloca = __alloca NOSIGFE
-+_dll_crt0 NOSIGFE
-+dll_entry NOSIGFE
 diff --git a/winsup/testsuite/config/default.exp b/winsup/testsuite/config/default.exp
 index 7ef16ee..fd592c3 100644
 --- a/winsup/testsuite/config/default.exp
--- a/msys2-runtime-3.4/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch
+++ b/msys2-runtime-3.4/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch
@@ -1,4 +1,4 @@
-From dbb6d2f4763ba2dcf787f9c5088198dab024ffad Mon Sep 17 00:00:00 2001
+From 602f5263d598c18340d9bdcc5c1a0b6603dee8df 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 04/N] Add functionality for converting UNIX paths in
 create mode 100644 winsup/cygwin/msys2_path_conv.h

 diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
-index 1a59ce1..d3e9454 100644
+index 56e72b2..4bf0bfb 100644
 --- a/winsup/cygwin/Makefile.am
 +++ b/winsup/cygwin/Makefile.am
-@@ -306,6 +306,7 @@ DLL_FILES= \
+@@ -305,6 +305,7 @@ DLL_FILES= \
 	miscfuncs.cc \
 	mktemp.cc \
 	msg.cc \
--- a/msys2-runtime-3.4/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
+++ b/msys2-runtime-3.4/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
@@ -1,4 +1,4 @@
-From 536297d5fc2552bd793e3c0edd642a12811670fc Mon Sep 17 00:00:00 2001
+From 8b8e40eac31fcfd91d6868fd21ee65876e1d5d38 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
@@ -148,7 +148,7 @@ index d6b3be9..730cb73 100644
   char release[_UTSNAME_LENGTH];
   char version[_UTSNAME_LENGTH];
 diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
-index e893660..4b9ec10 100644
+index be7d7c0..8ab56df 100644
 --- a/winsup/cygwin/uname.cc
 +++ b/winsup/cygwin/uname.cc
@@ -35,7 +35,12 @@ uname_x (struct utsname *name)
--- a/msys2-runtime-3.4/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
+++ b/msys2-runtime-3.4/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
@@ -1,4 +1,4 @@
-From 08a0f88772e42c932a2d832fd807f4061358037b Mon Sep 17 00:00:00 2001
+From 0d585f26cf92744da3871e414efb142fe51918d8 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
--- a/msys2-runtime-3.4/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch
+++ b/msys2-runtime-3.4/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch
@@ -1,4 +1,4 @@
-From 2a38b9e0a3ea5aa605b304fa3bc09adb395b1e87 Mon Sep 17 00:00:00 2001
+From b10887c828c2fdcbb9c598856ee7a1e48987f8fe 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
--- a/msys2-runtime-3.4/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
+++ b/msys2-runtime-3.4/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch
@@ -1,4 +1,4 @@
-From c17ed1ad52a0d976800f6cac9046bfbb5fb4c617 Mon Sep 17 00:00:00 2001
+From 5b18274280314f40732afa9c51ba2503553c7f42 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
--- a/msys2-runtime-3.4/0009-Do-not-convert-environment-for-strace.patch
+++ b/msys2-runtime-3.4/0009-Do-not-convert-environment-for-strace.patch
@@ -1,4 +1,4 @@
-From 46d541b22ac7fde531cebaba607b5d06f7040866 Mon Sep 17 00:00:00 2001
+From e2725d5884bf3219ad28b6b7743ef9af4593175f 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
--- a/msys2-runtime-3.4/0010-path_conv-special-case-root-directory-to-have-traili.patch
+++ b/msys2-runtime-3.4/0010-path_conv-special-case-root-directory-to-have-traili.patch
@@ -1,4 +1,4 @@
-From 314b224bb327053f53c511a06df070a4f47cdede Mon Sep 17 00:00:00 2001
+From 2fb8d236a1875f3b847298dc408d3fa9ca55446c 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
--- a/msys2-runtime-3.4/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
+++ b/msys2-runtime-3.4/0011-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
@@ -1,4 +1,4 @@
-From 3b54014255b5a1aad7bfcc24320db1001c256ad4 Mon Sep 17 00:00:00 2001
+From 9d19209de4885db5057c537a3c121cfc3d9ac68e 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 11/N] dcrt0.cc: Untangle allow_glob from winshell
--- a/msys2-runtime-3.4/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
+++ b/msys2-runtime-3.4/0012-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
@@ -1,4 +1,4 @@
-From b1c13f1b275b52a0582947749668628f5d135724 Mon Sep 17 00:00:00 2001
+From cd749a403502e32b8914532f3f5128bd0b905a61 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 12/N] dcrt0.cc (globify): Don't quote literal strings
--- a/msys2-runtime-3.4/0013-strace.cc-Don-t-set-MSYS-noglob.patch
+++ b/msys2-runtime-3.4/0013-strace.cc-Don-t-set-MSYS-noglob.patch
@@ -1,4 +1,4 @@
-From 7be9d2ffcced89192e913e116e76764562d43c26 Mon Sep 17 00:00:00 2001
+From 8816a31a44e5ec8d62d71027a40c865391080efd 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 13/N] strace.cc: Don't set MSYS=noglob
--- a/msys2-runtime-3.4/0014-Add-debugging-for-build_argv.patch
+++ b/msys2-runtime-3.4/0014-Add-debugging-for-build_argv.patch
@@ -1,4 +1,4 @@
-From 683feb7780fe288a44d8a2710befb68ec913cc5e Mon Sep 17 00:00:00 2001
+From aa074b029067400118fbe52372f6a27e04c38382 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 14/N] Add debugging for build_argv
--- a/msys2-runtime-3.4/0015-Add-debugging-for-strace-make_command_line.patch
+++ b/msys2-runtime-3.4/0015-Add-debugging-for-strace-make_command_line.patch
@@ -1,4 +1,4 @@
-From 23d56701f80a7d9ee02bd2a65a51acc2af5532ba Mon Sep 17 00:00:00 2001
+From f32d1276d957a144402920a7ba0b8eb20293e3fe 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 15/N] Add debugging for strace make_command_line
--- a/msys2-runtime-3.4/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch
+++ b/msys2-runtime-3.4/0016-environ.cc-New-facility-environment-variable-MSYS2_E.patch
@@ -1,4 +1,4 @@
-From 4d439a63b256338a7d385bfa09c25a5ed481c1c4 Mon Sep 17 00:00:00 2001
+From ad895858ebf8d412e42ff9bdee118321485b8ffa 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 16/N] environ.cc: New facility/environment variable
--- a/msys2-runtime-3.4/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
+++ b/msys2-runtime-3.4/0017-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
@@ -1,4 +1,4 @@
-From e494f98655c6a7bce92f45885b400ca1f6d9abe1 Mon Sep 17 00:00:00 2001
+From cbad9a34f08530350e125d30d472bfcc68230c67 Mon Sep 17 00:00:00 2001
 From: SquallATF <squallatf@gmail.com>
 Date: Mon, 10 Sep 2018 11:32:18 +0300
 Subject: [PATCH 17/N] Fix native symbolic link spawn passing wrong arg0
--- a/msys2-runtime-3.4/0018-strace-quiet-be-really-quiet.patch
+++ b/msys2-runtime-3.4/0018-strace-quiet-be-really-quiet.patch
@@ -1,4 +1,4 @@
-From ee2a3b40842719cd0456540409e6cbbdd2147761 Mon Sep 17 00:00:00 2001
+From e8ece1054ee222784d2b700404d2fa73360be2dd 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 18/N] strace --quiet: be *really* quiet
--- a/msys2-runtime-3.4/0019-Introduce-the-enable_pcon-value-for-MSYS.patch
+++ b/msys2-runtime-3.4/0019-Introduce-the-enable_pcon-value-for-MSYS.patch
@@ -1,4 +1,4 @@
-From 18ef990e35d6e03ece6a7647a91618bad7924feb Mon Sep 17 00:00:00 2001
+From 7b4d1e1f24d9b5d2d887f182a084dd4381d750ee 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 19/N] Introduce the `enable_pcon` value for `MSYS`
--- a/msys2-runtime-3.4/0020-popen-call-usr-bin-sh-instead-of-bin-sh.patch
+++ b/msys2-runtime-3.4/0020-popen-call-usr-bin-sh-instead-of-bin-sh.patch
@@ -1,4 +1,4 @@
-From 7a34fc403b8819a35694c722c7b680eadbc7973d Mon Sep 17 00:00:00 2001
+From 7beb5a3727e87826497570b0f92cc218eba6c129 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 20/N] popen: call /usr/bin/sh instead of /bin/sh
--- a/msys2-runtime-3.4/0021-Expose-full-command-lines-to-other-Win32-processes-b.patch
+++ b/msys2-runtime-3.4/0021-Expose-full-command-lines-to-other-Win32-processes-b.patch
@@ -1,4 +1,4 @@
-From e4726c3444023269f6dc6fb0b877f2d5b2c2cba9 Mon Sep 17 00:00:00 2001
+From bdd02c1a3eba28fe7af71987f97bb156a53a523d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 12 Aug 2020 12:22:38 +0200
 Subject: [PATCH 21/N] Expose full command-lines to other Win32 processes by
--- a/msys2-runtime-3.4/0022-Do-not-show-Error-dialogs-by-default.patch
+++ b/msys2-runtime-3.4/0022-Do-not-show-Error-dialogs-by-default.patch
@@ -1,4 +1,4 @@
-From 7d025fdde5f597878210f9264ab19907c69bbd04 Mon Sep 17 00:00:00 2001
+From 1afa43def928ad43733955782668e8ea086e68b9 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 31 Mar 2021 11:38:41 +0200
 Subject: [PATCH 22/N] Do not show Error dialogs by default
--- a/msys2-runtime-3.4/0023-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
+++ b/msys2-runtime-3.4/0023-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch
@@ -1,4 +1,4 @@
-From 81e2ef697f4b481e400966ed15d8a4611f7a11bb Mon Sep 17 00:00:00 2001
+From 00e23390269d7587b3e993722054c4764c30620f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 16 Apr 2018 14:59:39 +0200
 Subject: [PATCH 23/N] Add a helper to obtain a function's address in
--- a/msys2-runtime-3.4/0024-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
+++ b/msys2-runtime-3.4/0024-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch
@@ -1,4 +1,4 @@
-From 800f382c16af2bb22e1a702df2b49af7991ec5f2 Mon Sep 17 00:00:00 2001
+From 389730f305dcd1989cfed7ac4649be2ab89d1db2 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Mar 2015 09:56:28 +0000
 Subject: [PATCH 24/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
--- a/msys2-runtime-3.4/0025-kill-kill-Win32-processes-more-gently.patch
+++ b/msys2-runtime-3.4/0025-kill-kill-Win32-processes-more-gently.patch
@@ -1,4 +1,4 @@
-From d22a5362f32fd51b86acf9d2ec73fa41f4b2b5db Mon Sep 17 00:00:00 2001
+From 239897d20315dde2fde4578b1932fc25109a6536 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Mar 2015 10:01:50 +0000
 Subject: [PATCH 25/N] kill: kill Win32 processes more gently
--- a/msys2-runtime-3.4/0026-Cygwin-make-option-for-native-inner-link-handling.patch
+++ b/msys2-runtime-3.4/0026-Cygwin-make-option-for-native-inner-link-handling.patch
@@ -1,4 +1,4 @@
-From fbb074a381f9ae5d5a72faa5f9969c167f76ede0 Mon Sep 17 00:00:00 2001
+From 9a1f5f75709d83cd8f3589a4710984ed415dfada Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 22 Jul 2021 11:59:16 -0700
 Subject: [PATCH 26/N] Cygwin: make option for native inner link handling.
--- a/msys2-runtime-3.4/0027-docs-skip-building-texinfo-and-PDF-files.patch
+++ b/msys2-runtime-3.4/0027-docs-skip-building-texinfo-and-PDF-files.patch
@@ -1,4 +1,4 @@
-From 7143c123e7e200d7c664b5374bffc115060f30ea Mon Sep 17 00:00:00 2001
+From 73a1abd086fc09877698d0e2e982096aefbc2229 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 8 Nov 2021 14:20:07 +0100
 Subject: [PATCH 27/N] docs: skip building texinfo and PDF files
--- a/msys2-runtime-3.4/0028-install-libs-depend-on-the-toollibs.patch
+++ b/msys2-runtime-3.4/0028-install-libs-depend-on-the-toollibs.patch
@@ -1,4 +1,4 @@
-From de371116a04bdc8f5b8b64a19345e6eefb1163dc Mon Sep 17 00:00:00 2001
+From aebc57550aa6962db58443bd1f9705c43ec54f59 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 8 Nov 2021 16:22:57 +0100
 Subject: [PATCH 28/N] install-libs: depend on the "toollibs"
@@ -14,10 +14,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
-index d3e9454..5894b91 100644
+index 4bf0bfb..b34c25f 100644
 --- a/winsup/cygwin/Makefile.am
 +++ b/winsup/cygwin/Makefile.am
-@@ -678,7 +678,7 @@ man_MANS = regex/regex.3 regex/regex.7
+@@ -683,7 +683,7 @@ man_MANS = regex/regex.3 regex/regex.7
 install-exec-hook: install-libs
 install-data-local: install-headers install-ldif
 
--- a/msys2-runtime-3.4/0029-POSIX-ify-the-SHELL-variable.patch
+++ b/msys2-runtime-3.4/0029-POSIX-ify-the-SHELL-variable.patch
@@ -1,4 +1,4 @@
-From 89ea241b861ed01ac6fbaeb29cd7e200be55051d Mon Sep 17 00:00:00 2001
+From ae6426149d8d9dde1a72a0f6c682a3e417b1e448 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 23 Nov 2015 20:03:11 +0100
 Subject: [PATCH 29/N] POSIX-ify the SHELL variable
--- a/msys2-runtime-3.4/0030-Handle-ORIGINAL_PATH-just-like-PATH.patch
+++ b/msys2-runtime-3.4/0030-Handle-ORIGINAL_PATH-just-like-PATH.patch
@@ -1,4 +1,4 @@
-From bad0c35951ed7ad9c778808a827e99bdd6fab2cf Mon Sep 17 00:00:00 2001
+From b8ae835f1abb8aedbffe63411cf7e7e39d8b5a5a Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 21 Mar 2017 13:18:38 +0100
 Subject: [PATCH 30/N] Handle ORIGINAL_PATH just like PATH
--- a/msys2-runtime-3.4/0031-uname-allow-setting-the-system-name-to-CYGWIN.patch
+++ b/msys2-runtime-3.4/0031-uname-allow-setting-the-system-name-to-CYGWIN.patch
@@ -1,4 +1,4 @@
-From bf8058f74730590916d6a43393b3a18214ad4262 Mon Sep 17 00:00:00 2001
+From 1ee35b0cada5d126541e8d6a9f9ba192a997a09a Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 3 Jul 2022 22:39:32 +0200
 Subject: [PATCH 31/N] uname: allow setting the system name to CYGWIN
@@ -19,7 +19,7 @@ affecting users.
 1 file changed, 22 insertions(+), 14 deletions(-)

 diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
-index 4b9ec10..68e7b24 100644
+index 8ab56df..d839a5c 100644
 --- a/winsup/cygwin/uname.cc
 +++ b/winsup/cygwin/uname.cc
@@ -23,6 +23,24 @@ extern "C" int getdomainname (char *__name, size_t __len);
--- a/msys2-runtime-3.4/0032-Pass-environment-variables-with-empty-values.patch
+++ b/msys2-runtime-3.4/0032-Pass-environment-variables-with-empty-values.patch
@@ -1,4 +1,4 @@
-From e80407d7f078087ffb2081decbf6c20ed8f0d207 Mon Sep 17 00:00:00 2001
+From 9c8e1982ba4a14a4e20e2a1b2482933851435b7d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 18 Feb 2015 12:32:17 +0000
 Subject: [PATCH 32/N] Pass environment variables with empty values
--- a/msys2-runtime-3.4/0033-Optionally-disallow-empty-environment-values-again.patch
+++ b/msys2-runtime-3.4/0033-Optionally-disallow-empty-environment-values-again.patch
@@ -1,4 +1,4 @@
-From 44e862d665ef427bccf868242275ad30b6f73c88 Mon Sep 17 00:00:00 2001
+From a50819a1e176d9710f1e2dabadc5774ee8ad41b2 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 6 Sep 2022 10:40:58 +0200
 Subject: [PATCH 33/N] Optionally disallow empty environment values again
--- a/msys2-runtime-3.4/0034-build_env-respect-the-MSYS-environment-variable.patch
+++ b/msys2-runtime-3.4/0034-build_env-respect-the-MSYS-environment-variable.patch
@@ -1,4 +1,4 @@
-From 096b1d9efc895985c21a3ce1d096b2bd51c9c371 Mon Sep 17 00:00:00 2001
+From 6f8df67a739df88cf3036de207d54c8239a9bd04 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 6 Sep 2022 12:18:18 +0200
 Subject: [PATCH 34/N] build_env(): respect the `MSYS` environment variable
--- a/msys2-runtime-3.4/0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
+++ b/msys2-runtime-3.4/0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
@@ -1,4 +1,4 @@
-From 5d9cc79168a1942cb1de686f63a489ca81dc0c24 Mon Sep 17 00:00:00 2001
+From b67be918bce5fd529a7edc087f705e9ef0258df8 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 8 Nov 2022 16:24:20 +0100
 Subject: [PATCH 35/N] When converting to a Unix path, avoid double trailing
--- a/msys2-runtime-3.4/0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
+++ b/msys2-runtime-3.4/0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
@@ -1,4 +1,4 @@
-From 59418ea4d68c3911f00957de0f65d80475a84541 Mon Sep 17 00:00:00 2001
+From a8c05c3f95b38c6413102fe9d47de036ddd36737 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 20 Nov 2022 13:57:36 +0100
 Subject: [PATCH 36/N] msys2_path_conv: pass PC_NOFULL to path_conv
--- a/msys2-runtime-3.4/0037-Revert-Cygwin-drop-requirement-to-build-newlib-s-std.patch
+++ b/msys2-runtime-3.4/0037-Revert-Cygwin-drop-requirement-to-build-newlib-s-std.patch
@@ -1,87 +0,0 @@
-From 5ed72912a2fc1d642ceca3d297e8346bb707b032 Mon Sep 17 00:00:00 2001
-From: Johannes Schindelin <johannes.schindelin@gmx.de>
-Date: Wed, 7 Dec 2022 15:52:03 +0100
-Subject: [PATCH 37/N] Revert "Cygwin: drop requirement to build newlib's
- stdio64"
-
-As per the bug report in https://savannah.gnu.org/bugs/index.php?63480,
-2902b3a09e (Cygwin: drop requirement to build newlib's stdio64,
-2022-08-03) would require all binaries linking to the MSYS2 runtime to
-be rebuilt.
-
-Let's revert that commit instead.
-
-Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
- newlib/configure.host                 | 1 +
- newlib/libc/include/stdio.h           | 4 ++++
- winsup/cygwin/include/cygwin/config.h | 2 ++
- winsup/cygwin/syscalls.cc             | 4 ++--
- 4 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/newlib/configure.host b/newlib/configure.host
-index 4e4c393..7a5456a 100644
--- a/newlib/configure.host
-+++ b/newlib/configure.host
-@@ -420,6 +420,7 @@ fi
- case "${host}" in
-   *-*-cygwin* | *-*-msys*)
- 	posix_dir=posix
-+	stdio64_dir=stdio64
- 	xdr_dir=xdr
- 	;;
-   *-*-netware*)
-diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
-index ea4ddf3..c75e481 100644
--- a/newlib/libc/include/stdio.h
-+++ b/newlib/libc/include/stdio.h
-@@ -67,10 +67,14 @@ typedef __FILE FILE;
- # define __FILE_defined
- #endif
- 
-+#ifdef __CYGWIN__
-+typedef _fpos64_t fpos_t;
-+#else
- typedef _fpos_t fpos_t;
- #ifdef __LARGE64_FILES
- typedef _fpos64_t fpos64_t;
- #endif
-+#endif /* !__CYGWIN__ */
- 
- #ifndef _OFF_T_DECLARED
- typedef __off_t off_t;
-diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
-index 2a70832..1d515a6 100644
--- a/winsup/cygwin/include/cygwin/config.h
-+++ b/winsup/cygwin/include/cygwin/config.h
-@@ -54,6 +54,8 @@ extern inline struct _reent *__getreent (void)
-    Just leave them alone. */
- #define _READ_WRITE_RETURN_TYPE _ssize_t
- #define _READ_WRITE_BUFSIZE_TYPE size_t
-+#define __LARGE64_FILES 1
-+#define __USE_INTERNAL_STAT64 1
- #define __LINUX_ERRNO_EXTENSIONS__ 1
- #define _MB_EXTENDED_CHARSETS_ALL 1
- #define __HAVE_LOCALE_INFO__ 1
-diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index 5c7f46a..a27e283 100644
--- a/winsup/cygwin/syscalls.cc
-+++ b/winsup/cygwin/syscalls.cc
-@@ -4143,7 +4143,7 @@ gethostid (void)
- 
- #define ETC_SHELLS "/etc/shells"
- static int shell_index;
-static FILE *shell_fp;
-+static struct __sFILE64 *shell_fp;
- 
- extern "C" char *
- getusershell ()
-@@ -4162,7 +4162,7 @@ getusershell ()
-   static char buf[PATH_MAX];
-   int ch, buf_idx;
- 
-  if (!shell_fp && !(shell_fp = fopen (ETC_SHELLS, "rt")))
-+  if (!shell_fp && !(shell_fp = fopen64 (ETC_SHELLS, "rt")))
-     {
-       if (def_shells[shell_index])
- 	return strcpy (buf, def_shells[shell_index++]);
--- a/msys2-runtime-3.4/0038-Revert-Revert-Cygwin-drop-requirement-to-build-newli.patch
+++ b/msys2-runtime-3.4/0038-Revert-Revert-Cygwin-drop-requirement-to-build-newli.patch
@@ -1,80 +0,0 @@
-From 0af4324dd8267a864ba835875c3434a889ca293c Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 9 Dec 2022 16:15:53 +0100
-Subject: [PATCH 38/N] Revert "Revert "Cygwin: drop requirement to build
- newlib's stdio64""
-
-This reverts commit 5ed72912a2fc1d642ceca3d297e8346bb707b032.
---
- newlib/configure.host                 | 1 -
- newlib/libc/include/stdio.h           | 4 ----
- winsup/cygwin/include/cygwin/config.h | 2 --
- winsup/cygwin/syscalls.cc             | 4 ++--
- 4 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/newlib/configure.host b/newlib/configure.host
-index 7a5456a..4e4c393 100644
--- a/newlib/configure.host
-+++ b/newlib/configure.host
-@@ -420,7 +420,6 @@ fi
- case "${host}" in
-   *-*-cygwin* | *-*-msys*)
- 	posix_dir=posix
-	stdio64_dir=stdio64
- 	xdr_dir=xdr
- 	;;
-   *-*-netware*)
-diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
-index c75e481..ea4ddf3 100644
--- a/newlib/libc/include/stdio.h
-+++ b/newlib/libc/include/stdio.h
-@@ -67,14 +67,10 @@ typedef __FILE FILE;
- # define __FILE_defined
- #endif
- 
-#ifdef __CYGWIN__
-typedef _fpos64_t fpos_t;
-#else
- typedef _fpos_t fpos_t;
- #ifdef __LARGE64_FILES
- typedef _fpos64_t fpos64_t;
- #endif
-#endif /* !__CYGWIN__ */
- 
- #ifndef _OFF_T_DECLARED
- typedef __off_t off_t;
-diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
-index 1d515a6..2a70832 100644
--- a/winsup/cygwin/include/cygwin/config.h
-+++ b/winsup/cygwin/include/cygwin/config.h
-@@ -54,8 +54,6 @@ extern inline struct _reent *__getreent (void)
-    Just leave them alone. */
- #define _READ_WRITE_RETURN_TYPE _ssize_t
- #define _READ_WRITE_BUFSIZE_TYPE size_t
-#define __LARGE64_FILES 1
-#define __USE_INTERNAL_STAT64 1
- #define __LINUX_ERRNO_EXTENSIONS__ 1
- #define _MB_EXTENDED_CHARSETS_ALL 1
- #define __HAVE_LOCALE_INFO__ 1
-diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
-index a27e283..5c7f46a 100644
--- a/winsup/cygwin/syscalls.cc
-+++ b/winsup/cygwin/syscalls.cc
-@@ -4143,7 +4143,7 @@ gethostid (void)
- 
- #define ETC_SHELLS "/etc/shells"
- static int shell_index;
-static struct __sFILE64 *shell_fp;
-+static FILE *shell_fp;
- 
- extern "C" char *
- getusershell ()
-@@ -4162,7 +4162,7 @@ getusershell ()
-   static char buf[PATH_MAX];
-   int ch, buf_idx;
- 
-  if (!shell_fp && !(shell_fp = fopen64 (ETC_SHELLS, "rt")))
-+  if (!shell_fp && !(shell_fp = fopen (ETC_SHELLS, "rt")))
-     {
-       if (def_shells[shell_index])
- 	return strcpy (buf, def_shells[shell_index++]);
--- a/msys2-runtime-3.4/0039-fixup-Rename-dll-from-cygwin-to-msys.patch
+++ b/msys2-runtime-3.4/0039-fixup-Rename-dll-from-cygwin-to-msys.patch
@@ -1,19 +0,0 @@
-From 6d6f9ff84dd37616510629935c47645cc83b544d Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 9 Dec 2022 16:16:53 +0100
-Subject: [PATCH 39/N] fixup! Rename dll from cygwin to msys
-
---
- winsup/cygwin/cygwin.din | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
-index d24c7d2..3167f04 100644
--- a/winsup/cygwin/cygwin.din
-+++ b/winsup/cygwin/cygwin.din
-@@ -1,4 +1,4 @@
-LIBRARY "cygwin1.dll" BASE=0x180040000
-+LIBRARY "msys-2.0.dll" BASE=0x180040000
- 
- EXPORTS
- # Exported variables
--- a/msys2-runtime-3.4/PKGBUILD
+++ b/msys2-runtime-3.4/PKGBUILD
@@ -3,7 +3,7 @@

 pkgbase=msys2-runtime-3.4
 pkgname=('msys2-runtime-3.4' 'msys2-runtime-3.4-devel')
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
@@ -60,50 +60,44 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0033-Optionally-disallow-empty-environment-values-again.patch
        0034-build_env-respect-the-MSYS-environment-variable.patch
        0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
-        0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
-        0037-Revert-Cygwin-drop-requirement-to-build-newlib-s-std.patch
-        0038-Revert-Revert-Cygwin-drop-requirement-to-build-newli.patch
-        0039-fixup-Rename-dll-from-cygwin-to-msys.patch)
+        0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch)
 sha256sums=('SKIP'
-            'cab8dcfded363f755be1cb64a89c0d9b6baa1e36cae676bc516d91384f8004cf'
-            '1daf07bae4596211b2d8913bc8d7936017e3dc79fcdb4d4614c4f192b2f12225'
-            'ceca1abc1cabf420f449287dd0e9de6338d0ce0895854a23a8b9d3d8e530387f'
-            '732591b423767612bc20f88971835b65ef0ed265288184479436ea0beeca6e29'
-            'd7a12cea1381947a6156f5faba8afd1bbdfe0d21594c4ef563be08010ba1170e'
-            'd9f4e887f594bba0b2903ed1127d20a5a26bbd2771e3c9b939fd56b403d98594'
-            '618d1332d9c91f8c855f407f20117a51579648ecb171ba252f77868a5a15a115'
-            'aa2d11b4ce425427b6ba6a6c17aa3490f5bfff3c66e32967445ff48ead267dfe'
-            'e6409b1de10ac5b68cff2315d8da539df065e2f66c7d89e3bb2cef8be40dfd40'
-            'd23aed07798073dc6e5a350e2cd264ad86ed3b084f3dbd1a655e40ff218ac059'
-            'e695d15c064fd473b3471341f8685271e68ae3208b8eb7368fbd5375bcc02d17'
-            '8a64e6120a4ce466cda85429e34ea83e74207c678d17655dcd330b7f9396abf9'
-            'feb0b57f94a728012365f9f77ea3b72cf8cbcbec3203263e07f2d8ea70b015e6'
-            '51e848c7f7ce922b9321c7de8aa33ab254f9d2d7a2ee2a29f51561ceb10d7dfe'
-            'dc611623c5cba33279b6021f979b1d3698a8ee77e6bd22505c197d5a121a45cb'
-            '441e883db25fdbf32987a89cbb15eecdba9294d6c443fbd18d4841bc2473d304'
-            'b34c4fc945a5c808af6b26ce10faac4624fe4c04d8dd146abc2d707aa58fdab9'
-            '90f5593a6ed2d4d0d44f6d031cbb07d7c09917b66be119a7be6be790e4aba13a'
-            'd589d950ea5e94324952666771a366517143e6bd03f586088b343ce27ce12fb5'
-            'd4beea772795ff856033f5eb94d312b0607fc50c82055cf69d3afb1467467170'
-            '58d30b3a325981bf53cc7da1dafe431d930ac5d0127c336bb8cd26459132fb73'
-            '5edf1fcb84b622addcd51e653e28f61787f91d05aa2be40f8ce6e97513eee3c1'
-            'd25ec7d1d5ff493f5c3c467bc2a8e9ce27fa63a580eea99e50562d6a713f56b7'
-            '05cfa5e1d6a9c675c58068915d9971d9d3646cbf28d405bdf84ac8d8c4668ebc'
-            '22f4c4f527bbaafe97883f34054bbb414f37bcce41c13386a20c2966c5e4b24f'
-            'e70b23e90eb7af271d53e48a3777cfb94fee725e845b49c77f0971fbff1b25e0'
-            '725c0e1f42ea5d8972db65c0f428a7cd2f393f55ec8e60e9a9dabc400f1bf70c'
-            '4fcc272ba5f237daa1aa8f1769173293a909a7f9fc6d20b49cc0260cc931fb14'
-            '112e89e2e72cee3046814439742ca55255fdc6eeed38dceb39a3100f9c9c0ed6'
-            'a1d273d7e0d921d50aa9aa580ec6b7edcf843421cdc7fe2b4409183254e2a9ec'
-            '5f45e670a42e5088b058be089901f678644750c4e4fe42d9f5433254843d5a7b'
-            '78142c60b2d911bbdbd86a4a2a02aee3badf54f1fd158a53f69ca0e9655fb410'
-            '556158f439db1de440db470f0682d0627df23969ac2b39eca9f9e821d31a1a49'
-            '7b778576c81c677f6209e33bb4a00a51ba8d5c2f32e89752d3976337808af20f'
-            '70003701ba0b837c8df31afca7471120b02504e005ddd18b3cf8a97ded495198'
-            'beda69e05d7149b20c86799d5149f747b1367259029e93be83815eb97791c87a'
-            '92dbb8c9ce9d6a7b9c21ea5a9a443d3925e9aca6084cfb53dd6e077cfde622af'
-            '249153bc8cd047039910a53f93d14e86bdb81140e52971e0a7badb79a97175da'
-            'a524ff063176c760005247d1c6abc6b0aafc5f73e3a70ce8f4b32b3743397614')
+            '54be11e10d4e35a9a4b0a964b6e2f61f2e518bb7a798feb716d032812d00735b'
+            'bce4f5021be7783cfaaead34f577f72bdd66229ff0c00f90d0666b768afd509f'
+            '7a7672468d3ef33624401e108bd3529486dd87a2e853e7e9325cca7e6f9d0095'
+            'e7f327962f2254580c58e1b8f1f02286e77d5be6cc9337e3bc521631322a2d7e'
+            '29671c879713803c7d3b210d37522edaa0dbc6747fd6ddbfede9bdfa1b7d2bef'
+            '1a6eea26b040293f65924b8f57986406007398e523cebefddca517b8231defce'
+            '0b557992f03aeb3cb6d6e37199f87e019b22ca7504725b4ac5974eeb243d7ebd'
+            'e0cc568638e4ea3e1d5ba58e5ad2bf807898f7aa71c520ce24767c45c2f4f5c8'
+            'c698088d6413c4479ec24ee55696a744e39eb9f0adf11f1fcc2b3d222a17b2d9'
+            '812c9e0045eb47e5d33404ce1c26568fe7921ca6322e2f9c88d3ffd79cffe903'
+            '1cb019b5873be0a40b60a52b8edb88270f7d9eeaf3bf4d4c384c0c10a2194681'
+            'bccb9319874f586fd9d6ec1290be134b28c2dbfd237ae6ecb718dc4421dc89b6'
+            'fcaefc5750756ad90aa734adf375f7f11c06ca6954d59673b23e34bf79cd4090'
+            '6f212d792ca34d77d598c8b2937e4ef9c11992a2937859a3f5d21613b4117798'
+            'c4fdde1c66acf63335573c64fff041ed3757a644ab495e31d9e02bd7d4c92109'
+            '71b0b802b0190d06ba5bf5e833f01dd84dd5ad5805473e6ca6beef8d306b4483'
+            '84216796e675da331baf6b0510cb5a241776cd7ac27702e316986eda26153d24'
+            '724e6f332c2b7d85feda38a1a6393becc94bc6751c7746e63f47c43bf82da74c'
+            '54cba1fa22540a5b3ad9920c8b2380f2a6423edf8e50caddd5738182f2102374'
+            '799b103d313c0ba7876cf1193186662e3191011f6a0401766d9b6486b5441ff3'
+            '7bf1d24511753de1c0fc6cd45bea98df83dec833d625d6d8c5258ed044b5c448'
+            'b71fc10f58a1d5ad4a5ad38561b7d9a7224b00d5f77a4fbc748f5ab9e0fa27e6'
+            '26fa7cc15f52780c00df2beb0537d867af600fce02949f994dbba295c05f9b27'
+            'c46cf28eb4cfc9dfae74a2fe9587f15569dc4a8963d60da78e8ca4ef46b0e1c1'
+            '4d9450c5fb468d612148ac3aae095d47ed6544b3f0e895dd84c18154d9a91aab'
+            '2ca50e9c2030ebbbc19282288a01e50abf88a7e7a96e6e4b7788385d3ae1fef3'
+            '8e458ecec97d6bcd469cb66b07c0eb2b2371d1a5d0796cd91bb16273656cf76f'
+            '21c471f0dfb9fdd1b67114dae20b90a6a10fde4ad4d5fd21fcd8bc0b0e4aad92'
+            '210b0a66d5781f7dce0f7274b91322ea64be9d9ff124df89a835a169fcdd6910'
+            'f90f5ccfb2ebddc0a4c664636000532d265be2c19238d977fc1b77d71d7c9ba9'
+            'd80b7f2a7b1faa633c1f932c83441dccc20badc3e4708914ce6c7c7c77f6c6f8'
+            '866bdbe57eba09a70e7aa933b02626726b95ed0987f384da8cba751e4cd48ea0'
+            '293dd5d123ceac58f40d94f82af77f39f9d460ed07966e3e7df8d262a67ff46d'
+            'b36578d4006c8c361cb663cc72532105b4a33df80e8a0d9741831d0a34abe24c'
+            '305dadd1e5d7aceef9a8ae43b80f29ea4e38d41925a0924ef05cb9a3460d17b8'
+            '59b5a90bc2dcb49f29ceba7aa2cdb8e27872fea57807e65e9a7dd994a825f180')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -176,10 +170,7 @@ prepare() {
  0033-Optionally-disallow-empty-environment-values-again.patch \
  0034-build_env-respect-the-MSYS-environment-variable.patch \
  0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch \
-  0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch \
-  0037-Revert-Cygwin-drop-requirement-to-build-newlib-s-std.patch \
-  0038-Revert-Revert-Cygwin-drop-requirement-to-build-newli.patch \
-  0039-fixup-Rename-dll-from-cygwin-to-msys.patch
+  0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
 }

 build() {