Rebase to 1.10.8

Fix for CVE-2019-6486
Rebase to 1.10.7
2019-01-27 12:47:49 +01:00 · 2019-01-02 15:51:06 +01:00 · 2018-11-06 10:40:41 +01:00 · 2018-08-28 12:12:23 +02:00
6 changed files with 269 additions and 411 deletions
--- a/.gitignore
+++ b/.gitignore
@ -53,45 +53,7 @@
 /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.10.4.src.tar.gz
+/go1.10.5.src.tar.gz
+/go1.10.7.src.tar.gz
+/go1.10.8.src.tar.gz
--- a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
+++ b/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
-
--- a/0003-cmd-go-internal-work-improve-pkgconfig-support-to-wo.patch
+++ b/0003-cmd-go-internal-work-improve-pkgconfig-support-to-wo.patch
@ -0,0 +1,177 @@
+From 18385565374c36eda8306c57715332d5ae6eb9a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
+Date: Fri, 5 Jan 2018 13:38:55 +0100
+Subject: [PATCH 3/3] cmd/go/internal/work : improve pkgconfig support to work
+ with latest(1.4+) pkgconf
+
+Fixes #23373
+
+Fix interfacing with latest(1.4+) pkgconf versions, as they have change the output format, by extending parsing function splitPkgConfigOutput to accommodate more possible fragment escaping formats. Function is based on pkgconfigs own implementation at https://github.com/pkgconf/pkgconf/blob/master/libpkgconf/argvsplit.c. Along with this change test case TestSplitPkgConfigOutput have been expanded. Thanks to ignatenko for help on test cases and insights in to the pkgconfig.
+
+Change-Id: I55301bb564b07128d5564ec1454dd247f84a95c3
+---
+ src/cmd/go/internal/work/build_test.go | 44 +++++++++++++++++---
+ src/cmd/go/internal/work/exec.go       | 75 +++++++++++++++++++++++-----------
+ 2 files changed, 90 insertions(+), 29 deletions(-)
+
+diff --git a/src/cmd/go/internal/work/build_test.go b/src/cmd/go/internal/work/build_test.go
+index 3f5ba37c64..c3c63a97a4 100644
+--- a/src/cmd/go/internal/work/build_test.go
+++ b/src/cmd/go/internal/work/build_test.go
+@@ -39,14 +39,46 @@ func TestSplitPkgConfigOutput(t *testing.T) {
+ 	for _, test := range []struct {
+ 		in   []byte
+ 		want []string
+		pass bool
+ 	}{
+-		{[]byte(`-r:foo -L/usr/white\ space/lib -lfoo\ bar -lbar\ baz`), []string{"-r:foo", "-L/usr/white space/lib", "-lfoo bar", "-lbar baz"}},
+-		{[]byte(`-lextra\ fun\ arg\\`), []string{`-lextra fun arg\`}},
+-		{[]byte(`broken flag\`), []string{"broken", "flag"}},
+-		{[]byte("\textra     whitespace\r\n"), []string{"extra", "whitespace"}},
+-		{[]byte("     \r\n      "), nil},
+		{[]byte(`-r:foo -L/usr/white\ space/lib -lfoo\ bar -lbar\ baz`), []string{"-r:foo", "-L/usr/white space/lib", "-lfoo bar", "-lbar baz"}, true},
+		{[]byte(`-lextra\ fun\ arg\\`), []string{`-lextra fun arg\`}, true},
+		{[]byte(`broken flag\`), []string{"broken", "flag"}, true},
+		{[]byte(`extra broken flag \`), []string{"extra", "broken", "flag"}, true},
+		{[]byte(`\`), nil, true},
+		{[]byte("\textra     whitespace\r\n"), []string{"extra", "whitespace"}, true},
+		{[]byte("     \r\n      "), nil, true},
+		{[]byte(`"-r:foo" "-L/usr/white space/lib" "-lfoo bar" "-lbar baz"`), []string{"-r:foo", "-L/usr/white space/lib", "-lfoo bar", "-lbar baz"}, true},
+		{[]byte(`"-lextra fun arg\\"`), []string{`-lextra fun arg\`}, true},
+		{[]byte(`"     \r\n\      "`), []string{`     \r\n\      `}, true},
+		{[]byte(`""`), nil, true},
+		{[]byte(``), nil, true},
+		{[]byte(`"\\"`), []string{`\`}, true},
+		{[]byte(`"\x"`), []string{`\x`}, true},
+		{[]byte(`"\\x"`), []string{`\x`}, true},
+		{[]byte(`'\\'`), []string{`\`}, true},
+		{[]byte(`'\x'`), []string{`\x`}, true},
+		{[]byte(`"\\x"`), []string{`\x`}, true},
+		{[]byte(`-fPIC -I/test/include/foo -DQUOTED='"/test/share/doc"'`), []string{"-fPIC", "-I/test/include/foo", `-DQUOTED="/test/share/doc"`}, true},
+		{[]byte(`-fPIC -I/test/include/foo -DQUOTED="/test/share/doc"`), []string{"-fPIC", "-I/test/include/foo", "-DQUOTED=/test/share/doc"}, true},
+		{[]byte(`-fPIC -I/test/include/foo -DQUOTED=\"/test/share/doc\"`), []string{"-fPIC", "-I/test/include/foo", `-DQUOTED="/test/share/doc"`}, true},
+		{[]byte(`-fPIC -I/test/include/foo -DQUOTED='/test/share/doc'`), []string{"-fPIC", "-I/test/include/foo", "-DQUOTED=/test/share/doc"}, true},
+		{[]byte(`-DQUOTED='/te\st/share/d\oc'`), []string{`-DQUOTED=/te\st/share/d\oc`}, true},
+		{[]byte(`-Dhello=10 -Dworld=+32 -DDEFINED_FROM_PKG_CONFIG=hello\ world`), []string{"-Dhello=10", "-Dworld=+32", "-DDEFINED_FROM_PKG_CONFIG=hello world"}, true},
+		{[]byte(`"     \r\n      `), nil, false},
+		{[]byte(`"-r:foo" "-L/usr/white space/lib "-lfoo bar" "-lbar baz"`), nil, false},
+		{[]byte(`"-lextra fun arg\\`), nil, false},
+ 	} {
+-		got := splitPkgConfigOutput(test.in)
+		got, err := splitPkgConfigOutput(test.in)
+		if err != nil {
+			if test.pass {
+				t.Errorf("splitPkgConfigOutput(%v) = %v; function returned error %v", test.in, got, err)
+			}
+			if got != nil {
+				t.Errorf("splitPkgConfigOutput failed with error %v and output has been non nil %v", err, got)
+			}
+			continue
+		}
+ 		if !reflect.DeepEqual(got, test.want) {
+ 			t.Errorf("splitPkgConfigOutput(%v) = %v; want %v", test.in, got, test.want)
+ 		}
+diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
+index a50c996041..5596638e48 100644
+--- a/src/cmd/go/internal/work/exec.go
+++ b/src/cmd/go/internal/work/exec.go
+@@ -900,36 +900,62 @@ func (b *Builder) PkgconfigCmd() string {
+ }
+ 
+ // splitPkgConfigOutput parses the pkg-config output into a slice of
+-// flags. pkg-config always uses \ to escape special characters.
+-func splitPkgConfigOutput(out []byte) []string {
+// flags. This implements the algorithm from pkgconf/libpkgconf/argvsplit.c
+func splitPkgConfigOutput(out []byte) ([]string, error) {
+ 	if len(out) == 0 {
+-		return nil
+		return nil, nil
+ 	}
+ 	var flags []string
+-	flag := make([]byte, len(out))
+-	r, w := 0, 0
+-	for r < len(out) {
+-		switch out[r] {
+-		case ' ', '\t', '\r', '\n':
+-			if w > 0 {
+-				flags = append(flags, string(flag[:w]))
+	flag := make([]byte, 0, len(out))
+	escaped := false
+	quote := byte(0)
+
+	for _, c := range out {
+		if escaped {
+			if quote == '"' || quote == '\'' {
+				switch c {
+				case '$', '`', '"', '\\':
+				default:
+					flag = append(flag, '\\')
+				}
+				flag = append(flag, c)
+			} else {
+				flag = append(flag, c)
+ 			}
+-			w = 0
+-		case '\\':
+-			r++
+-			fallthrough
+-		default:
+-			if r < len(out) {
+-				flag[w] = out[r]
+-				w++
+			escaped = false
+		} else if quote != 0 {
+			if c == quote {
+				quote = 0
+			} else {
+				switch c {
+				case '\\':
+					escaped = true
+				default:
+					flag = append(flag, c)
+				}
+ 			}
+		} else if strings.IndexByte(" \t\n\v\f\r", c) < 0 {
+			switch c {
+			case '\\':
+				escaped = true
+			case '\'', '"':
+				quote = c
+			default:
+				flag = append(flag, c)
+			}
+		} else if len(flag) != 0 {
+			flags = append(flags, string(flag))
+			flag = flag[:0]
+ 		}
+-		r++
+ 	}
+-	if w > 0 {
+-		flags = append(flags, string(flag[:w]))
+
+	if quote != 0 {
+		return nil, errors.New("unterminated quoted string in pkgconf output ")
+	} else if len(flag) != 0 {
+		flags = append(flags, string(flag))
+ 	}
+-	return flags
+
+	return flags, nil
+ }
+ 
+ // Calls pkg-config if needed and returns the cflags/ldflags needed to build the package.
+@@ -961,7 +987,10 @@ func (b *Builder) getPkgConfigFlags(p *load.Package) (cflags, ldflags []string,
+ 			return nil, nil, errPrintedOutput
+ 		}
+ 		if len(out) > 0 {
+-			cflags = splitPkgConfigOutput(out)
+			cflags, err = splitPkgConfigOutput(out)
+			if err != nil {
+				return nil, nil, err
+			}
+ 			if err := checkCompilerFlags("CFLAGS", "pkg-config --cflags", cflags); err != nil {
+ 				return nil, nil, err
+ 			}
+-- 
+2.14.3
+
--- a/0004-cmd-internal-objfile-only-consider-executable-segmen.patch
+++ b/0004-cmd-internal-objfile-only-consider-executable-segmen.patch
@ -0,0 +1,39 @@
+From 1ea34a218ac99e35695617e5d3648e6762254cc7 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Fri, 3 Aug 2018 14:52:54 -0700
+Subject: [PATCH 4/4] cmd/internal/objfile: only consider executable segments
+ for load address
+
+Reportedly on some new Fedora systems the linker is producing extra
+load segments, basically making the dynamic section non-executable.
+We were assuming that the first load segment could be used to
+determine the program's load offset, but that is no longer true.
+Use the first executable load segment instead.
+
+Fixes #26369
+
+Change-Id: I5ee31ddeef2e8caeed3112edc5149065a6448456
+Reviewed-on: https://go-review.googlesource.com/127895
+Run-TryBot: Ian Lance Taylor <iant@golang.org>
+TryBot-Result: Gobot Gobot <gobot@golang.org>
+Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
+---
+ src/cmd/internal/objfile/elf.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cmd/internal/objfile/elf.go b/src/cmd/internal/objfile/elf.go
+index 7d5162a1e8..a48a9df5d6 100644
+--- a/src/cmd/internal/objfile/elf.go
+++ b/src/cmd/internal/objfile/elf.go
+@@ -114,7 +114,7 @@ func (f *elfFile) goarch() string {
+ 
+ func (f *elfFile) loadAddress() (uint64, error) {
+ 	for _, p := range f.elf.Progs {
+-		if p.Type == elf.PT_LOAD {
+		if p.Type == elf.PT_LOAD && p.Flags&elf.PF_X != 0 {
+ 			return p.Vaddr, nil
+ 		}
+ 	}
+-- 
+2.14.4
+
--- a/golang.spec
+++ b/golang.spec
@ -1,7 +1,6 @@
 %bcond_with bootstrap
 # temporalily ignore test failures
-# due to https://github.com/golang/go/issues/39466
-%ifarch aarch64
+%ifarch %{ix86} aarch64
 %bcond_without ignore_tests
 %else
 %bcond_with ignore_tests
@ -33,9 +32,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.
@ -105,11 +101,11 @@
 %global gohostarch  s390x
 %endif

-%global go_api 1.15
-%global go_version 1.15.5
+%global go_api 1.10
+%global go_version 1.10.8

 Name:           golang
-Version:        1.15.5
+Version:        1.10.8
 Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@ -137,25 +133,25 @@ 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/chacha20poly1305/internal/chacha20))
 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/internal/nettest))
+Provides: bundled(golang(golang.org/x/net/lex/httplex))
 Provides: bundled(golang(golang.org/x/net/nettest))
-Provides: bundled(golang(golang.org/x/sys/cpu))
+Provides: bundled(golang(golang.org/x/net/proxy))
+Provides: bundled(golang(golang.org/x/text/secure))
 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))
 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))
 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))
@ -163,72 +159,17 @@ 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/proftest))
 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/google/pprof/third.party/svg))
 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}
