From 8f73e590df5c2da65a90ae038e6dafce96a27bf8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2020 12:05:00 +0000 Subject: import golang-1.14.7-2.module+el8.3.0+7840+63dfb1ed --- diff --git a/.gitignore b/.gitignore index 9a334a0..daed2c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/go-go-1.13.15-1-openssl-fips.tar.gz +SOURCES/go-go-1.14.7-2-openssl-fips.tar.gz diff --git a/.golang.metadata b/.golang.metadata index 703b625..26fb63d 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1 +1 @@ -574abf1c8b1891c9b37c09a231365d2b78a5faaa SOURCES/go-go-1.13.15-1-openssl-fips.tar.gz +c8bffb54b2928e9d95eab76e148cdebd6dc88701 SOURCES/go-go-1.14.7-2-openssl-fips.tar.gz diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 112b0a4..53a6a4b 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -29,20 +29,20 @@ # Define GOROOT macros %global goroot %{_prefix}/lib/%{name} %global gopath %{_datadir}/gocode -%global golang_arches %{ix86} x86_64 aarch64 ppc64le s390x +%global golang_arches x86_64 aarch64 ppc64le s390x %global golibdir %{_libdir}/%{name} # Golang build options. # Build golang using external/internal(close to cgo disabled) linking. -%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x +%ifarch x86_64 ppc64le %{arm} aarch64 s390x %global external_linker 1 %else %global external_linker 0 %endif # Build golang with cgo enabled/disabled(later equals more or less to internal linking). -%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x +%ifarch x86_64 ppc64le %{arm} aarch64 s390x %global cgo_enabled 1 %else %global cgo_enabled 0 @@ -56,7 +56,7 @@ %endif # Controls what ever we fail on failed tests -%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64le +%ifarch x86_64 %{arm} aarch64 ppc64le %global fail_on_tests 1 %else %global fail_on_tests 0 @@ -79,9 +79,6 @@ %ifarch x86_64 %global gohostarch amd64 %endif -%ifarch %{ix86} -%global gohostarch 386 -%endif %ifarch %{arm} %global gohostarch arm %endif @@ -98,13 +95,13 @@ %global gohostarch s390x %endif -%global go_api 1.13 -%global go_version 1.13.15 -%global pkg_release 1 +%global go_api 1.14 +%global go_version 1.14.7 +%global pkg_release 2 Name: golang Version: %{go_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -142,6 +139,11 @@ Patch215: ./go1.5-zoneinfo_testing_only.patch # Proposed patch by jcajka https://golang.org/cl/86541 Patch221: fix_TestScript_list_std.patch +# It seems this patch will be included in Go 1.14.5 +# https://github.com/golang/go/issues/39991 +# https://go-review.googlesource.com/c/go/+/240917 +#Patch240917: ppc64le_fix_missing_deferreturn.patch + # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -235,6 +237,8 @@ Requires: %{name} = %{version}-%{release} %patch221 -p1 +#%patch240917 -p1 + cp %{SOURCE1} ./src/runtime/ %build @@ -426,19 +430,15 @@ export GO_TEST_RUN="" %if %{fail_on_tests} -# Limit number of test threads on i686 to avoid OOM failures. -%ifarch %{ix86} -export GOMAXPROCS=8 -%endif ./run.bash --no-rebuild -v -v -v -k $GO_TEST_RUN # Run tests with FIPS enabled. export GOLANG_FIPS=1 pushd crypto # Run all crypto tests but skip TLS, we will run FIPS specific TLS tests later - go test $(go list | grep -v tls) -v + go test $(go list ./... | grep -v tls) -v # Check that signature functions have parity between boring and notboring - CGO_ENABLED=0 go test ./ecdsa + CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v popd # Run all FIPS specific TLS tests pushd crypto/tls @@ -505,22 +505,31 @@ cd .. %endif %changelog -* Fri Aug 14 2020 Alejandro Sáez - 1.13.15-1 -- Rebase to 1.13.15 -- Related: rhbz#1865875 -- Related: rhbz#1865873 - -* Sat Aug 08 2020 Alejandro Sáez - 1.13.14-2 -- Rebase to 1.13.14 -- Bump up x/text to v0.3.3 fixing. This should have been done in the previous - commit -- Resolves: rhbz#1865875 -- Resolves: rhbz#1865873 - -* Wed Aug 05 2020 Alejandro Sáez - 1.13.14-1 -- Rebase to 1.13.14 -- Resolves: rhbz#1865875 -- Resolves: rhbz#1865873 +* Thu Aug 27 2020 Alejandro Sáez - 1.14.7-2 +- Improve test suit +- Resolves: rhbz#1854693 + +* Tue Aug 18 2020 Alejandro Sáez - 1.14.7-1 +- Rebase to 1.14.7 + +* Mon Aug 03 2020 Alejandro Sáez - 1.14.6-1 +- Rebase to 1.14.6 +- Resolves: rhbz#1820596 + +* Wed Jul 08 2020 Alejandro Sáez - 1.14.4-2 +- Include patch to fix missing deferreturn on linux/ppc64le +- Resolves: rhbz#1854836 + +* Thu Jun 25 2020 Alejandro Sáez - 1.14.4-1 +- Rebase to 1.14.4 + +* Thu May 21 2020 Alejandro Sáez - 1.14.2-2 +- Remove i686 references +- Related: rhbz#1752991 + +* Wed May 06 2020 Alejandro Sáez - 1.14.2-1 +- Rebase to 1.14.2 +- Related: rhbz#1820596 * Wed Nov 27 2019 Alejandro Sáez - 1.13.4-2 - Remove patches