Rebase to go1.15.5

Security fix for CVE-2020-28362, CVE-2020-28367 and CVE-2020-28366
Resolves: BZ#1897342, BZ#1897636, BZ#1897644, BZ#1897647

.gitignore

@@ -79,3 +79,19 @@
 /go1.13.4.src.tar.gz
 /go1.13.5.src.tar.gz
 /go1.13.6.src.tar.gz
+/go1.14beta1.src.tar.gz
+/go1.14rc1.src.tar.gz
+/go1.14.src.tar.gz
+/go1.14.2.src.tar.gz
+/go1.14.3.src.tar.gz
+/go1.14.4.src.tar.gz
+/go1.14.6.src.tar.gz
+/go1.15beta1.src.tar.gz
+/go1.15rc1.src.tar.gz
+/go1.15rc2.src.tar.gz
+/go1.15.src.tar.gz
+/go1.15.1.src.tar.gz
+/go1.15.2.src.tar.gz
+/go1.15.3.src.tar.gz
+/go1.15.4.src.tar.gz
+/go1.15.5.src.tar.gz

0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch

@@ -1,28 +1,34 @@
-From 014cbe9e8cdc1a5f78f3e792309133eaaabdfc8f Mon Sep 17 00:00:00 2001
+From b38cd2374c2395f5a77802ef8ea3d7ac5b8a86ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
 Date: Mon, 27 May 2019 15:12:53 +0200
 Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb
 
 ---
- src/cmd/go/internal/cfg/cfg.go                  | 4 ++--
- src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ src/cmd/go/internal/cfg/cfg.go                  | 10 +++++-----
+ src/cmd/go/testdata/script/mod_sumdb_golang.txt |  6 +++---
+ 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 a0b51a72c3..b972a81df2 100644
+index 61dc6bdda6..e8658dc56c 100644
 --- a/src/cmd/go/internal/cfg/cfg.go
 +++ b/src/cmd/go/internal/cfg/cfg.go
-@@ -292,8 +292,8 @@ var (
+@@ -245,11 +245,11 @@ var (
  	GOPPC64  = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", objabi.GOPPC64))
  	GOWASM   = envOr("GOWASM", fmt.Sprint(objabi.GOWASM))
  
--	GOPROXY   = envOr("GOPROXY", "https://proxy.golang.org,direct")
--	GOSUMDB   = envOr("GOSUMDB", "sum.golang.org")
+-	GOPROXY    = envOr("GOPROXY", "https://proxy.golang.org,direct")
+-	GOSUMDB    = envOr("GOSUMDB", "sum.golang.org")
+-	GOPRIVATE  = Getenv("GOPRIVATE")
+-	GONOPROXY  = envOr("GONOPROXY", GOPRIVATE)
+-	GONOSUMDB  = envOr("GONOSUMDB", GOPRIVATE)
 +	GOPROXY   = envOr("GOPROXY", "direct")
 +	GOSUMDB   = envOr("GOSUMDB", "off")
- 	GOPRIVATE = Getenv("GOPRIVATE")
- 	GONOPROXY = envOr("GONOPROXY", GOPRIVATE)
- 	GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE)
++	GOPRIVATE = Getenv("GOPRIVATE")
++	GONOPROXY = envOr("GONOPROXY", GOPRIVATE)
++	GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE)
+ 	GOINSECURE = Getenv("GOINSECURE")
+ )
+ 
 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
 --- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt

golang.spec

@@ -1,6 +1,7 @@
 %bcond_with bootstrap
 # temporalily ignore test failures
-%ifarch %{ix86} aarch64 %{arm}
+# due to https://github.com/golang/go/issues/39466
+%ifarch aarch64
 %bcond_without ignore_tests
 %else
 %bcond_with ignore_tests
@@ -104,11 +105,11 @@
 %global gohostarch  s390x
 %endif
 
-%global go_api 1.13
-%global go_version 1.13.6
+%global go_api 1.15
+%global go_version 1.15.5
 
 Name:           golang
-Version:        1.13.6
+Version:        1.15.5
 Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -136,12 +137,12 @@ Provides:       go = %{version}-%{release}
 
 # Bundled/Vendored provides generated by
 # go list -f {{.ImportPath}} ./src/vendor/... | sed "s:_$PWD/src/vendor/::g;s:_:.:;s:.*:Provides\: bundled(golang(&)):" && go list -f {{.ImportPath}} ./src/cmd/vendor/... | sed "s:_$PWD/src/cmd/vendor/::g;s:_:.:;s:.*:Provides\: bundled(golang(&)):"