@ -236,7 +177,8 @@ 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
+Patch3:       0003-cmd-go-internal-work-improve-pkgconfig-support-to-wo.patch
+Patch4:       0004-cmd-internal-objfile-only-consider-executable-segmen.patch

 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
@ -289,8 +231,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 +261,13 @@ 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,7 +300,12 @@ Requires:       %{name} = %{version}-%{release}
 %endif

 %prep
-%autosetup -p1 -n go
+%setup -q -n go
+
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1

 cp %{SOURCE1} ./src/runtime/

@ -415,8 +356,6 @@ GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race -v -x std

 %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 +408,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 +467,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 +491,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,244 +521,42 @@ 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
+* Sun Jan 27 2019 Jakub Čajka <jcajka@redhat.com> - 1.10.8-1
+- Rebase to 1.10.8
 - 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
+* Wed Jan 02 2019 Jakub Čajka <jcajka@redhat.com> - 1.10.7-1
+- Rebase to 1.10.7
 - 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
+* Tue Nov 06 2018 Jakub Čajka <jcajka@redhat.com> - 1.10.5-1
+- Rebase to 1.10.5

-* 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
+* Tue Aug 28 2018 Jakub Čajka <jcajka@redhat.com> - 1.10.4-1
+- Rebase to 1.10.4

 * Fri Jun 08 2018 Jakub Čajka <jcajka@redhat.com> - 1.10.3-1
 - Rebase to 1.10.3
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (go1.15.5.src.tar.gz) = 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
+SHA512 (go1.10.8.src.tar.gz) = c274b99e39b78dfdf6b6b1c4fd6a5a54bff1b3eba55a879413692586ac7f0d30772416dcb5f715213c650946ade649bd424981f77508d92510c717d1845e3ede
Author	SHA1	Message	Date
Jakub Čajka	272ab27fa9	Rebase to 1.10.8 Fix for CVE-2019-6486	2019-01-27 12:47:49 +01:00
Jakub Čajka	84691e5e07	Rebase to 1.10.7 Fix for CVE-2018-16875, CVE-2018-16874 and CVE-2018-16873 Resolves: BZ#1659290, BZ#1659289, BZ#1659288	2019-01-02 15:51:06 +01:00
Jakub Čajka	c72ca30b8a	Rebase to 1.10.5	2018-11-06 10:40:41 +01:00
Jakub Čajka	efb9813e97	Rebase to 1.10.4	2018-08-28 12:12:23 +02:00