community/go: use setrlimit patch from upstream CL

Contrary to the currently used patch, this patch also includes the
required change for MIPS.

See also: https://gitlab.alpinelinux.org/alpine/aports/-/commit/c8faf6518d1b40b83a6f1bd3610da2d3f437a862

2 files changed, 35 insertions, 7 deletions

diff --git a/community/go/APKBUILD b/community/go/APKBUILD
index 8b1f68ccc8..6d775e507d 100644
--- a/community/go/APKBUILD
+++ b/community/go/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=go
 # go binaries are statically linked, security updates require rebuilds
 pkgver=1.14.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Go programming language compiler"
 url="https://golang.org/"
 arch="all !mips64"
@@ -149,4 +149,4 @@ sha512sums="ab7454cf5e364a4b8d3035320bb8af5a3064accba51cb98211d2ba8afb116d07cedd
 ab4aa83d8a9bf10bbb93ad029095b47c6eea7d5532703d84449884039116e07897871649feb1df8128f10257cbdb5d7eb03820ab0f1a3f60315e195302f6e516  disable-flaky-gc-test.patch
 dc255153a3c09766c10e613fa5ec90e870382dc24129c96c69e0adbeb46383b7dafc72b68376dcb7250fc34f44da26bfbb329d255d744f2f6ab09f5fdb278d40  0001-Fix-FTBFS-on-HOME-managed-with-git.patch
 bdc3c25c9138d0c01bc2493fcb8395f8e8c40970328c22915f8008fcc093abb5d6184ee24b7a3b78fb164ebc55bff3174c0bca1ac767467d9244498a0e52760c  fix-rlimit-syscall-aarch64-armv7.patch
-ad91c22b3e2653871e490079e7f00cde916eeebd3f0f3fed3999a813527d238438d236169018f119b6b532994bc5f14d2b4fd16814e2edbe558d6bdbf1e8a393  fix-setrlimit-hang.patch"
+c20c126ce12f9a5190784f2a772a47658f375e44fb67884a0450ec3bbd0db61a978388b4c862bd80234e579bab58fd55b6306f3953acda11fd58603799b2e3b3  fix-setrlimit-hang.patch"
diff --git a/community/go/fix-setrlimit-hang.patch b/community/go/fix-setrlimit-hang.patch
index 7f3622d67d..928b0ff461 100644
--- a/community/go/fix-setrlimit-hang.patch
+++ b/community/go/fix-setrlimit-hang.patch
@@ -1,16 +1,44 @@
-By: tteras
-Based on https://www.openwall.com/lists/musl/2018/10/09/3
+From: https://go-review.googlesource.com/c/go/+/236518/
+
+See also: https://github.com/golang/go/issues/39343
+
+From 0f805dbee221cfb91e43e8a1facd77485a2ebd2a Mon Sep 17 00:00:00 2001
+From: George Tsilias <tsiliasg@gmail.com>
+Date: Thu, 04 Jun 2020 23:11:56 +0300
+Subject: [PATCH] runtime: handle signal 34 for musl setgid
+
+It has been observed that setgid hangs when using cgo with musl.
+This fix ensures that signal 34 gets handled in an appropriate way,
+like signal 33 when using glibc.
+
+Fixes #39343
+
+Change-Id: I89565663e2c361f62cbccfe80aaedf290bd58d57
+---
 
 diff --git a/src/runtime/sigtab_linux_generic.go b/src/runtime/sigtab_linux_generic.go
-index b26040b803..851148d049 100644
+index b26040b..38d6865 100644
 --- a/src/runtime/sigtab_linux_generic.go
 +++ b/src/runtime/sigtab_linux_generic.go
-@@ -45,7 +45,7 @@ var sigtable = [...]sigTabT{
+@@ -45,7 +45,7 @@
         /* 31 */ {_SigThrow, "SIGSYS: bad system call"},
         /* 32 */ {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */
         /* 33 */ {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */
 -       /* 34 */ {_SigNotify, "signal 34"},
-+       /* 34 */ {_SigSetStack + _SigUnblock, "signal 34"}, /* SIGSYNCCALL (musl); see https://www.openwall.com/lists/musl/2018/10/09/3 */
++       /* 34 */ {_SigSetStack + _SigUnblock, "signal 34"}, /* musl SIGSYNCCALL; see issue 39343 */
         /* 35 */ {_SigNotify, "signal 35"},
         /* 36 */ {_SigNotify, "signal 36"},
         /* 37 */ {_SigNotify, "signal 37"},
+diff --git a/src/runtime/sigtab_linux_mipsx.go b/src/runtime/sigtab_linux_mipsx.go
+index 81dd231..51ef470 100644
+--- a/src/runtime/sigtab_linux_mipsx.go
++++ b/src/runtime/sigtab_linux_mipsx.go
+@@ -42,7 +42,7 @@
+        /*  31 */ {_SigNotify, "SIGXFSZ: file size limit exceeded"},
+        /*  32 */ {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */
+        /*  33 */ {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */
+-       /*  34 */ {_SigNotify, "signal 34"},
++       /*  34 */ {_SigSetStack + _SigUnblock, "signal 34"}, /* musl SIGSYNCCALL; see issue 39343 */
+        /*  35 */ {_SigNotify, "signal 35"},
+        /*  36 */ {_SigNotify, "signal 36"},
+        /*  37 */ {_SigNotify, "signal 37"},