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

@@ -24,3 +24,74 @@
 /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.5-zoneinfo_testing_only.patch

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

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")
- 	}

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-1.5.1-a3156aaa12.patch

@@ -1,309 +0,0 @@
-commit a3156aaa121446c4136927f8c2139fefe05ba82c
-Author: Brad Fitzpatrick <bradfitz@golang.org>
-Date:   Tue Sep 29 14:26:48 2015 -0700
-
-    net/http/httptest: change Server to use http.Server.ConnState for accounting
-    
-    With this CL, httptest.Server now uses connection-level accounting of
-    outstanding requests instead of ServeHTTP-level accounting. This is
-    more robust and results in a non-racy shutdown.
-    
-    This is much easier now that net/http.Server has the ConnState hook.
-    
-    Fixes #12789
-    Fixes #12781
-    
-    Change-Id: I098cf334a6494316acb66cd07df90766df41764b
-    Reviewed-on: https://go-review.googlesource.com/15151
-    Reviewed-by: Andrew Gerrand <adg@golang.org>
-    Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
-    TryBot-Result: Gobot Gobot <gobot@golang.org>
-
-diff --git a/src/net/http/httptest/server.go b/src/net/http/httptest/server.go
-index 96eb0ef..e4f680f 100644
---- a/src/net/http/httptest/server.go
-+++ b/src/net/http/httptest/server.go
-@@ -7,13 +7,17 @@
- package httptest
- 
- import (
-+	"bytes"
- 	"crypto/tls"
- 	"flag"
- 	"fmt"
-+	"log"
- 	"net"
- 	"net/http"
- 	"os"
-+	"runtime"
- 	"sync"
-+	"time"
- )
- 
- // A Server is an HTTP server listening on a system-chosen port on the
-@@ -34,24 +38,10 @@ type Server struct {
- 	// wg counts the number of outstanding HTTP requests on this server.
- 	// Close blocks until all requests are finished.
- 	wg sync.WaitGroup
--}
--
--// historyListener keeps track of all connections that it's ever
--// accepted.
--type historyListener struct {
--	net.Listener
--	sync.Mutex // protects history
--	history    []net.Conn
--}
- 
--func (hs *historyListener) Accept() (c net.Conn, err error) {
--	c, err = hs.Listener.Accept()
--	if err == nil {
--		hs.Lock()
--		hs.history = append(hs.history, c)
--		hs.Unlock()
--	}
--	return
-+	mu     sync.Mutex // guards closed and conns
-+	closed bool
-+	conns  map[net.Conn]http.ConnState // except terminal states
- }
- 
- func newLocalListener() net.Listener {
-@@ -103,10 +93,9 @@ func (s *Server) Start() {
- 	if s.URL != "" {
- 		panic("Server already started")
- 	}
--	s.Listener = &historyListener{Listener: s.Listener}
- 	s.URL = "http://" + s.Listener.Addr().String()
--	s.wrapHandler()
--	go s.Config.Serve(s.Listener)
-+	s.wrap()
-+	s.goServe()
- 	if *serve != "" {
- 		fmt.Fprintln(os.Stderr, "httptest: serving on", s.URL)
- 		select {}
-@@ -134,23 +123,10 @@ func (s *Server) StartTLS() {
- 	if len(s.TLS.Certificates) == 0 {
- 		s.TLS.Certificates = []tls.Certificate{cert}
- 	}
--	tlsListener := tls.NewListener(s.Listener, s.TLS)
--
--	s.Listener = &historyListener{Listener: tlsListener}
-+	s.Listener = tls.NewListener(s.Listener, s.TLS)
- 	s.URL = "https://" + s.Listener.Addr().String()
--	s.wrapHandler()
--	go s.Config.Serve(s.Listener)
--}
--
--func (s *Server) wrapHandler() {
--	h := s.Config.Handler
--	if h == nil {
--		h = http.DefaultServeMux
--	}
--	s.Config.Handler = &waitGroupHandler{
--		s: s,
--		h: h,
--	}
-+	s.wrap()
-+	s.goServe()
- }
- 
- // NewTLSServer starts and returns a new Server using TLS.
-@@ -161,43 +137,139 @@ func NewTLSServer(handler http.Handler) *Server {
- 	return ts
- }
- 
-+type closeIdleTransport interface {
-+	CloseIdleConnections()
-+}
-+
- // Close shuts down the server and blocks until all outstanding
- // requests on this server have completed.
- func (s *Server) Close() {
--	s.Listener.Close()
--	s.wg.Wait()
--	s.CloseClientConnections()
--	if t, ok := http.DefaultTransport.(*http.Transport); ok {
-+	s.mu.Lock()
-+	if !s.closed {
-+		s.closed = true
-+		s.Listener.Close()
-+		s.Config.SetKeepAlivesEnabled(false)
-+		for c, st := range s.conns {
-+			if st == http.StateIdle {
-+				s.closeConn(c)
-+			}
-+		}
-+		// If this server doesn't shut down in 5 seconds, tell the user why.
-+		t := time.AfterFunc(5*time.Second, s.logCloseHangDebugInfo)
-+		defer t.Stop()
-+	}
-+	s.mu.Unlock()
-+
-+	// Not part of httptest.Server's correctness, but assume most
-+	// users of httptest.Server will be using the standard
-+	// transport, so help them out and close any idle connections for them.
-+	if t, ok := http.DefaultTransport.(closeIdleTransport); ok {
- 		t.CloseIdleConnections()
- 	}
-+
-+	s.wg.Wait()
- }
- 
--// CloseClientConnections closes any currently open HTTP connections
--// to the test Server.
-+func (s *Server) logCloseHangDebugInfo() {
-+	s.mu.Lock()
-+	defer s.mu.Unlock()
-+	var buf bytes.Buffer
-+	buf.WriteString("httptest.Server blocked in Close after 5 seconds, waiting for connections:\n")
-+	for c, st := range s.conns {
-+		fmt.Fprintf(&buf, "  %T %p %v in state %v\n", c, c, c.RemoteAddr(), st)
-+	}
-+	log.Print(buf.String())
-+}
-+
-+// CloseClientConnections closes any open HTTP connections to the test Server.
- func (s *Server) CloseClientConnections() {
--	hl, ok := s.Listener.(*historyListener)
--	if !ok {
--		return
-+	s.mu.Lock()
-+	defer s.mu.Unlock()
-+	for c := range s.conns {
-+		s.closeConn(c)
- 	}
--	hl.Lock()
--	for _, conn := range hl.history {
--		conn.Close()
-+}
-+
-+func (s *Server) goServe() {
-+	s.wg.Add(1)
-+	go func() {
-+		defer s.wg.Done()
-+		s.Config.Serve(s.Listener)
-+	}()
-+}
-+
-+// wrap installs the connection state-tracking hook to know which
-+// connections are idle.
-+func (s *Server) wrap() {
-+	oldHook := s.Config.ConnState
-+	s.Config.ConnState = func(c net.Conn, cs http.ConnState) {
-+		s.mu.Lock()
-+		defer s.mu.Unlock()
-+		switch cs {
-+		case http.StateNew:
-+			s.wg.Add(1)
-+			if _, exists := s.conns[c]; exists {
-+				panic("invalid state transition")
-+			}
-+			if s.conns == nil {
-+				s.conns = make(map[net.Conn]http.ConnState)
-+			}
-+			s.conns[c] = cs
-+			if s.closed {
-+				// Probably just a socket-late-binding dial from
-+				// the default transport that lost the race (and
-+				// thus this connection is now idle and will
-+				// never be used).
-+				s.closeConn(c)
-+			}
-+		case http.StateActive:
-+			if oldState, ok := s.conns[c]; ok {
-+				if oldState != http.StateNew && oldState != http.StateIdle {
-+					panic("invalid state transition")
-+				}
-+				s.conns[c] = cs
-+			}
-+		case http.StateIdle:
-+			if oldState, ok := s.conns[c]; ok {
-+				if oldState != http.StateActive {
-+					panic("invalid state transition")
-+				}
-+				s.conns[c] = cs
-+			}
-+			if s.closed {
-+				s.closeConn(c)
-+			}
-+		case http.StateHijacked, http.StateClosed:
-+			s.forgetConn(c)
-+		}
-+		if oldHook != nil {
-+			oldHook(c, cs)
-+		}
- 	}
--	hl.Unlock()
- }
- 
--// waitGroupHandler wraps a handler, incrementing and decrementing a
--// sync.WaitGroup on each request, to enable Server.Close to block
--// until outstanding requests are finished.
--type waitGroupHandler struct {
--	s *Server
--	h http.Handler // non-nil
-+// closeConn closes c. Except on plan9, which is special. See comment below.
-+// s.mu must be held.
-+func (s *Server) closeConn(c net.Conn) {
-+	if runtime.GOOS == "plan9" {
-+		// Go's Plan 9 net package isn't great at unblocking reads when
-+		// their underlying TCP connections are closed.  Don't trust
-+		// that that the ConnState state machine will get to
-+		// StateClosed. Instead, just go there directly. Plan 9 may leak
-+		// resources if the syscall doesn't end up returning. Oh well.
-+		s.forgetConn(c)
-+	}
-+	go c.Close()
- }
- 
--func (h *waitGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
--	h.s.wg.Add(1)
--	defer h.s.wg.Done() // a defer, in case ServeHTTP below panics
--	h.h.ServeHTTP(w, r)
-+// forgetConn removes c from the set of tracked conns and decrements it from the
-+// waitgroup, unless it was previously removed.
-+// s.mu must be held.
-+func (s *Server) forgetConn(c net.Conn) {
-+	if _, ok := s.conns[c]; ok {
-+		delete(s.conns, c)
-+		s.wg.Done()
-+	}
- }
- 
- // localhostCert is a PEM-encoded TLS cert with SAN IPs
-diff --git a/src/net/http/httptest/server_test.go b/src/net/http/httptest/server_test.go
-index 500a9f0..90901ce 100644
---- a/src/net/http/httptest/server_test.go
-+++ b/src/net/http/httptest/server_test.go
-@@ -27,3 +27,30 @@ func TestServer(t *testing.T) {
- 		t.Errorf("got %q, want hello", string(got))
- 	}
- }
-+
-+// Issue 12781
-+func TestGetAfterClose(t *testing.T) {
-+	ts := NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-+		w.Write([]byte("hello"))
-+	}))
-+
-+	res, err := http.Get(ts.URL)
-+	if err != nil {
-+		t.Fatal(err)
-+	}
-+	got, err := ioutil.ReadAll(res.Body)
-+	if err != nil {
-+		t.Fatal(err)
-+	}
-+	if string(got) != "hello" {
-+		t.Fatalf("got %q, want hello", string(got))
-+	}
-+
-+	ts.Close()
-+
-+	res, err = http.Get(ts.URL)
-+	if err == nil {
-+		body, _ := ioutil.ReadAll(res.Body)
-+		t.Fatalf("Unexected response after close: %v, %v, %s", res.Status, res.Header, body)
-+	}
-+}

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

sources

@@ -1 +1 @@
-4adfbdfca523cc1c229be8a321f3602f  go1.5.1.src.tar.gz
+SHA512 (go1.15.5.src.tar.gz) = 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4