+Provides: bundled(golang(golang.org/x/crypto/chacha20))
 Provides: bundled(golang(golang.org/x/crypto/chacha20poly1305))
 Provides: bundled(golang(golang.org/x/crypto/cryptobyte))
 Provides: bundled(golang(golang.org/x/crypto/cryptobyte/asn1))
 Provides: bundled(golang(golang.org/x/crypto/curve25519))
 Provides: bundled(golang(golang.org/x/crypto/hkdf))
-Provides: bundled(golang(golang.org/x/crypto/internal/chacha20))
 Provides: bundled(golang(golang.org/x/crypto/internal/subtle))
 Provides: bundled(golang(golang.org/x/crypto/poly1305))
 Provides: bundled(golang(golang.org/x/net/dns/dnsmessage))
@@ -175,9 +176,20 @@ Provides: bundled(golang(golang.org/x/arch/arm/armasm))
 Provides: bundled(golang(golang.org/x/arch/arm64/arm64asm))
 Provides: bundled(golang(golang.org/x/arch/ppc64/ppc64asm))
 Provides: bundled(golang(golang.org/x/arch/x86/x86asm))
+Provides: bundled(golang(golang.org/x/crypto/ed25519))
+Provides: bundled(golang(golang.org/x/crypto/ed25519/internal/edwards25519))
 Provides: bundled(golang(golang.org/x/crypto/ssh/terminal))
+Provides: bundled(golang(golang.org/x/mod/internal/lazyregexp))
+Provides: bundled(golang(golang.org/x/mod/modfile))
+Provides: bundled(golang(golang.org/x/mod/module))
+Provides: bundled(golang(golang.org/x/mod/semver))
+Provides: bundled(golang(golang.org/x/mod/sumdb))
+Provides: bundled(golang(golang.org/x/mod/sumdb/dirhash))
+Provides: bundled(golang(golang.org/x/mod/sumdb/note))
+Provides: bundled(golang(golang.org/x/mod/sumdb/tlog))
+Provides: bundled(golang(golang.org/x/mod/zip))
+Provides: bundled(golang(golang.org/x/sys/internal/unsafeheader))
 Provides: bundled(golang(golang.org/x/sys/unix))
-Provides: bundled(golang(golang.org/x/sys/windows))
 Provides: bundled(golang(golang.org/x/tools/go/analysis))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/internal/analysisflags))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/internal/facts))
@@ -192,6 +204,7 @@ 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/httpresponse))
+Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/ifaceassert))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/inspect))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/internal/analysisutil))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/loopclosure))
@@ -200,6 +213,7 @@ Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/nilfunc))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/printf))
 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/tests))
 Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/unmarshal))
@@ -212,6 +226,9 @@ Provides: bundled(golang(golang.org/x/tools/go/ast/inspector))
 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/xerrors))
+Provides: bundled(golang(golang.org/x/xerrors/internal))
 
 Requires:       %{name}-bin = %{version}-%{release}
 Requires:       %{name}-src = %{version}-%{release}
@@ -310,7 +327,11 @@ Requires(preun): %{_sbindir}/update-alternatives
 # This is an odd issue, still looking for a better fix.
 Requires:       glibc
 Requires:       gcc
+%if 0%{?rhel} && 0%{?rhel} < 8
+Requires:       git, subversion, mercurial
+%else
 Recommends:     git, subversion, mercurial
+%endif
 %description    bin
 %{summary}
 
@@ -507,6 +528,12 @@ export GO_LDFLAGS="-linkmode internal"
 %if !%{cgo_enabled} || !%{external_linker}
 export CGO_ENABLED=0
 %endif
+# workaround for https://github.com/golang/go/issues/39466 until it gests fixed
+# Commented until the patch is ready, this work around suggested in the link avobe
+# doesn't work properly
+#ifarch aarch64
+#export CGO_CFLAGS="-mno-outline-atomics"
+#endif
 
 # make sure to not timeout
 export GO_TEST_TIMEOUT_SCALE=2
