msys2-runtime-3.4: Update to 3.4.2

2022-12-11 14:00:22 +01:00 · 2022-12-11 14:00:22 +01:00 · ccfea45e9e
commit ccfea45e9e
parent 94ec3ec00b
37 changed files with 92 additions and 92 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 b9d1e765bf5980761a296440455f4ef43c14327d Mon Sep 17 00:00:00 2001
+From e354a5623694c6ae69d4801b26249a479d59aeea 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 c00c3efc51874b7a0b870e3b69c88ffbf9cd033e Mon Sep 17 00:00:00 2001
+From 328c920b3007332dcf3d8f39625a841caaffd892 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 90e47caebf5e3dc0320b7b79bd397d6b08351330 Mon Sep 17 00:00:00 2001
+From 7d2e0811c6b7ea1cbda27ae95ca47c5a78cb0a58 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
@ -93,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 8ba5ae2..56e72b2 100644
+index e61f727..6628825 100644
 --- a/winsup/cygwin/Makefile.am
 +++ b/winsup/cygwin/Makefile.am
@@ -37,15 +37,15 @@ newlib_build=$(target_builddir)/newlib
@ -120,7 +120,7 @@ index 8ba5ae2..56e72b2 100644
 
 #
 # sources
-@@ -555,32 +555,32 @@ LIBSERVER = $(cygserver_blddir)/libcygserver.a
+@@ -564,32 +564,32 @@ LIBSERVER = $(cygserver_blddir)/libcygserver.a
 $(LIBSERVER):
 	$(MAKE) -C $(cygserver_blddir) libcygserver.a
 
@ -159,7 +159,7 @@ index 8ba5ae2..56e72b2 100644
 $(DBG_DLL_NAME): $(PRE_DLL_NAME)
 	$(AM_V_GEN)$(OBJCOPY) --add-gnu-debuglink=/dev/null \
 			      --only-keep-debug \
-@@ -593,7 +593,7 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME)
+@@ -602,7 +602,7 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME)
 			      --add-gnu-debuglink=$(DBG_DLL_NAME) \
 			      $(PRE_DLL_NAME) $(NEW_DLL_NAME)
 
@ -168,7 +168,7 @@ index 8ba5ae2..56e72b2 100644
 toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@
 
 $(DEF_FILE): scripts/gendef cygwin.din
-@@ -606,17 +606,18 @@ sigfe.s: $(DEF_FILE) tlsoffsets
+@@ -615,17 +615,18 @@ sigfe.s: $(DEF_FILE) tlsoffsets
 
 LIBCOS=$(addsuffix .o,$(basename $(LIB_FILES)))
 $(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(NEW_DLL_NAME)
@ -190,7 +190,7 @@ index 8ba5ae2..56e72b2 100644
 	--exclude='(?i:dll)' \
 	--exclude='reloc' \
 	--exclude='^main$$' \
-@@ -663,7 +664,7 @@ all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
+@@ -672,7 +673,7 @@ all-local: $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
 clean-local:
 	-rm -f $(BUILT_SOURCES)
 	-rm -f $(DEF_FILE) sigfe.s
@ -199,7 +199,7 @@ index 8ba5ae2..56e72b2 100644
 	-rm -f $(PRE_DLL_NAME) $(DBG_DLL_NAME) $(NEW_DLL_NAME)
 	-rm -f $(LIB_NAME) $(TEST_LIB_NAME) $(SUBLIBS)
 	-rm -f version.cc
-@@ -685,6 +686,7 @@ install-libs:
+@@ -694,6 +695,7 @@ install-libs:
 	@$(MKDIR_P) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(NEW_DLL_NAME) $(DESTDIR)$(bindir)/$(DLL_NAME)
 	@$(MKDIR_P) $(DESTDIR)$(toollibdir)
@ -207,7 +207,7 @@ index 8ba5ae2..56e72b2 100644
 	(cd $(DESTDIR)$(toollibdir) && ln -sf $(LIB_NAME) libg.a)
 
 install-headers:
-@@ -707,7 +709,7 @@ install-ldif:
+@@ -716,7 +718,7 @@ install-ldif:
 uninstall-hook: uninstall-headers uninstall-ldif uninstall-libs
 
 uninstall-libs:
@ -581,7 +581,7 @@ index 1e4cf98..b77598b 100644
       }									      \
     }									      \
 diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
-index b05fcaf..032b6b0 100644
+index e7fc3e1..2feb4bc 100644
 --- a/winsup/cygwin/include/cygwin/version.h
 +++ b/winsup/cygwin/include/cygwin/version.h
