Update to Go 1.22.3

Remove re-enable-cgo patch, it's already included in upstream

Resolves: RHEL-35629
Resolves: RHEL-35882
Resolves: RHEL-35074
This commit is contained in:
Alejandro Sáez 2024-05-22 14:10:16 +02:00
parent fff4ad9ce8
commit 1b54720e99
4 changed files with 5 additions and 35 deletions

2
.gitignore vendored
View File

@ -145,3 +145,5 @@
/go1.22.1-2-openssl-fips.tar.gz
/go1.22.2.src.tar.gz
/go1.22.2-1-openssl-fips.tar.gz
/go1.22.3.src.tar.gz
/go1.22.3-1-openssl-fips.tar.gz

View File

@ -104,7 +104,7 @@
%global go_api 1.22
# Use only for prerelease versions
#global go_prerelease rc3
%global go_patch 2
%global go_patch 3
%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
@ -186,7 +186,6 @@ Requires: %{name}-src = %{version}-%{release}
Patch1: 0001-Modify-go.env.patch
Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch
Patch5: re-enable-cgo.patch
# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4

View File

@ -1,31 +0,0 @@
From 09ff18f22def1766faa746df87e57d5b68454246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Tue, 5 Mar 2024 10:03:13 +0100
Subject: [PATCH] Re-enable CGO in cmd/go and cmd/pprof
---
src/cmd/dist/build.go | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 32e59b446a..941abdcebd 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1304,13 +1304,6 @@ func timelog(op, name string) {
// to switch between the host and target configurations when cross-compiling.
func toolenv() []string {
var env []string
- if !mustLinkExternal(goos, goarch, false) {
- // Unless the platform requires external linking,
- // we disable cgo to get static binaries for cmd/go and cmd/pprof,
- // so that they work on systems without the same dynamic libraries
- // as the original build system.
- env = append(env, "CGO_ENABLED=0")
- }
if isRelease || os.Getenv("GO_BUILDER_NAME") != "" {
// Add -trimpath for reproducible builds of releases.
// Include builders so that -trimpath is well-tested ahead of releases.
--
2.43.2

View File

@ -1,2 +1,2 @@
SHA512 (go1.22.2.src.tar.gz) = f2491d2b5d4ef2dd86ca7820503a2534cd1860822049dc01a6cb40b556a0812cfc4196fa83173765816060253ac949f4165b0fb4b2bed5d45e30d03bb69e434d
SHA512 (go1.22.2-1-openssl-fips.tar.gz) = 01a7924f86be2030207b32bbac5b0b4f5b5e8430349eb1d0a1ade8a48536e4402fdf000f8c07e7bd270df338e5f97553f6933045ad96411aa9b2dfd7f127d280
SHA512 (go1.22.3.src.tar.gz) = e6756866d3cf195f1afd3d852015f32dfb2de3648e30a78e9238a863eae192e9e7ccbcfd19fd97b1d552f35d51d62bf2104d81e35b8854a40400b0d61cf93672
SHA512 (go1.22.3-1-openssl-fips.tar.gz) = a666fffd3459598b0ac7b93e5dd9d3925877fc5cc6a140bf6e97831013204b13224149f888e2bd3ef0e2629d46ac838aacd40a8668606c50342556b506a9a5d6