rpms/golang
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import UBI golang-1.23.6-1.module+el8.10.0+22945+b2c96a17

Browse Source
This commit is contained in:
eabdullin 2025-04-10 00:24:39 +00:00
parent d6bb6b5a95
commit 899e164860
4 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/go1.22.9-1-openssl-fips.tar.gz
SOURCES/go1.22.9.tar.gz
SOURCES/go1.23.6-1-openssl-fips.tar.gz
SOURCES/go1.23.6.tar.gz

4
.golang.metadata
View File

@ -1,2 +1,2 @@
af6e318112b0e4fa6f42978d5c80e2c4fc5ca02c SOURCES/go1.22.9-1-openssl-fips.tar.gz
3860690f8aee2de5da3cd46af6e84f4f94bfc5f0 SOURCES/go1.22.9.tar.gz
fc81b4b133be67519cc3387b654bbe80bf42f5b9 SOURCES/go1.23.6-1-openssl-fips.tar.gz
73a4be73230ca8fc57f6757560333494cc5f26a7 SOURCES/go1.23.6.tar.gz

42
SOURCES/disable_static_tests_part1.patch
View File

@ -1,48 +1,35 @@
From 24aac090069f79307aeceb8362f60a3cc5e60f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Fri, 3 May 2024 17:25:19 +0200
Subject: [PATCH] disable_static_tests_part1
---
src/crypto/internal/backend/nobackend.go | 4 ++--
src/crypto/internal/backend/openssl.go | 4 ++--
src/crypto/internal/boring/goboringcrypto.h | 1 +
src/crypto/internal/boring/syso/syso.go | 2 +-
src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h | 1 +
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
index 5b0e356dff..a2e17f7fa5 100644
index 95c2cdc..88df624 100644
--- a/src/crypto/internal/backend/nobackend.go
+++ b/src/crypto/internal/backend/nobackend.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl
-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl
+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || static || static
+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static static
-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || purego
-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl purego
+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || purego || static
+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl purego static
package backend
diff --git a/src/crypto/internal/backend/openssl.go b/src/crypto/internal/backend/openssl.go
index 3d3a9a36ee..7e32d3b0fa 100644
index 297c3cb..1a4fa10 100644
--- a/src/crypto/internal/backend/openssl.go
+++ b/src/crypto/internal/backend/openssl.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl
-// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl
+//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl && !static
+// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!static
-//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl && !purego
-// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!purego
+//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl && !purego && !static
+// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!purego,!static
// Package openssl provides access to OpenSSLCrypto implementation functions.
// Check the variable Enabled to find out whether OpenSSLCrypto is available.
diff --git a/src/crypto/internal/boring/goboringcrypto.h b/src/crypto/internal/boring/goboringcrypto.h
index 2b11049728..dec1cb2851 100644
index 2b11049..dec1cb2 100644
--- a/src/crypto/internal/boring/goboringcrypto.h
+++ b/src/crypto/internal/boring/goboringcrypto.h
@@ -1,4 +1,5 @@
@ -52,7 +39,7 @@ index 2b11049728..dec1cb2851 100644
// license that can be found in the LICENSE file.
diff --git a/src/crypto/internal/boring/syso/syso.go b/src/crypto/internal/boring/syso/syso.go
index b3387545e6..db5ea1e3d9 100644
index b338754..db5ea1e 100644
--- a/src/crypto/internal/boring/syso/syso.go
+++ b/src/crypto/internal/boring/syso/syso.go
@@ -2,7 +2,7 @@
@ -65,7 +52,7 @@ index b3387545e6..db5ea1e3d9 100644
// This package only exists with GOEXPERIMENT=boringcrypto.
// It provides the actual syso file.
diff --git a/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h b/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
index e488bf2014..e776aa46a3 100644
index e488bf2..e776aa4 100644
--- a/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
+++ b/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h
@@ -1,4 +1,5 @@
@ -74,6 +61,3 @@ index e488bf2014..e776aa46a3 100644
#include <stdlib.h> // size_t
--
2.44.0

19
SPECS/golang.spec
View File

@ -91,8 +91,8 @@
%global gohostarch s390x
%endif
%global go_api 1.22
%global version 1.22.9
%global go_api 1.23
%global version 1.23.6
%global pkg_release 1
Name: golang
@ -258,6 +258,8 @@ popd
%autopatch -p1
sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION
# Delete the boring binary blob. We use the system OpenSSL instead.
rm -rf src/crypto/internal/boring/syso
cp %{SOURCE2} ./src/runtime/
@ -521,6 +523,19 @@ cd ..
%endif
%changelog
* Thu Mar 13 2025 David Benoit <dbenoit@redhat.com> - 1.23.6-1
- Update to Go 1.23.6
- Resolves: RHEL-83824
* Tue Jan 21 2025 Archana <aravinda@redhat.com> - 1.22.11-1
- Rebase to Go1.22.11 to pick up fixes for CVE 2024-45341 and 2024-45336
- Fix test failures with expired certificates
- Resolves: RHEL-73752
* Fri Dec 13 2024 Alejandro Sáez <asm@redhat.com> - 1.22.9-2
- Remove bundled boringcrypto blob
- Resolves: RHEL-54338
* Thu Nov 14 2024 David Benoit <dbenoit@redhat.com> - 1.22.9-1
- Update to Go 1.22.9
- Resolves: RHEL-67668