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

import UBI golang-1.23.6-2.el9_5

Browse Source
This commit is contained in:
eabdullin 2025-04-10 02:39:09 +00:00
parent 5612399580
commit ef66b21a4b
4 changed files with 66 additions and 20 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.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,3 +1,3 @@
6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz
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

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

@ -0,0 +1,44 @@
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)

34
SPECS/golang.spec
View File

@ -92,8 +92,8 @@
%global gohostarch s390x
%endif
%global go_api 1.22
%global go_version 1.22.9
%global go_api 1.23
%global go_version 1.23.6
%global version %{go_version}
%global pkg_release 1
@ -101,7 +101,7 @@
%global llvm_compiler_rt_version 18.1.8
Name: golang
Version: %{version}
Version: %{version}
Release: 2%{?dist}
Summary: The Go Programming Language
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@ -154,6 +154,7 @@ 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
@ -583,22 +584,23 @@ cd ..
%endif
%changelog
* Thu Nov 14 2024 David Benoit <dbenoit@redhat.com> - 1.22.9-2
- Fix sources
- Related: RHEL-67672
* 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
* Thu Nov 14 2024 David Benoit <dbenoit@redhat.com> - 1.22.9-1
- Update to Go 1.22.9
- Resolves: RHEL-67672
* Thu Feb 20 2025 David Benoit <dbenoit@redhat.com> - 1.23.6-1
- Update to Go 1.23.6 (fips-1)
- Resolves: RHEL-80344
* Thu Oct 03 2024 Archana <aravinda@redhat.com> - 1.22.7-2
- Rebuilt to use right build target
- Related: RHEL-57867
* Thu Jan 09 2025 David Benoit <dbenoit@redhat.com> - 1.23.4-1
- Update to Go 1.23.4 (fips-1)
- Resolves: RHEL-61048
- Resolves: RHEL-61223
* Tue Sep 24 2024 David Benoit <dbenoit@redhat.com> - 1.22.7-1
- Update to Go 1.22.7
- Remove fix-standard-crypto-panic.patch (upstreamed)
- Resolves: RHEL-57867
* Wed Oct 23 2024 Archana <aravinda@redhat.com> - 1.23.2-1
- Rebase to Go1.23.2
- Remove fix standard crypto panic patch as the source already has changes
- Resolves: RHEL-62392
* Wed Aug 14 2024 David Benoit <dbenoit@redhat.com> - 1.22.5-2
- Rebuild race detector archives from LLVM sources