|
 |
29d5602 |
From 014cbe9e8cdc1a5f78f3e792309133eaaabdfc8f Mon Sep 17 00:00:00 2001
|
|
|
29d5602 |
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
|
|
|
29d5602 |
Date: Mon, 27 May 2019 15:12:53 +0200
|
|
|
29d5602 |
Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb
|
|
|
29d5602 |
|
|
|
29d5602 |
---
|
|
|
29d5602 |
src/cmd/go/internal/cfg/cfg.go | 4 ++--
|
|
|
29d5602 |
src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++---
|
|
|
29d5602 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
29d5602 |
|
|
|
29d5602 |
diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
|
|
|
29d5602 |
index a0b51a72c3..b972a81df2 100644
|
|
|
29d5602 |
--- a/src/cmd/go/internal/cfg/cfg.go
|
|
|
29d5602 |
+++ b/src/cmd/go/internal/cfg/cfg.go
|
|
|
29d5602 |
@@ -292,8 +292,8 @@ var (
|
|
|
29d5602 |
GOPPC64 = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", objabi.GOPPC64))
|
|
|
29d5602 |
GOWASM = envOr("GOWASM", fmt.Sprint(objabi.GOWASM))
|
|
|
29d5602 |
|
|
|
29d5602 |
- GOPROXY = envOr("GOPROXY", "https://proxy.golang.org,direct")
|
|
|
29d5602 |
- GOSUMDB = envOr("GOSUMDB", "sum.golang.org")
|
|
|
29d5602 |
+ GOPROXY = envOr("GOPROXY", "direct")
|
|
|
29d5602 |
+ GOSUMDB = envOr("GOSUMDB", "off")
|
|
|
29d5602 |
GOPRIVATE = Getenv("GOPRIVATE")
|
|
|
29d5602 |
GONOPROXY = envOr("GONOPROXY", GOPRIVATE)
|
|
|
29d5602 |
GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE)
|
|
|
29d5602 |
diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
|
|
|
29d5602 |
index 40a07fc7e9..50436e32d7 100644
|
|
|
29d5602 |
--- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt
|
|
|
29d5602 |
+++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
|
|
|
29d5602 |
@@ -2,12 +2,12 @@
|
|
|
29d5602 |
env GOPROXY=
|
|
|
29d5602 |
env GOSUMDB=
|
|
|
29d5602 |
go env GOPROXY
|
|
|
29d5602 |
-stdout '^https://proxy.golang.org,direct$'
|
|
|
29d5602 |
+stdout '^direct$'
|
|
|
29d5602 |
go env GOSUMDB
|
|
|
29d5602 |
-stdout '^sum.golang.org$'
|
|
|
29d5602 |
+stdout '^off$'
|
|
|
29d5602 |
env GOPROXY=https://proxy.golang.org
|
|
|
29d5602 |
go env GOSUMDB
|
|
|
29d5602 |
-stdout '^sum.golang.org$'
|
|
|
29d5602 |
+stdout '^off$'
|
|
|
29d5602 |
|
|
|
29d5602 |
# download direct from github
|
|
|
29d5602 |
[!net] skip
|
|
|
29d5602 |
--
|
|
|
29d5602 |
2.21.0
|
|
|
29d5602 |
|