From f36ef671fb8b0eee8d5fc2c397a99fc8bef84d26 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Sun, 31 May 2026 22:49:29 -0400 Subject: [PATCH] import UBI golang-1.26.3-1.el9_8 --- .gitignore | 4 ++-- .golang.metadata | 4 ++-- SPECS/golang.spec | 35 ++++++++++++++++++++++++++++++----- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5b85818..225b980 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/compiler-rt-18.1.8.src.tar.xz -SOURCES/go1.26.2-2-openssl-fips.tar.gz -SOURCES/go1.26.2.tar.gz +SOURCES/go1.26.3-1-openssl-fips.tar.gz +SOURCES/go1.26.3.tar.gz diff --git a/.golang.metadata b/.golang.metadata index 1da1ea2..fa81c05 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1,3 +1,3 @@ 6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz -c2a920517029583c71821c26bbb8ca6c0747662e SOURCES/go1.26.2-2-openssl-fips.tar.gz -b01eed6d11011e1168a2c273354a6b01c717d2ad SOURCES/go1.26.2.tar.gz +526321621c7dcb76556f42fd0478f714e190f09c SOURCES/go1.26.3-1-openssl-fips.tar.gz +fae5b1aa67c7199612f9b0009f10ae8cd979d29e SOURCES/go1.26.3.tar.gz diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 41a5d65..b49075a 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -92,10 +92,24 @@ %global gohostarch s390x %endif +# Set the RHEL architecture baseline. +%if 0%{?rhel} < 9 +%global goamd64 v1 +%global goppc64 power8 +%else +%if 0%{?rhel} < 10 +%global goamd64 v2 +%global goppc64 power8 +%else +%global goamd64 v3 +%global goppc64 power9 +%endif +%endif + %global go_api 1.26 -%global go_version 1.26.2 +%global go_version 1.26.3 %global version %{go_version} -%global pkg_release 2 +%global pkg_release 1 # LLVM compiler-rt version for race detector %global llvm_compiler_rt_version 18.1.8 @@ -275,6 +289,13 @@ popd sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION +# Historically the ISA baselines have been set in modify-go.env.patch. +# This will prevent us sharing a specfile across major RHEL versions. +# As such, we must override the baselines set in the patch file. +sed -iE "s/^.*baseline for RHEL.*$//" go.env +sed -i "s/GOAMD64=.*/GOAMD64=%{goamd64}/" go.env +sed -i "s/GOPPC64=.*/GOPPC64=%{goppc64}/" go.env + cp %{SOURCE2} ./src/runtime/ # Delete the bundled race detector objects. find ./src/runtime/race/ -name "race_*.syso" -exec rm {} \; @@ -335,7 +356,7 @@ export GOROOT_FINAL=%{goroot} export GOHOSTOS=linux export GOHOSTARCH=%{gohostarch} -export GOAMD64=v2 +export GOAMD64=%{goamd64} pushd src # use our gcc options for this build, but store gcc as default for compiler @@ -345,7 +366,7 @@ export CC="gcc" export CC_FOR_TARGET="gcc" export GOOS=linux export GOARCH=%{gohostarch} -export GOAMD64=v2 +export GOAMD64=%{goamd64} DEFAULT_GO_LD_FLAGS="" %if !%{external_linker} @@ -492,7 +513,7 @@ go env export CC="gcc" export CFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" -export GOAMD64=v2 +export GOAMD64=%{goamd64} %if !%{external_linker} export GO_LDFLAGS="-linkmode internal" %else @@ -601,6 +622,10 @@ cd .. %endif %changelog +* Tue May 12 2026 dbenoit - 1.26.3-1 +- Update to Go 1.26.3 (fips-1) +- Resolves: RHEL-175607 + * Wed Apr 22 2026 dbenoit - 1.26.2-1 - Update to Go 1.26.2 (fips-2) - Resolves: RHEL-169929