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

import UBI golang-1.20.10-1.module+el8.9.0+20382+04f7fe80

Browse Source
This commit is contained in:
eabdullin 2023-11-15 03:01:11 +00:00
parent bc947cd8d7
commit 32f77170e3
5 changed files with 41 additions and 132 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.19.13-2-openssl-fips.tar.gz SOURCES/go1.20.10-1-openssl-fips.tar.gz
SOURCES/go1.19.13.tar.gz SOURCES/go1.20.10.tar.gz

4
.golang.metadata
View File

@ -1,2 +1,2 @@
3335b6ee2baab3a616b7a969b62ac1c9ed136b74 SOURCES/go1.19.13-2-openssl-fips.tar.gz a16d4c1ed23caee22e90f86027d861cadb634993 SOURCES/go1.20.10-1-openssl-fips.tar.gz
5627a7cd27f73a12c909dd818d310deda7146b86 SOURCES/go1.19.13.tar.gz f919ce5ad523ccba39500cab7ccd1ebbfde70021 SOURCES/go1.20.10.tar.gz

53
SOURCES/cmd-link-use-correct-path-for-dynamic-loader-on-ppc6.patch
View File

@ -1,53 +0,0 @@
From 241192ecd31ca03a6f68fa7e55bb9f66040d3a2f Mon Sep 17 00:00:00 2001
From: Lynn Boger <laboger@linux.vnet.ibm.com>
Date: Thu, 14 Jul 2022 10:47:28 -0500
Subject: [PATCH] cmd/link: use correct path for dynamic loader on ppc64le
The setting of the path for the dynamic loader when building for
linux/ppc64le ELF v2 was incorrectly set to the path for
PPC64 ELF v1. This has not caused issues in the common cases
because this string can be set based on the default GO_LDSO setting.
It does result in an incorrect value when cross compiling binaries
with -buildmode=pie.
Updates #53813
Change-Id: I84de1c97b42e0434760b76a57c5a05e055fbb730
---
src/cmd/link/internal/ppc64/obj.go | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
index b6d5ad92af..bca8fa9212 100644
--- a/src/cmd/link/internal/ppc64/obj.go
+++ b/src/cmd/link/internal/ppc64/obj.go
@@ -38,9 +38,12 @@ import (
)
func Init() (*sys.Arch, ld.Arch) {
- arch := sys.ArchPPC64
- if buildcfg.GOARCH == "ppc64le" {
- arch = sys.ArchPPC64LE
+ arch := sys.ArchPPC64LE
+ dynld := "/lib64/ld64.so.2"
+
+ if buildcfg.GOARCH == "ppc64" {
+ arch = sys.ArchPPC64
+ dynld = "/lib64/ld64.so.1"
}
theArch := ld.Arch{
@@ -64,9 +67,7 @@ func Init() (*sys.Arch, ld.Arch) {
Machoreloc1: machoreloc1,
Xcoffreloc1: xcoffreloc1,
- // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
- Linuxdynld: "/lib64/ld64.so.1",
-
+ Linuxdynld: dynld,
Freebsddynld: "XXX",
Openbsddynld: "XXX",
Netbsddynld: "XXX",
--
2.35.3

35
SOURCES/disable_static_tests_part2.patch
View File

@ -1,36 +1,13 @@
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index da5b179..6a772df 100644 index 9f26606..2408505 100644
--- a/src/cmd/dist/test.go --- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go
@@ -1247,18 +1247,20 @@ func (t *tester) cgoTest(dt *distTest) error { @@ -1259,7 +1259,7 @@ func (t *tester) registerCgoTests() {
fmt.Println("No support for static linking found (lacks libc.a?), skip cgo static linking test.")
} else { } else {
if goos != "android" { panic("unknown linkmode with static build: " + linkmode)
- t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
+ t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, "-tags=no_openssl")
}
t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), ".")
t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external`, ".")
if goos != "android" {
- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
+ t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, "-tags=no_openssl")
+ /*
t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=static", "-ldflags", `-linkmode=external -extldflags "-static -pthread"`, ".")
// -static in CGO_LDFLAGS triggers a different code path
// than -static in -extldflags, so test both.
// See issue #16651.
cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=static", ".")
setEnv(cmd, "CGO_LDFLAGS", "-static -pthread")
+ */
} }
- gt.tags = append(gt.tags, "static")
+ gt.tags = append(gt.tags, "static", "no_openssl")
} }
@@ -1268,7 +1270,7 @@ func (t *tester) cgoTest(dt *distTest) error { t.registerTest("cgo:"+name, "../misc/cgo/test", gt, opts...)
t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal", "-tags=internal,internal_pie", ".")
}
t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie", ".")
- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", ".")
+ t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", "-tags=no_openssl")
}
}
}

71
SPECS/golang.spec
View File

@ -69,12 +69,8 @@
%global shared 0 %global shared 0
%endif %endif
# Pre build std lib with -race enabled # Disabled due to 1.20 new cache usage, see 1.20 upstream release notes
%ifarch x86_64
%global race 1
%else
%global race 0 %global race 0
%endif
%ifarch x86_64 %ifarch x86_64
%global gohostarch amd64 %global gohostarch amd64
@ -95,13 +91,14 @@
%global gohostarch s390x %global gohostarch s390x
%endif %endif
%global go_api 1.19 %global go_api 1.20
%global version 1.19.13 %global version 1.20.10
%global pkg_release 2 %global pkg_release 1
Name: golang Name: golang
Version: %{version} Version: %{version}
Release: 1%{?dist} Release: 1%{?dist}
Summary: The Go Programming Language Summary: The Go Programming Language
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
License: BSD and Public Domain License: BSD and Public Domain
@ -149,14 +146,15 @@ Patch1939923: skip_test_rhbz1939923.patch
Patch2: disable_static_tests_part1.patch Patch2: disable_static_tests_part1.patch
Patch3: disable_static_tests_part2.patch Patch3: disable_static_tests_part2.patch
Patch227: cmd-link-use-correct-path-for-dynamic-loader-on-ppc6.patch
# Having documentation separate was broken # Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4 Obsoletes: %{name}-docs < 1.1-4
# RPM can't handle symlink -> dir with subpackages, so merge back # RPM can't handle symlink -> dir with subpackages, so merge back
Obsoletes: %{name}-data < 1.1.1-4 Obsoletes: %{name}-data < 1.1.1-4
# We don't build golang-race anymore, rhbz#2230599
Obsoletes: golang-race < 1.20.0
# These are the only RHEL/Fedora architectures that we compile this package for # These are the only RHEL/Fedora architectures that we compile this package for
ExclusiveArch: %{golang_arches} ExclusiveArch: %{golang_arches}
@ -246,7 +244,6 @@ popd
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/003-h2-bundle-fix-CVE-2023-39325.patch
# Configure crypto tests # Configure crypto tests
pushd ../go-go%{version}-%{pkg_release}-openssl-fips pushd ../go-go%{version}-%{pkg_release}-openssl-fips
@ -260,7 +257,6 @@ popd
%patch221 -p1 %patch221 -p1
%patch1939923 -p1 %patch1939923 -p1
%patch227 -p1
cp %{SOURCE2} ./src/runtime/ cp %{SOURCE2} ./src/runtime/
@ -344,12 +340,11 @@ cwd=$(pwd)
src_list=$cwd/go-src.list src_list=$cwd/go-src.list
pkg_list=$cwd/go-pkg.list pkg_list=$cwd/go-pkg.list
shared_list=$cwd/go-shared.list shared_list=$cwd/go-shared.list
race_list=$cwd/go-race.list
misc_list=$cwd/go-misc.list misc_list=$cwd/go-misc.list
docs_list=$cwd/go-docs.list docs_list=$cwd/go-docs.list
tests_list=$cwd/go-tests.list tests_list=$cwd/go-tests.list
rm -f $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list rm -f $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list
touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list
pushd $RPM_BUILD_ROOT%{goroot} pushd $RPM_BUILD_ROOT%{goroot}
find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list
find src/ ! -type d -a \( ! -ipath '*/testdata/*' -a ! -name '*_test*.go' \) -printf '%{goroot}/%p\n' >> $src_list find src/ ! -type d -a \( ! -ipath '*/testdata/*' -a ! -name '*_test*.go' \) -printf '%{goroot}/%p\n' >> $src_list
@ -380,13 +375,6 @@ pushd $RPM_BUILD_ROOT%{goroot}
find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
%endif %endif
%if %{race}
find pkg/*_race/ -type d -printf '%%%dir %{goroot}/%p\n' >> $race_list
find pkg/*_race/ ! -type d -printf '%{goroot}/%p\n' >> $race_list
%endif
find test/ -type d -printf '%%%dir %{goroot}/%p\n' >> $tests_list find test/ -type d -printf '%%%dir %{goroot}/%p\n' >> $tests_list
find test/ ! -type d -printf '%{goroot}/%p\n' >> $tests_list find test/ ! -type d -printf '%{goroot}/%p\n' >> $tests_list
find src/ -type d -a \( -name testdata -o -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $tests_list find src/ -type d -a \( -name testdata -o -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $tests_list
@ -529,33 +517,30 @@ cd ..
%files -f go-shared.list shared %files -f go-shared.list shared
%endif %endif
%if %{race}
%files -f go-race.list race
%endif
%changelog %changelog
* Thu Oct 12 2023 David Benoit <dbenoit@redhat.com> - 1.19.13-1 * Fri Oct 13 2023 David Benoit <dbenoit@redhat.com> - 1.20.10-1
- Update to Go 1.20.10
- Fix CVE-2023-39325 - Fix CVE-2023-39325
- Resolves: RHEL-12618
* Wed Aug 30 2023 David Benoit <dbenoit@redhat.com> - 1.19.12-1
- Update to Go 1.19.12
- Midstream patches - Midstream patches
- Resolves: rhbz#2223641 - Resolves: RHEL-12619
* Tue Jun 6 2023 David Benoit <dbenoit@redhat.com> - 1.19.10-1 * Mon Aug 14 2023 Alejandro Sáez <asm@redhat.com> - 1.20.6-2
- Update to Go 1.19.10 - Retire golang-race package
- Resolves: rhbz#2217623 - Resolves: rhbz#2230599
- Resolves: rhbz#2217609
- Resolves: rhbz#2217581
* Wed May 17 2023 Alejandro Sáez <asm@redhat.com> - 1.19.9-1 * Tue Jul 25 2023 Alejandro Sáez <asm@redhat.com> - 1.20.6-1
- Rebase to Go 1.19.9 - Rebase to Go 1.20.6
- Resolves: rhbz#2204473 - Resolves: rhbz#2217596
* Wed Mar 01 2023 David Benoit <dbenoit@redhat.com> - 1.19.6-1 * Mon May 29 2023 Alejandro Sáez <asm@redhat.com> - 1.20.4-1
- Rebase to Go 1.19.6 - Rebase to Go 1.20.4
- Resolves: rhbz#2174430 - Resolves: rhbz#2204474
* Tue Apr 11 2023 David Benoit <dbenoit@redhat.com> - 1.20.3-1
- Rebase to Go 1.20.3
- Remove race archives
- Update static tests patches
- Resolves: rhbz#2185260
* Tue Jan 3 2023 David Benoit <dbenoit@redhat.com> - 1.19.4-2 * Tue Jan 3 2023 David Benoit <dbenoit@redhat.com> - 1.19.4-2
- Fix memory leaks in EVP_{sign,verify}_raw - Fix memory leaks in EVP_{sign,verify}_raw