Compare commits
18 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5016072e66 | ||
|
|
8efa82150f | ||
|
|
0aac166560 | ||
|
|
4fc1690f7f | ||
|
|
25aa1e9fff | ||
|
|
1f54c26ae5 | ||
|
|
419b93bde7 | ||
|
|
15b13d2e8a | ||
|
|
239ad3bcfa | ||
|
|
71bf9ad1dc | ||
|
|
faf4527c70 | ||
|
|
3d2418e585 | ||
|
|
995b9e433b | ||
|
|
86030f71d2 | ||
|
|
0efbd8d1c9 | ||
|
|
341e2b9753 | ||
|
|
5de10bb978 | ||
|
|
d6f0425b10 |
5 changed files with 71 additions and 112 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -115,3 +115,13 @@
|
|||
/go1.18.1.src.tar.gz
|
||||
/go1.18.2.src.tar.gz
|
||||
/go1.18.3.src.tar.gz
|
||||
/go1.18.4.src.tar.gz
|
||||
/go1.18.5.src.tar.gz
|
||||
/go1.18.6.src.tar.gz
|
||||
/go1.18.7.src.tar.gz
|
||||
/go1.18.8.src.tar.gz
|
||||
/go1.18.9.src.tar.gz
|
||||
/go1.18.10.src.tar.gz
|
||||
/go1.19.6.src.tar.gz
|
||||
/go1.19.7.src.tar.gz
|
||||
/go1.19.8.src.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,88 +0,0 @@
|
|||
From f3d446b60a082308ec5aaa2fdc36e31f566081bb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
|
||||
Date: Thu, 22 Mar 2018 11:49:09 +0100
|
||||
Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the
|
||||
internal test suite
|
||||
|
||||
---
|
||||
src/time/internal_test.go | 7 +++++--
|
||||
src/time/zoneinfo_test.go | 3 ++-
|
||||
src/time/zoneinfo_unix.go | 2 --
|
||||
3 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/time/internal_test.go b/src/time/internal_test.go
|
||||
index 35ce69b228..1cea04ed7e 100644
|
||||
--- a/src/time/internal_test.go
|
||||
+++ b/src/time/internal_test.go
|
||||
@@ -4,13 +4,15 @@
|
||||
|
||||
package time
|
||||
|
||||
+import "runtime"
|
||||
+
|
||||
func init() {
|
||||
// force US/Pacific for time zone tests
|
||||
ForceUSPacificForTesting()
|
||||
}
|
||||
|
||||
func initTestingZone() {
|
||||
- z, err := loadLocation("America/Los_Angeles", zoneSources[len(zoneSources)-1:])
|
||||
+ z, err := loadLocation("America/Los_Angeles", zoneSources)
|
||||
if err != nil {
|
||||
panic("cannot load America/Los_Angeles for testing: " + err.Error() + "; you may want to use -tags=timetzdata")
|
||||
}
|
||||
@@ -21,8 +23,9 @@ func initTestingZone() {
|
||||
var OrigZoneSources = zoneSources
|
||||
|
||||
func forceZipFileForTesting(zipOnly bool) {
|
||||
- zoneSources = make([]string, len(OrigZoneSources))
|
||||
+ zoneSources = make([]string, len(OrigZoneSources)+1)
|
||||
copy(zoneSources, OrigZoneSources)
|
||||
+ zoneSources = append(zoneSources, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
|
||||
if zipOnly {
|
||||
zoneSources = zoneSources[len(zoneSources)-1:]
|
||||
}
|
||||
diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
|
||||
index 277b68f798..be2aa6c687 100644
|
||||
--- a/src/time/zoneinfo_test.go
|
||||
+++ b/src/time/zoneinfo_test.go
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
"reflect"
|
||||
+ "runtime"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -139,7 +140,7 @@ func TestLoadLocationFromTZData(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
- tzinfo, err := time.LoadTzinfo(locationName, time.OrigZoneSources[len(time.OrigZoneSources)-1])
|
||||
+ tzinfo, err := time.LoadTzinfo(locationName, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
|
||||
index d2465eef65..b8c934c9a9 100644
|
||||
--- a/src/time/zoneinfo_unix.go
|
||||
+++ b/src/time/zoneinfo_unix.go
|
||||
@@ -12,7 +12,6 @@
|
||||
package time
|
||||
|
||||
import (
|
||||
- "runtime"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
@@ -22,7 +21,6 @@ var zoneSources = []string{
|
||||
"/usr/share/zoneinfo/",
|
||||
"/usr/share/lib/zoneinfo/",
|
||||
"/usr/lib/locale/TZ/",
|
||||
- runtime.GOROOT() + "/lib/time/zoneinfo.zip",
|
||||
}
|
||||
|
||||
func initLocal() {
|
||||
--
|
||||
2.26.2
|
||||
|
||||
80
golang.spec
80
golang.spec
|
|
@ -106,16 +106,16 @@
|
|||
%endif
|
||||
|
||||
# Comment out go_prerelease and go_patch as needed
|
||||
%global go_api 1.18
|
||||
%global go_api 1.19
|
||||
#global go_prerelease rc1
|
||||
%global go_patch 3
|
||||
%global go_patch 8
|
||||
|
||||
%global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
|
||||
%global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
|
||||
|
||||
|
||||
# For rpmdev-bumpspec and releng automation
|
||||
%global baserelease 1
|
||||
|
||||
|
||||
Name: golang
|
||||
Version: %{go_version}
|
||||
Release: %{baserelease}%{?dist}
|
||||
|
|
@ -145,24 +145,22 @@ Provides: go = %{version}-%{release}
|
|||
|
||||
# Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data
|
||||
# - in version filed substituted with . per versioning guidelines
|
||||
Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20211104044539.f987b9c94b31
|
||||
Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20210905161508.09a460cdf81d
|
||||
Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20210923205945.b76863e36670
|
||||
Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20211215153901.e495a2d5b3d3
|
||||
Provides: bundled(golang(golang.org/x/mod)) = 0.6.0.dev.0.20211102181907.3a5865c02020
|
||||
Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20211209124913.491a49abca63
|
||||
Provides: bundled(golang(golang.org/x/sync)) = 0.0.0.20210220032951.036812b2e83c
|
||||
Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20211205182925.97ca703d548d
|
||||
Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20210927222741.03fcf44c2211
|
||||
Provides: bundled(golang(golang.org/x/text)) = 0.3.8.0.20211105212822.18b340fc7af2
|
||||
Provides: bundled(golang(golang.org/x/tools)) = 0.1.9.0.20220329150752.294080fd2f5a
|
||||
Provides: bundled(golang(golang.org/x/xerrors)) = 0.0.0.20200804184101.5ec99f83aff1
|
||||
Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20220729232143.a41b82acbcb1
|
||||
Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20220319035150.800ac71e25c2
|
||||
Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20220412001346.fc48f9fe4c15
|
||||
Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20220516162934.403b01795ae8
|
||||
Provides: bundled(golang(golang.org/x/mod)) = 0.6.0.dev.0.20220419223038.86c51ed26bb4
|
||||
Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20230214200805.d99f623d45a4
|
||||
Provides: bundled(golang(golang.org/x/sync)) = 0.0.0.20220513210516.0976fa681c29
|
||||
Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20220614162138.6c1b26c55098
|
||||
Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20220411215600.e5f449aeb171
|
||||
Provides: bundled(golang(golang.org/x/text)) = 0.3.8.0.20220509174342.b4bca84b0361
|
||||
Provides: bundled(golang(golang.org/x/tools)) = 0.1.11.0.20220516163903.1e55371df567
|
||||
|
||||
Requires: %{name}-bin = %{version}-%{release}
|
||||
Requires: %{name}-src = %{version}-%{release}
|
||||
Requires: go-srpm-macros
|
||||
|
||||
Patch1: 0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
|
||||
Patch2: 0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
|
||||
Patch3: 0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
|
||||
|
||||
|
|
@ -399,7 +397,7 @@ echo "== 4 =="
|
|||
echo "%%{goroot}/$file" >> $shared_list
|
||||
echo "%%{golibdir}/$(basename $file)" >> $shared_list
|
||||
done
|
||||
|
||||
|
||||
find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list
|
||||
find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
|
||||
%endif
|
||||
|
|
@ -494,7 +492,6 @@ fi
|
|||
|
||||
%files
|
||||
%license LICENSE PATENTS
|
||||
%doc AUTHORS CONTRIBUTORS
|
||||
# VERSION has to be present in the GOROOT, for `go install std` to work
|
||||
%doc %{goroot}/VERSION
|
||||
%dir %{goroot}/doc
|
||||
|
|
@ -541,6 +538,43 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Apr 04 2023 Alejandro Sáez <asm@redhat.com> - 1.19.8-1
|
||||
- Update to go1.19.8
|
||||
|
||||
* Mon Mar 20 2023 Bradley G Smith <bradley.g.smith@gmail.com> - 1.19.7-1
|
||||
- Update to 1.19.7
|
||||
- Resolves #2176528, in part
|
||||
|
||||
* Wed Feb 15 2023 Alejandro Sáez <asm@redhat.com> - 1.19.6-1
|
||||
- Update to go1.19.6
|
||||
- Remove tzdata patch
|
||||
- Major release approved by FESCO https://pagure.io/fesco/issue/2941
|
||||
|
||||
* Tue Jan 10 2023 Alejandro Sáez <asm@redhat.com> - 1.18.10-1
|
||||
- Update to go 1.18.10
|
||||
|
||||
* Wed Dec 07 2022 Alejandro Sáez <asm@redhat.com> - 1.18.9-1
|
||||
- Update to 1.18.9
|
||||
|
||||
* Sun Nov 13 2022 Bradley G Smith <bradley.g.smith@gmail.com> - 1.18.8-1
|
||||
- Update to 1.18.8
|
||||
|
||||
* Tue Oct 04 2022 Alejandro Sáez <asm@redhat.com> - 1.18.7-1
|
||||
- Update to 1.18.7
|
||||
|
||||
* Tue Sep 06 2022 Alejandro Sáez <asm@redhat.com> - 1.18.6-1
|
||||
- Update to 1.18.6
|
||||
|
||||
* Mon Aug 01 2022 Alejandro Sáez <asm@redhat.com> - 1.18.5-1
|
||||
- Update to 1.18.5
|
||||
|
||||
* Wed Jul 13 2022 Alejandro Sáez <asm@redhat.com> - 1.18.4-1
|
||||
- Update to 1.18.4
|
||||
|
||||
* Wed Jun 22 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.18.3-2
|
||||
- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
|
||||
CVE-2022-29526, CVE-2022-30629
|
||||
|
||||
* Thu Jun 02 2022 Alejandro Sáez <asm@redhat.com> - 1.18.3-1
|
||||
- Update to 1.18.3
|
||||
- Resolves: rhbz#2092631
|
||||
|
|
@ -552,10 +586,14 @@ fi
|
|||
* Tue Apr 12 2022 Alejandro Sáez <asm@redhat.com> - 1.18.1-1
|
||||
- Update to 1.18.1
|
||||
|
||||
* Tue Mar 15 2022 Mike Rochefort <mroche@redhat.com> - 1.18-1
|
||||
* Wed Mar 16 2022 Alejandro Sáez <asm@redhat.com> - 1.18-1
|
||||
- Update to 1.18
|
||||
- Remove 0004-syscall-remove-TestRlimit.diff
|
||||
- Resolves: rhbz#2064409
|
||||
|
||||
* Tue Mar 08 2022 Alejandro Sáez <asm@redhat.com> - 1.18~rc1-2
|
||||
- Add 0004-syscall-remove-TestRlimit.diff until it gets removed in rc2
|
||||
|
||||
* Thu Feb 17 2022 Mike Rochefort <mroche@redhat.com> - 1.18~rc1-1
|
||||
- Update to 1.18rc1
|
||||
- Resolves: rhbz#2002859
|
||||
|
|
@ -617,7 +655,7 @@ fi
|
|||
|
||||
* Mon May 10 2021 Alejandro Sáez <asm@redhat.com> - 1.16.4-1
|
||||
- Update to go1.16.4
|
||||
- Security fix for CVE-2021-31525
|
||||
- Security fix for CVE-2021-31525
|
||||
- Resolves: rhbz#1958343
|
||||
|
||||
* Fri Apr 09 2021 Alejandro Sáez <asm@redhat.com> - 1.16.3-1
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
summary: CI Gating Plan
|
||||
discover:
|
||||
how: fmf
|
||||
directory: tests
|
||||
execute:
|
||||
how: beakerlib
|
||||
how: tmt
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (go1.18.3.src.tar.gz) = bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe
|
||||
SHA512 (go1.19.8.src.tar.gz) = d7ecbae3034211d7c64df4c0fce6894bae3e7e8de20bd2aa9f24b39cc040fa64d8a3bea311582cf4455a981dc3c8f319141f7f357db4eebd27d4451fee05727a
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue