diff --git a/.gitignore b/.gitignore index bc1ed3a..0144cb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/go-go-1.12.12-4-openssl-fips.tar.gz +SOURCES/go-go-1.13.4-1-openssl-fips.tar.gz diff --git a/.golang.metadata b/.golang.metadata index d5842a0..c6b3f80 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1 +1 @@ -317c273d2effe6c56ce3730267cb4dfff5c146e0 SOURCES/go-go-1.12.12-4-openssl-fips.tar.gz +c9f2a53028d012c6db32a34a9345e08aba31a771 SOURCES/go-go-1.13.4-1-openssl-fips.tar.gz diff --git a/SOURCES/fix_TestScript_list_std.patch b/SOURCES/fix_TestScript_list_std.patch index f1f00b7..1387cb7 100644 --- a/SOURCES/fix_TestScript_list_std.patch +++ b/SOURCES/fix_TestScript_list_std.patch @@ -1,25 +1,13 @@ -From 00b6dcb4eec0dd1bb931493e59ee223c08be1ae8 Mon Sep 17 00:00:00 2001 -From: Derek Parker -Date: Wed, 5 Dec 2018 13:20:23 -0800 -Subject: [PATCH] testdata/script: Ignore _$GOROOT in test - ---- - src/cmd/go/testdata/script/list_std.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/cmd/go/testdata/script/list_std.txt b/src/cmd/go/testdata/script/list_std.txt -index a63d74db1205a4a905e319eb59b195ce0625163e..137eb717ad4a8ec24902dcf668b7de48e1929087 100644 +index 6ab1bd1674..4a00e436fd 100644 --- a/src/cmd/go/testdata/script/list_std.txt +++ b/src/cmd/go/testdata/script/list_std.txt -@@ -3,7 +3,7 @@ - # listing GOROOT should only find standard packages +@@ -6,7 +6,7 @@ env GO111MODULE=off + # Listing GOROOT should only find standard packages. cd $GOROOT/src go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' ./... -! stdout . +stdout _$GOROOT - # TODO: ignore _/blah/go/src in output - # our vendored packages should be reported as standard --- -2.16.5 - + # Standard packages should include cmd, but not cmd/vendor. + go list ./... diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 288113e..6ff71c6 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -29,7 +29,7 @@ # Define GOROOT macros %global goroot %{_prefix}/lib/%{name} %global gopath %{_datadir}/gocode -%global golang_arches %{ix86} x86_64 aarch64 ppc64le s390x %{arm} +%global golang_arches %{ix86} x86_64 aarch64 ppc64le s390x %global golibdir %{_libdir}/%{name} # Golang build options. @@ -56,7 +56,7 @@ %endif # Controls what ever we fail on failed tests -%ifarch %{ix86} x86_64 aarch64 ppc64le +%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64le %global fail_on_tests 1 %else %global fail_on_tests 0 @@ -98,13 +98,13 @@ %global gohostarch s390x %endif -%global go_api 1.12 -%global go_version 1.12.12 -%global pkg_release 4 +%global go_api 1.13 +%global go_version 1.13.4 +%global pkg_release 1 Name: golang Version: %{go_version} -Release: %{pkg_release}%{?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 @@ -436,9 +436,9 @@ export GOMAXPROCS=8 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 $(go list ./... | grep -v tls) -v + CGO_ENABLED=0 go test ./ecdsa popd # Run all FIPS specific TLS tests pushd crypto/tls @@ -505,20 +505,13 @@ cd .. %endif %changelog -* Tue Oct 29 2019 Derek Parker - 1.12.12-4 -- Fix boring/aes_test.go tags +* Wed Nov 27 2019 Alejandro Sáez - 1.13.4-2 +- Remove patches +- Related: rhbz#1747150 -* Tue Oct 29 2019 Tom Stellard - 1.12.12-3 -- Fix tarball - -* Tue Oct 29 2019 Derek Parker - 1.12.12-2 -- Fix stub boring.(Sign/Verify)RSAPKCS1v15 functions - -* Mon Oct 28 2019 Derek Parker - 1.12.12-1 -- Rebase to 1.12.12 -- Revert to Sign/Verify operations not expected unhashed inputs -- Remove previously added verbose output -- Better expose openssl errors +* Mon Nov 25 2019 Alejandro Sáez - 1.13.4-1 +- Rebase to 1.13.4 +- Related: rhbz#1747150 * Tue Sep 17 2019 Tom Stellard - 1.12.8-4 - Reduce number of threads when testing on i686