import RHEL 10 Beta golang-1.22.5-1.el10

.gitignore

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

.golang.metadata

@@ -1,2 +0,0 @@
-cfcfc208c18ecffcebe3d6218537f495eb555395 SOURCES/go1.21.13-4-openssl-fips.tar.gz
-a6aa471b6f806146bbd4ffec11b70ca834421a2e SOURCES/go1.21.13.tar.gz

0001-Modify-go.env.patch

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,35 @@
+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

@@ -1,374 +0,0 @@
-diff --git a/src/crypto/boring/boring.go b/src/crypto/boring/boring.go
-index 47618fe..d93784d 100644
---- a/src/crypto/boring/boring.go
-+++ b/src/crypto/boring/boring.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
- 
- // Package boring exposes functions that are only available when building with
- // Go+BoringCrypto. This package is available on all targets as long as the
-diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
-index 33a53a8..f630ea5 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
-+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static
- 
- package backend
- 
-diff --git a/src/crypto/internal/backend/openssl.go b/src/crypto/internal/backend/openssl.go
-index 59370ec..eb81ef6 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/div_test.c b/src/crypto/internal/boring/div_test.c
-index f909cc9..8530533 100644
---- a/src/crypto/internal/boring/div_test.c
-+++ b/src/crypto/internal/boring/div_test.c
-@@ -1,4 +1,5 @@
- // Copyright 2022 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/goboringcrypto.h b/src/crypto/internal/boring/goboringcrypto.h
-index 2b11049..dec1cb2 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 b338754..db5ea1e 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/crypto/tls/fipsonly/fipsonly.go b/src/crypto/tls/fipsonly/fipsonly.go
-index e5e4783..a0d9523 100644
---- a/src/crypto/tls/fipsonly/fipsonly.go
-+++ b/src/crypto/tls/fipsonly/fipsonly.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
- 
- // Package fipsonly restricts all TLS configuration to FIPS-approved settings.
- //
-diff --git a/src/crypto/tls/fipsonly/fipsonly_test.go b/src/crypto/tls/fipsonly/fipsonly_test.go
-index f8485dc..6563ac4 100644
---- a/src/crypto/tls/fipsonly/fipsonly_test.go
-+++ b/src/crypto/tls/fipsonly/fipsonly_test.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
- 
- package fipsonly
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/aes.go b/src/vendor/github.com/golang-fips/openssl/openssl/aes.go
-index 079fc3c..e826d0b 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/aes.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/aes.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go b/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go
-index 9537870..c491628 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go b/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go
-index 9f46388..87feb18 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/evp.go b/src/vendor/github.com/golang-fips/openssl/openssl/evp.go
-index 46d2bdd..34f4a43 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/evp.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/evp.go
-@@ -1,5 +1,5 @@
--//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h b/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
-index ac6c64f..5526db9 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.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.
- // +build linux
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go b/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go
-index 2e21224..83da261 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go b/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
-index 3af1924..57a525a 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/hmac.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go b/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go
-index 5093cde..0610495 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/notboring.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
-+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go b/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go
-index 17a9034..db51ced 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c
-index 7ce9833..fe66288 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c
-@@ -1,4 +1,5 @@
- // +build linux
-+// +build !static
- // +build !android
- // +build !no_openssl
- // +build !cmd_go_bootstrap
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c
-index a45ed60..2b541fd 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c
-@@ -1,4 +1,5 @@
- // +build linux
-+// +build !static
- // +build !android
- // +build !no_openssl
- // +build !cmd_go_bootstrap
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c
-index 49d40a7..3b3dbf8 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c
-@@ -1,4 +1,5 @@
- // +build linux
-+// +build !static
- // +build !android
- // +build !no_openssl
- // +build !cmd_go_bootstrap
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c
-index 7eb645e..1c3225a 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c
-@@ -1,4 +1,5 @@
- // This file contains a port of the BoringSSL AEAD interface.
-+// +build !static
- // +build linux
- // +build !android
- // +build !no_openssl
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c
-index df4ebe3..876393b 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c
-@@ -1,4 +1,5 @@
- // +build linux
-+// +build !static
- // +build !android
- // +build !no_openssl
- // +build !cmd_go_bootstrap
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c
-index 8205b04..dcd751d 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c
-@@ -1,4 +1,5 @@
- // +build linux
-+// +build !static
- // +build !android
- // +build !no_openssl
- // +build !cmd_go_bootstrap
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c
-index 2eedd5b..04510d3 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c
-@@ -1,4 +1,5 @@
- // This file contains a backport of the EVP_md5_sha1 method.
-+// +build !static
- // +build linux
- // +build !android
- // +build !no_openssl
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
-index a5996d6..2552081 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
-@@ -1,4 +1,5 @@
- // This file contains HMAC portability wrappers.
-+// +build !static
- // +build linux
- // +build !android
- // +build !no_openssl
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c
-index e214929..c9f6887 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c
-@@ -1,4 +1,5 @@
- // This file contains RSA portability wrappers.
-+// +build !static
- // +build linux
- // +build !android
- // +build !no_openssl
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c
-index 22bd865..b7aa26b 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c
-@@ -1,4 +1,5 @@
- // +build linux
-+// +build !static
- // +build !android
- // +build !no_openssl
- // +build !cmd_go_bootstrap
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/rand.go b/src/vendor/github.com/golang-fips/openssl/openssl/rand.go
-index b3668b8..dcdae70 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/rand.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/rand.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go b/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go
-index 7870b93..564db24 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/rsa.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/sha.go b/src/vendor/github.com/golang-fips/openssl/openssl/sha.go
-index 0b55ced..57309c0 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/sha.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/sha.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 && !android && !cmd_go_bootstrap && !msan && !no_openssl
--// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
-+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
-+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
- 
- package openssl
- 

