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

@@ -21,3 +21,77 @@
 /golang-19087:a15f344a9efa-xattrs.tar
 /go1.5beta2.src.tar.gz
 /go1.5beta3.src.tar.gz
+/go1.5rc1.src.tar.gz
+/go1.5.src.tar.gz
+/go1.5.1.src.tar.gz
+/go1.5.2.src.tar.gz
+/Mark.Twain-Tom.Sawyer.txt.bz2
+/go1.5.3.src.tar.gz
+/go1.6rc1.src.tar.gz
+/go1.6.src.tar.gz
+/go1.6.1.src.tar.gz
+/go1.6.2.src.tar.gz
+/go1.7rc2.src.tar.gz
+/go1.7rc5.src.tar.gz
+/go1.7.src.tar.gz
+/go1.7.1.src.tar.gz
+/go1.7.3.src.tar.gz
+/go1.7.4.src.tar.gz
+/go1.8rc3.src.tar.gz
+/go1.8.src.tar.gz
+/go1.8.1.src.tar.gz
+/go1.8.3.src.tar.gz
+/go1.9beta2.src.tar.gz
+/go1.9.src.tar.gz
+/go1.9.1.src.tar.gz
+/go1.9.2.src.tar.gz
+/go1.10beta1.src.tar.gz
+/go1.10beta2.src.tar.gz
+/go1.10rc1.src.tar.gz
+/go1.10rc2.src.tar.gz
+/go1.10.src.tar.gz
+/go1.10.1.src.tar.gz
+/go1.10.2.src.tar.gz
+/go1.10.3.src.tar.gz
+/go1.11beta1.src.tar.gz
+/go1.11beta2.src.tar.gz
+/go1.11beta3.src.tar.gz
+/go1.11rc1.src.tar.gz
+/go1.11rc2.src.tar.gz
+/go1.11.src.tar.gz
+/go1.11.1.src.tar.gz
+/go1.11.2.src.tar.gz
+/go1.11.4.src.tar.gz
+/go1.12beta2.src.tar.gz
+/go1.12rc1.src.tar.gz
+/go1.12.src.tar.gz
+/go1.12.1.src.tar.gz
+/go1.12.2.src.tar.gz
+/go1.12.5.src.tar.gz
+/go1.12.6.src.tar.gz
+/go1.12.7.src.tar.gz
+/go1.13beta1.src.tar.gz
+/go1.13rc1.src.tar.gz
+/go1.13rc2.src.tar.gz
+/go1.13.src.tar.gz
+/go1.13.1.src.tar.gz
+/go1.13.3.src.tar.gz
+/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

0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch

@@ -0,0 +1,88 @@
+From edce31a2904846ae74e3c011f2cf5fddc963459e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
+Date: Thu, 22 Mar 2018 12:07:32 +0100
+Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the
+ internal test suite
+
+---
+ src/time/internal_test.go | 7 +++++--
+ src/time/zoneinfo_test.go | 3 ++-
+ src/time/zoneinfo_unix.go | 2 --
+ 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
+--- a/src/time/internal_test.go
++++ b/src/time/internal_test.go
+@@ -4,13 +4,15 @@
+ 
+ package time
+ 
++import "runtime"
++
+ func init() {
+ 	// force US/Pacific for time zone tests
+ 	ForceUSPacificForTesting()
+ }
+ 
+ func initTestingZone() {
+-	z, err := loadLocation("America/Los_Angeles", zoneSources[len(zoneSources)-1:])
++	z, err := loadLocation("America/Los_Angeles", zoneSources)
+ 	if err != nil {
+ 		panic("cannot load America/Los_Angeles for testing: " + err.Error())
+ 	}
+@@ -21,8 +23,9 @@ func initTestingZone() {
+ var OrigZoneSources = zoneSources
+ 
+ func forceZipFileForTesting(zipOnly bool) {
+-	zoneSources = make([]string, len(OrigZoneSources))
++	zoneSources = make([]string, len(OrigZoneSources)+1)
+ 	copy(zoneSources, OrigZoneSources)
++	zoneSources = append(zoneSources, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
+ 	if zipOnly {
+ 		zoneSources = zoneSources[len(zoneSources)-1:]
+ 	}
+diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
+index 7a55d4f618..6063ca1195 100644
+--- a/src/time/zoneinfo_test.go
++++ b/src/time/zoneinfo_test.go
+@@ -8,6 +8,7 @@ import (
+ 	"fmt"
+ 	"os"
+ 	"reflect"
++	"runtime"
+ 	"testing"
+ 	"time"
+ )
+@@ -128,7 +129,7 @@ func TestLoadLocationFromTZData(t *testing.T) {
+ 		t.Fatal(err)
+ 	}
+ 
+-	tzinfo, err := time.LoadTzinfo(locationName, time.OrigZoneSources[len(time.OrigZoneSources)-1])
++	tzinfo, err := time.LoadTzinfo(locationName, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
+ 	if err != nil {
+ 		t.Fatal(err)
+ 	}
+diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
+index 88313aa0ed..d9596115ef 100644
+--- a/src/time/zoneinfo_unix.go
++++ b/src/time/zoneinfo_unix.go
+@@ -12,7 +12,6 @@
+ package time
+ 
+ import (
+-	"runtime"
+ 	"syscall"
+ )
+ 
+@@ -22,7 +21,6 @@ var zoneSources = []string{
+ 	"/usr/share/zoneinfo/",
+ 	"/usr/share/lib/zoneinfo/",
+ 	"/usr/lib/locale/TZ/",
+-	runtime.GOROOT() + "/lib/time/zoneinfo.zip",
+ }
+ 
+ func initLocal() {
+-- 
+2.14.3
+

0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch

@@ -0,0 +1,41 @@
+From 817407fc2d6a861e65086388766f58082d38bc0b Mon Sep 17 00:00:00 2001
+From: Michael Munday <munday@ca.ibm.com>
+Date: Tue, 17 Jan 2017 11:33:38 -0500
+Subject: [PATCH 2/3] syscall: expose IfInfomsg.X__ifi_pad on s390x
+
+Exposing this field on s390x improves compatibility with the other
+linux architectures, all of which already expose it.
+
+Fixes #18628 and updates #18632.
+
+Change-Id: I08e8e1eb705f898cd8822f8bee0d61ce11d514b5
+---
+ src/syscall/ztypes_linux_s390x.go | 12 ++++++------
+ 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
+--- a/src/syscall/ztypes_linux_s390x.go
++++ b/src/syscall/ztypes_linux_s390x.go
+@@ -449,12 +449,12 @@ type RtAttr struct {
+ }
+ 
+ type IfInfomsg struct {
+-	Family uint8
+-	_      uint8
+-	Type   uint16
+-	Index  int32
+-	Flags  uint32
+-	Change uint32
++	Family     uint8
++	X__ifi_pad uint8
++	Type       uint16
++	Index      int32
++	Flags      uint32
++	Change     uint32
+ }
+ 
+ type IfAddrmsg struct {
+-- 
+2.14.3
+

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

@@ -0,0 +1,54 @@
+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                  | 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 61dc6bdda6..e8658dc56c 100644
+--- a/src/cmd/go/internal/cfg/cfg.go
++++ b/src/cmd/go/internal/cfg/cfg.go
+@@ -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")
+-	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)
+ 	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
++++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt
+@@ -2,12 +2,12 @@
+ env GOPROXY=
+ env GOSUMDB=
+ go env GOPROXY
+-stdout '^https://proxy.golang.org,direct$'
++stdout '^direct$'
+ go env GOSUMDB
+-stdout '^sum.golang.org$'
++stdout '^off$'
+ env GOPROXY=https://proxy.golang.org
+ go env GOSUMDB
+-stdout '^sum.golang.org$'
++stdout '^off$'
+ 
+ # download direct from github
+ [!net] skip
+-- 
+2.21.0
+

fedora.go

@@ -0,0 +1,7 @@
+// +build rpm_crashtraceback
+
+package runtime
+
+func init() {
+	setTraceback("crash")
+}

go1.5beta1-disable-TestGdbPython.patch

@@ -1,13 +0,0 @@
-diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
-index f4014b2..2c09441 100644
---- a/src/runtime/runtime-gdb_test.go
-+++ b/src/runtime/runtime-gdb_test.go
-@@ -38,7 +38,7 @@ func main() {
- }
- `
- 
--func TestGdbPython(t *testing.T) {
-+func testGdbPython(t *testing.T) {
- 	if runtime.GOOS == "darwin" {
- 		t.Skip("gdb does not work on darwin")
- 	}

go1.5beta2-disable-TestCloneNEWUSERAndRemapNoRootDisableSetgroups.patch

@@ -1,13 +0,0 @@
-diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go
-index 60d2734..b16540f 100644
---- a/src/syscall/exec_linux_test.go
-+++ b/src/syscall/exec_linux_test.go
-@@ -89,7 +89,7 @@ func kernelVersion(t *testing.T) (int, int) {
- 	return major, minor
- }
- 
--func TestCloneNEWUSERAndRemapNoRootDisableSetgroups(t *testing.T) {
-+func testCloneNEWUSERAndRemapNoRootDisableSetgroups(t *testing.T) {
- 	if os.Getuid() == 0 {
- 		t.Skip("skipping unprivileged user only test")
- 	}

go1.5beta2-increase-elfreserve-for-debug.patch

@@ -1,13 +0,0 @@
-diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
-index cf52f2e..7cdb8c4 100644
---- a/src/cmd/link/internal/ld/elf.go
-+++ b/src/cmd/link/internal/ld/elf.go
-@@ -713,7 +713,7 @@ var Elfstrdat []byte
-  * On FreeBSD, cannot be larger than a page.
-  */
- const (
--	ELFRESERVE = 3072
-+	ELFRESERVE = 3104
- )
- 
- /*

golang-1.2-verbose-build.patch

@@ -1,19 +0,0 @@
-Index: go/src/make.bash
-===================================================================
---- go.orig/src/make.bash
-+++ go/src/make.bash
-@@ -153,12 +153,12 @@ if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOHOSTOS" != "$GOOS" ]; then
- 	# CC_FOR_TARGET is recorded as the default compiler for the go tool. When building for the host, however,
- 	# use the host compiler, CC, from `cmd/dist/dist env` instead.
- 	CC=$CC GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \
--		"$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd
-+		"$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std cmd
- 	echo
- fi
- 
- echo "##### Building packages and commands for $GOOS/$GOARCH."
--CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd
-+CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std cmd
- echo
- 
- rm -f "$GOTOOLDIR"/go_bootstrap

golang-1.5-bootstrap-binary-path.patch

@@ -1,53 +0,0 @@
-diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
-index be54ac4..6744fbdc 100644
---- a/src/cmd/dist/buildtool.go
-+++ b/src/cmd/dist/buildtool.go
-@@ -108,12 +108,20 @@ func bootstrapBuildTools() {
- 	os.Setenv("GOBIN", "")
- 
- 	os.Setenv("GOOS", "")
--	os.Setenv("GOHOSTOS", "")
- 	os.Setenv("GOARCH", "")
-+
-+	hostos := os.Getenv("GOHOSTOS")
-+	hostarch := os.Getenv("GOHOSTARCH")
-+	os.Setenv("GOHOSTOS", "")
- 	os.Setenv("GOHOSTARCH", "")
- 
-+	bingopath := pathf("%s/bin/%s_%s/go", goroot_bootstrap, hostos, hostarch)
-+	if _, err := os.Stat(bingopath); os.IsNotExist(err) {
-+		bingopath = pathf("%s/bin/go", goroot_bootstrap)
-+	}
-+
- 	// Run Go 1.4 to build binaries.
--	run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go", goroot_bootstrap), "install", "-v", "bootstrap/...")
-+	run(workspace, ShowOutput|CheckExit, bingopath, "install", "-v", "bootstrap/...")
- 
- 	// Copy binaries into tool binary directory.
- 	for _, name := range bootstrapDirs {
-diff --git a/src/make.bash b/src/make.bash
-index f17648a..77f463c 100755
---- a/src/make.bash
-+++ b/src/make.bash
-@@ -113,12 +113,17 @@ echo '##### Building Go bootstrap tool.'
- echo cmd/dist
- export GOROOT="$(cd .. && pwd)"
- GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
--if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
--	echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2
-+if [ -x "$GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go" ]; then
-+	rm -f cmd/dist/dist
-+	GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go" build -o cmd/dist/dist ./cmd/dist
-+elif [ -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
-+	rm -f cmd/dist/dist
-+	GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
-+else
-+	echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go." >&2
-+	echo "ERROR: or $GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go." >&2
- 	echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2
- fi
--rm -f cmd/dist/dist
--GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
- 
- # -e doesn't propagate out of eval, so check success by hand.
- eval $(./cmd/dist/dist env -p || echo FAIL=true)

golang-f21-hostname.patch

@@ -1,11 +0,0 @@
---- src/os/os_test.go.orig	2014-02-20 13:14:45.543644182 -0600
-+++ src/os/os_test.go	2014-02-20 13:14:55.934813622 -0600
-@@ -854,7 +854,7 @@
- 		t.Fatal(err)
- 	}
- 	defer r.Close()
--	p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
-+	p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
- 	if err != nil {
- 		t.Fatal(err)
- 	}

golang-gdbinit

@@ -1 +1 @@
-add-auto-load-safe-path /usr/lib/golang/src/pkg/runtime/runtime-gdb.py
+add-auto-load-safe-path /usr/lib/golang/src/runtime/runtime-gdb.py

golang-prelink.conf

@@ -1,3 +0,0 @@
-# there are ELF files in src which are testdata and shouldn't be modified
--b /usr/lib/golang/src
--b /usr/lib64/golang/src

macros.golang

@@ -1,8 +0,0 @@
-# Where to set GOPATH for builds. Like:
-# export GOPATH=$(pwd)/_build:%{gopath}
-%gopath          %{_datadir}/gocode
-
-# for use like:
-# ExclusiveArch:  %{go_arches}
-%go_arches       %{ix86} x86_64 %{arm}
-

sources

@@ -1,4 +1 @@
-d76dc07e475b2905b5fec1cf319b6356  golang-19087:a15f344a9efa-xattrs.tar
+SHA512 (go1.15.5.src.tar.gz) = 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
-aa82b90515edd1fa814e5ecb4ee771a4  go1.5beta1.src.tar.gz
-a1389a16aeecd934fc175e4a57f59417  go1.5beta2.src.tar.gz
-0020be59b7711307ebd37ac116a6ee34  go1.5beta3.src.tar.gz