@@ -495,7 +495,11 @@ details. */
--- 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 602f5263d598c18340d9bdcc5c1a0b6603dee8df Mon Sep 17 00:00:00 2001
+From bbd256d8334e2a39ddd6a776ba0184d3ee5ddca0 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,7 +22,7 @@ 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 56e72b2..4bf0bfb 100644
+index 6628825..b5a9623 100644
 --- a/winsup/cygwin/Makefile.am
 +++ b/winsup/cygwin/Makefile.am
@@ -305,6 +305,7 @@ DLL_FILES= \
--- 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 8b8e40eac31fcfd91d6868fd21ee65876e1d5d38 Mon Sep 17 00:00:00 2001
+From 9a4906e03a811bddf57746289dd4cfd58cd9ba53 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,10 +148,10 @@ 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 be7d7c0..8ab56df 100644
+index dd41601..0d0c5aa 100644
 --- a/winsup/cygwin/uname.cc
 +++ b/winsup/cygwin/uname.cc
-@@ -35,7 +35,12 @@ uname_x (struct utsname *name)
+@@ -36,7 +36,12 @@ uname_x (struct utsname *name)
 
       memset (name, 0, sizeof (*name));
       /* sysname */
@ -165,7 +165,7 @@ index be7d7c0..8ab56df 100644
 		       wincap.osname (), wincap.build_number ());
       /* nodename */
       memset (buf, 0, sizeof buf);