SOURCES/disable_static_tests_part2.patch

@@ -1,13 +0,0 @@
-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/evp-digest-sign-final.patch

@@ -1,92 +0,0 @@
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h b/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
-index ac6c64f86d..5213b841dc 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
-@@ -264,7 +264,7 @@ int _goboringcrypto_HMAC_Update(GO_HMAC_CTX *ctx,
- int _goboringcrypto_HMAC_CTX_reset(GO_HMAC_CTX *ctx);
- void _goboringcrypto_HMAC_CTX_free(GO_HMAC_CTX *ctx);
- int _goboringcrypto_HMAC_Final(GO_HMAC_CTX *ctx,
--			       unsigned char *md, unsigned int *len);
-+			       unsigned char *md, unsigned int len);
- 
- #include <openssl/evp.h>
- #include <openssl/aes.h>
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go b/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
-index 3af1924884..c76d6690aa 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
-@@ -121,7 +121,9 @@ func (h *boringHMAC) finalize() {
- 
- func (h *boringHMAC) Write(p []byte) (int, error) {
- 	if len(p) > 0 {
--		C._goboringcrypto_HMAC_Update(h.ctx, (*C.uint8_t)(unsafe.Pointer(&p[0])), C.size_t(len(p)))
-+		if C._goboringcrypto_HMAC_Update(h.ctx, (*C.uint8_t)(unsafe.Pointer(&p[0])), C.size_t(len(p))) == 0 {
-+			panic("boringcrypto: HMAC_Update failed")
-+		}
- 	}
- 	runtime.KeepAlive(h)
- 	return len(p), nil
-@@ -136,10 +138,12 @@ func (h *boringHMAC) BlockSize() int {
- }
- 
- func (h *boringHMAC) Sum(in []byte) []byte {
-+	size := h.Size()
- 	if h.sum == nil {
--		size := h.Size()
- 		h.sum = make([]byte, size)
- 	}
--	C._goboringcrypto_HMAC_Final(h.ctx, (*C.uint8_t)(unsafe.Pointer(&h.sum[0])), nil)
-+	if C._goboringcrypto_HMAC_Final(h.ctx, (*C.uint8_t)(unsafe.Pointer(&h.sum[0])), C.uint(size)) == 0 {
-+		panic("boringcrypto: HMAC_Final failed")
-+	}
- 	return append(in, h.sum...)
- }
-diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
-index d26ce90c82..f7dabb25e0 100644
---- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
-+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
-@@ -115,10 +115,10 @@ void _goboringcrypto_HMAC_CTX_free(GO_HMAC_CTX *ctx)
- }
- 
- int _goboringcrypto_HMAC_Final(GO_HMAC_CTX *ctx,
--			       unsigned char *md, unsigned int *len)
-+			       unsigned char *md, unsigned int len)
- {
-   EVP_MD_CTX *mdctx = NULL;
--  size_t slen;
-+  size_t slen = len;
-   int ret = 0;
- 
-   mdctx = _goboringcrypto_EVP_MD_CTX_create();
-@@ -128,9 +128,10 @@ int _goboringcrypto_HMAC_Final(GO_HMAC_CTX *ctx,
-   if (_goboringcrypto_internal_EVP_MD_CTX_copy_ex(mdctx, ctx->mdctx) != 1)
-     goto err;
- 
--  ret = _goboringcrypto_EVP_DigestSignFinal(mdctx, md, &slen);
--  if (ret == 1 && len)
--    *len = slen;
-+  if (_goboringcrypto_EVP_DigestSignFinal(mdctx, md, &slen) != 1)
-+    goto err;
-+
-+  ret = 1;
- 
-  err:
-   _goboringcrypto_EVP_MD_CTX_free(mdctx);
-@@ -219,7 +220,7 @@ void _goboringcrypto_HMAC_CTX_free(GO_HMAC_CTX *ctx)
- }
- 
- int _goboringcrypto_HMAC_Final(GO_HMAC_CTX *ctx,
--			       unsigned char *md, unsigned int *len)
-+			       unsigned char *md, unsigned int len)
- {
-   HMAC_CTX hctx;
-   int ret;
-@@ -228,7 +229,7 @@ int _goboringcrypto_HMAC_Final(GO_HMAC_CTX *ctx,
-   if (ret != 1)
-     return ret;
- 
--  ret = _goboringcrypto_internal_HMAC_Final(&hctx, md, len);
-+  ret = _goboringcrypto_internal_HMAC_Final(&hctx, md, &len);
-   _goboringcrypto_internal_HMAC_CTX_cleanup(&hctx);
-   return ret;
- }

SOURCES/fix_TestScript_list_std.patch

@@ -1,13 +0,0 @@
-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

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

SOURCES/modify_go.env.patch

@@ -1,22 +0,0 @@
-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_test_rhbz1939923.patch

@@ -1,12 +0,0 @@
-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

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

sources

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