import UBI golang-1.22.9-1.module+el8.10.0+22500+aee717ef

.gitignore

@@ -1,2 +1,2 @@
-go1.22.5-1-openssl-fips.tar.gz
-go1.22.5.src.tar.gz
+SOURCES/go1.22.9-1-openssl-fips.tar.gz
+SOURCES/go1.22.9.tar.gz

.golang.metadata

@@ -0,0 +1,2 @@
+af6e318112b0e4fa6f42978d5c80e2c4fc5ca02c SOURCES/go1.22.9-1-openssl-fips.tar.gz
+3860690f8aee2de5da3cd46af6e84f4f94bfc5f0 SOURCES/go1.22.9.tar.gz

0001-Modify-go.env.patch

@@ -1,31 +0,0 @@
-From fbcfe983cdeb723420d67364022fc91ac8c6be3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
-Date: Wed, 5 Jun 2024 12:30:46 +0200
-Subject: [PATCH] Modify environment variables defaults
-
-- Set GOTOOLCHAIN to local
-- Set GOAMD64 to v3
-- Set GOPPC64 to power9
----
- go.env | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/go.env b/go.env
-index 6ff2b921d4..0bff84446c 100644
---- a/go.env
-+++ b/go.env
-@@ -9,4 +9,10 @@ GOSUMDB=sum.golang.org
- 
- # Automatically download newer toolchains as directed by go.mod files.
- # See https://go.dev/doc/toolchain for details.
--GOTOOLCHAIN=auto
-+GOTOOLCHAIN=local
-+
-+# The AMD64 baseline for RHEL10 is v3.
-+GOAMD64=v3
-+# The PPC64LE baseline for RHEL10 is power9
-+GOPPC64=power9
-+
--- 
-2.45.1
-

0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch

@@ -1,35 +0,0 @@
-From 7506da0af38aa307f45664f0c787b5767cc7a87f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
-Date: Thu, 22 Jun 2023 17:19:00 +0200
-Subject: [PATCH] Force gold in aarch64 until binutils 2.41 is on Fedora
-
----
- src/cmd/link/internal/ld/lib.go | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
-index 91e2d5149c..99c305530b 100644
---- a/src/cmd/link/internal/ld/lib.go
-+++ b/src/cmd/link/internal/ld/lib.go
-@@ -1605,15 +1605,13 @@ func (ctxt *Link) hostlink() {
- 			// https://go.dev/issue/22040
- 			altLinker = "gold"
- 
--			// If gold is not installed, gcc will silently switch
--			// back to ld.bfd. So we parse the version information
--			// and provide a useful error if gold is missing.
-+			// In both cases, switch to gold if gold is available.
- 			name, args := flagExtld[0], flagExtld[1:]
- 			args = append(args, "-fuse-ld=gold", "-Wl,--version")
- 			cmd := exec.Command(name, args...)
- 			if out, err := cmd.CombinedOutput(); err == nil {
--				if !bytes.Contains(out, []byte("GNU gold")) {
--					log.Fatalf("ARM64 external linker must be gold (issue #15696, 22040), but is not: %s", out)
-+				if bytes.Contains(out, []byte("GNU gold")) {
-+					altLinker = "gold"
- 				}
- 			}
- 		}
--- 
-2.40.1
-

SOURCES/disable_static_tests_part1.patch

@@ -0,0 +1,79 @@
+From 24aac090069f79307aeceb8362f60a3cc5e60f7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Fri, 3 May 2024 17:25:19 +0200
+Subject: [PATCH] disable_static_tests_part1
+
+---
+ src/crypto/internal/backend/nobackend.go                 | 4 ++--
+ src/crypto/internal/backend/openssl.go                   | 4 ++--
+ src/crypto/internal/boring/goboringcrypto.h              | 1 +
+ src/crypto/internal/boring/syso/syso.go                  | 2 +-
+ src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h | 1 +
+ 5 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
+index 5b0e356dff..a2e17f7fa5 100644
+--- a/src/crypto/internal/backend/nobackend.go
++++ b/src/crypto/internal/backend/nobackend.go
+@@ -2,8 +2,8 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
+-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl
+-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl
++//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || static || static
++// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static static
+ 
+ package backend
+ 
+diff --git a/src/crypto/internal/backend/openssl.go b/src/crypto/internal/backend/openssl.go
+index 3d3a9a36ee..7e32d3b0fa 100644
+--- a/src/crypto/internal/backend/openssl.go
++++ b/src/crypto/internal/backend/openssl.go
+@@ -2,8 +2,8 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
+-//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl
+-// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl
++//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl && !static
++// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!static
+ 
+ // Package openssl provides access to OpenSSLCrypto implementation functions.
+ // Check the variable Enabled to find out whether OpenSSLCrypto is available.
+diff --git a/src/crypto/internal/boring/goboringcrypto.h b/src/crypto/internal/boring/goboringcrypto.h
+index 2b11049728..dec1cb2851 100644
+--- a/src/crypto/internal/boring/goboringcrypto.h
++++ b/src/crypto/internal/boring/goboringcrypto.h
+@@ -1,4 +1,5 @@
+ // Copyright 2017 The Go Authors. All rights reserved.
++// +build !static
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
+diff --git a/src/crypto/internal/boring/syso/syso.go b/src/crypto/internal/boring/syso/syso.go
+index b3387545e6..db5ea1e3d9 100644
+--- a/src/crypto/internal/boring/syso/syso.go
++++ b/src/crypto/internal/boring/syso/syso.go
+@@ -2,7 +2,7 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
+-//go:build boringcrypto
++//go:build boringcrypto && !static
+ 
+ // This package only exists with GOEXPERIMENT=boringcrypto.
+ // It provides the actual syso file.
+diff --git a/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h b/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
+index e488bf2014..e776aa46a3 100644
+--- a/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
++++ b/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
+@@ -1,4 +1,5 @@
+ // This header file describes the OpenSSL ABI as built for use in Go.
++// +build !static
+ 
+ #include <stdlib.h> // size_t
+ 
+-- 
+2.44.0
+

SOURCES/disable_static_tests_part2.patch

@@ -0,0 +1,13 @@
+diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
+index 36a20e8b2a..8c2dd1b44b 100644
+--- a/src/cmd/dist/test.go
++++ b/src/cmd/dist/test.go
+@@ -1125,7 +1125,7 @@ func (t *tester) registerCgoTests(heading string) {
+ 			} else {
+ 				panic("unknown linkmode with static build: " + linkmode)
+ 			}
+-			gt.tags = append(gt.tags, "static")
++			gt.tags = append(gt.tags, "static", "no_openssl")
+ 		}
+ 		gt.ldflags = strings.Join(ldflags, " ")
+ 