@@ -581,7 +608,82 @@ fi
 %endif
 
 %changelog
-* Mon Jan 13 2020  Jakub Čajka <jcajka@redhat.com> - 1.13.6-1
+* Fri Nov 13 2020 Jakub Čajka <jcajka@redhat.com> - 1.15.5-1
+- Rebase to go1.15.5
+- Security fix for CVE-2020-28362, CVE-2020-28367 and CVE-2020-28366
+- Resolves: BZ#1897342, BZ#1897636, BZ#1897644, BZ#1897647
+
+* Fri Nov 06 2020 Jakub Čajka <jcajka@redhat.com> - 1.15.4-1
+- Rebase to go1.15.4
+- Resolves: BZ#1895189
+
+* Thu Oct 15 2020 Jakub Čajka <jcajka@redhat.com> - 1.15.3-1
+- Rebase to go1.15.3
+- Resolves: BZ#1888443
+
+* Thu Sep 10 2020 Jakub Čajka <jcajka@redhat.com> - 1.15.2-1
+- Rebase to go1.15.2
+- Resolves: BZ#1877565
+
+* Thu Sep 03 2020 Jakub Čajka <jcajka@redhat.com> - 1.15.1-1
+- Rebase to go1.15.1
+- Security fix for CVE-2020-24553
+- Resolves: BZ#1874858, BZ#1866892
+
+* Wed Aug 12 2020 Jakub Čajka <jcajka@redhat.com> - 1.15-1
+- Rebase to go1.15 proper
+- Resolves: BZ#1859241, BZ#1866892
+
+* Mon Aug 10 2020 Jakub Čajka <jcajka@redhat.com> - 1.15-0.rc2.0
+- Rebase to go1.15rc1
+- Security fix for CVE-2020-16845
+- Resolves: BZ#1867101
+- Related: BZ#1859241
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-0.rc1.0.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Jakub Čajka <jcajka@redhat.com> - 1.15-0.rc1.0
+- Rebase to go1.15rc1
+- Related: BZ#1859241
+
+* Mon Jul 20 2020 Jakub Čajka <jcajka@redhat.com> - 1.15-0.beta1.0
+- Rebase to go1.15beta1
+
+* Mon Jul 20 2020 Jakub Čajka <jcajka@redhat.com> - 1.14.6-1
+- Rebase to go1.14.6
+- Security fix for CVE-2020-14040 and CVE-2020-15586
+- Resolves: BZ#1842708, BZ#1856957, BZ#1853653
+
+* Tue Jun 30 2020 Alejandro Sáez <asm@redhat.com> - 1.14.4-1
+- Rebase to go1.14.4
+- Add patch that fixes: https://golang.org/issue/39991
+- Related: BZ#1842708
+
+* Mon May 18 2020 Álex Sáez <asm@redhat.com> - 1.14.3-1
+- Rebase to go1.14.3
+- Resolves: BZ#1836015
+
+* Mon Apr 20 2020 Jakub Čajka <jcajka@redhat.com> - 1.14.2-1
+- Rebase to go1.14.2
+- Resolves: BZ#1815282
+
+* Wed Feb 26 2020 Jakub Čajka <jcajka@redhat.com> - 1.14-1
+- Rebase to go1.14 proper
+- Resolves: BZ#1792475
+
+* Thu Feb 06 2020 Jakub Čajka <jcajka@redhat.com> - 1.14-0.rc1.0
+- Rebase to go1.14.rc1
+- Related: BZ#1792475
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-0.beta1.0.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Jakub Čajka <jcajka@redhat.com> - 1.14-0.beta1.0
+- Rebase to go1.14beta1
+- Resolves: BZ#1792475
+
+* Mon Jan 13 2020 Jakub Čajka <jcajka@redhat.com> - 1.13.6-1
 - Rebase to go1.13.6
 
 * Thu Dec 05 2019 Jakub Čajka <jcajka@redhat.com> - 1.13.5-1

sources

@@ -1 +1 @@
-SHA512 (go1.13.6.src.tar.gz) = dffb6e06eea0b1541901dfbed8d28e8cc1eac3184dc40a19ed3637737df796a67a2e7170b228e1003d36b14e6f0f13bb8be9d2a702834a9c06228d1821659528
+SHA512 (go1.15.5.src.tar.gz) = 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4