Rebase to Go 1.21.7
Add release information Set GOTOOLCHAIN to local Skip TestOverlongMessagePKCS1v15 Resolves: RHEL-24082 Resolves: RHEL-18363 Resolves: RHEL-18382
This commit is contained in:
parent
c3be9cc552
commit
b086c4ab6f
2
.gitignore
vendored
2
.gitignore
vendored
@ -12,3 +12,5 @@ SOURCES/go1.19.4.tar.gz
|
||||
/go1.20.6-1-openssl-fips.tar.gz
|
||||
/go1.21.3-1-openssl-fips.tar.gz
|
||||
/go1.21.3.tar.gz
|
||||
/go1.21.7.tar.gz
|
||||
/go1.21.7-1-openssl-fips.tar.gz
|
||||
|
26
golang.spec
26
golang.spec
@ -92,12 +92,12 @@
|
||||
%endif
|
||||
|
||||
%global go_api 1.21
|
||||
%global version 1.21.3
|
||||
%global version 1.21.7
|
||||
%global pkg_release 1
|
||||
|
||||
Name: golang
|
||||
Version: %{version}
|
||||
Release: 4%{?dist}
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: The Go Programming Language
|
||||
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
|
||||
@ -142,8 +142,10 @@ Patch221: fix_TestScript_list_std.patch
|
||||
|
||||
Patch1939923: skip_test_rhbz1939923.patch
|
||||
|
||||
Patch2: disable_static_tests_part1.patch
|
||||
Patch3: disable_static_tests_part2.patch
|
||||
Patch2: disable_static_tests_part1.patch
|
||||
Patch3: disable_static_tests_part2.patch
|
||||
Patch4: skip-test-overlong-message.patch
|
||||
Patch5: modify_go.env.patch
|
||||
|
||||
# Having documentation separate was broken
|
||||
Obsoletes: %{name}-docs < 1.1-4
|
||||
@ -250,12 +252,9 @@ ln -s ../go-go%{version} go
|
||||
./scripts/configure-crypto-tests.sh
|
||||
popd
|
||||
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%autopatch -p1
|
||||
|
||||
%patch221 -p1
|
||||
|
||||
%patch1939923 -p1
|
||||
sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION
|
||||
|
||||
cp %{SOURCE2} ./src/runtime/
|
||||
|
||||
@ -518,6 +517,15 @@ cd ..
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Feb 13 2024 Alejandro Sáez <asm@redhat.com> - 1.21.7-1
|
||||
- Rebase to Go 1.21.7
|
||||
- Add release information
|
||||
- Set GOTOOLCHAIN to local
|
||||
- Skip TestOverlongMessagePKCS1v15
|
||||
- Resolves: RHEL-24082
|
||||
- Resolves: RHEL-18363
|
||||
- Resolves: RHEL-18382
|
||||
|
||||
* Wed Nov 08 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-4
|
||||
- Do not remove GOPROXY/GOSUMDB
|
||||
- Related: RHEL-12620
|
||||
|
22
modify_go.env.patch
Normal file
22
modify_go.env.patch
Normal file
@ -0,0 +1,22 @@
|
||||
From eab9004c072200e58df83ab94678bda1faa7b229 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
|
||||
Date: Fri, 9 Feb 2024 20:06:16 +0100
|
||||
Subject: [PATCH] Set GOTOOLCHAIN to local
|
||||
|
||||
---
|
||||
go.env | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/go.env b/go.env
|
||||
index 6ff2b921d4..e87f6e7b6d 100644
|
||||
--- a/go.env
|
||||
+++ b/go.env
|
||||
@@ -9,4 +9,4 @@ GOSUMDB=sum.golang.org
|
||||
|
||||
# Automatically download newer toolchains as directed by go.mod files.
|
||||
# See https://go.dev/doc/toolchain for details.
|
||||
-GOTOOLCHAIN=auto
|
||||
+GOTOOLCHAIN=local
|
||||
--
|
||||
2.43.0
|
||||
|
15
skip-test-overlong-message.patch
Normal file
15
skip-test-overlong-message.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/src/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go
|
||||
index 0853178e3a..16eb37734b 100644
|
||||
--- a/src/crypto/rsa/pkcs1v15_test.go
|
||||
+++ b/src/crypto/rsa/pkcs1v15_test.go
|
||||
@@ -247,6 +247,10 @@ func TestVerifyPKCS1v15(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestOverlongMessagePKCS1v15(t *testing.T) {
|
||||
+ // OpenSSL now returns a random string instead of an error
|
||||
+ if boring.Enabled() {
|
||||
+ t.Skip("Not relevant in boring mode")
|
||||
+ }
|
||||
ciphertext := decodeBase64("fjOVdirUzFoLlukv80dBllMLjXythIf22feqPrNo0YoIjzyzyoMFiLjAc/Y4krkeZ11XFThIrEvw\nkRiZcCq5ng==")
|
||||
_, err := DecryptPKCS1v15(nil, rsaPrivateKey, ciphertext)
|
||||
if err == nil {
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (go1.21.3-1-openssl-fips.tar.gz) = 869cd8d20ecd2c81ca4ae184fd1f73c124ee479334a002bda2135cb60ce919b0185f203f9d78f08c9616b32339f588aec6f9bc609d458e29dedcdab13dc985d3
|
||||
SHA512 (go1.21.3.tar.gz) = ad7976c4d31237c7aad7c0323390387db9d6800bd060debcd421f16d3b734276a159d4795e7cb8d9bd1e39358512293a11f0a35b0199f7113f28d25a20e20b0f
|
||||
SHA512 (go1.21.7.tar.gz) = 367fdc64475b2c7f639fdc74b2934594ae787def78048897159b42275adb11bee7169cda12d87dd62b3fc66e2d6fdf96c6fe6afa39c700c6e398117a7c82bbf2
|
||||
SHA512 (go1.21.7-1-openssl-fips.tar.gz) = 6dba839d045a7f820cef25c638b7b4545779af46a855916027d28d3014b06f481271ebebe34ee33d4a9506f376c13cf8ee03e78d8b71764f3c6676f46dc82e11
|
||||
|
Loading…
Reference in New Issue
Block a user