Rebase to Go 1.21.7

Set GOTOOLCHAIN to local

Resolves: RHEL-24334
Resolves: RHEL-18364
Resolves: RHEL-18365
This commit is contained in:
Alejandro Sáez 2024-02-09 19:10:12 +01:00
parent 327b3e2c7d
commit 99bbf0eb77
4 changed files with 37 additions and 5 deletions

2
.gitignore vendored
View File

@ -64,3 +64,5 @@
/go1.21.3.tar.gz
/go1.21.4.tar.gz
/go1.21.4-1-openssl-fips.tar.gz
/go1.21.7.tar.gz
/go1.21.7-1-openssl-fips.tar.gz

View File

@ -93,13 +93,13 @@
%endif
%global go_api 1.21
%global go_version 1.21.4
%global go_version 1.21.7
%global version %{go_version}
%global pkg_release 1
Name: golang
Version: %{version}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: The Go Programming Language
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
License: BSD and Public Domain
@ -147,6 +147,7 @@ Patch1939923: skip_test_rhbz1939923.patch
# are incompatible with dlopen in golang-fips
Patch2: disable_static_tests_part1.patch
Patch3: disable_static_tests_part2.patch
Patch4: modify_go.env.patch
# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
@ -240,7 +241,7 @@ Requires: %{name} = %{version}-%{release}
%package -n go-toolset
Summary: Package that installs go-toolset
Requires: %{name} = %{version}-%{release}
%ifarch x86_64
%ifarch x86_64 aarch64 ppc64le
Requires: delve
%endif
@ -528,6 +529,13 @@ cd ..
%files -n go-toolset
%changelog
* Fri Feb 09 2024 Alejandro Sáez <asm@redhat.com> - 1.21.7-1
- Rebase to Go 1.21.7
- Set GOTOOLCHAIN to local
- Resolves: RHEL-24334
- Resolves: RHEL-18364
- Resolves: RHEL-18365
* Thu Nov 30 2023 Alejandro Sáez <asm@redhat.com> - 1.21.4-2
- Add release information

22
modify_go.env.patch Normal file
View File

@ -0,0 +1,22 @@
From eab9004c072200e58df83ab94678bda1faa7b229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Fri, 9 Feb 2024 20:06:16 +0100
Subject: [PATCH] Set GOTOOLCHAIN to local
---
go.env | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/go.env b/go.env
index 6ff2b921d4..e87f6e7b6d 100644
--- a/go.env
+++ b/go.env
@@ -9,4 +9,4 @@ GOSUMDB=sum.golang.org
# Automatically download newer toolchains as directed by go.mod files.
# See https://go.dev/doc/toolchain for details.
-GOTOOLCHAIN=auto
+GOTOOLCHAIN=local
--
2.43.0

View File

@ -1,2 +1,2 @@
SHA512 (go1.21.4.tar.gz) = e4dda45bbd1714c3c0077074d5fe2ae748ef3e848def62ff01de1595ad74bee2c3a8a20f5afe6aa97db7a82ee17f90f3c96a77d40d89d09c17f3edcd9ca71dd1
SHA512 (go1.21.4-1-openssl-fips.tar.gz) = 40d794fe7ea00233d0a4c9f0fe7e53b045f6279ebba1b183ef01c9961787a0d47c6c72213e00c2bb2fc5c47fc9ff352252c71a0e4703a5c548767a3aa9451de5
SHA512 (go1.21.7.tar.gz) = 367fdc64475b2c7f639fdc74b2934594ae787def78048897159b42275adb11bee7169cda12d87dd62b3fc66e2d6fdf96c6fe6afa39c700c6e398117a7c82bbf2
SHA512 (go1.21.7-1-openssl-fips.tar.gz) = 6dba839d045a7f820cef25c638b7b4545779af46a855916027d28d3014b06f481271ebebe34ee33d4a9506f376c13cf8ee03e78d8b71764f3c6676f46dc82e11