diff --git a/0001-cmd-go-use-aliyun-proxy-and-disable-sumdb.patch b/0001-cmd-go-use-aliyun-proxy-and-local-sumdb.patch similarity index 93% rename from 0001-cmd-go-use-aliyun-proxy-and-disable-sumdb.patch rename to 0001-cmd-go-use-aliyun-proxy-and-local-sumdb.patch index acdcdf1ec914be7f8256545c14f56b92b4848b35..c0c28be542942dcb040c99f4eb5fc98e1fe90ffc 100644 --- a/0001-cmd-go-use-aliyun-proxy-and-disable-sumdb.patch +++ b/0001-cmd-go-use-aliyun-proxy-and-local-sumdb.patch @@ -19,7 +19,7 @@ index 57a3c1ff6f..e56c60e591 100644 - GOPROXY = envOr("GOPROXY", "https://proxy.golang.org,direct") - GOSUMDB = envOr("GOSUMDB", "sum.golang.org") + GOPROXY = envOr("GOPROXY", "https://mirrors.aliyun.com/goproxy/,direct") -+ GOSUMDB = envOr("GOSUMDB", "off") ++ GOSUMDB = envOr("GOSUMDB", "sum.golang.google.cn") GOPRIVATE = Getenv("GOPRIVATE") GONOPROXY = envOr("GONOPROXY", GOPRIVATE) GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) @@ -35,11 +35,11 @@ index becd88b52e..b2a1250372 100644 +stdout '^https://mirrors.aliyun.com/goproxy/,direct$' go env GOSUMDB -stdout '^sum.golang.org$' -+stdout '^off$' ++stdout '^sum.golang.google.cn$' env GOPROXY=https://proxy.golang.org go env GOSUMDB -stdout '^sum.golang.org$' -+stdout '^off$' ++stdout '^sum.golang.google.cn$' # Download direct from github. diff --git a/go1.20.5.src.tar.gz b/go1.20.9.src.tar.gz similarity index 72% rename from go1.20.5.src.tar.gz rename to go1.20.9.src.tar.gz index 28a749f42d77029a10726fbb54bf09adea6ff5e8..2c700af2d18137ac095cbffee5dfc576d67959ba 100644 Binary files a/go1.20.5.src.tar.gz and b/go1.20.9.src.tar.gz differ diff --git a/golang.spec b/golang.spec index 8ba2739785e30b048744ab222eddba7d917cbde1..5f56f8c01b7d7e478abab3fa5419e3d23998e44d 100644 --- a/golang.spec +++ b/golang.spec @@ -61,7 +61,7 @@ # Comment out go_patch as needed %global go_api 1.20 -%global go_patch 5 +%global go_patch 9 Name: golang Version: %{go_api}%{?go_patch:.%{go_patch}} @@ -105,7 +105,7 @@ Provides: bundled(golang(golang.org/x/tools)) = 0.3.1.0.20230118190848.070db2996 Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} -Patch3: 0001-cmd-go-use-aliyun-proxy-and-disable-sumdb.patch +Patch3: 0001-cmd-go-use-aliyun-proxy-and-local-sumdb.patch Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch Source100: golang-gdbinit @@ -539,6 +539,10 @@ fi %files docs -f go-docs.list %changelog +* Mon Oct 9 2023 Funda Wang - 1.20.9-1 +- New version 1.20.9 +- Use local sumdb rather than disable it + * Fri Jun 09 2023 Funda Wang - 1.20.5-1 - New version 1.20.5