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

import UBI golang-1.23.9-1.el9_6

Browse Source
This commit is contained in:
eabdullin 2025-06-04 02:36:25 +00:00
parent ef66b21a4b
commit b7d213d0be
4 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,3 +1,3 @@
SOURCES/compiler-rt-18.1.8.src.tar.xz
SOURCES/go1.23.6-1-openssl-fips.tar.gz
SOURCES/go1.23.6.tar.gz
SOURCES/go1.23.9-1-openssl-fips.tar.gz
SOURCES/go1.23.9.tar.gz

4
.golang.metadata
View File

@ -1,3 +1,3 @@
6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz
fc81b4b133be67519cc3387b654bbe80bf42f5b9 SOURCES/go1.23.6-1-openssl-fips.tar.gz
73a4be73230ca8fc57f6757560333494cc5f26a7 SOURCES/go1.23.6.tar.gz
f88e1a017f8abb82764e1340b858268b8beca1d8 SOURCES/go1.23.9-1-openssl-fips.tar.gz
ac7c4463e6f0e61fceb6c4e73d7c7d9da61d6a5d SOURCES/go1.23.9.tar.gz

44
SOURCES/runtime-usleep-s390x.patch
View File

@ -1,44 +0,0 @@
From 22fdd35c242b6bdc822483a03557a58291174673 Mon Sep 17 00:00:00 2001
From: Paul Murphy <murp@ibm.com>
Date: Wed, 12 Feb 2025 08:45:34 -0600
Subject: [PATCH] [release-branch.go1.23] runtime: fix usleep on s390x/linux
The timespec argument takes the remainder in nanoseconds, not
microseconds. Convert the remaining time to nsec.
Fixes #71727
Change-Id: I36cbbe3a088830c5e3afcc9516ef42e96ee21268
Reviewed-on: https://go-review.googlesource.com/c/go/+/648915
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
Reviewed-by: Axel Busch <axel.busch@ibm.com>
Run-TryBot: Paul Murphy <murp@ibm.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Vishwanatha HD <vishwanatha.hd@ibm.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/649395
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
---
src/runtime/sys_linux_s390x.s | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
index adf5612c3cfbee..59e2f2ab31f204 100644
--- a/src/runtime/sys_linux_s390x.s
+++ b/src/runtime/sys_linux_s390x.s
@@ -112,9 +112,10 @@ TEXT runtime·usleep(SB),NOSPLIT,$16-4
MOVW $1000000, R3
DIVD R3, R2
MOVD R2, 8(R15)
- MOVW $1000, R3
- MULLD R2, R3
+ MULLD R2, R3 // Convert sec to usec and subtract
SUB R3, R4
+ MOVW $1000, R3
+ MULLD R3, R4 // Convert remaining usec into nsec.
MOVD R4, 16(R15)
// nanosleep(&ts, 0)

10
SPECS/golang.spec
View File

@ -93,7 +93,7 @@
%endif
%global go_api 1.23
%global go_version 1.23.6
%global go_version 1.23.9
%global version %{go_version}
%global pkg_release 1
@ -102,7 +102,7 @@
Name: golang
Version: %{version}
Release: 2%{?dist}
Release: 1%{?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
@ -154,7 +154,6 @@ Patch1939923: skip_test_rhbz1939923.patch
Patch4: modify_go.env.patch
Patch6: skip_TestCrashDumpsAllThreads.patch
Patch7: runtime-usleep-s390x.patch
# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
@ -584,6 +583,11 @@ cd ..
%endif
%changelog
* Fri May 30 2025 Alejandro Sáez <asm@redhat.com> - 1.23.9-1
- Update to Go 1.23.9
- Remove runtime-usleep-s390x.patch, already merged
- Resolves: RHEL-93212
* Thu Feb 27 2025 David Benoit <dbenoit@redhat.com> - 1.23.6-2
- Fix runtime usleep issue on s390x (runtime-usleep-s390x.patch)
- Resolves: RHEL-81242