From 8f85706b8bb15edeb301280f073a364236244394 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Tue, 19 May 2026 20:37:50 -0400 Subject: [PATCH] import UBI golang-1.26.2-1.el9_8 --- .gitignore | 4 ++-- .golang.metadata | 4 ++-- SOURCES/revert_dwarf5.patch | 35 ++++++++++------------------------- SPECS/golang.spec | 35 ++++++++++++++++------------------- 4 files changed, 30 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 86314e8..5b85818 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/compiler-rt-18.1.8.src.tar.xz -SOURCES/go1.25.9-2-openssl-fips.tar.gz -SOURCES/go1.25.9.tar.gz +SOURCES/go1.26.2-2-openssl-fips.tar.gz +SOURCES/go1.26.2.tar.gz diff --git a/.golang.metadata b/.golang.metadata index ada277f..1da1ea2 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1,3 +1,3 @@ 6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz -f540271534682b92a0964612c025f1c53631cfcf SOURCES/go1.25.9-2-openssl-fips.tar.gz -7736ef09d6dda8418d0c27db3d995db98c790797 SOURCES/go1.25.9.tar.gz +c2a920517029583c71821c26bbb8ca6c0747662e SOURCES/go1.26.2-2-openssl-fips.tar.gz +b01eed6d11011e1168a2c273354a6b01c717d2ad SOURCES/go1.26.2.tar.gz diff --git a/SOURCES/revert_dwarf5.patch b/SOURCES/revert_dwarf5.patch index 80a58bb..939c7eb 100644 --- a/SOURCES/revert_dwarf5.patch +++ b/SOURCES/revert_dwarf5.patch @@ -1,17 +1,8 @@ -From e90ae9076a108b83c645814f75a574c14a5a4b98 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= -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 +index aa41986..f1a8ba8 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) { +@@ -69,21 +69,11 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) { regabiSupported = true } @@ -25,18 +16,12 @@ index 689ca8ce58..b2ea97481b 100644 - // 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 - + baseline := goexperiment.Flags{ + RegabiWrappers: regabiSupported, + RegabiArgs: regabiSupported, +- Dwarf5: dwarf5Supported, ++ Dwarf5: false, + RandomizedHeapBase64: true, + GreenTeaGC: true, + } diff --git a/SPECS/golang.spec b/SPECS/golang.spec index c608d5c..41a5d65 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -92,8 +92,8 @@ %global gohostarch s390x %endif -%global go_api 1.25 -%global go_version 1.25.9 +%global go_api 1.26 +%global go_version 1.26.2 %global version %{go_version} %global pkg_release 2 @@ -519,9 +519,10 @@ export GOLANG_FIPS=1 export OPENSSL_FORCE_FIPS_MODE=1 pushd crypto # Run all crypto tests but skip TLS, we will run FIPS specific TLS tests later - go test -timeout 50m $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP" + FIPS_SKIP="TestEd25519Vectors|TestACVP|TestGCMNoncesFIPSV126|TestGCMNoncesFIPSV1|TestWithoutEnforcement|TestCASTPasses|TestCASTFailures|TestIntegrityCheck|TestBetterTLS" + go test -timeout 50m $(go list ./... | grep -v tls) -v -skip="$FIPS_SKIP" # Check that signature functions have parity between boring and notboring - CGO_ENABLED=0 go test -timeout 50m $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP" + CGO_ENABLED=0 go test -timeout 50m $(go list ./... | grep -v tls) -v -skip="$FIPS_SKIP" popd # Run all FIPS specific TLS tests pushd crypto/tls @@ -600,41 +601,37 @@ cd .. %endif %changelog -* Wed Apr 22 2026 dbenoit - 1.25.9-1 -- Update to Go 1.25.9 (fips-2) -- Resolves: RHEL-169931 +* Wed Apr 22 2026 dbenoit - 1.26.2-1 +- Update to Go 1.26.2 (fips-2) +- Resolves: RHEL-169929 -* Tue Mar 24 2026 dbenoit - 1.25.8-2 -- Update to Go 1.25.8 (fips-1) -- Resolves: RHEL-157451 +* Fri Mar 27 2026 Alejandro Sáez - 1.26.1-1 +- Update to Go 1.26.1 +- Resolves: RHEL-153434 * Thu Feb 12 2026 dbenoit - 1.25.7-1 - Update to Go 1.25.7 (fips-1) -- Resolves: RHEL-146476 - -* Tue Jan 20 2026 dbenoit - 1.25.5-2 -- Rebase to rhel-9-main -- Related: RHEL-139366 +- Resolves: RHEL-146452 * Mon Jan 19 2026 dbenoit - 1.25.5-1 - Update to Go 1.25.5 (fips-1) -- Resolves: RHEL-139366 +- Resolves: RHEL-139364 * Fri Dec 19 2025 Alejandro Sáez - 1.25.3-2 - Cleanup lib/ ownership * Wed Oct 29 2025 Alejandro Sáez - 1.25.3-1 - Update to Go 1.25.3 -- Related: RHEL-139366 +- Resolves: RHEL-121220 * Mon Sep 29 2025 Archana Ravindar - 1.25.1-1 - Update to Go 1.25.1 -- Related: RHEL-139366 +- Resolves: RHEL-116850 * Fri Sep 12 2025 Alejandro Sáez - 1.25.0-2 - Revert DWARF5 defaults - Add elf5 to rpminspect.yaml -- Related: RHEL-139366 +- Related: RHEL-109557 * Wed Aug 20 2025 Alejandro Sáez - 1.25.0-1 - Update to Go 1.25.0