import UBI golang-1.25.3-2.module+el8.10.0+23746+9db33b5e

.gitignore

@@ -1,2 +1,3 @@
-SOURCES/go1.24.6-1-openssl-fips.tar.gz
+SOURCES/compiler-rt-18.1.8.src.tar.xz
-SOURCES/go1.24.6.tar.gz
+SOURCES/go1.25.3-1-openssl-fips.tar.gz
+SOURCES/go1.25.3.tar.gz

.golang.metadata

@@ -1,2 +1,3 @@
-5a76a00182a4e6ee8bb5a75ea99e545a10e09c39 SOURCES/go1.24.6-1-openssl-fips.tar.gz
+6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz
-e156513b78ffa159c033bec54675cc3dd2fe9101 SOURCES/go1.24.6.tar.gz
+eb585257c57d2644a89c43d5fa277f78df3ab8c9 SOURCES/go1.25.3-1-openssl-fips.tar.gz
+22eae00c75c7739a710b07eb4d2a4e96c89c479e SOURCES/go1.25.3.tar.gz

SOURCES/disable_static_tests_part1.patch

@@ -1,63 +0,0 @@
-diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
-index 95c2cdc..88df624 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 || purego
--// +build !linux !cgo android cmd_go_bootstrap msan no_openssl purego
-+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || purego || static
-+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl purego static
- 
- package backend
- 
-diff --git a/src/crypto/internal/backend/openssl.go b/src/crypto/internal/backend/openssl.go
-index 297c3cb..1a4fa10 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 && !purego
--// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!purego
-+//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl && !purego && !static
-+// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!purego,!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 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/vendor/github.com/golang-fips/openssl/v2/goopenssl.h b/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
-index e488bf2..e776aa4 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
- 

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/revert_dwarf5.patch

@@ -0,0 +1,42 @@
+From e90ae9076a108b83c645814f75a574c14a5a4b98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
+Date: Wed, 27 Aug 2025 16:18:09 +0200
+Subject: [PATCH] Revert DWARF5 as default, use DWARF4
+
+---
+ src/internal/buildcfg/exp.go | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
+index 689ca8ce58..b2ea97481b 100644
+--- a/src/internal/buildcfg/exp.go
++++ b/src/internal/buildcfg/exp.go
+@@ -67,24 +67,13 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
+ 		regabiSupported = true
+ 	}
+ 
+-	// Older versions (anything before V16) of dsymutil don't handle
+-	// the .debug_rnglists section in DWARF5. See
+-	// https://github.com/golang/go/issues/26379#issuecomment-2677068742
+-	// for more context. This disables all DWARF5 on mac, which is not
+-	// ideal (would be better to disable just for cases where we know
+-	// the build will use external linking). In the GOOS=aix case, the
+-	// XCOFF format (as far as can be determined) doesn't seem to
+-	// support the necessary section subtypes for DWARF-specific
+-	// things like .debug_addr (needed for DWARF 5).
+-	dwarf5Supported := (goos != "darwin" && goos != "ios" && goos != "aix")
+-
+ 	baseline := goexperiment.Flags{
+ 		RegabiWrappers:  regabiSupported,
+ 		RegabiArgs:      regabiSupported,
+ 		AliasTypeParams: true,
+ 		SwissMap:        true,
+ 		SyncHashTrieMap: true,
+-		Dwarf5:          dwarf5Supported,
++		Dwarf5:          false,
+ 	}
+ 
+ 	// Start with the statically enabled set of experiments.
+-- 
+2.51.0
+

SPECS/golang.spec

@@ -69,6 +69,7 @@
 %global shared 0
 %endif
 
+# Pre build std lib with -race enabled
 # Disabled due to 1.20 new cache usage, see 1.20 upstream release notes
 %global race 0
 
@@ -91,14 +92,17 @@
 %global gohostarch  s390x
 %endif
 
-%global go_api 1.24
+%global go_api 1.25
-%global version 1.24.6
+%global go_version 1.25.3
+%global version %{go_version}
 %global pkg_release 1
 
