Merge branch 'f21' into f20

Conflicts:
	.gitignore

.gitignore

@@ -1,4 +1,3 @@
-*.rpm
 /go1.1.1.src.tar.gz
 /go1.1.2.src.tar.gz
 /go1.2.1.src.tar.gz
@@ -17,81 +16,4 @@
 /go1.4beta1.src.tar.gz
 /go1.4rc1.src.tar.gz
 /go1.4rc2.src.tar.gz
-/go1.5beta1.src.tar.gz
 /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

@@ -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
-

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

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

@@ -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
-

fedora.go

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

golang-1.2-BSD-SVID-SOURCE.patch

@@ -0,0 +1,19 @@
+Index: go/include/u.h
+===================================================================
+--- go.orig/include/u.h
++++ go/include/u.h
+@@ -38,10 +38,13 @@ extern "C" {
+ #		define __MAKECONTEXT_V2_SOURCE 1
+ #	endif
+ #endif
++#if defined __linux__ || defined __GNU__ || defined __GLIBC__
++#define _DEFAULT_SOURCE 1
++#else
+ #define _BSD_SOURCE 1
+ #define _NETBSD_SOURCE 1	/* NetBSD */
+-#define _DEFAULT_SOURCE 1	/* glibc > 2.19 */
+ #define _SVID_SOURCE 1
++#endif
+ #if !defined(__APPLE__) && !defined(__OpenBSD__)
+ #	define _XOPEN_SOURCE 1000
+ #	define _XOPEN_SOURCE_EXTENDED 1

golang-1.2-remove-ECC-p224.patch

@@ -0,0 +1,172 @@
+Index: go/api/go1.txt
+===================================================================
+--- go.orig/api/go1.txt
++++ go/api/go1.txt
+@@ -412,7 +412,6 @@ pkg crypto/ecdsa, type PublicKey struct,
+ pkg crypto/ecdsa, type PublicKey struct, embedded elliptic.Curve
+ pkg crypto/elliptic, func GenerateKey(Curve, io.Reader) ([]uint8, *big.Int, *big.Int, error)
+ pkg crypto/elliptic, func Marshal(Curve, *big.Int, *big.Int) []uint8
+-pkg crypto/elliptic, func P224() Curve
+ pkg crypto/elliptic, func P256() Curve
+ pkg crypto/elliptic, func P384() Curve
+ pkg crypto/elliptic, func P521() Curve
+Index: go/src/crypto/ecdsa/ecdsa_test.go
+===================================================================
+--- go.orig/src/crypto/ecdsa/ecdsa_test.go
++++ go/src/crypto/ecdsa/ecdsa_test.go
+@@ -33,7 +33,6 @@ func testKeyGeneration(t *testing.T, c e
+ }
+ 
+ func TestKeyGeneration(t *testing.T) {
+-	testKeyGeneration(t, elliptic.P224(), "p224")
+ 	if testing.Short() {
+ 		return
+ 	}
+@@ -63,7 +62,6 @@ func testSignAndVerify(t *testing.T, c e
+ }
+ 
+ func TestSignAndVerify(t *testing.T) {
+-	testSignAndVerify(t, elliptic.P224(), "p224")
+ 	if testing.Short() {
+ 		return
+ 	}
+@@ -129,8 +127,6 @@ func TestVectors(t *testing.T) {
+ 			parts := strings.SplitN(line, ",", 2)
+ 
+ 			switch parts[0] {
+-			case "P-224":
+-				pub.Curve = elliptic.P224()
+ 			case "P-256":
+ 				pub.Curve = elliptic.P256()
+ 			case "P-384":
+Index: go/src/crypto/elliptic/bottombits.go
+===================================================================
+--- /dev/null
++++ go/src/crypto/elliptic/bottombits.go
+@@ -0,0 +1,14 @@
++
++// Copyright 2012 The Go Authors.  All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++package elliptic
++
++const bottom12Bits = 0xfff
++const bottom28Bits = 0xfffffff
++
++const two31p3 = 1<<31 + 1<<3
++const two31m3 = 1<<31 - 1<<3
++const two31m15m3 = 1<<31 - 1<<15 - 1<<3
++
+Index: go/src/crypto/elliptic/elliptic.go
+===================================================================
+--- go.orig/src/crypto/elliptic/elliptic.go
++++ go/src/crypto/elliptic/elliptic.go
+@@ -326,7 +326,6 @@ var p384 *CurveParams
+ var p521 *CurveParams
+ 
+ func initAll() {
+-	initP224()
+ 	initP256()
+ 	initP384()
+ 	initP521()
+Index: go/src/crypto/elliptic/elliptic_test.go
+===================================================================
+--- go.orig/src/crypto/elliptic/elliptic_test.go
++++ go/src/crypto/elliptic/elliptic_test.go
+@@ -1,3 +1,5 @@
++// +build ignore
++
+ // Copyright 2010 The Go Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+Index: go/src/crypto/elliptic/p224.go
+===================================================================
+--- go.orig/src/crypto/elliptic/p224.go
++++ go/src/crypto/elliptic/p224.go
+@@ -1,3 +1,5 @@
++// +build ignore
++
+ // Copyright 2012 The Go Authors.  All rights reserved.
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+@@ -183,10 +185,6 @@ func p224Add(out, a, b *p224FieldElement
+ 	}
+ }
+ 
+-const two31p3 = 1<<31 + 1<<3
+-const two31m3 = 1<<31 - 1<<3
+-const two31m15m3 = 1<<31 - 1<<15 - 1<<3
+-
+ // p224ZeroModP31 is 0 mod p where bit 31 is set in all limbs so that we can
+ // subtract smaller amounts without underflow. See the section "Subtraction" in
+ // [1] for reasoning.
+@@ -215,9 +213,6 @@ const two63m35m19 = 1<<63 - 1<<35 - 1<<1
+ // "Subtraction" in [1] for why.
+ var p224ZeroModP63 = [8]uint64{two63p35, two63m35, two63m35, two63m35, two63m35m19, two63m35, two63m35, two63m35}
+ 
+-const bottom12Bits = 0xfff
+-const bottom28Bits = 0xfffffff
+-
+ // p224Mul computes *out = a*b
+ //
+ // a[i] < 2**29, b[i] < 2**30 (or vice versa)
+Index: go/src/crypto/elliptic/p224_test.go
+===================================================================
+--- go.orig/src/crypto/elliptic/p224_test.go
++++ go/src/crypto/elliptic/p224_test.go
+@@ -1,3 +1,5 @@
++// +build ignore
++
+ // Copyright 2012 The Go Authors.  All rights reserved.
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+Index: go/src/crypto/x509/x509.go
+===================================================================
+--- go.orig/src/crypto/x509/x509.go
++++ go/src/crypto/x509/x509.go
+@@ -306,9 +306,6 @@ func getPublicKeyAlgorithmFromOID(oid as
+ 
+ // RFC 5480, 2.1.1.1. Named Curve
+ //
+-// secp224r1 OBJECT IDENTIFIER ::= {
+-//   iso(1) identified-organization(3) certicom(132) curve(0) 33 }
+-//
+ // secp256r1 OBJECT IDENTIFIER ::= {
+ //   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
+ //   prime(1) 7 }
+@@ -321,7 +318,6 @@ func getPublicKeyAlgorithmFromOID(oid as
+ //
+ // NB: secp256r1 is equivalent to prime256v1
+ var (
+-	oidNamedCurveP224 = asn1.ObjectIdentifier{1, 3, 132, 0, 33}
+ 	oidNamedCurveP256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
+ 	oidNamedCurveP384 = asn1.ObjectIdentifier{1, 3, 132, 0, 34}
+ 	oidNamedCurveP521 = asn1.ObjectIdentifier{1, 3, 132, 0, 35}
+@@ -329,8 +325,6 @@ var (
+ 
+ func namedCurveFromOID(oid asn1.ObjectIdentifier) elliptic.Curve {
+ 	switch {
+-	case oid.Equal(oidNamedCurveP224):
+-		return elliptic.P224()
+ 	case oid.Equal(oidNamedCurveP256):
+ 		return elliptic.P256()
+ 	case oid.Equal(oidNamedCurveP384):
+@@ -343,8 +337,6 @@ func namedCurveFromOID(oid asn1.ObjectId
+ 
+ func oidFromNamedCurve(curve elliptic.Curve) (asn1.ObjectIdentifier, bool) {
+ 	switch curve {
+-	case elliptic.P224():
+-		return oidNamedCurveP224, true
+ 	case elliptic.P256():
+ 		return oidNamedCurveP256, true
+ 	case elliptic.P384():
+@@ -1371,7 +1363,7 @@ func signingParamsForPrivateKey(priv int
+ 		pubType = ECDSA
+ 
+ 		switch priv.Curve {
+-		case elliptic.P224(), elliptic.P256():
++		case elliptic.P256():
+ 			hashFunc = crypto.SHA256
+ 			sigAlgo.Algorithm = oidSignatureECDSAWithSHA256
+ 		case elliptic.P384():

golang-1.2-verbose-build.patch

@@ -0,0 +1,19 @@
+Index: go/src/make.bash
+===================================================================
+--- go.orig/src/make.bash
++++ go/src/make.bash
+@@ -161,12 +161,12 @@ if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOH
+ 	# 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 -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std
++		"$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std
+ 	echo
+ fi
+ 
+ echo "# Building packages and commands for $GOOS/$GOARCH."
+-CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std
++CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std
+ echo
+ 
+ rm -f "$GOTOOLDIR"/go_bootstrap

golang-f21-hostname.patch

@@ -0,0 +1,11 @@
+--- 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/runtime/runtime-gdb.py
+add-auto-load-safe-path /usr/lib/golang/src/pkg/runtime/runtime-gdb.py

golang-prelink.conf

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

@@ -0,0 +1,8 @@
+# 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 +1,2 @@
-SHA512 (go1.15.5.src.tar.gz) = 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
+d76dc07e475b2905b5fec1cf319b6356  golang-19087:a15f344a9efa-xattrs.tar
+907f85c8fa765d31f7f955836fec4049  go1.4.2.src.tar.gz