diff --git a/.gitignore b/.gitignore index d696a35..7914d97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/compiler-rt-18.1.8.src.tar.xz -SOURCES/go1.24.6-1-openssl-fips.tar.gz -SOURCES/go1.24.6.tar.gz +SOURCES/go1.25.3-1-openssl-fips.tar.gz +SOURCES/go1.25.3.tar.gz diff --git a/.golang.metadata b/.golang.metadata index 9884ea6..a2e5118 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1,3 +1,3 @@ 6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz -5a76a00182a4e6ee8bb5a75ea99e545a10e09c39 SOURCES/go1.24.6-1-openssl-fips.tar.gz -e156513b78ffa159c033bec54675cc3dd2fe9101 SOURCES/go1.24.6.tar.gz +eb585257c57d2644a89c43d5fa277f78df3ab8c9 SOURCES/go1.25.3-1-openssl-fips.tar.gz +22eae00c75c7739a710b07eb4d2a4e96c89c479e SOURCES/go1.25.3.tar.gz diff --git a/SOURCES/revert_dwarf5.patch b/SOURCES/revert_dwarf5.patch new file mode 100644 index 0000000..80a58bb --- /dev/null +++ b/SOURCES/revert_dwarf5.patch @@ -0,0 +1,42 @@ +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 +--- a/src/internal/buildcfg/exp.go ++++ b/src/internal/buildcfg/exp.go +@@ -67,24 +67,13 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) { + regabiSupported = true + } + +- // Older versions (anything before V16) of dsymutil don't handle +- // the .debug_rnglists section in DWARF5. See +- // https://github.com/golang/go/issues/26379#issuecomment-2677068742 +- // for more context. This disables all DWARF5 on mac, which is not +- // ideal (would be better to disable just for cases where we know +- // the build will use external linking). In the GOOS=aix case, the +- // XCOFF format (as far as can be determined) doesn't seem to +- // 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 + diff --git a/SPECS/golang.spec b/SPECS/golang.spec index f7e80a3..8a98004 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -92,8 +92,8 @@ %global gohostarch s390x %endif -%global go_api 1.24 -%global go_version 1.24.6 +%global go_api 1.25 +%global go_version 1.25.3 %global version %{go_version} %global pkg_release 1 @@ -101,7 +101,7 @@ %global llvm_compiler_rt_version 18.1.8 Name: golang -Version: %{version} +Version: %{version} Release: 1%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain @@ -154,6 +154,8 @@ Patch1939923: skip_test_rhbz1939923.patch Patch4: modify_go.env.patch Patch6: skip_TestCrashDumpsAllThreads.patch +# Related: https://sourceware.org/bugzilla/show_bug.cgi?id=33204 +Patch7: revert_dwarf5.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -332,6 +334,7 @@ export GOROOT_FINAL=%{goroot} export GOHOSTOS=linux export GOHOSTARCH=%{gohostarch} +export GOAMD64=v2 pushd src # use our gcc options for this build, but store gcc as default for compiler @@ -341,6 +344,7 @@ export CC="gcc" export CC_FOR_TARGET="gcc" export GOOS=linux export GOARCH=%{gohostarch} +export GOAMD64=v2 DEFAULT_GO_LD_FLAGS="" %if !%{external_linker} @@ -478,6 +482,7 @@ go env export CC="gcc" export CFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" +export GOAMD64=v2 %if !%{external_linker} export GO_LDFLAGS="-linkmode internal" %else @@ -585,36 +590,60 @@ cd .. %endif %changelog +* Wed Oct 29 2025 Alejandro Sáez - 1.25.3-1 +- Update to Go 1.25.3 +- Resolves: RHEL-121220 + +* Mon Sep 29 2025 Archana Ravindar - 1.25.1-1 +- Update to Go 1.25.1 +- Resolves: RHEL-116850 + +* Fri Sep 12 2025 Alejandro Sáez - 1.25.0-2 +- Revert DWARF5 defaults +- Add elf5 to rpminspect.yaml +- Related: RHEL-109557 + +* Wed Aug 20 2025 Alejandro Sáez - 1.25.0-1 +- Update to Go 1.25.0 +- Set GOAMD64 to v2 to align with new architecture baselines +- Modify the modify_go.env.patch to reflect GOAMD64 baseline version change to v2 +- Resolves: RHEL-109557 + * Wed Aug 13 2025 David Benoit - 1.24.6-1 - Update to Go 1.24.6 (fips-1) -- Resolves: RHEL-106464 +- Resolves: RHEL-106461 + +* Mon Jul 21 2025 David Benoit - 1.24.4-3 +- Re-enable debguginfo and waive rpminspect result +- Resolves: RHEL-101454 + +* Thu Jun 26 2025 Alejandro Sáez - 1.24.4-2 +- Add LD_FLAGS for stripping binaries +- Resolves: RHEL-93238 * Fri Jun 13 2025 David Benoit - 1.24.4-1 - Update to Go 1.24.4 (fips-1) -- Resolves: RHEL-101074 +- Resolves: RHEL-95998 -* Thu Jun 12 2025 Archana - 1.23.10-1 -- Update to Go 1.23.10 -- Fix for CVE-2025-4673, CVE-2025-0913, and CVE-2025-22874 -- Resolves: RHEL-96000 +* Mon Jun 02 2025 David Benoit - 1.24.3-3 +- Update to Go 1.24.3 (fips-3) +- Fix linkage issue in bin/go +- Fix loading issue in non-fips mode +- Related: RHEL-83439 +- Related: RHEL-87632 -* Fri May 30 2025 Alejandro Sáez - 1.23.9-1 -- Update to Go 1.23.9 -- Remove runtime-usleep-s390x.patch, already merged -- Resolves: RHEL-93212 +* Thu May 29 2025 David Benoit - 1.24.3-2 +- Update to Go 1.24.3 (fips-2) +- Resolves: RHEL-87632 -* Fri May 30 2025 Alejandro Sáez - 1.23.9-1 -- Update to Go 1.23.9 -- Remove runtime-usleep-s390x.patch, already merged -- Resolves: RHEL-93212 - -* Thu Feb 27 2025 David Benoit - 1.23.6-2 -- Fix runtime usleep issue on s390x (runtime-usleep-s390x.patch) -- Resolves: RHEL-81242 - -* Thu Feb 20 2025 David Benoit - 1.23.6-1 -- Update to Go 1.23.6 (fips-1) -- Resolves: RHEL-80344 +* Thu May 08 2025 David Benoit - 1.24.3-1 +- Update to Go 1.24.3 (fips-1) +- Exclude TestEd25519Vectors, TestACVP which require network +- Resolves: RHEL-83439 +- Resolves: RHEL-85268 +- Resolves: RHEL-87632 +- Resolves: RHEL-91312 +- Resolves: RHEL-92023 * Thu Jan 09 2025 David Benoit - 1.23.4-1 - Update to Go 1.23.4 (fips-1)