diff --git a/0030-cmd-nm-cmd-objdump-cmd-pprof-disassembly-is-not-supp.patch b/0030-cmd-nm-cmd-objdump-cmd-pprof-disassembly-is-not-supp.patch index b299ba48b45c3252210d793f5f0000275d309bfd..cebbd76e47778d0d76e84189c2ccee9d0fa37d04 100644 --- a/0030-cmd-nm-cmd-objdump-cmd-pprof-disassembly-is-not-supp.patch +++ b/0030-cmd-nm-cmd-objdump-cmd-pprof-disassembly-is-not-supp.patch @@ -29,8 +29,8 @@ index f231a7c..40fe21b 100644 --- a/src/cmd/objdump/objdump_test.go +++ b/src/cmd/objdump/objdump_test.go @@ -107,6 +107,8 @@ var ppcGnuNeed = []string{ - - func mustHaveDisasm(t *testing.T) { + t.Skipf("builder %q has an incompatible version of XCode installed, see go.dev/issue/49700", testenv.Builder()) + } switch runtime.GOARCH { + case "loong64": + t.Skipf("skipping on %s", runtime.GOARCH) diff --git a/download b/download index 756c91f648f2384b1a261633617f542f09ffc4a6..6ce8d24e73010376046feebc67f88a96a391b3f1 100644 --- a/download +++ b/download @@ -1 +1 @@ -17410e2ec2dbfe34d042ca0bbec189da go-go-1.17.7-1-openssl-fips.tar.gz +462bb173624bc2858b904e29ab0463e4 go1.17.10-1-openssl-fips.tar.gz diff --git a/fix_TestScript_list_std.patch b/fix_TestScript_list_std.patch index 1387cb71ca3f9caf033b87d05c22b22a1fee407b..ade3711c6807083c4076be5015919c9b1b641d72 100644 --- a/fix_TestScript_list_std.patch +++ b/fix_TestScript_list_std.patch @@ -1,5 +1,5 @@ diff --git a/src/cmd/go/testdata/script/list_std.txt b/src/cmd/go/testdata/script/list_std.txt -index 6ab1bd1674..4a00e436fd 100644 +index 6ab1bd1..4a00e43 100644 --- a/src/cmd/go/testdata/script/list_std.txt +++ b/src/cmd/go/testdata/script/list_std.txt @@ -6,7 +6,7 @@ env GO111MODULE=off diff --git a/go1.5-zoneinfo_testing_only.patch b/go1.5-zoneinfo_testing_only.patch index 581cb948848ef8a78bbd8642c3c7dd6e00b09fb9..d6abe20ad48570a3719cf390ee2b51449eb875d3 100644 --- a/go1.5-zoneinfo_testing_only.patch +++ b/go1.5-zoneinfo_testing_only.patch @@ -1,6 +1,7 @@ -diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go.time go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go ---- go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go.time 2017-12-05 01:10:10.000000000 +0100 -+++ go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go 2017-12-05 14:55:10.574637475 +0100 +diff --git a/src/time/internal_test.go b/src/time/internal_test.go +index 87a4208..0923e75 100644 +--- a/src/time/internal_test.go ++++ b/src/time/internal_test.go @@ -4,13 +4,15 @@ package time @@ -29,10 +30,11 @@ diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/internal_test.go.t if zipOnly { zoneSources = zoneSources[len(zoneSources)-1:] } -diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go.time go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go ---- go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go.time 2017-12-05 01:10:10.000000000 +0100 -+++ go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go 2017-12-05 14:58:09.823109248 +0100 -@@ -8,6 +8,7 @@ import ( +diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go +index f032aa7..e3e5547 100644 +--- a/src/time/zoneinfo_test.go ++++ b/src/time/zoneinfo_test.go +@@ -9,6 +9,7 @@ import ( "fmt" "os" "reflect" @@ -40,7 +42,7 @@ diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go.t "testing" "time" ) -@@ -128,7 +129,7 @@ func TestLoadLocationFromTZData(t *testi +@@ -137,7 +138,7 @@ func TestLoadLocationFromTZData(t *testing.T) { t.Fatal(err) } @@ -49,10 +51,11 @@ diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_test.go.t if err != nil { t.Fatal(err) } -diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go.time go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go ---- go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go.time 2017-12-05 01:10:10.000000000 +0100 -+++ go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go 2017-12-05 14:55:10.574637475 +0100 -@@ -12,7 +12,6 @@ +diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go +index 4ea029d..e887769 100644 +--- a/src/time/zoneinfo_unix.go ++++ b/src/time/zoneinfo_unix.go +@@ -13,7 +13,6 @@ package time import ( @@ -60,7 +63,7 @@ diff -up go-dd7cbf3a846c2cb125ac65173abaf6a8b9f903ff/src/time/zoneinfo_unix.go.t "syscall" ) -@@ -22,7 +21,6 @@ var zoneSources = []string{ +@@ -23,7 +22,6 @@ var zoneSources = []string{ "/usr/share/zoneinfo/", "/usr/share/lib/zoneinfo/", "/usr/lib/locale/TZ/", diff --git a/golang.spec b/golang.spec index d5892583f3dfbc42ea8fa8d4a0fd1b7da68720a2..4130f735e648a27d29e8bd2143e23f1e66068370 100644 --- a/golang.spec +++ b/golang.spec @@ -99,7 +99,7 @@ %endif %global go_api 1.17 -%global go_version 1.17.7 +%global go_version 1.17.10 %global pkg_release 1 %global anolis_release .0.1 @@ -110,8 +110,9 @@ Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain URL: http://golang.org/ -Source0: https://pagure.io/go/archive/go-%{go_version}-%{pkg_release}-openssl-fips/go-go-%{go_version}-%{pkg_release}-openssl-fips.tar.gz # make possible to override default traceback level at build time by setting build tag rpm_crashtraceback +Source0: https://github.com/golang-fips/go/archive/refs/tags/go%{go_version}-%{pkg_release}-openssl-fips.tar.gz + Source1: fedora.go # The compiler is written in Go. Needs go(1.4+) compiler for build. @@ -146,11 +147,6 @@ Patch221: fix_TestScript_list_std.patch Patch1939923: skip_test_rhbz1939923.patch -# These tests has been removed upstream due to -# nondeterministic flakiness -# https://bugzilla.redhat.com/show_bug.cgi?id=2028662 -Patch2028662: remove_waitgroup_misuse_tests.patch - # Port to loongarch64 patches Patch0001: 0001-cmd-internal-sys-declare-loong64-arch.patch Patch0002: 0002-cmd-internal-sys-fix-placement-of-loong64-definition.patch @@ -296,7 +292,7 @@ Requires: %{name} = %{version}-%{release} %endif %prep -%autosetup -p1 -n go-go-%{go_version}-%{pkg_release}-openssl-fips +%autosetup -p1 -n go-go%{go_version}-%{pkg_release}-openssl-fips cp %{SOURCE1} ./src/runtime/ @@ -571,8 +567,12 @@ cd .. %endif %changelog -* Tue Jun 28 2022 Guoqi Chen - 1.17.7-1.0.1 -- Add loongarch support. +* Tue Jun 28 2022 Guoqi Chen - 1.17.10-1.0.1 +- Add loongarch support (Guoqi Chen) + +* Fri May 27 2022 David Benoit - 1.17.10-1 +- Rebase to Go 1.17.10 +- Resolves: rhbz#2091077 * Thu Feb 17 2022 David Benoit - 1.17.7-1 - Rebase to Go 1.17.7 diff --git a/skip_test_rhbz1939923.patch b/skip_test_rhbz1939923.patch index 80302d09405fedb227a0bce5e2d84f5c7c30f50c..c9ff600d4849dcbd10a4523c4059c99b0cd13950 100644 --- a/skip_test_rhbz1939923.patch +++ b/skip_test_rhbz1939923.patch @@ -1,5 +1,5 @@ diff --git a/src/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go -index 51dda16815..2d1e1b1e6e 100644 +index f32dc7d..54db97c 100644 --- a/src/crypto/x509/x509_test.go +++ b/src/crypto/x509/x509_test.go @@ -2880,6 +2880,7 @@ func (bs *brokenSigner) Sign(_ io.Reader, _ []byte, _ crypto.SignerOpts) ([]byte