-@@ -77,7 +82,7 @@ uname_x (struct utsname *name)
+@@ -88,7 +93,7 @@ uname_x (struct utsname *name)
 /* Old entrypoint for applications up to API 334 */
 struct old_utsname
 {
@ -174,7 +174,7 @@ index be7d7c0..8ab56df 100644
   char nodename[20];
   char release[20];
   char version[20];
-@@ -91,7 +96,15 @@ uname (struct utsname *in_name)
+@@ -102,7 +107,15 @@ uname (struct utsname *in_name)
   __try
     {
       memset (name, 0, sizeof (*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 0d585f26cf92744da3871e414efb142fe51918d8 Mon Sep 17 00:00:00 2001
+From a41f04c9a1310e2f16021facf23eefe74d4d1568 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 b10887c828c2fdcbb9c598856ee7a1e48987f8fe Mon Sep 17 00:00:00 2001
+From 022a1b10d703a9054f70da7052164b2453b81c2f 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 5b18274280314f40732afa9c51ba2503553c7f42 Mon Sep 17 00:00:00 2001
+From 59fad928296fde8f048e5b01d76299c5a52a4226 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 e2725d5884bf3219ad28b6b7743ef9af4593175f Mon Sep 17 00:00:00 2001
+From b12070aa5d5c913cee61c8b47eb29346aeaa4323 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 2fb8d236a1875f3b847298dc408d3fa9ca55446c Mon Sep 17 00:00:00 2001
+From ff4b2b56e1c264cc65888c5c203e25ffa43351f3 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 9d19209de4885db5057c537a3c121cfc3d9ac68e Mon Sep 17 00:00:00 2001
+From efee836d2c918c415fffacf6496db9c26a0d4823 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 cd749a403502e32b8914532f3f5128bd0b905a61 Mon Sep 17 00:00:00 2001
+From 769a69e9c836839ea5d4bf712992f5be3367ffd2 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 8816a31a44e5ec8d62d71027a40c865391080efd Mon Sep 17 00:00:00 2001
+From 85b95c3c99c960103db0ff6863966b9c0883af0f 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 aa074b029067400118fbe52372f6a27e04c38382 Mon Sep 17 00:00:00 2001
+From af85de3679b79fcd565aa0bcf583d24b4f55f913 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 f32d1276d957a144402920a7ba0b8eb20293e3fe Mon Sep 17 00:00:00 2001
+From 53202c34f84f8608eb9ba162f3ac4a78ea3e4285 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 ad895858ebf8d412e42ff9bdee118321485b8ffa Mon Sep 17 00:00:00 2001
+From 7d264a4cb2664d15df2fa3ef27139f0c398085bc 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 cbad9a34f08530350e125d30d472bfcc68230c67 Mon Sep 17 00:00:00 2001
+From 533ee9cdf15b855facff6e6bc21130ff0a22e4df 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 e8ece1054ee222784d2b700404d2fa73360be2dd Mon Sep 17 00:00:00 2001
+From 2d811c5c8d87d773d0fbe59e6d0b487f058d19aa 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 7b4d1e1f24d9b5d2d887f182a084dd4381d750ee Mon Sep 17 00:00:00 2001
+From 07e31bfef8d34b5f4eda0b4cab586e33dea9765b 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 7beb5a3727e87826497570b0f92cc218eba6c129 Mon Sep 17 00:00:00 2001
+From 9aef01080d60593bb677e84891bc99da4998ed60 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 bdd02c1a3eba28fe7af71987f97bb156a53a523d Mon Sep 17 00:00:00 2001
+From 93c604c9fee02c02309a6c20c9f22f5e05732f62 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 1afa43def928ad43733955782668e8ea086e68b9 Mon Sep 17 00:00:00 2001
+From c6aee9a4355d132aed30033e64391a1acf017862 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 00e23390269d7587b3e993722054c4764c30620f Mon Sep 17 00:00:00 2001
+From 1808dbe8f52df301fa0291faaeaf3b9deba25272 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 389730f305dcd1989cfed7ac4649be2ab89d1db2 Mon Sep 17 00:00:00 2001
+From e193d904c6c0da1ef880367ca04f089df723ab8c 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 239897d20315dde2fde4578b1932fc25109a6536 Mon Sep 17 00:00:00 2001
+From e0a26e4235bba21739889e83e45e87bfffe46a81 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 9a1f5f75709d83cd8f3589a4710984ed415dfada Mon Sep 17 00:00:00 2001
+From 7ad158939560bbfc838bd551f891bf5772d8d528 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 73a1abd086fc09877698d0e2e982096aefbc2229 Mon Sep 17 00:00:00 2001
+From 8f0445ddeca2fa4b9e7427d947fa798886a4938f 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 aebc57550aa6962db58443bd1f9705c43ec54f59 Mon Sep 17 00:00:00 2001
+From b2c546398bfb39d56a21cd58fba9238c2eb6c450 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 4bf0bfb..b34c25f 100644
+index b5a9623..1de819e 100644
 --- a/winsup/cygwin/Makefile.am
 +++ b/winsup/cygwin/Makefile.am
-@@ -683,7 +683,7 @@ man_MANS = regex/regex.3 regex/regex.7
+@@ -692,7 +692,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 ae6426149d8d9dde1a72a0f6c682a3e417b1e448 Mon Sep 17 00:00:00 2001
+From 3d286ce3d55418970a34a406f6fd7aa18567e1c9 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 b8ae835f1abb8aedbffe63411cf7e7e39d8b5a5a Mon Sep 17 00:00:00 2001
+From d783dd78dd478a25dbe95eded1117f059d3b3e8f 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 1ee35b0cada5d126541e8d6a9f9ba192a997a09a Mon Sep 17 00:00:00 2001
+From 841a8164f0805b994130adc65392217879893afb 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,10 +19,10 @@ affecting users.
 1 file changed, 22 insertions(+), 14 deletions(-)

 diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
-index 8ab56df..d839a5c 100644
+index 0d0c5aa..a4ac0e3 100644
 --- a/winsup/cygwin/uname.cc
 +++ b/winsup/cygwin/uname.cc
-@@ -23,6 +23,24 @@ extern "C" int getdomainname (char *__name, size_t __len);
+@@ -24,6 +24,24 @@ extern "C" int getdomainname (char *__name, size_t __len);
 #define ATTRIBUTE_NONSTRING
 #endif
 
@ -47,7 +47,7 @@ index 8ab56df..d839a5c 100644
 /* uname: POSIX 4.4.1.1 */
 
 /* New entrypoint for applications since API 335 */
-@@ -35,12 +53,9 @@ uname_x (struct utsname *name)
+@@ -36,12 +54,9 @@ uname_x (struct utsname *name)
 
       memset (name, 0, sizeof (*name));
       /* sysname */
@ -62,7 +62,7 @@ index 8ab56df..d839a5c 100644
 		       wincap.osname (), wincap.build_number ());
       /* nodename */
       memset (buf, 0, sizeof buf);
-@@ -96,15 +111,8 @@ uname (struct utsname *in_name)
+@@ -107,15 +122,8 @@ uname (struct utsname *in_name)
   __try
     {
       memset (name, 0, sizeof (*name));
--- 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 9c8e1982ba4a14a4e20e2a1b2482933851435b7d Mon Sep 17 00:00:00 2001
+From 59b6d44bc001b07793310a885424c203a8ff2cfb 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 a50819a1e176d9710f1e2dabadc5774ee8ad41b2 Mon Sep 17 00:00:00 2001
+From 805ffa6659e1f6b58f95d909ca19aac29ad8017c 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 6f8df67a739df88cf3036de207d54c8239a9bd04 Mon Sep 17 00:00:00 2001
+From 69c01b1b1b2b96a81a184a54ddef2b5fcf219372 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 b67be918bce5fd529a7edc087f705e9ef0258df8 Mon Sep 17 00:00:00 2001
+From 428217d2d0321dec5c9edea5f0468d34a04e74da 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 a8c05c3f95b38c6413102fe9d47de036ddd36737 Mon Sep 17 00:00:00 2001
+From aba92ee1753973069622241a8f75f87f98edc5c1 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/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.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('x86_64')
@ -62,42 +62,42 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
        0035-When-converting-to-a-Unix-path-avoid-double-trailing.patch
        0036-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch)
 sha256sums=('SKIP'
-            '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')
+            '41c05e71166b0fe649518868e0295208976fcc295b4d6de475c87fad527f8544'
+            '8de7cc5f98664a6cd9cf627d7aa83af3872e85285ad489555dd0a411a017180f'
+            'caaee403cf2dc5d6df833c4a3d78c065c08c2aa6ec6a04686994363a999ca633'
+            'b9bb38be3a6c5baebd7cdf04ab2c57a8f38d39017577a7e02596f6a3a1de6567'
+            '0e7901cbe0a63a73ff057607e69f4680289c7e593824e315588ecfea06d47722'
+            '23415c36dd24f4cda3e8a4cca863e7c01c22d18835555dd413a59f169457c8e0'
+            '74397fb215cb7f9036f24646eb3d128d649217efd206c2495a7394b43b881101'
+            '71faa9fedac4ac678ba3b10deaf742eb4b26c0f82ecb17fd5f9531bf4c5b58f8'
+            '3b4d2fe329d1d90f63e17aec6ed935d173612bafd2acc9abd9dafd98d5b91668'
+            '146a5370de2f6e5eb3e749328b9d3eb43d9aba0192e4e2855c0612a5dbdd91bb'
+            '2e6ec342c41d0921d40e2423e6a98f9f690a1d8626952a803c5bcc25fe13be60'
+            '74bc5b6c81196de0a62127777dd53cb8b9e9bd258f62b13e8ca667d10157c768'
+            'e04812aab34c1a1e2cd5b40f3c7229b6a6c80b9055c000fbf125a39e50df20b4'
+            '19441a0daaf4dda6349eaa65e31978146c5f3da56c84f7281635101c53794f52'
+            '7e175f9ea03d46f0bde8c92be89e4ca59266cd51626a78a4021aef0dde7e4ff6'
+            '96731640914c99141b42ee184004eebe69d80a84635b09dfd3993990173cb148'
+            'b18f8c5be4aee4a07254c8e742d41fb4ba2f6e577d37795a741e85d10d758085'
+            '63d98ab73c97a904ac1b99f18df8aa96bd2ba152591076633d2f3469543782d6'
+            'e11c3f6e4d2da7e50e3f4cc0a6b684e4d96edf33b183bab29bbd29208cdf498b'
+            '026e637ff7660efdd042ce1f168dd9b8ccbc7484823bdeefb7f3f7454dae9c33'
+            'c12956bfaab7246e991541279835aaa7cdd0a42960bf1702864674fd8e88396e'
+            '710a86b84f989ee1706f8275c5ea4db93b3f48bdfc97d10c3a7429cea0a01e9a'
+            '5012951badfd9d3910dc2558ee749d056db351f3b96384bfbf5438a2e0e16827'
+            'aeae8ff815ac3b78ba755c55715714e24756645b4a998155f70cf9edaacd6462'
+            '9c90504e8d92c1f47089f7e97be6cbb18ab465e140a12bb83ff22dc754185b14'
+            'aa6c2fd623d845e1cae64b2843efb96a04aae87318c923014751add385d5d671'
+            '4ff3f255fe262638a69c90f383932e806e1ebe0413b6359cfb472d45b33587d6'
+            '76ece9060724aa3d689a90b8c86559721ef3be3a7c225d7efaee9c60b94c77f0'
+            '5a0861d039689b8582ce3d16a0533a1ec53378a14230c88846148723f345dbda'
+            'd45e9e9b9c9df1a4463f8a7c40804dc05b337205d1f5812158bcb7ea5d8d99c9'
+            'b4b4df3a862a488d35084eed82264a0aa1b48c49424a0b438f9ad7441850c35b'
+            '9d8b521ec7d181deada9e8d8c1f73842124e53bbc7e65239fb94d3b34f2b3b63'
+            'c8b6496704cc6ac21e05eed3c8f5eacc601a0e11e08cdf9e46e4d70735640b8f'
+            '548b794a5fdadf629ac704807104b6cc5b1417d873526b80957dd83475e62c82'
+            '0757173b2a93759cf83a85a3798725efdf75834a55dea05f284f4c8c864553d3'
+            '9767d461da9c58a7a5955c9f632e475d851d8c2b879226749e4870456519ec78')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {