Rebase to 1.8.7

Fix CVE-2018-6574
Resolves: BZ#1543561, BZ#1543562

.gitignore

@@ -41,57 +41,6 @@
 /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
+/go1.8.4.src.tar.gz
+/go1.8.5.src.tar.gz
+/go1.8.7.src.tar.gz

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

@@ -1,88 +0,0 @@
-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
-

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

@@ -1,54 +0,0 @@
-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
-

31bit-OID-asn1.patch

@@ -0,0 +1,83 @@
+From 94aba76639cf4d5e30975d846bb0368db8202269 Mon Sep 17 00:00:00 2001
+From: Monis Khan <mkhan@redhat.com>
+Date: Wed, 12 Apr 2017 16:00:58 -0400
+Subject: [PATCH] encoding/asn1: support 31 bit identifiers with OID
+
+The current implementation uses a max of 28 bits when decoding an
+ObjectIdentifier.  This change makes it so that an int64 is used to
+accumulate up to 35 bits.  If the resulting data would not overflow
+an int32, it is used as an int.  Thus up to 31 bits may be used to
+represent each subidentifier of an ObjectIdentifier.
+
+Fixes #19933
+
+Change-Id: I95d74b64b24cdb1339ff13421055bce61c80243c
+Reviewed-on: https://go-review.googlesource.com/40436
+Reviewed-by: Adam Langley <agl@golang.org>
+Run-TryBot: Adam Langley <agl@golang.org>
+---
+ src/encoding/asn1/asn1.go      | 15 ++++++++++++---
+ src/encoding/asn1/asn1_test.go |  3 +++
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/src/encoding/asn1/asn1.go b/src/encoding/asn1/asn1.go
+index c2c0ee420ac..65f018d0148 100644
+--- a/src/encoding/asn1/asn1.go
++++ b/src/encoding/asn1/asn1.go
+@@ -22,6 +22,7 @@ package asn1
+ import (
+ 	"errors"
+ 	"fmt"
++	"math"
+ 	"math/big"
+ 	"reflect"
+ 	"strconv"
+@@ -293,16 +294,24 @@ type Flag bool
+ // given byte slice. It returns the value and the new offset.
+ func parseBase128Int(bytes []byte, initOffset int) (ret, offset int, err error) {
+ 	offset = initOffset
++	var ret64 int64
+ 	for shifted := 0; offset < len(bytes); shifted++ {
+-		if shifted == 4 {
++		// 5 * 7 bits per byte == 35 bits of data
++		// Thus the representation is either non-minimal or too large for an int32
++		if shifted == 5 {
+ 			err = StructuralError{"base 128 integer too large"}
+ 			return
+ 		}
+-		ret <<= 7
++		ret64 <<= 7
+ 		b := bytes[offset]
+-		ret |= int(b & 0x7f)
++		ret64 |= int64(b & 0x7f)
+ 		offset++
+ 		if b&0x80 == 0 {
++			ret = int(ret64)
++			// Ensure that the returned value fits in an int on all platforms
++			if ret64 > math.MaxInt32 {
++				err = StructuralError{"base 128 integer too large"}
++			}
+ 			return
+ 		}
+ 	}
+diff --git a/src/encoding/asn1/asn1_test.go b/src/encoding/asn1/asn1_test.go
+index 9976656df89..2dd799f2362 100644
+--- a/src/encoding/asn1/asn1_test.go
++++ b/src/encoding/asn1/asn1_test.go
+@@ -7,6 +7,7 @@ package asn1
+ import (
+ 	"bytes"
+ 	"fmt"
++	"math"
+ 	"math/big"
+ 	"reflect"
+ 	"strings"
+@@ -386,6 +387,8 @@ var tagAndLengthData = []tagAndLengthTest{
+ 	{[]byte{0xa0, 0x81, 0x7f}, false, tagAndLength{}},
+ 	// Tag numbers which would overflow int32 are rejected. (The value below is 2^31.)
+ 	{[]byte{0x1f, 0x88, 0x80, 0x80, 0x80, 0x00, 0x00}, false, tagAndLength{}},
++	// Tag numbers that fit in an int32 are valid. (The value below is 2^31 - 1.)
++	{[]byte{0x1f, 0x87, 0xFF, 0xFF, 0xFF, 0x7F, 0x00}, true, tagAndLength{tag: math.MaxInt32}},
+ 	// Long tag number form may not be used for tags that fit in short form.
+ 	{[]byte{0x1f, 0x1e, 0x00}, false, tagAndLength{}},
+ }

go1.5-zoneinfo_testing_only.patch

@@ -0,0 +1,21 @@
+diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
+index ed9502d..c2569e7 100644
+--- a/src/time/zoneinfo_unix.go
++++ b/src/time/zoneinfo_unix.go
+@@ -32,14 +32,14 @@ var zoneDirs = []string{
+ 	"/usr/share/zoneinfo/",
+ 	"/usr/share/lib/zoneinfo/",
+ 	"/usr/lib/locale/TZ/",
+-	runtime.GOROOT() + "/lib/time/zoneinfo.zip",
+ }
+ 
+ var origZoneDirs = zoneDirs
+ 
+ func forceZipFileForTesting(zipOnly bool) {
+-	zoneDirs = make([]string, len(origZoneDirs))
++	zoneDirs = make([]string, len(origZoneDirs)+1)
+ 	copy(zoneDirs, origZoneDirs)
++	zoneDirs = append(zoneDirs, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
+ 	if zipOnly {
+ 		for i := 0; i < len(zoneDirs)-1; i++ {
+ 			zoneDirs[i] = "/XXXNOEXIST"

golang-1.2-verbose-build.patch

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,60 @@
+diff -up go/src/cmd/dist/buildtool.go.bootstrap go/src/cmd/dist/buildtool.go
+--- go/src/cmd/dist/buildtool.go.bootstrap	2016-10-24 12:54:57.620563325 +0200
++++ go/src/cmd/dist/buildtool.go	2016-10-24 13:12:25.036466602 +0200
+@@ -131,17 +131,25 @@ func bootstrapBuildTools() {
+ 	defer os.Setenv("GOBIN", os.Getenv("GOBIN"))
+ 	os.Setenv("GOBIN", "")
+ 
++	hostos := os.Getenv("GOHOSTOS")
++	hostarch := os.Getenv("GOHOSTARCH")
++
+ 	os.Setenv("GOOS", "")
+ 	os.Setenv("GOHOSTOS", "")
+ 	os.Setenv("GOARCH", "")
+ 	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. Use -gcflags=-l to disable inlining to
+ 	// workaround bugs in Go 1.4's compiler. See discussion thread:
+ 	// https://groups.google.com/d/msg/golang-dev/Ss7mCKsvk8w/Gsq7VYI0AwAJ
+ 	// Use the math_big_pure_go build tag to disable the assembly in math/big
+ 	// which may contain unsupported instructions.
+-	run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go", goroot_bootstrap), "install", "-gcflags=-l", "-tags=math_big_pure_go", "-v", "bootstrap/cmd/...")
++	run(workspace, ShowOutput|CheckExit, bingopath, "install", "-gcflags=-l", "-v", "-tags=math_big_pure_go", "bootstrap/...")
+ 
+ 	// Copy binaries into tool binary directory.
+ 	for _, name := range bootstrapDirs {
+diff -up go/src/make.bash.bootstrap go/src/make.bash
+--- go/src/make.bash.bootstrap	2016-10-24 12:54:57.606563267 +0200
++++ go/src/make.bash	2016-10-24 12:54:57.620563325 +0200
+@@ -120,8 +120,15 @@ 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
+ 	exit 1
+ fi
+@@ -130,8 +137,6 @@ if [ "$GOROOT_BOOTSTRAP" == "$GOROOT" ];
+ 	echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2
+ 	exit 1
+ 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.spec

@@ -1,12 +1,4 @@
 %bcond_with bootstrap
-# temporalily ignore test failures
-# due to https://github.com/golang/go/issues/39466
-%ifarch aarch64
-%bcond_without ignore_tests
-%else
-%bcond_with ignore_tests
-%endif
-
 # build ids are not currently generated:
 # https://code.google.com/p/go/issues/detail?id=5238
 #
@@ -33,9 +25,6 @@
 
 %global golibdir %{_libdir}/golang
 
-# This macro may not always be defined, ensure it is
-%{!?gopath: %global gopath %{_datadir}/gocode}
-
 # Golang build options.
 
 # Build golang using external/internal(close to cgo disabled) linking.
@@ -60,10 +49,10 @@
 %endif
 
 # Controls what ever we fail on failed tests
-%if %{with ignore_tests}
-%global fail_on_tests 0
-%else
+%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64le
 %global fail_on_tests 1
+%else
+%global fail_on_tests 0
 %endif
 
 # Build golang shared objects for stdlib
@@ -105,11 +94,11 @@
 %global gohostarch  s390x
 %endif
 
-%global go_api 1.15
-%global go_version 1.15.5
+%global go_api 1.8
+%global go_version 1.8.7
 
 Name:           golang
-Version:        1.15.5
+Version:        1.8.7
 Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -131,112 +120,30 @@ BuildRequires:  hostname
 BuildRequires:  net-tools
 %endif
 # for tests
-BuildRequires:  pcre-devel, glibc-static, perl-interpreter, procps-ng
+BuildRequires:  pcre-devel, glibc-static, perl, procps-ng
 
 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/subtle))
-Provides: bundled(golang(golang.org/x/crypto/poly1305))
-Provides: bundled(golang(golang.org/x/net/dns/dnsmessage))
-Provides: bundled(golang(golang.org/x/net/http/httpguts))
-Provides: bundled(golang(golang.org/x/net/http/httpproxy))
-Provides: bundled(golang(golang.org/x/net/http2/hpack))
-Provides: bundled(golang(golang.org/x/net/idna))
-Provides: bundled(golang(golang.org/x/net/nettest))
-Provides: bundled(golang(golang.org/x/sys/cpu))
-Provides: bundled(golang(golang.org/x/text/secure/bidirule))
-Provides: bundled(golang(golang.org/x/text/transform))
-Provides: bundled(golang(golang.org/x/text/unicode/bidi))
-Provides: bundled(golang(golang.org/x/text/unicode/norm))
-Provides: bundled(golang(github.com/google/pprof/driver))
-Provides: bundled(golang(github.com/google/pprof/internal/binutils))
-Provides: bundled(golang(github.com/google/pprof/internal/driver))
-Provides: bundled(golang(github.com/google/pprof/internal/elfexec))
-Provides: bundled(golang(github.com/google/pprof/internal/graph))
-Provides: bundled(golang(github.com/google/pprof/internal/measurement))
-Provides: bundled(golang(github.com/google/pprof/internal/plugin))
-Provides: bundled(golang(github.com/google/pprof/internal/report))
-Provides: bundled(golang(github.com/google/pprof/internal/symbolizer))
-Provides: bundled(golang(github.com/google/pprof/internal/symbolz))
-Provides: bundled(golang(github.com/google/pprof/internal/transport))
-Provides: bundled(golang(github.com/google/pprof/profile))
-Provides: bundled(golang(github.com/google/pprof/third.party/d3))
-Provides: bundled(golang(github.com/google/pprof/third.party/d3flamegraph))
-Provides: bundled(golang(github.com/google/pprof/third.party/svgpan))
-Provides: bundled(golang(github.com/ianlancetaylor/demangle))
-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/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))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/asmdecl))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/assign))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/atomic))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/bools))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/buildtag))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/cgocall))
-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/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))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/lostcancel))
-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))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/unreachable))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/unsafeptr))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/unusedresult))
-Provides: bundled(golang(golang.org/x/tools/go/analysis/unitchecker))
-Provides: bundled(golang(golang.org/x/tools/go/ast/astutil))
-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}
 Requires:       go-srpm-macros
 
-Patch1:       0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
-Patch2:       0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
-Patch3:       0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
+Patch0:         golang-1.2-verbose-build.patch
+
+# use the arch dependent path in the bootstrap
+Patch212:       golang-1.5-bootstrap-binary-path.patch
+
+# we had been just removing the zoneinfo.zip, but that caused tests to fail for users that 
+# later run `go test -a std`. This makes it only use the zoneinfo.zip where needed in tests.
+Patch215:       ./go1.5-zoneinfo_testing_only.patch
+
+# Proposed patch by mmunday https://golang.org/cl/35262
+Patch219: s390x-expose-IfInfomsg-X__ifi_pad.patch 
+# https://github.com/golang/go/commit/94aba76639cf4d5e30975d846bb0368db8202269
+Patch220: 31bit-OID-asn1.patch
+
+Patch221: s390x-ignore-L0syms.patch
+
+Patch222: use-buildmode-pie-for-pie-testing.patch 
 
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
@@ -289,8 +196,6 @@ BuildArch:      noarch
 
 %package        bin
 Summary:        Golang core compiler tools
-# Some distributions refer to this package by this name
-Provides:       %{name}-go = %{version}-%{release}
 Requires:       go = %{version}-%{release}
 # Pre-go1.5, all arches had to be bootstrapped individually, before usable, and
 # env variables to compile for the target os-arch.
@@ -321,17 +226,12 @@ Obsoletes:      golang-vet < 0-12.1
 Obsoletes:      golang-cover < 0-12.1
 
 Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
 
 # We strip the meta dependency, but go does require glibc.
 # 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}
 
@@ -364,10 +264,27 @@ Requires:       %{name} = %{version}-%{release}
 %endif
 
 %prep
-%autosetup -p1 -n go
+%setup -q -n go
+
+# increase verbosity of build
+%patch0 -p1 -b .verbose
+
+# use the arch dependent path in the bootstrap
+%patch212 -p1 -b .bootstrap
+
+%patch215 -p1
+
+%patch219 -p1
+%patch220 -p1
+
+%patch221 -p1
+%patch222 -p1
 
 cp %{SOURCE1} ./src/runtime/
 
+# don't include chacha test vectors in buildID
+mv ./src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_test_vectors.go ./src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go
+
 %build
 # print out system information
 uname -a
@@ -401,22 +318,20 @@ export GO_LDFLAGS="-linkmode internal"
 %if !%{cgo_enabled}
 export CGO_ENABLED=0
 %endif
-./make.bash --no-clean -v
+./make.bash --no-clean
 popd
 
 # build shared std lib
 %if %{shared}
-GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -buildmode=shared -v -x std
+GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -buildmode=shared std
 %endif
 
 %if %{race}
-GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race -v -x std
+GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race std
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# remove GC build cache
-rm -rf pkg/obj/go-build/*
 
 # create the top level directories
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -469,8 +384,8 @@ pushd $RPM_BUILD_ROOT%{goroot}
         echo "%%{golibdir}/$(basename $file)" >> $shared_list
     done
     
-    find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list
-    find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
+	find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list
+	find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
 %endif
 
 %if %{race}
@@ -528,12 +443,6 @@ 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
@@ -558,18 +467,21 @@ fi
 
 
 %files
-%license LICENSE PATENTS
-%doc AUTHORS CONTRIBUTORS
+%doc AUTHORS CONTRIBUTORS LICENSE PATENTS
 # VERSION has to be present in the GOROOT, for `go install std` to work
 %doc %{goroot}/VERSION
 %dir %{goroot}/doc
+%doc %{goroot}/doc/*
 
 # go files
 %dir %{goroot}
-%{goroot}/api/
-%{goroot}/lib/time/
-%{goroot}/favicon.ico
-%{goroot}/robots.txt
+%exclude %{goroot}/bin/
+%exclude %{goroot}/pkg/
+%exclude %{goroot}/src/
+%exclude %{goroot}/doc/
+%exclude %{goroot}/misc/
+%exclude %{goroot}/test/
+%{goroot}/*
 
 # ensure directory ownership, so they are cleaned up if empty
 %dir %{gopath}
@@ -585,305 +497,50 @@ fi
 # gdbinit (for gdb debugging)
 %{_sysconfdir}/gdbinit.d
 
-%files src -f go-src.list
+%files -f go-src.list src
 
-%files docs -f go-docs.list
+%files -f go-docs.list docs
 
-%files misc -f go-misc.list
+%files -f go-misc.list misc
 
-%files tests -f go-tests.list
+%files -f go-tests.list tests
 
-%files bin -f go-pkg.list
+%files -f go-pkg.list bin
 %{_bindir}/go
 %{_bindir}/gofmt
-%{goroot}/bin/linux_%{gohostarch}/go
-%{goroot}/bin/linux_%{gohostarch}/gofmt
 
 %if %{shared}
-%files shared -f go-shared.list
+%files -f go-shared.list shared
 %endif
 
 %if %{race}
-%files race -f go-race.list
+%files -f go-race.list race
 %endif
 
 %changelog
-* 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
-- Rebase to go1.13.5
-
-* Tue Nov 26 2019 Neal Gompa <ngompa@datto.com> - 1.13.4-2
-- Small fixes to the spec and tighten up the file list
-
-* Fri Nov 01 2019 Jakub Čajka <jcajka@redhat.com> - 1.13.4-1
-- Rebase to go1.13.4
-- Resolves BZ#1767673
-
-* Sat Oct 19 2019 Jakub Čajka <jcajka@redhat.com> - 1.13.3-1
-- Rebase to go1.13.3
-- Fix for CVE-2019-17596
-- Resolves: BZ#1755639, BZ#1763312
-
-* Fri Sep 27 2019 Jakub Čajka <jcajka@redhat.com> - 1.13.1-1
-- Rebase to go1.13.1
-- Fix for CVE-2019-16276
-- Resolves: BZ#1755970
-
-* Thu Sep 05 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-2
-- Back to go1.13 tls1.3 behavior
-
-* Wed Sep 04 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-1
-- Rebase to go1.13
-
-* Fri Aug 30 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-0.rc2.1
-- Rebase to go1.13rc2
-- Do not enable tls1.3 by default
-- Related: BZ#1737471
-
-* Wed Aug 28 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-0.rc1.2
-- Actually fix CVE-2019-9514 and CVE-2019-9512
-- Related: BZ#1741816, BZ#1741827
-
-* Mon Aug 26 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-0.rc1.1
-- Rebase to 1.13rc1
-- Fix for CVE-2019-14809, CVE-2019-9514 and CVE-2019-9512
-- Resolves: BZ#1741816, BZ#1741827 and BZ#1743131
-
-* Thu Aug 01 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-0.beta1.2.2
-- Fix ICE affecting aarch64
-- Resolves: BZ#1735290
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-0.beta1.2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 24 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-0.beta1.2
-- De-configure sumdb and go proxy
-
-* Wed Jul 24 2019 Jakub Čajka <jcajka@redhat.com> - 1.13-0.beta1.1
-- Rebase to 1.13beta1
-- Related: BZ#1732118
-
-* Tue Jul 09 2019 Jakub Čajka <jcajka@redhat.com> - 1.12.7-1
-- Rebase to 1.12.7
-- Resolves: BZ#1728056
-
-* Wed Jun 12 2019 Jakub Čajka <jcajka@redhat.com> - 1.12.6-1
-- Rebase to 1.12.6
-- Resolves: BZ#1719483
-
-* Tue May 07 2019 Jakub Čajka <jcajka@redhat.com> - 1.12.5-1
-- Rebase to 1.12.5
-- Resolves: BZ#1707187
-
-* Mon Apr 08 2019 Jakub Čajka <jcajka@redhat.com> - 1.12.2-1
-- Rebase to 1.12.2
-- Resolves: BZ#1688996
-
-* Mon Apr 01 2019 Jakub Čajka <jcajka@redhat.com> - 1.12.1-2
-- Fix up change log, respective CVE has been fixed in go1.12rc1
-
-* Fri Mar 15 2019 Jakub Čajka <jcajka@redhat.com> - 1.12.1-1
-- Rebase to 1.12.1
-- Fix requirement for %%preun (instead of %%postun) scriptlet thanks to Tim Landscheidt
-- Use weak deps for SCM deps
-
-* Wed Feb 27 2019 Jakub Čajka <jcajka@redhat.com> - 1.12-1
-- Rebase to go1.12 proper
-- Resolves:  BZ#1680040
-
-* Mon Feb 18 2019 Jakub Čajka <jcajka@redhat.com> - 1.12-0.rc1.1
-- Rebase to go1.12rc1
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-0.beta2.2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Jan 27 2019 Jakub Čajka <jcajka@redhat.com> - 1.12-0.beta2.2
-- Fix for CVE-2019-6486
-- Resolves: BZ#1668973
-
-* Fri Jan 11 2019 Jakub Čajka <jcajka@redhat.com> - 1.12-0.beta2.1
-- Rebase to go1.12beta2
-
-* Wed Jan 02 2019 Jakub Čajka <jcajka@redhat.com> - 1.11.4-1
-- Rebase to go1.11.4
-- Fix for CVE-2018-16875, CVE-2018-16874 and CVE-2018-16873
-- Resolves: BZ#1659290, BZ#1659289, BZ#1659288
-
-* Mon Nov 05 2018 Jakub Čajka <jcajka@redhat.com> - 1.11.2-1
-- Rebase to go1.11.2
-
-* Thu Oct 04 2018 Jakub Čajka <jcajka@redhat.com> - 1.11.1-1
-- Rebase to go1.11.1
-
-* Mon Aug 27 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-1
-- Rebase to go1.11 release
-
-* Thu Aug 23 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.rc2.1
-- Rebase to go1.11rc2
-- Reduce size of bin package
-
-* Tue Aug 14 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.rc1.1
-- Rebase to go1.11rc1
-
-* Mon Aug 06 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.beta3.1
-- Rebase to go1.11beta3
-
-* Fri Jul 27 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.beta2.2
-- Turn on back DWARF compression by default
-- Use less memory on 32bit targets during build
-- Resolves: BZ#1607270
-- Related: BZ#1602096
-
-* Fri Jul 20 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.beta2.1
-- Rebase to 1.11beta2
-
-* Wed Jul 18 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.beta1.2
-- Turn off DWARF compression by default as it is not supported by rpm/debuginfo
-- Related: BZ#1602096
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-0.beta1.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 04 2018 Jakub Čajka <jcajka@redhat.com> - 1.11-0.beta1.1
-* Rebase to 1.11beta1
-
-* Fri Jun 08 2018 Jakub Čajka <jcajka@redhat.com> - 1.10.3-1
-- Rebase to 1.10.3
-
-* Wed May 02 2018 Jakub Čajka <jcajka@redhat.com> - 1.10.2-1
-- Rebase to 1.10.2
-
-* Wed Apr 04 2018 Jakub Čajka <jcajka@redhat.com> - 1.10.1-1
-- Rebase to 1.10.1
-- Resolves: BZ#1562270
-
-* Sat Mar 03 2018 Jakub Čajka <jcajka@redhat.com> - 1.10-2
-- Fix CVE-2018-7187
-- Resolves: BZ#1546386, BZ#1546388
-
-* Wed Feb 21 2018 Jakub Čajka <jcajka@redhat.com> - 1.10-1
-- Rebase to 1.10
-
-* Thu Feb 08 2018 Jakub Čajka <jcajka@redhat.com> - 1.10-0.rc2.1
-- Rebase to 1.10rc2
+* Thu Feb 08 2018 Jakub Čajka <jcajka@redhat.com> - 1.8.7-1
+- Rebase to 1.8.7
 - Fix CVE-2018-6574
 - Resolves: BZ#1543561, BZ#1543562
 
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-0.rc1.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Tue Oct 31 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.5-1
+- Rebase to 1.8.5
+- re-apply s390x workaround
 
-* Fri Jan 26 2018 Jakub Čajka <jcajka@redhat.com> - 1.10-0.rc1.1
-- Rebase to 1.10rc1
+* Thu Oct 12 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.4-2
+- add bcond for bootstrap
 
-* Fri Jan 12 2018 Jakub Čajka <jcajka@redhat.com> - 1.10-0.beta2.1
-- Rebase to 1.10beta2
-
-* Mon Jan 08 2018 Jakub Čajka <jcajka@redhat.com> - 1.10-0.beta1.1
-- Rebase to 1.10beta1
-- Drop verbose patch as most of it is now implemented by bootstrap tool and is easily toggled by passing -v flag to make.bash
-
-* Thu Oct 26 2017 Jakub Čajka <jcajka@redhat.com> - 1.9.2-1
-- Rebase to 1.9.2
-- execute correctly pie tests
-- allow to ignore tests via bcond
-- reduce size of golang package
-
-* Fri Oct 06 2017 Jakub Čajka <jcajka@redhat.com> - 1.9.1-1
+* Fri Oct 06 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.4-1
 - fix CVE-2017-15041 and CVE-2017-15042
 
-* Fri Sep 15 2017 Jakub Čajka <jcajka@redhat.com> - 1.9-1
-- bump to the relased version
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-0.beta2.1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-0.beta2.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jul 11 2017 Jakub Čajka <jcajka@redhat.com> - 1.9-0.beta2.1
-- bump to beta2
+* Fri Jul 14 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.3-2
+- apply the s390x workaround
 
 * Thu May 25 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.3-1
 - bump to 1.8.3
 - fix for CVE-2017-8932
 - make possible to use 31bit OID in ASN1
+- workaround build issue on s390x
 - Resolves: BZ#1454978, BZ#1455191
 
 * Fri Apr 21 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.1-2

s390x-expose-IfInfomsg-X__ifi_pad.patch

@@ -1,7 +1,7 @@
-From 817407fc2d6a861e65086388766f58082d38bc0b Mon Sep 17 00:00:00 2001
+From 84b8c9ceaa5257f7ff4ab059ff208246ecdfe9d9 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
+Subject: [PATCH] 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.
@@ -10,14 +10,12 @@ 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
+index 63c4a83..b589425 100644
 --- a/src/syscall/ztypes_linux_s390x.go
 +++ b/src/syscall/ztypes_linux_s390x.go
-@@ -449,12 +449,12 @@ type RtAttr struct {
+@@ -449,12 +449,12 @@
  }
  
  type IfInfomsg struct {
@@ -36,6 +34,3 @@ index 63c4a83b19..b5894255df 100644
  }
  
  type IfAddrmsg struct {
--- 
-2.14.3
-

s390x-ignore-L0syms.patch

@@ -0,0 +1,18 @@
+diff --git a/src/cmd/link/internal/ld/ldelf.go b/src/cmd/link/internal/ld/ldelf.go
+index d4f9fc4..87dabaa 100644
+--- a/src/cmd/link/internal/ld/ldelf.go
++++ b/src/cmd/link/internal/ld/ldelf.go
+@@ -799,6 +799,13 @@ func ldelf(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
+ 				continue
+ 			}
+ 
++			if sect.name == ".debug_str" && sym.name == "L0
" && sym.type_ == 0 {
++				// introduced by https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=49fced1206db40c71208c201165d65f92c69cebe on s390x
++				// TODO investigate from where they are actually coming from, could be possible issue with elf parsing as seeing 0x1 in name is weird
++				// See issue 
++				continue
++			}
++
+ 			if strings.HasPrefix(sym.name, ".LASF") { // gcc on s390x does this
+ 				continue
+ 			}

sources

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

use-buildmode-pie-for-pie-testing.patch

@@ -0,0 +1,51 @@
+diff -up go/src/cmd/dist/test.go.origin go/src/cmd/dist/test.go
+--- go/src/cmd/dist/test.go.origin	2017-10-25 19:32:35.000000000 +0200
++++ go/src/cmd/dist/test.go	2017-11-08 12:24:52.771586558 +0100
+@@ -789,6 +789,16 @@ func (t *tester) supportedBuildmode(mode
+ 			return true
+ 		}
+ 		return false
++	case "pie":
++		switch pair {
++		case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-s390x",
++			"android-amd64", "android-arm", "android-arm64", "android-386":
++			return true
++		case "darwin-amd64":
++			return true
++		}
++		return false
++
+ 	default:
+ 		log.Fatalf("internal error: unknown buildmode %s", mode)
+ 		return false
+@@ -891,24 +901,16 @@ func (t *tester) cgoTest(dt *distTest) e
+ 				}
+ 			}
+ 
+-			if pair != "freebsd-amd64" { // clang -pie fails to link misc/cgo/test
+-				cmd := t.dirCmd("misc/cgo/test",
+-					cc, "-xc", "-o", "/dev/null", "-pie", "-")
++			if t.supportedBuildmode("pie") {
++				cmd = t.addCmd(dt, "misc/cgo/test", "go", "test", "-buildmode=pie")
+ 				cmd.Env = env
+-				cmd.Stdin = strings.NewReader("int main() {}")
+-				if err := cmd.Run(); err != nil {
+-					fmt.Println("No support for -pie found, skip cgo PIE test.")
+-				} else {
+-					cmd = t.addCmd(dt, "misc/cgo/test", "go", "test", "-ldflags", `-linkmode=external -extldflags "-pie"`)
+-					cmd.Env = env
+ 
+-					cmd = t.addCmd(dt, "misc/cgo/testtls", "go", "test", "-ldflags", `-linkmode=external -extldflags "-pie"`)
+-					cmd.Env = env
++				cmd = t.addCmd(dt, "misc/cgo/testtls", "go", "test", "-buildmode=pie")
++				cmd.Env = env
+ 
+-					cmd = t.addCmd(dt, "misc/cgo/nocgo", "go", "test", "-ldflags", `-linkmode=external -extldflags "-pie"`)
+-					cmd.Env = env
++				cmd = t.addCmd(dt, "misc/cgo/nocgo", "go", "test", "-buildmode=pie")
++				cmd.Env = env
+ 
+-				}
+ 			}
+ 		}
+ 	}