go: update to 1.22.0

srcpkgs/go/patches/fix-32bit-tests.patch

@@ -1,13 +0,0 @@
-Fixes go1.21 error on i686 -
-  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-
---- a/go/src/cmd/go/script_test.go
-+++ b/go/src/cmd/go/script_test.go
-@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
- 	"GO_TESTING_GOTOOLS", // for gccgo testing
- 	"GCCGO",              // for gccgo testing
- 	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
- }
- 
- // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or

srcpkgs/go/patches/fix-musl-tests.patch

@@ -1,29 +0,0 @@
-These tests fail on musl because /proc/../status doesn't
-contain the "Groups" field, because musl lacks the getgroups() syscall.
-
---- a/go/src/cmd/cgo/internal/test/issue1435.go
-+++ b/go/src/cmd/cgo/internal/test/issue1435.go
-@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
- 		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- 		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
- 
--		{call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
--		{call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
--		{call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- 		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- 		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- 		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
- 		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- 		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
- 
--		{call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
--		{call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
--		{call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- 		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- 		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- 		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},

srcpkgs/go/patches/fix-tests.patch

@@ -1,171 +0,0 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then
-chown won't work. https://github.com/golang/go/issues/42525
-
---- a/go/src/os/os_unix_test.go
-+++ b/go/src/os/os_unix_test.go
-@@ -7,7 +7,6 @@
- package os_test
- 
- import (
--	"internal/testenv"
- 	"io"
- 	. "os"
- 	"path/filepath"
-@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
- 	}
- }
- 
--func TestChown(t *testing.T) {
--	if runtime.GOOS == "wasip1" {
--		t.Skip("file ownership not supported on " + runtime.GOOS)
--	}
--	t.Parallel()
--
--	// Use TempDir() to make sure we're on a local file system,
--	// so that the group ids returned by Getgroups will be allowed
--	// on the file. On NFS, the Getgroups groups are
--	// basically useless.
--	f := newFile("TestChown", t)
--	defer Remove(f.Name())
--	defer f.Close()
--	dir, err := f.Stat()
--	if err != nil {
--		t.Fatalf("stat %s: %s", f.Name(), err)
--	}
--
--	// Can't change uid unless root, but can try
--	// changing the group id. First try our current group.
--	gid := Getgid()
--	t.Log("gid:", gid)
--	if err = Chown(f.Name(), -1, gid); err != nil {
--		t.Fatalf("chown %s -1 %d: %s", f.Name(), gid, err)
--	}
--	sys := dir.Sys().(*syscall.Stat_t)
--	checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
--	// Then try all the auxiliary groups.
--	groups, err := Getgroups()
--	if err != nil {
--		t.Fatalf("getgroups: %s", err)
--	}
--	t.Log("groups: ", groups)
--	for _, g := range groups {
--		if err = Chown(f.Name(), -1, g); err != nil {
--			t.Fatalf("chown %s -1 %d: %s", f.Name(), g, err)
--		}
--		checkUidGid(t, f.Name(), int(sys.Uid), g)
--
--		// change back to gid to test fd.Chown
--		if err = f.Chown(-1, gid); err != nil {
--			t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
--		}
--		checkUidGid(t, f.Name(), int(sys.Uid), gid)
--	}
--}
--
--func TestFileChown(t *testing.T) {
--	if runtime.GOOS == "wasip1" {
--		t.Skip("file ownership not supported on " + runtime.GOOS)
--	}
--	t.Parallel()
--
--	// Use TempDir() to make sure we're on a local file system,
--	// so that the group ids returned by Getgroups will be allowed
--	// on the file. On NFS, the Getgroups groups are
--	// basically useless.
--	f := newFile("TestFileChown", t)
--	defer Remove(f.Name())
--	defer f.Close()
--	dir, err := f.Stat()
--	if err != nil {
--		t.Fatalf("stat %s: %s", f.Name(), err)
--	}
--
--	// Can't change uid unless root, but can try
--	// changing the group id. First try our current group.
--	gid := Getgid()
--	t.Log("gid:", gid)
--	if err = f.Chown(-1, gid); err != nil {
--		t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
--	}
--	sys := dir.Sys().(*syscall.Stat_t)
--	checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
--	// Then try all the auxiliary groups.
--	groups, err := Getgroups()
--	if err != nil {
--		t.Fatalf("getgroups: %s", err)
--	}
--	t.Log("groups: ", groups)
--	for _, g := range groups {
--		if err = f.Chown(-1, g); err != nil {
--			t.Fatalf("fchown %s -1 %d: %s", f.Name(), g, err)
--		}
--		checkUidGid(t, f.Name(), int(sys.Uid), g)
--
--		// change back to gid to test fd.Chown
--		if err = f.Chown(-1, gid); err != nil {
--			t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
--		}
--		checkUidGid(t, f.Name(), int(sys.Uid), gid)
--	}
--}
--
--func TestLchown(t *testing.T) {
--	testenv.MustHaveSymlink(t)
--	t.Parallel()
--
--	// Use TempDir() to make sure we're on a local file system,
--	// so that the group ids returned by Getgroups will be allowed
--	// on the file. On NFS, the Getgroups groups are
--	// basically useless.
--	f := newFile("TestLchown", t)
--	defer Remove(f.Name())
--	defer f.Close()
--	dir, err := f.Stat()
--	if err != nil {
--		t.Fatalf("stat %s: %s", f.Name(), err)
--	}
--
--	linkname := f.Name() + "2"
--	if err := Symlink(f.Name(), linkname); err != nil {
--		if runtime.GOOS == "android" && IsPermission(err) {
--			t.Skip("skipping test on Android; permission error creating symlink")
--		}
--		t.Fatalf("link %s -> %s: %v", f.Name(), linkname, err)
--	}
--	defer Remove(linkname)
--
--	// Can't change uid unless root, but can try
--	// changing the group id. First try our current group.
--	gid := Getgid()
--	t.Log("gid:", gid)
--	if err = Lchown(linkname, -1, gid); err != nil {
--		if err, ok := err.(*PathError); ok && err.Err == syscall.ENOSYS {
--			t.Skip("lchown is unavailable")
--		}
--		t.Fatalf("lchown %s -1 %d: %s", linkname, gid, err)
--	}
--	sys := dir.Sys().(*syscall.Stat_t)
--	checkUidGid(t, linkname, int(sys.Uid), gid)
--
--	// Then try all the auxiliary groups.
--	groups, err := Getgroups()
--	if err != nil {
--		t.Fatalf("getgroups: %s", err)
--	}
--	t.Log("groups: ", groups)
--	for _, g := range groups {
--		if err = Lchown(linkname, -1, g); err != nil {
--			t.Fatalf("lchown %s -1 %d: %s", linkname, g, err)
--		}
--		checkUidGid(t, linkname, int(sys.Uid), g)
--
--		// Check that link target's gid is unchanged.
--		checkUidGid(t, f.Name(), int(sys.Uid), int(sys.Gid))
--	}
--}
--
- // Issue 16919: Readdir must return a non-empty slice or an error.
- func TestReaddirRemoveRace(t *testing.T) {
- 	oldStat := *LstatP

srcpkgs/go/template

@@ -1,10 +1,10 @@
 # Template file for 'go'
 pkgname=go
-version=1.21.5
+version=1.22.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
-hostmakedepends="go1.17-bootstrap"
+hostmakedepends="go1.22-bootstrap"
 checkdepends="iana-etc clang gcc-fortran"
 short_desc="Go Programming Language"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19
+checksum=4d196c3d41a0d6c1dfc64d04e3cc1f608b0c436bd87b7060ce3e23234e1f4d5c
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -60,7 +60,7 @@ do_build() {
 	# dependency
 	unset CGO_CXXFLAGS CGO_ENABLED # CGO_CFLAGS
 
-	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
+	export GOROOT_BOOTSTRAP="/usr/lib/go1.22.0"
 	export GOROOT=$PWD
 
 	cd "src"

srcpkgs/go1.22-bootstrap/template

@@ -0,0 +1,51 @@
+# Template file for 'go1.22-bootstrap'
+pkgname=go1.22-bootstrap
+version=1.22.0
+revision=1
+archs="x86_64* i686* armv[67]l* aarch64* ppc64le*"
+short_desc="Go 1.22 (bootstrap compiler)"
+maintainer="Felix Hanley <felix@userspace.com.au>"
+license="BSD-3-Clause"
+homepage="https://golang.org"
+nostrip=yes
+noverifyrdeps=yes
+nocross=yes
+lib32disabled=yes
+repository=bootstrap
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	depends+=" gcompat"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*)
+		_dist_arch="amd64"
+		checksum="f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265"
+		;;
+	i686*)
+		_dist_arch="386"
+		checksum="1e209c4abde069067ac9afb341c8003db6a210f8173c77777f02d3a524313da3"
+		;;
+	arm*)
+		_dist_arch="armv6l"
+		checksum="0525f92f79df7ed5877147bce7b955f159f3962711b69faac66bc7121d36dcc4"
+		;;
+	aarch64*)
+		_dist_arch="arm64"
+		checksum="6a63fef0e050146f275bf02a0896badfe77c11b6f05499bb647e7bd613a45a10"
+		;;
+	ppc64le*)
+		_dist_arch="ppc64le"
+		checksum="0e57f421df9449066f00155ce98a5be93744b3d81b00ee4c2c9b511be2a31d93"
+		;;
+esac
+
+distfiles="https://dl.google.com/go/go${version}.linux-${_dist_arch}.tar.gz"
+
+do_install() {
+	vmkdir usr/lib/go${version}
+	vcopy bin usr/lib/go${version}
+	vcopy src usr/lib/go${version}
+	vcopy pkg usr/lib/go${version}
+	vlicense LICENSE
+}