golang/0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch
Alejandro Sáez 3fe4f3f05f Update to go1.21rc3
Update bundled dependencies.
Update pcre-devel to pcre2-devel
Add go-filesystem
Remove skipping tests, related: https://github.com/golang/go/issues/39466
Remove 0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch, already merged
Rename 0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch to 0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch
Update 0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch
Update 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch

Resolves: rhbz#2128303
Resolves: rhbz#2215635
Resolves: rhbz#2172392
2023-07-14 18:20:36 +02:00

51 lines
1.4 KiB
Diff

From 34168586ca0af835b5e836b6fe458e2ff23a9820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Tue, 4 Jul 2023 18:12:14 +0200
Subject: [PATCH] Disable Google's proxy, sumdb and toolchain
---
go.env | 6 +++---
src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++---
2 files changed, 6 insertions(+), 6 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
diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
index 8698412f78..78e8e87700 100644
--- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt
+++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
@@ -2,12 +2,12 @@
env GOPROXY=
env GOSUMDB=
go env GOPROXY
-stdout '^https://proxy.golang.org,direct$'
+stdout '^direct$'
go env GOSUMDB
-stdout '^sum.golang.org$'
+stdout '^off$'
env GOPROXY=https://proxy.golang.org
go env GOSUMDB
-stdout '^sum.golang.org$'
+stdout '^off$'
# Download direct from github.
--
2.40.1