Date: Mon, 27 May 2019 15:12:53 +0200 From: Jakub Cajka Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb Updated for use with "go" 1.22.4. --- go.old/src/cmd/go/internal/cfg/cfg.go +++ go/src/cmd/go/internal/cfg/cfg.go @@ -416,8 +416,9 @@ GOPPC64 = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", buildcfg.GOPPC64)) GOWASM = envOr("GOWASM", fmt.Sprint(buildcfg.GOWASM)) - GOPROXY = envOr("GOPROXY", "") - GOSUMDB = envOr("GOSUMDB", "") + GOPROXY = envOr("GOPROXY", "direct") + GOSUMDB = envOr("GOSUMDB", "off") + GOPRIVATE = Getenv("GOPRIVATE") GONOPROXY = envOr("GONOPROXY", GOPRIVATE) GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) --- go.old/src/cmd/go/testdata/script/mod_sumdb_golang.txt +++ go/src/cmd/go/testdata/script/mod_sumdb_golang.txt @@ -2,12 +2,12 @@ [go-builder] env GOPROXY= [go-builder] env GOSUMDB= [go-builder] go env GOPROXY -[go-builder] stdout '^https://proxy.golang.org,direct$' +[go-builder] stdout '^direct$' [go-builder] go env GOSUMDB -[go-builder] stdout '^sum.golang.org$' +[go-builder] stdout '^off$' [go-builder] env GOPROXY=https://proxy.golang.org [go-builder] go env GOSUMDB -[go-builder] stdout '^sum.golang.org$' +[go-builder] stdout '^off$' # Download direct from github. ==== end of patch ====