From 992637ac64e01d6e20b2a5d6c0d7b2883b4d1da8 Mon Sep 17 00:00:00 2001
From: dbenoit <dbenoit@redhat.com>
Date: Wed, 22 Apr 2026 09:44:56 -0400
Subject: [PATCH 1/2] Update to Go 1.26.2 (fips-2)

Resolves: RHEL-169926
---
 .gitignore  | 2 ++
 golang.spec | 6 +++---
 sources     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8cec988..4081eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,3 +179,5 @@
 /go1.25.7-1-openssl-fips.tar.gz
 /go1.26.1.src.tar.gz
 /go1.26.1-1-openssl-fips.tar.gz
+/go1.26.2.src.tar.gz
+/go1.26.2-2-openssl-fips.tar.gz
diff --git a/golang.spec b/golang.spec
index 11085d4..b04a245 100644
--- a/golang.spec
+++ b/golang.spec
@@ -115,11 +115,11 @@
 %global go_api 1.26
 # Use only for prerelease versions
 #global go_prerelease rc3
-%global go_patch 1
+%global go_patch 2
 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
 %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
 # Go FIPS package release
-%global pkg_release 1
+%global pkg_release 2
 
 # For rpmdev-bumpspec and releng automation.
 %global baserelease 1
@@ -128,7 +128,7 @@
 %global llvm_compiler_rt_version 18.1.8
 
 Name:           golang
-Version:        %{go_version}
+Version:	%{go_version}
 Release:        %autorelease
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
diff --git a/sources b/sources
index 5c0a852..701d88c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (go1.26.1.src.tar.gz) = 7bab2a762b4aff1c2c3a3cf3ad20bce63fabff28c7ff63b18cb8b0ce427a7bc1781cfd3fa291f4bff499247b1f0fd56f1698bb19bc7c1be7d7d2f38716438d41
-SHA512 (go1.26.1-1-openssl-fips.tar.gz) = 8bdc47255d85444d00ee3f5667bd3af17e0cb4df4bbbcc00d40c4ac484fdc9cae6fcd9495dd6941ef3f3ad430bacf3b1635dc28c3dd1a9488466a75670ce501b
+SHA512 (go1.26.2.src.tar.gz) = 370773727c0e6fbf0acd534726938aaaa03ff785f0634c258c94a7a896e9a27acc0ba57120967f711a942e9e275cec46251a194d6f84ba15f28b5dcf0efed673
+SHA512 (go1.26.2-2-openssl-fips.tar.gz) = 3b086cd73f7520eb786b866043c31f0d6a75294fbbee9390adb688ee7dd5666183789897cb9ac7dfbaa993310ae6decec9889eecb4c3f0bd708b1d660e3330c9
 SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d

From a368e476ff2e5443653c8e1d1e4fcd0ab2891d74 Mon Sep 17 00:00:00 2001
From: dbenoit <dbenoit@redhat.com>
Date: Wed, 22 Apr 2026 14:16:06 -0400
Subject: [PATCH 2/2] Do not ignore any tests in check

The aarch64 linker issues are long since resolved.
We should enforce full %check for builds on all arches.

Related: RHEL-169926
---
 golang.spec | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/golang.spec b/golang.spec
index b04a245..31c1c90 100644
--- a/golang.spec
+++ b/golang.spec
@@ -1,12 +1,4 @@
 %bcond_with bootstrap
-# temporalily ignore test failures
-# due to https://github.com/golang/go/issues/39466
-%ifarch aarch64
-%bcond_without ignore_tests
-%else
-%bcond_with ignore_tests
-%endif
-
 # Enable race by default
 %global race 1
 
@@ -74,12 +66,7 @@
 %global golang_bootstrap 1
 %endif
 
-# Controls what ever we fail on failed tests
-%if %{with ignore_tests}
-%global fail_on_tests 0
-%else
 %global fail_on_tests 1
-%endif
 
 # shared mode is breaks Go 1.21 in ELN
 %global shared 0