From 78a6d8f673e15b7c499544b8d09a8f44d2979896 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Tue, 19 May 2026 15:08:53 -0400 Subject: [PATCH] import CS golang-1.26.2-2.el10 --- .gitignore | 4 +-- golang.spec | 67 +++++++++++++++++++++++++++++++++------------ revert_dwarf5.patch | 35 +++++++---------------- sources | 4 +-- 4 files changed, 64 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 51d99ce..190e67c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ compiler-rt-18.1.8.src.tar.xz -go1.25.9-2-openssl-fips.tar.gz -go1.25.9.src.tar.gz +go1.26.2-2-openssl-fips.tar.gz +go1.26.2.src.tar.gz diff --git a/golang.spec b/golang.spec index 7f312a7..4ace6e1 100644 --- a/golang.spec +++ b/golang.spec @@ -1,8 +1,8 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.8.3) +## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 3; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -109,10 +109,10 @@ %global gohostarch riscv64 %endif -%global go_api 1.25 +%global go_api 1.26 # Use only for prerelease versions #global go_prerelease rc3 -%global go_patch 9 +%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 @@ -369,8 +369,8 @@ rm -rf src/crypto/internal/boring/syso # Add --no-backup-if-mismatch option to avoid creating .orig temp files patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches" for p in "$patch_dir"/*.patch; do - echo "Applying $p" - patch --no-backup-if-mismatch -p1 < $p + echo "Applying $p" + patch --no-backup-if-mismatch -p1 < $p done # Configure crypto tests @@ -640,9 +640,9 @@ echo "=== Start testing ===" echo "=== Run all crypto test skipping tls ===" pushd crypto # run all crypto tests but skip tls, we will run fips specific tls tests later - go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP" + go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP|TestGCMNoncesFIPSV126|TestGCMNoncesFIPSV1|TestWithoutEnforcement|TestCASTPasses|TestCASTFailures|TestIntegrityCheck|TestBetterTLS" # check that signature functions have parity between boring and notboring - CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP" + CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP|TestGCMNoncesFIPSV126|TestGCMNoncesFIPSV1|TestWithoutEnforcement|TestCASTPasses|TestCASTFailures|TestIntegrityCheck|TestBetterTLS" popd echo "=== Run tls tests ===" # run all fips specific tls tests @@ -735,20 +735,53 @@ fi %changelog ## START: Generated by rpmautospec -* Wed Apr 22 2026 dbenoit - 1.25.9-3 +* Wed Apr 22 2026 dbenoit - 1.26.2-2 - Do not ignore any tests in check -* Wed Apr 22 2026 dbenoit - 1.25.9-2 -- Skip terminal test in container +* Wed Apr 22 2026 dbenoit - 1.26.2-1 +- Update to Go 1.26.2 (fips-2) -* Wed Apr 22 2026 dbenoit - 1.25.9-1 -- Update to Go 1.25.9 (fips-2) - -* Tue Mar 24 2026 dbenoit - 1.25.8-1 -- Update to Go 1.25.8 (fips-1) +* Wed Mar 25 2026 Alejandro Sáez - 1.26.1-1 +- Update to Go 1.26.1 * Thu Feb 12 2026 dbenoit - 1.25.7-1 -- Rebase to latest rhel-10-main (170a5b7e084) +- Update to Go 1.25.7 (fips-1) + +* Mon Jan 19 2026 dbenoit - 1.25.5-1 +- Update to Go 1.25.5 (fips-1) + +* Wed Dec 17 2025 Edjunior Machado - 1.25.3-5 +- gating.yaml: Add tier1 s390x tests + +* Wed Dec 10 2025 Alejandro Sáez - 1.25.3-4 +- Cleanup lib/ ownership +- Remove legacy logic forcing lib/ into golang-tests +- Move lib/wasm, lib/fips140, and lib/time to main golang package +- Fixes go_js_wasm_exec availability + +* Tue Dec 09 2025 Edjunior Machado - 1.25.3-3 +- plans/tier0.fmf: Import plan + +* Tue Dec 09 2025 Edjunior Machado - 1.25.3-2 +- rpminspect.yaml: Add testdata to annocheck ignore + +* Wed Oct 29 2025 Alejandro Sáez - 1.25.3-1 +- Update to Go 1.25.3 + +* Tue Sep 30 2025 Archana - 1.25.1-1 +- Update to Go1.25.1 -Resolves: RHEL-116849 + +* Thu Sep 11 2025 Louis Abel - 1.25.0-5 +- Disable race for risv64 + +* Wed Sep 10 2025 Alejandro Sáez - 1.25.0-4 +- Revert DWARF5 defaults + +* Fri Sep 05 2025 Edjunior Machado - 1.25.0-3 +- Update CI support + +* Fri Aug 29 2025 Edjunior Machado - 1.25.0-2 +- rpminspect.yaml: Add preprofile binary as it contains debugging symbols * Wed Aug 20 2025 Alejandro Sáez - 1.25.0-1 - Update to Go 1.25.0 diff --git a/revert_dwarf5.patch b/revert_dwarf5.patch index 80a58bb..939c7eb 100644 --- a/revert_dwarf5.patch +++ b/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/sources b/sources index 18f4549..8d25beb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d -SHA512 (go1.25.9-2-openssl-fips.tar.gz) = 274f228ce8663525c9b80fb2a31f97bbd46c1bd4566a9835450b738fc6c10537a341bc399a3dbec77ea81f905842e3713e8e7132e5ff3664fa30df82130e7500 -SHA512 (go1.25.9.src.tar.gz) = b1a89da9f53db56f59716814adf412f10fcb7e72aa9fa0df216ad7200082731f18b449bc669d340f59b80355e66a6e2f156567a45ffd2e138df45bf8bce8dd8f +SHA512 (go1.26.2-2-openssl-fips.tar.gz) = 3b086cd73f7520eb786b866043c31f0d6a75294fbbee9390adb688ee7dd5666183789897cb9ac7dfbaa993310ae6decec9889eecb4c3f0bd708b1d660e3330c9 +SHA512 (go1.26.2.src.tar.gz) = 370773727c0e6fbf0acd534726938aaaa03ff785f0634c258c94a7a896e9a27acc0ba57120967f711a942e9e275cec46251a194d6f84ba15f28b5dcf0efed673