+# LLVM compiler-rt version for race detector
+%global llvm_compiler_rt_version 18.1.8
+
 Name:           golang
 Version:        %{version}
-Release:        1%{?dist}
+Release:        2%{?dist}
-
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -110,9 +114,10 @@ Source0:        https://github.com/golang/go/archive/refs/tags/go%{version}.tar.
 # located at https://github.com/golang-fips/openssl-fips,
 # And pre-genetated patches to set up the module for a given
 # Go release are located at https://github.com/golang-fips/go.
-Source1:       https://github.com/golang-fips/go/archive/refs/tags/go%{version}-%{pkg_release}-openssl-fips.tar.gz
+Source1:	https://github.com/golang-fips/go/archive/refs/tags/go%{version}-%{pkg_release}-openssl-fips.tar.gz
 # make possible to override default traceback level at build time by setting build tag rpm_crashtraceback
 Source2:        fedora.go
+Source3: 	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{llvm_compiler_rt_version}/compiler-rt-%{llvm_compiler_rt_version}.src.tar.xz
 
 # The compiler is written in Go. Needs go(1.4+) compiler for build.
 # Actual Go based bootstrap compiler provided by above source.
@@ -131,9 +136,14 @@ BuildRequires:  openssl-devel
 # for tests
 BuildRequires:  pcre-devel, glibc-static, perl
 
+# Necessary for building llvm address sanitizer for Go race detector
+BuildRequires: libstdc++-devel
+BuildRequires: clang
+
 Provides:       go = %{version}-%{release}
 Requires:       %{name}-bin = %{version}-%{release}
 Requires:       %{name}-src = %{version}-%{release}
+Requires:       %{name}-race = %{version}-%{release}
 Requires:       openssl-devel
 Requires:       diffutils
 
@@ -142,10 +152,10 @@ Patch221:       fix_TestScript_list_std.patch
 
 Patch1939923:   skip_test_rhbz1939923.patch
 
-Patch2:		disable_static_tests_part1.patch
+Patch4:		modify_go.env.patch
-Patch3:		disable_static_tests_part2.patch
+Patch6:		skip_TestCrashDumpsAllThreads.patch
-Patch5:		modify_go.env.patch
+# Related: https://sourceware.org/bugzilla/show_bug.cgi?id=33204
-Patch7:		skip_TestCrashDumpsAllThreads.patch
+Patch7:     revert_dwarf5.patch
 
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
@@ -153,9 +163,6 @@ Obsoletes:      %{name}-docs < 1.1-4
 # RPM can't handle symlink -> dir with subpackages, so merge back
 Obsoletes:      %{name}-data < 1.1.1-4
 
-# We don't build golang-race anymore, rhbz#2230599
-Obsoletes:      golang-race < 1.20.0
-
 # These are the only RHEL/Fedora architectures that we compile this package for
 ExclusiveArch:  %{golang_arches}
 
@@ -226,15 +233,23 @@ Summary:        Golang shared object libraries
 %{summary}.
 %endif
 
-%if %{race}
+%package -n go-toolset
-%package        race
+Summary:        Package that installs go-toolset
-Summary:        Golang std library with -race enabled
+Requires:       %{name} = %{version}-%{release}
+%ifarch x86_64 aarch64 ppc64le
+Requires:       delve
+%endif
 
+%description -n go-toolset
+This is the main package for go-toolset.
+
+
+%package race
+Summary:	Race detetector library object files.
 Requires:       %{name} = %{version}-%{release}
 
 %description    race
-%{summary}
+Binary library objects for Go's race detector.
-%endif
 
 %prep
 %setup -q -n go-go%{version}
