diff --git a/0001-fedora-Modify-go.env.patch b/0001-fedora-Modify-go.env.patch deleted file mode 100644 index d0b18c7..0000000 --- a/0001-fedora-Modify-go.env.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 52d9cfec8124a9c7382bed5284246d9b18a21eb4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= -Date: Wed, 16 Aug 2023 07:06:38 +0200 -Subject: [PATCH] Modify go.env - -Change GOPROXY, GOSUMDB, and GOTOOLCHAIN ---- - go.env | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/go.env b/go.env -index 6ff2b921d4..087208cd7c 100644 ---- a/go.env -+++ b/go.env -@@ -4,9 +4,9 @@ - - # Use the Go module mirror and checksum database by default. - # See https://proxy.golang.org for details. --GOPROXY=https://proxy.golang.org,direct --GOSUMDB=sum.golang.org -+GOPROXY=direct -+GOSUMDB=off - - # Automatically download newer toolchains as directed by go.mod files. - # See https://go.dev/doc/toolchain for details. --GOTOOLCHAIN=auto -+GOTOOLCHAIN=local --- -2.41.0 - diff --git a/golang.spec b/golang.spec index c3b98ff..6b96d6f 100644 --- a/golang.spec +++ b/golang.spec @@ -99,7 +99,7 @@ Name: golang Version: %{version} -Release: 4%{?dist} +Release: 5%{?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 @@ -138,9 +138,6 @@ Requires: %{name}-src = %{version}-%{release} Requires: openssl-devel Requires: diffutils -Patch0001: 0001-fedora-Modify-go.env.patch - - # Proposed patch by jcajka https://golang.org/cl/86541 Patch221: fix_TestScript_list_std.patch @@ -529,8 +526,12 @@ cd .. %files -n go-toolset %changelog +* Wed Nov 08 2023 David Benoit - 1.21.3-5 +- Don't change GOPROXY/GOSUMDB +- Related: RHEL-12624 + * Thu Nov 02 2023 David Benoit - 1.21.3-4 -- Fix missin go.env in Go 1.21 +- Fix missing go.env in Go 1.21 - Related: RHEL-12624 * Tue Oct 31 2023 Archana Ravindar - 1.21.3-3