From fa8aa9ec2bd2753596dce1f628cdd493cf78cded Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Fri, 24 Apr 2026 11:29:19 -0400
Subject: [PATCH] import Oracle_OSS golang-1.25.9-3.el10_1

---
 .gitignore                                 |  4 +--
 golang.spec                                | 31 ++++++++++------------
 skip-TestTerminalSignal-in-container.patch | 26 ++++++++++++++++++
 sources                                    |  4 +--
 4 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 skip-TestTerminalSignal-in-container.patch

diff --git a/.gitignore b/.gitignore
index 666acf4..51d99ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 compiler-rt-18.1.8.src.tar.xz
-go1.25.8-1-openssl-fips.tar.gz
-go1.25.8.src.tar.gz
+go1.25.9-2-openssl-fips.tar.gz
+go1.25.9.src.tar.gz
diff --git a/golang.spec b/golang.spec
index ec754d6..7f312a7 100644
--- a/golang.spec
+++ b/golang.spec
@@ -1,22 +1,14 @@
 ## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
+## (rpmautospec version 0.8.3)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 3;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
 %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
 
@@ -84,12 +76,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
@@ -125,11 +112,11 @@
 %global go_api 1.25
 # Use only for prerelease versions
 #global go_prerelease rc3
-%global go_patch 8
+%global go_patch 9
 %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
@@ -223,6 +210,7 @@ Patch1:         0001-Modify-go.env.patch
 Patch6:         0006-Default-to-ld.bfd-on-ARM64.patch
 # Related: https://sourceware.org/bugzilla/show_bug.cgi?id=33204
 Patch7:         revert_dwarf5.patch
+Patch8:         skip-TestTerminalSignal-in-container.patch
 
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
@@ -747,6 +735,15 @@ fi
 
 %changelog
 ## START: Generated by rpmautospec
+* Wed Apr 22 2026 dbenoit <dbenoit@redhat.com> - 1.25.9-3
+- Do not ignore any tests in check
+
+* Wed Apr 22 2026 dbenoit <dbenoit@redhat.com> - 1.25.9-2
+- Skip terminal test in container
+
+* Wed Apr 22 2026 dbenoit <dbenoit@redhat.com> - 1.25.9-1
+- Update to Go 1.25.9 (fips-2)
+
 * Tue Mar 24 2026 dbenoit <dbenoit@redhat.com> - 1.25.8-1
 - Update to Go 1.25.8 (fips-1)
 
diff --git a/skip-TestTerminalSignal-in-container.patch b/skip-TestTerminalSignal-in-container.patch
new file mode 100644
index 0000000..17d9100
--- /dev/null
+++ b/skip-TestTerminalSignal-in-container.patch
@@ -0,0 +1,26 @@
+diff --git a/src/os/signal/signal_cgo_test.go b/src/os/signal/signal_cgo_test.go
+index abcdef1..abcdef2 100644
+--- a/src/os/signal/signal_cgo_test.go
++++ b/src/os/signal/signal_cgo_test.go
+@@ -17,6 +17,7 @@
+ 	"internal/syscall/unix"
+ 	"internal/testenv"
+ 	"internal/testpty"
++	"strings"
+ 	"os"
+ 	"os/signal"
+ 	"runtime"
+@@ -79,6 +80,13 @@
+ 		t.Skip("skipping: wait hangs on dragonfly; see https://go.dev/issue/56132")
+ 	}
+
++	// Check if we're in a container environment where wait4() might hang
++	if data, err := os.ReadFile("/proc/1/comm"); err == nil {
++		if strings.Contains(string(data), "podman") {
++			t.Skip("Skipping TestTerminalSignal in container environment - wait4() operations may hang")
++		}
++	}
++
+ 	scale := 1
+ 	if s := os.Getenv("GO_TEST_TIMEOUT_SCALE"); s != "" {
+ 		if sc, err := strconv.Atoi(s); err == nil {
diff --git a/sources b/sources
index dd6aaab..18f4549 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d
-SHA512 (go1.25.8-1-openssl-fips.tar.gz) = e5e3b0236bdb024bda4be625e5d2ea6c8d764273b672fc629e218f1da6e98efc5766217f4b51f713f66b7a0f621ce34cf432440193a592390dfe295f5937c852
-SHA512 (go1.25.8.src.tar.gz) = 2f5c9f314d18169985a9a4b19346e00dd5d4b396c8c17bfffe5719e51f27d834cc9649d0165f7eeb7367d3b6d384f49917325a40b49ba4da65e22f2c5362c739
+SHA512 (go1.25.9-2-openssl-fips.tar.gz) = 274f228ce8663525c9b80fb2a31f97bbd46c1bd4566a9835450b738fc6c10537a341bc399a3dbec77ea81f905842e3713e8e7132e5ff3664fa30df82130e7500
+SHA512 (go1.25.9.src.tar.gz) = b1a89da9f53db56f59716814adf412f10fcb7e72aa9fa0df216ad7200082731f18b449bc669d340f59b80355e66a6e2f156567a45ffd2e138df45bf8bce8dd8f