SOURCES/fix_TestScript_list_std.patch

@@ -0,0 +1,13 @@
+diff --git a/src/cmd/go/testdata/script/list_std.txt b/src/cmd/go/testdata/script/list_std.txt
+index 6ab1bd1..4a00e43 100644
+--- a/src/cmd/go/testdata/script/list_std.txt
++++ b/src/cmd/go/testdata/script/list_std.txt
+@@ -6,7 +6,7 @@ env GO111MODULE=off
+ # Listing GOROOT should only find standard packages.
+ cd $GOROOT/src
+ go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' ./...
+-! stdout .
++stdout _$GOROOT
+ 
+ # Standard packages should include cmd, but not cmd/vendor.
+ go list ./...

SOURCES/golang-gdbinit

@@ -0,0 +1 @@
+add-auto-load-safe-path /usr/lib/golang/src/pkg/runtime/runtime-gdb.py

SOURCES/modify_go.env.patch

@@ -0,0 +1,22 @@
+From eab9004c072200e58df83ab94678bda1faa7b229 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Fri, 9 Feb 2024 20:06:16 +0100
+Subject: [PATCH] Set GOTOOLCHAIN to local
+
+---
+ go.env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/go.env b/go.env
+index 6ff2b921d4..e87f6e7b6d 100644
+--- a/go.env
++++ b/go.env
+@@ -9,4 +9,4 @@ GOSUMDB=sum.golang.org
+ 
+ # Automatically download newer toolchains as directed by go.mod files.
+ # See https://go.dev/doc/toolchain for details.
+-GOTOOLCHAIN=auto
++GOTOOLCHAIN=local
+-- 
+2.43.0
+

SOURCES/skip_TestCrashDumpsAllThreads.patch

@@ -0,0 +1,27 @@
+From fdcaf4e6876cfd910c3da672564be4a6e829047c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Wed, 27 Mar 2024 17:15:48 +0100
+Subject: [PATCH] Skip TestCrashDumpsAllThreads
+
+---
+ src/runtime/crash_unix_test.go | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go
+index 123a462423..a0034d6455 100644
+--- a/src/runtime/crash_unix_test.go
++++ b/src/runtime/crash_unix_test.go
+@@ -74,6 +74,10 @@ func TestCrashDumpsAllThreads(t *testing.T) {
+ 		t.Skip("skipping; SIGQUIT is blocked, see golang.org/issue/19196")
+ 	}
+ 
++	if runtime.GOOS == "linux" && runtime.GOARCH == "s390x" {
++		t.Skip("skipping; frequent TestCrashDumpsAllThreads failures on linux/s390x, see golang.org/issue/64650")
++	}
++
+ 	testenv.MustHaveGoBuild(t)
+ 
+ 	if strings.Contains(os.Getenv("GOFLAGS"), "mayMoreStackPreempt") {
+-- 
+2.44.0
+

SOURCES/skip_test_rhbz1939923.patch

@@ -0,0 +1,12 @@
+diff --git a/src/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go
+index b1cdabb..09eaace 100644
+--- a/src/crypto/x509/x509_test.go
++++ b/src/crypto/x509/x509_test.go
+@@ -2993,6 +2993,7 @@ func (bs *brokenSigner) Sign(_ io.Reader, _ []byte, _ crypto.SignerOpts) ([]byte
+ }
+ 
+ func TestCreateCertificateBrokenSigner(t *testing.T) {
++	t.Skip("TODO Fix me: rhbz#1939923")
+ 	template := &Certificate{
+ 		SerialNumber: big.NewInt(10),
+ 		DNSNames:     []string{"example.com"},

golang-gdbinit

@@ -1 +0,0 @@
-add-auto-load-safe-path /usr/lib/golang/src/runtime/runtime-gdb.py

sources

@@ -1,2 +0,0 @@
-SHA512 (go1.22.5-1-openssl-fips.tar.gz) = 230fa331c2470a7a42c916cd1bec79fa423e913d7722235b4386b0aaf678e9baefc71d5c201a6d2c63d5936d06f2756b945ba54513109b046d569daeecc1cef3
-SHA512 (go1.22.5.src.tar.gz) = 798c2bd5d59be1fb5d7af98893fa7bb68322117facfdee546a37175ec5e8be634f2bed2d8d0e7d4d0555b354c8e9d72b3829c39670d3be2d2328376a00a48576