@@ -246,7 +261,7 @@ patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
 # Add --no-backup-if-mismatch option to avoid creating .orig temp files
 for p in "$patch_dir"/*.patch; do
 	echo "Applying $p"
-	patch -p1 --no-backup-if-mismatch < $p
+	patch --no-backup-if-mismatch -p1 < $p
 done
 
 # Configure crypto tests
@@ -258,10 +273,13 @@ popd
 %autopatch -p1
 
 sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION
-# Delete the boring binary blob.  We use the system OpenSSL instead.
-rm -rf src/crypto/internal/boring/syso
 
 cp %{SOURCE2} ./src/runtime/
+# Delete the bundled race detector objects.
+find ./src/runtime/race/ -name "race_*.syso" -exec rm {} \;
+
+# Delete the boring binary blob.  We use the system OpenSSL instead.
+rm -rf src/crypto/internal/boring/syso
 
 %build
 set -xe
@@ -270,6 +288,40 @@ uname -a
 cat /proc/cpuinfo
 cat /proc/meminfo
 
+# Build race detector .syso's from llvm sources
+# The race detector requests a -fno-exceptions build.
+%global tsan_buildflags %(rpm -D 'toolchain clang' -E '%{optflags}' | sed 's/-fexceptions//')
+%global tsan_optflag -O1
+mkdir ../llvm
+
+tar -xf %{SOURCE3} -C ../llvm
+tsan_go_dir="../llvm/compiler-rt-%{llvm_compiler_rt_version}.src/lib/tsan/go"
+
+# The script uses uname -a and grep to set the GOARCH.  This
+# is unreliable and can get the wrong architecture in
+# circumstances like cross-architecture emulation.  We fix it
+# by just reading GOARCH directly from Go.
+export GOARCH=$(go env GOARCH)
+
+%ifarch x86_64
+pushd "${tsan_go_dir}"
+  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh
+popd
+cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v3/race_linux.syso
+
+pushd "${tsan_go_dir}"
+  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v1 ./buildgo.sh
+popd
+cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v1/race_linux.syso
+
+%else
+pushd "${tsan_go_dir}"
+  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang ./buildgo.sh
+popd
+cp "${tsan_go_dir}"/race_linux_%{gohostarch}.syso ./src/runtime/race/race_linux_%{gohostarch}.syso
+%endif
+
+
 # bootstrap compiler GOROOT
 %if !%{golang_bootstrap}
 export GOROOT_BOOTSTRAP=/
@@ -373,7 +425,7 @@ pushd $RPM_BUILD_ROOT%{goroot}
         echo "%%{goroot}/$file" >> $shared_list
         echo "%%{golibdir}/$(basename $file)" >> $shared_list
     done
-    
+
     find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list
     find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
 %endif
@@ -447,9 +499,6 @@ export GO_TEST_RUN=""
 
 %if %{fail_on_tests}
 
-# TestEd25519Vectors needs network connectivity but it should be cover by
-# this test https://pkgs.devel.redhat.com/cgit/tests/golang/tree/Regression/internal-testsuite/runtest.sh#n127
-
 ./run.bash --no-rebuild -v -v -v -k $GO_TEST_RUN
 
 # Run tests with FIPS enabled.
@@ -504,8 +553,13 @@ cd ..
 # prelink blacklist
 %{_sysconfdir}/prelink.conf.d
 
-
 %files -f go-src.list src
+%ifarch x86_64
+%exclude %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso
+%exclude %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso
+%else
+%exclude %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso
+%endif
 
 %files -f go-docs.list docs
 
@@ -522,7 +576,23 @@ cd ..
 %files -f go-shared.list shared
 %endif
 
+%files -n go-toolset
+
+%files race
+%ifarch x86_64
+%{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso
+%{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso
+%else
+%{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso
+%endif
+
 %changelog
+* Wed Oct 29 2025 David Benoit <dbenoit@redhat.com> - 1.25.3-1
+- Update to Go 1.25.3 (sync from CentOS Stream 9)
+- Build go-toolset as a subpackage
+- Preserve GOAMD64=v1 for RHEL 8
+- Resolves: RHEL-121223
+
 * Wed Aug 13 2025 David Benoit <dbenoit@redhat.com> - 1.24.6-1
 - Update to Go 1.24.6 (fips-1)
 - Resolves: RHEL-106455