From edff8901c1023bf5c4e2dc6ca3348eddb0806c44 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 24 Mar 2021 22:37:48 +0100
Subject: [PATCH] msys2-runtime: improve uname compatibility again

---
 ...uname-limit-sysname-to-MSYS-or-MINGW.patch | 34 +++++++++++++++++++
 msys2-runtime/PKGBUILD                        | 11 +++---
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 msys2-runtime/0039-fixup-uname-limit-sysname-to-MSYS-or-MINGW.patch

diff --git a/msys2-runtime/0039-fixup-uname-limit-sysname-to-MSYS-or-MINGW.patch b/msys2-runtime/0039-fixup-uname-limit-sysname-to-MSYS-or-MINGW.patch
new file mode 100644
index 00000000..b72702d7
--- /dev/null
+++ b/msys2-runtime/0039-fixup-uname-limit-sysname-to-MSYS-or-MINGW.patch
@@ -0,0 +1,34 @@
+From 12ee69ae288878ed4dfec45f3d5abf69954cc435 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Wed, 24 Mar 2021 21:14:54 +0100
+Subject: [PATCH 39/N] fixup! uname: limit sysname to "MSYS" or "MINGW"
+
+---
+ winsup/cygwin/uname.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
+index ad554ec..daed73f 100644
+--- a/winsup/cygwin/uname.cc
++++ b/winsup/cygwin/uname.cc
+@@ -39,7 +39,7 @@ uname_x (struct utsname *name)
+       char* msystem = getenv("MSYSTEM");
+       const char* msystem_sysname = "MSYS";
+       if (msystem != NULL && *msystem && strcmp(msystem, "MSYS") != 0)
+-        msystem_sysname = "MINGW";
++        msystem_sysname = (strstr(msystem, "32") != NULL) ? "MINGW32" : "MINGW64";;
+       __small_sprintf (name->sysname, "%s_%s-%u%s",
+ 		       msystem_sysname,
+ 		       wincap.osname (), wincap.build_number (),
+@@ -107,7 +107,7 @@ uname (struct utsname *in_name)
+       char* msystem = getenv("MSYSTEM");
+       const char* msystem_sysname = "MSYS";
+       if (msystem != NULL && *msystem && strcmp(msystem, "MSYS") != 0)
+-        msystem_sysname = "MINGW";
++        msystem_sysname = (strstr(msystem, "32") != NULL) ? "MINGW32" : "MINGW64";
+       __small_sprintf (name->sysname, "%s_%s", msystem_sysname, wincap.osname ());
+ #else
+       __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
+-- 
+2.31.0
+
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index 1af41a13..8320e2a3 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=3.1.7
-pkgrel=7
+pkgrel=8
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -60,7 +60,8 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
         0035-CI-Upload-the-build-artifacts.patch
         0036-Fix-msys-library-name-in-import-libraries.patch
         0037-Cygwin-winlean.h-remove-most-of-the-extended-memory-.patch
-        0038-uname-limit-sysname-to-MSYS-or-MINGW.patch)
+        0038-uname-limit-sysname-to-MSYS-or-MINGW.patch
+        0039-fixup-uname-limit-sysname-to-MSYS-or-MINGW.patch)
 sha256sums=('SKIP'
             '766fc79dd4348444fff3bc6c10babfdfdee237873b0538aa3a383474e115ac01'
             'c563d3eec08774fb7f370a7f9fba0b9ea45e2a215cf67beddc1b74eafddbac8b'
@@ -99,7 +100,8 @@ sha256sums=('SKIP'
             'bd0b699e836463580182f6f72628b8abb92ea71f422dd86eb9b66c3aca104a4c'
             '797f904663b604515602654fa88a515dc58dfc0def702696486e3ef97ec93cec'
             '4348aeaaa959ff812af209c6995f2e173fa76fba75c79c3495f65172be586863'
-            '4a96bc11e1189a5bec3917430c8db8ac94bc3ba1c74e516dbc302ecf5578492b')
+            '4a96bc11e1189a5bec3917430c8db8ac94bc3ba1c74e516dbc302ecf5578492b'
+            '364a04469a911f355b5fcb2b86e3726ff96c93b91474895f7adac1290741ccc7')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -174,7 +176,8 @@ prepare() {
   0035-CI-Upload-the-build-artifacts.patch \
   0036-Fix-msys-library-name-in-import-libraries.patch \
   0037-Cygwin-winlean.h-remove-most-of-the-extended-memory-.patch \
-  0038-uname-limit-sysname-to-MSYS-or-MINGW.patch
+  0038-uname-limit-sysname-to-MSYS-or-MINGW.patch \
+  0039-fixup-uname-limit-sysname-to-MSYS-or-MINGW.patch
 }
 
 build() {