From 0ac347cd15c616d33cdce52c87fbce2906a8ac7d Mon Sep 17 00:00:00 2001 From: basebuilder_pel7ppc64bebuilder0 Date: Mon, 29 Oct 2018 10:53:07 +0100 Subject: [PATCH] golang update to 1.11 Signed-off-by: basebuilder_pel7ppc64bebuilder0 --- ...ndled-tzdata-at-runtime-except-for-t.patch | 65 ++++++++++--------- ...expose-IfInfomsg.X__ifi_pad-on-s390x.patch | 7 +- SPECS/golang.spec | 63 ++++++++++++++---- 3 files changed, 89 insertions(+), 46 deletions(-) diff --git a/SOURCES/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch b/SOURCES/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch index b27fcce0..422ca2b7 100644 --- a/SOURCES/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch +++ b/SOURCES/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch @@ -15,73 +15,74 @@ 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() + // 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()) - } + 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) + copy(zoneSources, OrigZoneSources) + zoneSources = append(zoneSources, runtime.GOROOT()+"/lib/time/zoneinfo.zip") - if zipOnly { - zoneSources = zoneSources[len(zoneSources)-1:] - } + 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" + "fmt" + "os" + "reflect" + "runtime" - "testing" - "time" + "testing" + "time" ) @@ -128,7 +129,7 @@ func TestLoadLocationFromTZData(t *testing.T) { - t.Fatal(err) - } - + 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) - } + 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" + "syscall" ) - + @@ -22,7 +21,6 @@ var zoneSources = []string{ - "/usr/share/zoneinfo/", - "/usr/share/lib/zoneinfo/", - "/usr/lib/locale/TZ/", + "/usr/share/zoneinfo/", + "/usr/share/lib/zoneinfo/", + "/usr/lib/locale/TZ/", - runtime.GOROOT() + "/lib/time/zoneinfo.zip", } - + func initLocal() { --- +-- 2.14.3 + diff --git a/SOURCES/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch b/SOURCES/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch index 10bd12eb..072440dd 100644 --- a/SOURCES/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch +++ b/SOURCES/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch @@ -19,7 +19,7 @@ index 63c4a83b19..b5894255df 100644 +++ b/src/syscall/ztypes_linux_s390x.go @@ -449,12 +449,12 @@ type RtAttr struct { } - + type IfInfomsg struct { - Family uint8 - _ uint8 @@ -34,7 +34,8 @@ index 63c4a83b19..b5894255df 100644 + Flags uint32 + Change uint32 } - + type IfAddrmsg struct { --- +-- 2.14.3 + diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 0780cb07..74e14ee6 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -1,6 +1,6 @@ %bcond_with bootstrap # temporalily ignore test failures -%ifarch %{ix86} aarch64 ppc64 ppc64le +%ifarch %{ix86} aarch64 %{arm} ppc64 ppc64le %bcond_without ignore_tests %else %bcond_with ignore_tests @@ -101,11 +101,11 @@ %global gohostarch s390x %endif -%global go_api 1.10 -%global go_version 1.10.3 +%global go_api 1.11 +%global go_version 1.11 Name: golang -Version: 1.10.3 +Version: 1.11 Release: 1%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain @@ -134,24 +134,24 @@ 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/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/internal/chacha20)) 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/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)) @@ -164,12 +164,18 @@ 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/profile)) -Provides: bundled(golang(github.com/google/pprof/third.party/svg)) +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/ssh/terminal)) +Provides: bundled(golang(golang.org/x/sys/unix)) +Provides: bundled(golang(golang.org/x/sys/windows)) +Provides: bundled(golang(golang.org/x/sys/windows/registry)) Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} @@ -177,7 +183,6 @@ 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-internal-work-improve-pkgconfig-support-to-wo.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -303,7 +308,6 @@ Requires: %{name} = %{version}-%{release} %patch1 -p1 %patch2 -p1 -%patch3 -p1 cp %{SOURCE1} ./src/runtime/ @@ -354,6 +358,8 @@ 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} @@ -540,6 +546,41 @@ fi %endif %changelog +* Mon Aug 27 2018 Jakub Čajka - 1.11-1 +- Rebase to go1.11 release + +* Thu Aug 23 2018 Jakub Čajka - 1.11-0.rc2.1 +- Rebase to go1.11rc2 +- Reduce size of bin package + +* Tue Aug 14 2018 Jakub Čajka - 1.11-0.rc1.1 +- Rebase to go1.11rc1 + +* Mon Aug 06 2018 Jakub Čajka - 1.11-0.beta3.1 +- Rebase to go1.11beta3 + +* Fri Jul 27 2018 Jakub Čajka - 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 - 1.11-0.beta2.1 +- Rebase to 1.11beta2 + +* Wed Jul 18 2018 Jakub Čajka - 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 - 1.11-0.beta1.1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 04 2018 Jakub Čajka - 1.11-0.beta1.1 +* Rebase to 1.11beta1 + +* Fri Jun 08 2018 Jakub Čajka - 1.10.3-1 +- Rebase to 1.10.3 + * Wed May 02 2018 Jakub Čajka - 1.10.2-1 - Rebase to 1.10.2