From 7065f2ca0a3218888edea9517a18ef583ec626af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Fri, 15 Jan 2021 22:29:14 +0100 Subject: [PATCH] Update to go1.16beta1 Related: BZ#1913835 --- .gitignore | 1 + ...-bundled-tzdata-at-runtime-except-for-t.patch | 16 ++++++++-------- ...ll-expose-IfInfomsg.X__ifi_pad-on-s390x.patch | 6 +++--- ...cmd-go-disable-Google-s-proxy-and-sumdb.patch | 14 +++++++------- golang.spec | 15 +++++++++++---- sources | 2 +- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 4127c4e..1e93797 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /go1.15.4.src.tar.gz /go1.15.5.src.tar.gz /go1.15.6.src.tar.gz +/go1.16beta1.src.tar.gz diff --git a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch index 422ca2b..a8538b5 100644 --- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch +++ b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch @@ -1,6 +1,6 @@ -From edce31a2904846ae74e3c011f2cf5fddc963459e Mon Sep 17 00:00:00 2001 +From f3d446b60a082308ec5aaa2fdc36e31f566081bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= -Date: Thu, 22 Mar 2018 12:07:32 +0100 +Date: Thu, 22 Mar 2018 11:49:09 +0100 Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the internal test suite @@ -11,7 +11,7 @@ Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/time/internal_test.go b/src/time/internal_test.go -index 76d5524124..e81ace5f64 100644 +index 35ce69b228..1cea04ed7e 100644 --- a/src/time/internal_test.go +++ b/src/time/internal_test.go @@ -4,13 +4,15 @@ @@ -43,10 +43,10 @@ index 76d5524124..e81ace5f64 100644 zoneSources = zoneSources[len(zoneSources)-1:] } diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go -index 7a55d4f618..6063ca1195 100644 +index 277b68f798..be2aa6c687 100644 --- a/src/time/zoneinfo_test.go +++ b/src/time/zoneinfo_test.go -@@ -8,6 +8,7 @@ import ( +@@ -9,6 +9,7 @@ import ( "fmt" "os" "reflect" @@ -54,7 +54,7 @@ index 7a55d4f618..6063ca1195 100644 "testing" "time" ) -@@ -128,7 +129,7 @@ func TestLoadLocationFromTZData(t *testing.T) { +@@ -139,7 +140,7 @@ func TestLoadLocationFromTZData(t *testing.T) { t.Fatal(err) } @@ -64,7 +64,7 @@ index 7a55d4f618..6063ca1195 100644 t.Fatal(err) } diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go -index 88313aa0ed..d9596115ef 100644 +index d2465eef65..b8c934c9a9 100644 --- a/src/time/zoneinfo_unix.go +++ b/src/time/zoneinfo_unix.go @@ -12,7 +12,6 @@ @@ -84,5 +84,5 @@ index 88313aa0ed..d9596115ef 100644 func initLocal() { -- -2.14.3 +2.26.2 diff --git a/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch b/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch index 072440d..5d0970c 100644 --- a/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch +++ b/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch @@ -1,4 +1,4 @@ -From 817407fc2d6a861e65086388766f58082d38bc0b Mon Sep 17 00:00:00 2001 +From 67a4711d09c6595c17f32470c15bf471c287777d Mon Sep 17 00:00:00 2001 From: Michael Munday Date: Tue, 17 Jan 2017 11:33:38 -0500 Subject: [PATCH 2/3] syscall: expose IfInfomsg.X__ifi_pad on s390x @@ -14,7 +14,7 @@ Change-Id: I08e8e1eb705f898cd8822f8bee0d61ce11d514b5 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/syscall/ztypes_linux_s390x.go b/src/syscall/ztypes_linux_s390x.go -index 63c4a83b19..b5894255df 100644 +index 91f5ceff20..59a8b1fccd 100644 --- a/src/syscall/ztypes_linux_s390x.go +++ b/src/syscall/ztypes_linux_s390x.go @@ -449,12 +449,12 @@ type RtAttr struct { @@ -37,5 +37,5 @@ index 63c4a83b19..b5894255df 100644 type IfAddrmsg struct { -- -2.14.3 +2.26.2 diff --git a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch index a6235e4..9f55553 100644 --- a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch +++ b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch @@ -1,4 +1,4 @@ -From b38cd2374c2395f5a77802ef8ea3d7ac5b8a86ad Mon Sep 17 00:00:00 2001 +From fa250374b727439159bc9f203b854bb5df00186f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 27 May 2019 15:12:53 +0200 Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb @@ -9,10 +9,10 @@ Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index 61dc6bdda6..e8658dc56c 100644 +index 9bc48132ae..d5be72473f 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -245,11 +245,11 @@ var ( +@@ -262,11 +262,11 @@ var ( GOPPC64 = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", objabi.GOPPC64)) GOWASM = envOr("GOWASM", fmt.Sprint(objabi.GOWASM)) @@ -27,10 +27,10 @@ index 61dc6bdda6..e8658dc56c 100644 + GONOPROXY = envOr("GONOPROXY", GOPRIVATE) + GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) GOINSECURE = Getenv("GOINSECURE") + GOVCS = Getenv("GOVCS") ) - diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt -index 40a07fc7e9..50436e32d7 100644 +index cc0b0da474..b50689e209 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 @@ @@ -47,8 +47,8 @@ index 40a07fc7e9..50436e32d7 100644 -stdout '^sum.golang.org$' +stdout '^off$' - # download direct from github + # Download direct from github. [!net] skip -- -2.21.0 +2.26.2 diff --git a/golang.spec b/golang.spec index 4f1c9df..d5ce2a8 100644 --- a/golang.spec +++ b/golang.spec @@ -105,12 +105,12 @@ %global gohostarch s390x %endif -%global go_api 1.15 -%global go_version 1.15.6 +%global go_api 1.16 +%global go_version 1.16beta1 Name: golang -Version: 1.15.6 -Release: 1%{?dist} +Version: 1.16 +Release: 0.beta1.1%{?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 @@ -203,6 +203,7 @@ Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/composite)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/copylock)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/ctrlflow)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/errorsas)) +Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/framepointer)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/httpresponse)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/ifaceassert)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/inspect)) @@ -215,6 +216,7 @@ Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/shift)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/stdmethods)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/stringintconv)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/structtag)) +Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/testinggoroutine)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/tests)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/unmarshal)) Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/unreachable)) @@ -227,6 +229,7 @@ Provides: bundled(golang(golang.org/x/tools/go/cfg)) Provides: bundled(golang(golang.org/x/tools/go/types/objectpath)) Provides: bundled(golang(golang.org/x/tools/go/types/typeutil)) Provides: bundled(golang(golang.org/x/tools/internal/analysisinternal)) +Provides: bundled(golang(golang.org/x/tools/internal/lsp/fuzzy)) Provides: bundled(golang(golang.org/x/xerrors)) Provides: bundled(golang(golang.org/x/xerrors/internal)) @@ -608,6 +611,10 @@ fi %endif %changelog +* Fri Jan 15 2021 Jakub Čajka - 1.16-0.beta1.1 +- Update to go1.16beta1 +- Related: BZ#1913835 + * Fri Dec 04 2020 Jakub Čajka - 1.15.6-1 - Rebase to go1.15.6 - Resolves: BZ#1904238 diff --git a/sources b/sources index d81e4cd..b1e67f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.15.6.src.tar.gz) = f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326 +SHA512 (go1.16beta1.src.tar.gz) = 8a9c2abbaeedb8bb17aa0de20a20fb520430b19bbc4034a5763dfd54468df70715f129c0b8a05542be4bf012b73eb2967c27d33508104fb4e01716011c687cfe