AlmaLinux changes: Update env var for v2
Disable race for riscv64
This commit is contained in:
Eduard Abdullin
root
commit
ef9bce789b
2
.gitignore
vendored
2
.gitignore
vendored
@ -177,3 +177,5 @@
|
||||
/go1.25.5-1-openssl-fips.tar.gz
|
||||
/go1.25.7.src.tar.gz
|
||||
/go1.25.7-1-openssl-fips.tar.gz
|
||||
/go1.26.1.src.tar.gz
|
||||
/go1.26.1-1-openssl-fips.tar.gz
|
||||
|
||||
15
golang.spec
15
golang.spec
@ -117,10 +117,10 @@
|
||||
%global gohostarch riscv64
|
||||
%endif
|
||||
|
||||
%global go_api 1.25
|
||||
%global go_api 1.26
|
||||
# Use only for prerelease versions
|
||||
#global go_prerelease rc3
|
||||
%global go_patch 7
|
||||
%global go_patch 1
|
||||
%global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
|
||||
%global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
|
||||
# Go FIPS package release
|
||||
@ -133,7 +133,7 @@
|
||||
%global llvm_compiler_rt_version 18.1.8
|
||||
|
||||
Name: golang
|
||||
Version: %{go_version}
|
||||
Version: %{go_version}
|
||||
Release: %autorelease
|
||||
Summary: The Go Programming Language
|
||||
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
|
||||
@ -218,6 +218,7 @@ Patch1: 0001-Modify-go.env.patch
|
||||
Patch6: 0006-Default-to-ld.bfd-on-ARM64.patch
|
||||
# Related: https://sourceware.org/bugzilla/show_bug.cgi?id=33204
|
||||
Patch7: revert_dwarf5.patch
|
||||
Patch8: skip-TestTerminalSignal-in-container.patch
|
||||
|
||||
# Having documentation separate was broken
|
||||
Obsoletes: %{name}-docs < 1.1-4
|
||||
@ -376,8 +377,8 @@ rm -rf src/crypto/internal/boring/syso
|
||||
# Add --no-backup-if-mismatch option to avoid creating .orig temp files
|
||||
patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
|
||||
for p in "$patch_dir"/*.patch; do
|
||||
echo "Applying $p"
|
||||
patch --no-backup-if-mismatch -p1 < $p
|
||||
echo "Applying $p"
|
||||
patch --no-backup-if-mismatch -p1 < $p
|
||||
done
|
||||
|
||||
# Configure crypto tests
|
||||
@ -676,9 +677,9 @@ echo "=== Start testing ==="
|
||||
echo "=== Run all crypto test skipping tls ==="
|
||||
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 -skip="TestEd25519Vectors|TestACVP"
|
||||
go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP|TestGCMNoncesFIPSV126|TestGCMNoncesFIPSV1|TestWithoutEnforcement|TestCASTPasses|TestCASTFailures|TestIntegrityCheck|TestBetterTLS"
|
||||
# check that signature functions have parity between boring and notboring
|
||||
CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP"
|
||||
CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v -skip="TestEd25519Vectors|TestACVP|TestGCMNoncesFIPSV126|TestGCMNoncesFIPSV1|TestWithoutEnforcement|TestCASTPasses|TestCASTFailures|TestIntegrityCheck|TestBetterTLS"
|
||||
popd
|
||||
echo "=== Run tls tests ==="
|
||||
# run all fips specific tls tests
|
||||
|
||||
@ -1,17 +1,8 @@
|
||||
From e90ae9076a108b83c645814f75a574c14a5a4b98 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
|
||||
Date: Wed, 27 Aug 2025 16:18:09 +0200
|
||||
Subject: [PATCH] Revert DWARF5 as default, use DWARF4
|
||||
|
||||
---
|
||||
src/internal/buildcfg/exp.go | 13 +------------
|
||||
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
|
||||
index 689ca8ce58..b2ea97481b 100644
|
||||
index aa41986..f1a8ba8 100644
|
||||
--- a/src/internal/buildcfg/exp.go
|
||||
+++ b/src/internal/buildcfg/exp.go
|
||||
@@ -67,24 +67,13 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
|
||||
@@ -69,21 +69,11 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
|
||||
regabiSupported = true
|
||||
}
|
||||
|
||||
@ -25,18 +16,12 @@ index 689ca8ce58..b2ea97481b 100644
|
||||
- // support the necessary section subtypes for DWARF-specific
|
||||
- // things like .debug_addr (needed for DWARF 5).
|
||||
- dwarf5Supported := (goos != "darwin" && goos != "ios" && goos != "aix")
|
||||
-
|
||||
baseline := goexperiment.Flags{
|
||||
RegabiWrappers: regabiSupported,
|
||||
RegabiArgs: regabiSupported,
|
||||
AliasTypeParams: true,
|
||||
SwissMap: true,
|
||||
SyncHashTrieMap: true,
|
||||
- Dwarf5: dwarf5Supported,
|
||||
+ Dwarf5: false,
|
||||
}
|
||||
|
||||
// Start with the statically enabled set of experiments.
|
||||
--
|
||||
2.51.0
|
||||
|
||||
baseline := goexperiment.Flags{
|
||||
RegabiWrappers: regabiSupported,
|
||||
RegabiArgs: regabiSupported,
|
||||
- Dwarf5: dwarf5Supported,
|
||||
+ Dwarf5: false,
|
||||
RandomizedHeapBase64: true,
|
||||
GreenTeaGC: true,
|
||||
}
|
||||
|
||||
26
skip-TestTerminalSignal-in-container.patch
Normal file
26
skip-TestTerminalSignal-in-container.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/src/os/signal/signal_cgo_test.go b/src/os/signal/signal_cgo_test.go
|
||||
index abcdef1..abcdef2 100644
|
||||
--- a/src/os/signal/signal_cgo_test.go
|
||||
+++ b/src/os/signal/signal_cgo_test.go
|
||||
@@ -17,6 +17,7 @@
|
||||
"internal/syscall/unix"
|
||||
"internal/testenv"
|
||||
"internal/testpty"
|
||||
+ "strings"
|
||||
"os"
|
||||
"os/signal"
|
||||
"runtime"
|
||||
@@ -79,6 +80,13 @@
|
||||
t.Skip("skipping: wait hangs on dragonfly; see https://go.dev/issue/56132")
|
||||
}
|
||||
|
||||
+ // Check if we're in a container environment where wait4() might hang
|
||||
+ if data, err := os.ReadFile("/proc/1/comm"); err == nil {
|
||||
+ if strings.Contains(string(data), "podman") {
|
||||
+ t.Skip("Skipping TestTerminalSignal in container environment - wait4() operations may hang")
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
scale := 1
|
||||
if s := os.Getenv("GO_TEST_TIMEOUT_SCALE"); s != "" {
|
||||
if sc, err := strconv.Atoi(s); err == nil {
|
||||
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (go1.25.7.src.tar.gz) = 054fdb8219d18a7942c524d8acc3c942d0a7b8f1c01b96184fa79017b6548533798f5f48cc78f7ecfb70da504c5c66569377a35d517a0e3184c32fe84c9ee0b6
|
||||
SHA512 (go1.25.7-1-openssl-fips.tar.gz) = de6dd32432023b2e3509fac46d77daa1ee5edd5b9a310c4da5421d46a2c6033ecef27327eb219b46b1d7fdd2471f31c00ff920bbb59633da3e1a18e4dff6fd37
|
||||
SHA512 (go1.26.1.src.tar.gz) = 7bab2a762b4aff1c2c3a3cf3ad20bce63fabff28c7ff63b18cb8b0ce427a7bc1781cfd3fa291f4bff499247b1f0fd56f1698bb19bc7c1be7d7d2f38716438d41
|
||||
SHA512 (go1.26.1-1-openssl-fips.tar.gz) = 8bdc47255d85444d00ee3f5667bd3af17e0cb4df4bbbcc00d40c4ac484fdc9cae6fcd9495dd6941ef3f3ad430bacf3b1635dc28c3dd1a9488466a75670ce501b
|
||||
SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user