import CS golang-1.21.7-2.module_el8+1005+ea39424f

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/go1.20.12-2-openssl-fips.tar.gz
+SOURCES/go1.21.7-1-openssl-fips.tar.gz
-SOURCES/go1.20.12.tar.gz
+SOURCES/go1.21.7.tar.gz

.golang.metadata

@@ -1,2 +1,2 @@
-f57205df5fc5d2e0392ca39c795c6d60d22f0c80 SOURCES/go1.20.12-2-openssl-fips.tar.gz
+95372ec41602b3cbe44e4697a8aee799b7fcc9b2 SOURCES/go1.21.7-1-openssl-fips.tar.gz
-6d5bc127443fc42b1af8d9ba4115abe18554feb7 SOURCES/go1.20.12.tar.gz
+1b5c56fdf9030baaa0601ca6f2cbd36ae02433d0 SOURCES/go1.21.7.tar.gz

SOURCES/disable_static_tests_part2.patch

@@ -1,13 +1,13 @@
 diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index 9f26606..2408505 100644
+index 36a20e8b2a..8c2dd1b44b 100644
 --- a/src/cmd/dist/test.go
 +++ b/src/cmd/dist/test.go
-@@ -1259,7 +1259,7 @@ func (t *tester) registerCgoTests() {
+@@ -1125,7 +1125,7 @@ func (t *tester) registerCgoTests(heading string) {
  			} else {
  				panic("unknown linkmode with static build: " + linkmode)
  			}
 -			gt.tags = append(gt.tags, "static")
 +			gt.tags = append(gt.tags, "static", "no_openssl")
  		}
+ 		gt.ldflags = strings.Join(ldflags, " ")
  
- 		t.registerTest("cgo:"+name, "../misc/cgo/test", gt, opts...)

SOURCES/modify_go.env.patch

@@ -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
+

SPECS/golang.spec

@@ -56,7 +56,7 @@
 %endif
 
 # Controls what ever we fail on failed tests
-%ifarch x86_64 %{arm} aarch64 ppc64le s390x
+%ifarch x86_64 %{arm} ppc64le s390x
 %global fail_on_tests 1
 %else
 %global fail_on_tests 0
@@ -91,13 +91,13 @@
 %global gohostarch  s390x
 %endif
 
-%global go_api 1.20
+%global go_api 1.21
-%global version 1.20.12
+%global version 1.21.7
-%global pkg_release 2
+%global pkg_release 1
 
 Name:           golang
 Version:        %{version}
-Release:        8%{?dist}
+Release:        2%{?dist}
 
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -137,17 +137,16 @@ Requires:       %{name}-src = %{version}-%{release}
 Requires:       openssl-devel
 Requires:       diffutils
 
-
 # Proposed patch by jcajka https://golang.org/cl/86541
 Patch221:       fix_TestScript_list_std.patch
-Patch222:	skip-test-overlong-message.patch
+Patch229:       fix-memleak-setupRSA.patch
 
 Patch1939923:   skip_test_rhbz1939923.patch
 
 Patch2:		disable_static_tests_part1.patch
 Patch3:		disable_static_tests_part2.patch
-
+Patch4:		skip-test-overlong-message.patch
-Patch229:	fix-memleak-rsa-ecdh.patch
+Patch5:		modify_go.env.patch
 
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
@@ -244,10 +243,9 @@ Requires:       %{name} = %{version}-%{release}
 pushd ..
 tar -xf %{SOURCE1}
 popd
-
+patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch
-for patch in ../go-go%{version}-%{pkg_release}-openssl-fips/patches/*.patch; do
+patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch
-  patch -p1 < "${patch}"
+patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch
-done
 
 # Configure crypto tests
 pushd ../go-go%{version}-%{pkg_release}-openssl-fips
@@ -255,16 +253,9 @@ ln -s ../go-go%{version} go
 ./scripts/configure-crypto-tests.sh
 popd
 
-%patch2 -p1
+%autopatch -p1
-%patch3 -p1
-
-%patch221 -p1
-%patch222 -p1
-
-%patch229 -p1
-
-%patch1939923 -p1
 
+sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION
 
 cp %{SOURCE2} ./src/runtime/
 
@@ -335,7 +326,7 @@ rm -rf pkg/bootstrap/bin
 
 # install everything into libdir (until symlink problems are fixed)
 # https://code.google.com/p/go/issues/detail?id=5830
-cp -apv api bin doc lib pkg src misc test VERSION \
+cp -apv api bin doc lib pkg src misc test go.env VERSION \
    $RPM_BUILD_ROOT%{goroot}
 
 # bz1099206
@@ -520,38 +511,44 @@ cd ..
 %files -f go-pkg.list bin
 %{_bindir}/go
 %{_bindir}/gofmt
+%{goroot}/go.env
 
 %if %{shared}
 %files -f go-shared.list shared
 %endif
 
 %changelog
-* Wed Apr 10 2024 David Benoit <dbenoit@redhat.com> - 1.20.12-8
+* Mon Apr 1 2024 Archana Ravindar <aravinda@redhat.com> - 1.21.7-2
-- Update sources file
-- Related: RHEL-27928
-
-* Tue Apr 09 2024 David Benoit <dbenoit@redhat.com> - 1.20.12-7
 - Fix CVE-2024-1394
-- Resolves: RHEL-27928
+- Resolves RHEL-24300
 
-* Mon Apr 08 2024 Derek Parker <deparker@redhat.com> - 1.20.12-6
+* Tue Feb 13 2024 Alejandro Sáez <asm@redhat.com> - 1.21.7-1
-- Fix CVE-2023-45288
+- Rebase to Go 1.21.7
-- Resolves: RHEL-31914
+- Add release information
+- Set GOTOOLCHAIN to local
+- Skip TestOverlongMessagePKCS1v15
+- Resolves: RHEL-24082
+- Resolves: RHEL-18363
+- Resolves: RHEL-18382
 
-* Wed Dec 13 2023 David Benoit <dbenoit@redhat.com> - 1.20.12-2
+* Wed Nov 08 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-4
-- Fix sources file
+- Do not remove GOPROXY/GOSUMDB
-- Related: RHEL-19231
+- Related: RHEL-12620
 
-* Tue Dec 12 2023 David Benoit <dbenoit@redhat.com> - 1.20.12-1
+* Thu Nov 02 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-3
-- Update to Go 1.20.12
+- Fix go.env in Go 1.21
-- Fix CVE-2023-39326
+- Related: RHEL-12620
-- Resolves: RHEL-19231
 
-* Fri Oct 13 2023 David Benoit <dbenoit@redhat.com> - 1.20.10-1
+* Tue Oct 31 2023 Archana Ravindar <aravinda@redhat.com> - 1.21.3-2
-- Update to Go 1.20.10
+- Rebase disable_static_tests_part2.patch to Go 1.21.3
-- Fix CVE-2023-39325
+- Add missing strict fips runtime detection patch
-- Midstream patches
+- Temporarily disable FIPS tests on aarch64 due to builder kernel bugs
-- Resolves: RHEL-12619
+- Remove fix-memory-leak patch as it is fixed upstream
+- Resolves: RHEL-12620
+
+* Fri Oct 20 2023 Archana Ravindar <aravinda@redhat.com> - 1.21.3-1
+- Rebase Go to 1.21.3
+- Resolves: RHEL-12620
 
 * Mon Aug 14 2023 Alejandro Sáez <asm@redhat.com> - 1.20.6-2
 - Retire golang-race package