From d6f0425b10686974432726222c575e08eab43647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Tue, 8 Mar 2022 17:11:38 +0100 Subject: [PATCH 01/14] Add 0004-syscall-remove-TestRlimit.diff Until it gets removed in rc2 --- 0004-syscall-remove-TestRlimit.diff | 62 +++++++++++++++++++++++++++++ golang.spec | 6 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 0004-syscall-remove-TestRlimit.diff diff --git a/0004-syscall-remove-TestRlimit.diff b/0004-syscall-remove-TestRlimit.diff new file mode 100644 index 0000000..afb374d --- /dev/null +++ b/0004-syscall-remove-TestRlimit.diff @@ -0,0 +1,62 @@ +From 520f0d04017dff65314ce54a45e4b8212f0bfb87 Mon Sep 17 00:00:00 2001 +From: Ian Lance Taylor +Date: Fri, 04 Mar 2022 10:03:32 -0800 +Subject: [PATCH] [release-branch.go1.18] syscall: remove TestRlimit + +It's more trouble than it's worth. New code should be using x/sys/unix +anyhow. + +Fixes #40564 +Fixes #51479 + +Change-Id: I1c0e13f494380c1565e98359f088af9f52790b79 +Reviewed-on: https://go-review.googlesource.com/c/go/+/390020 +Trust: Ian Lance Taylor +Run-TryBot: Ian Lance Taylor +Reviewed-by: Bryan Mills +TryBot-Result: Gopher Robot +(cherry picked from commit 1e122e3894bd12407b0043ab25c2a5f665b3f6e5) +Reviewed-on: https://go-review.googlesource.com/c/go/+/390022 +Trust: Dmitri Shuralyov +Run-TryBot: Dmitri Shuralyov +Reviewed-by: Ian Lance Taylor +--- + +diff --git a/src/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go +index 1ef2634..317c0c1 100644 +--- a/src/syscall/syscall_unix_test.go ++++ b/src/syscall/syscall_unix_test.go +@@ -326,33 +326,6 @@ + } + } + +-func TestRlimit(t *testing.T) { +- var rlimit, zero syscall.Rlimit +- if err := syscall.Getrlimit(syscall.RLIMIT_CPU, &rlimit); err != nil { +- t.Fatalf("Getrlimit: save failed: %v", err) +- } +- if zero == rlimit { +- t.Fatalf("Getrlimit: save failed: got zero value %#v", rlimit) +- } +- set := rlimit +- set.Cur = set.Max - 1 +- if err := syscall.Setrlimit(syscall.RLIMIT_CPU, &set); err != nil { +- t.Fatalf("Setrlimit: set failed: %#v %v", set, err) +- } +- var get syscall.Rlimit +- if err := syscall.Getrlimit(syscall.RLIMIT_CPU, &get); err != nil { +- t.Fatalf("Getrlimit: get failed: %v", err) +- } +- set = rlimit +- set.Cur = set.Max - 1 +- if set != get { +- t.Fatalf("Rlimit: change failed: wanted %#v got %#v", set, get) +- } +- if err := syscall.Setrlimit(syscall.RLIMIT_CPU, &rlimit); err != nil { +- t.Fatalf("Setrlimit: restore failed: %#v %v", rlimit, err) +- } +-} +- + func TestSeekFailure(t *testing.T) { + _, err := syscall.Seek(-1, 0, io.SeekStart) + if err == nil { diff --git a/golang.spec b/golang.spec index 39a407d..5b051ad 100644 --- a/golang.spec +++ b/golang.spec @@ -114,7 +114,7 @@ %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} # For rpmdev-bumpspec and releng automation -%global baserelease 1 +%global baserelease 2 Name: golang Version: %{go_version} @@ -165,6 +165,7 @@ 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 +Patch4: 0004-syscall-remove-TestRlimit.diff # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -541,6 +542,9 @@ fi %endif %changelog +* Tue Mar 08 2022 Alejandro Sáez - 1.18~rc1-2 +- Add 0004-syscall-remove-TestRlimit.diff until it gets removed in rc2 + * Thu Feb 17 2022 Mike Rochefort - 1.18~rc1-1 - Update to 1.18rc1 - Resolves: rhbz#2002859 From 995b9e433b6698fe201eec52cbf0e4ea82e47559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 22 Jun 2022 17:53:51 +0200 Subject: [PATCH 02/14] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- golang.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/golang.spec b/golang.spec index 17b40b0..f18cf6c 100644 --- a/golang.spec +++ b/golang.spec @@ -114,7 +114,7 @@ %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} # For rpmdev-bumpspec and releng automation -%global baserelease 1 +%global baserelease 2 Name: golang Version: %{go_version} @@ -541,6 +541,10 @@ fi %endif %changelog +* Wed Jun 22 2022 Robert-André Mauchin - 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 - 1.18.3-1 - Update to 1.18.3 - Resolves: rhbz#2092631 From 3d2418e585734cc7fa70d38d95407a9f1df049c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 13 Jul 2022 11:35:48 +0200 Subject: [PATCH 03/14] Update to 1.18.4 --- .gitignore | 1 + golang.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd01b35..dc6d26e 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ /go1.18.1.src.tar.gz /go1.18.2.src.tar.gz /go1.18.3.src.tar.gz +/go1.18.4.src.tar.gz diff --git a/golang.spec b/golang.spec index f18cf6c..5291aa0 100644 --- a/golang.spec +++ b/golang.spec @@ -108,13 +108,13 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 3 +%global go_patch 4 %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 2 +%global baserelease 1 Name: golang Version: %{go_version} @@ -541,6 +541,9 @@ fi %endif %changelog +* Wed Jul 13 2022 Alejandro Sáez - 1.18.4-1 +- Update to 1.18.4 + * Wed Jun 22 2022 Robert-André Mauchin - 1.18.3-2 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 diff --git a/sources b/sources index 166dc28..d77510c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.3.src.tar.gz) = bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe +SHA512 (go1.18.4.src.tar.gz) = 4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b From faf4527c70c1d64c784db954b9dee6b4e7bee5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Mon, 1 Aug 2022 18:19:55 +0200 Subject: [PATCH 04/14] Update to 1.18.5 --- .gitignore | 1 + golang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dc6d26e..25f5801 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ /go1.18.2.src.tar.gz /go1.18.3.src.tar.gz /go1.18.4.src.tar.gz +/go1.18.5.src.tar.gz diff --git a/golang.spec b/golang.spec index 5291aa0..46d6e88 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 4 +%global go_patch 5 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -541,6 +541,9 @@ fi %endif %changelog +* Mon Aug 01 2022 Alejandro Sáez - 1.18.5-1 +- Update to 1.18.5 + * Wed Jul 13 2022 Alejandro Sáez - 1.18.4-1 - Update to 1.18.4 diff --git a/sources b/sources index d77510c..a2f68bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.4.src.tar.gz) = 4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b +SHA512 (go1.18.5.src.tar.gz) = 4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef From 71bf9ad1dcd18d66073a26836c5fd6954ca14a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Tue, 6 Sep 2022 18:51:36 +0200 Subject: [PATCH 05/14] Update to 1.18.6 --- .gitignore | 1 + golang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 25f5801..9b171d1 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ /go1.18.3.src.tar.gz /go1.18.4.src.tar.gz /go1.18.5.src.tar.gz +/go1.18.6.src.tar.gz diff --git a/golang.spec b/golang.spec index 46d6e88..3c50b3d 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 5 +%global go_patch 6 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -541,6 +541,9 @@ fi %endif %changelog +* Tue Sep 06 2022 Alejandro Sáez - 1.18.6-1 +- Update to 1.18.6 + * Mon Aug 01 2022 Alejandro Sáez - 1.18.5-1 - Update to 1.18.5 diff --git a/sources b/sources index a2f68bb..4ab019d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.5.src.tar.gz) = 4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef +SHA512 (go1.18.6.src.tar.gz) = 2af66b09bfe033b413eb7603a73a490319bf49fec0a2e20c40350e60b9ef35250a6dc8544c5fc67bd1ede55e242d056e7749f69ef500a38b1efe4b8f93078de3 From 239ad3bcfa631c99da16e104d67df3c77c54e4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Tue, 4 Oct 2022 20:16:51 +0200 Subject: [PATCH 06/14] Update to 1.18.7 --- .gitignore | 1 + golang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9b171d1..5d3cc09 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ /go1.18.4.src.tar.gz /go1.18.5.src.tar.gz /go1.18.6.src.tar.gz +/go1.18.7.src.tar.gz diff --git a/golang.spec b/golang.spec index 3c50b3d..8f75344 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 6 +%global go_patch 7 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -541,6 +541,9 @@ fi %endif %changelog +* Tue Oct 04 2022 Alejandro Sáez - 1.18.7-1 +- Update to 1.18.7 + * Tue Sep 06 2022 Alejandro Sáez - 1.18.6-1 - Update to 1.18.6 diff --git a/sources b/sources index 4ab019d..3c61f5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.6.src.tar.gz) = 2af66b09bfe033b413eb7603a73a490319bf49fec0a2e20c40350e60b9ef35250a6dc8544c5fc67bd1ede55e242d056e7749f69ef500a38b1efe4b8f93078de3 +SHA512 (go1.18.7.src.tar.gz) = cf1ff024e94b900b87cc52d3ec04b0f7f853880a99c416791ad4b9af5f8e50ec82fbe00788bc8dcc184ef5ce1a9df17f5f5e95cf01c0c8138f28f53d691ca5d4 From 15b13d2e8aaa53b7050528731a5c30d42eb16185 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Sat, 12 Nov 2022 13:44:38 -0800 Subject: [PATCH 07/14] Update to 1.18.8 --- .gitignore | 1 + golang.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5d3cc09..5296779 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ /go1.18.5.src.tar.gz /go1.18.6.src.tar.gz /go1.18.7.src.tar.gz +/go1.18.8.src.tar.gz diff --git a/golang.spec b/golang.spec index 8f75344..76cada1 100644 --- a/golang.spec +++ b/golang.spec @@ -108,14 +108,14 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 7 +%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} @@ -399,7 +399,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 @@ -541,6 +541,9 @@ fi %endif %changelog +* Sun Nov 13 2022 Bradley G Smith - 1.18.8-1 +- Update to 1.18.8 + * Tue Oct 04 2022 Alejandro Sáez - 1.18.7-1 - Update to 1.18.7 @@ -637,7 +640,7 @@ fi * Mon May 10 2021 Alejandro Sáez - 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 - 1.16.3-1 diff --git a/sources b/sources index 3c61f5e..51f295c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.7.src.tar.gz) = cf1ff024e94b900b87cc52d3ec04b0f7f853880a99c416791ad4b9af5f8e50ec82fbe00788bc8dcc184ef5ce1a9df17f5f5e95cf01c0c8138f28f53d691ca5d4 +SHA512 (go1.18.8.src.tar.gz) = 8fb257e2e53bf887948735c03a68748c55e2ceda3c6593cabb0c70e82b0e4e8f6ecd8aece5e6b1b96e4589a53ae557f8d9d6dea093efff0ae657afad25b05b22 From 419b93bde7a7eaee740a10e467c3e246921c59b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 7 Dec 2022 13:33:34 +0100 Subject: [PATCH 08/14] Update to 1.18.9 --- .gitignore | 1 + golang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5296779..7ff8ad0 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ /go1.18.6.src.tar.gz /go1.18.7.src.tar.gz /go1.18.8.src.tar.gz +/go1.18.9.src.tar.gz diff --git a/golang.spec b/golang.spec index 76cada1..e6d57d0 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 8 +%global go_patch 9 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -541,6 +541,9 @@ fi %endif %changelog +* Wed Dec 07 2022 Alejandro Sáez - 1.18.9-1 +- Update to 1.18.9 + * Sun Nov 13 2022 Bradley G Smith - 1.18.8-1 - Update to 1.18.8 diff --git a/sources b/sources index 51f295c..d6c6de8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.8.src.tar.gz) = 8fb257e2e53bf887948735c03a68748c55e2ceda3c6593cabb0c70e82b0e4e8f6ecd8aece5e6b1b96e4589a53ae557f8d9d6dea093efff0ae657afad25b05b22 +SHA512 (go1.18.9.src.tar.gz) = 5f47442cc8ffbbc8c709ed5e8a6f3c5e19fc7979a21dc9883bb27096ffd165a08106ed01e2239c95c9276517081f967be9581f7c45272f9b2dcfced096eb8a67 From 1f54c26ae5a9afb6b3b6685a61c00279b274c831 Mon Sep 17 00:00:00 2001 From: Edjunior Machado Date: Thu, 8 Dec 2022 14:25:44 +0100 Subject: [PATCH 09/14] tests: Fix fmf plan attributes 'directory'/'path' and 'how' Thanks mprchlik@redhat.com for spotting the issue and providing the fix. --- plans/ci.fmf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..5991864 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,6 @@ summary: CI Gating Plan discover: how: fmf - directory: tests + path: tests execute: - how: beakerlib + how: tmt From 25aa1e9fffb6e7f6deda0d91a362fcc711eeecea Mon Sep 17 00:00:00 2001 From: Edjunior Machado Date: Fri, 9 Dec 2022 16:21:13 +0100 Subject: [PATCH 10/14] tests: Drop path attribute --- plans/ci.fmf | 1 - 1 file changed, 1 deletion(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 5991864..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - path: tests execute: how: tmt From 4fc1690f7fe037dadf7df0657bc1ff53826c9bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Tue, 10 Jan 2023 20:27:05 +0100 Subject: [PATCH 11/14] Updaste to go 1.18.10 --- .gitignore | 1 + golang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ff8ad0..a2a0647 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ /go1.18.7.src.tar.gz /go1.18.8.src.tar.gz /go1.18.9.src.tar.gz +/go1.18.10.src.tar.gz diff --git a/golang.spec b/golang.spec index e6d57d0..5cea594 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.18 #global go_prerelease rc1 -%global go_patch 9 +%global go_patch 10 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -541,6 +541,9 @@ fi %endif %changelog +* Tue Jan 10 2023 Alejandro Sáez - 1.18.10-1 +- Update to go 1.18.10 + * Wed Dec 07 2022 Alejandro Sáez - 1.18.9-1 - Update to 1.18.9 diff --git a/sources b/sources index d6c6de8..c818d42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.9.src.tar.gz) = 5f47442cc8ffbbc8c709ed5e8a6f3c5e19fc7979a21dc9883bb27096ffd165a08106ed01e2239c95c9276517081f967be9581f7c45272f9b2dcfced096eb8a67 +SHA512 (go1.18.10.src.tar.gz) = 5ae4c054a9e7c5fe159a27d46a37517797d8a1545f0920dc50234cc229977d02ecebf2445da5d4c641fbab574546d2c92c0ccb9cddc99be250967e2bb2ad9287 From 0aac1665605b2ae9b176162436a3374df873a43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 15 Feb 2023 10:25:00 +0100 Subject: [PATCH 12/14] Update to go1.19.6 Remove tzdata patch Major release approved by FESCO https://pagure.io/fesco/issue/2941 --- .gitignore | 1 + ...ndled-tzdata-at-runtime-except-for-t.patch | 88 ------------------- golang.spec | 34 +++---- sources | 2 +- 4 files changed, 20 insertions(+), 105 deletions(-) delete mode 100644 0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch diff --git a/.gitignore b/.gitignore index a2a0647..b3d6d7b 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ /go1.18.8.src.tar.gz /go1.18.9.src.tar.gz /go1.18.10.src.tar.gz +/go1.19.6.src.tar.gz diff --git a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch deleted file mode 100644 index c0f214b..0000000 --- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f3d446b60a082308ec5aaa2fdc36e31f566081bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20=C4=8Cajka?= -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 - diff --git a/golang.spec b/golang.spec index 5cea594..149e11d 100644 --- a/golang.spec +++ b/golang.spec @@ -106,9 +106,9 @@ %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 10 +%global go_patch 6 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -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.20221214163817.183621ab9c4e +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 @@ -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,11 @@ fi %endif %changelog +* Wed Feb 15 2023 Alejandro Sáez - 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 - 1.18.10-1 - Update to go 1.18.10 diff --git a/sources b/sources index c818d42..ec2b908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.18.10.src.tar.gz) = 5ae4c054a9e7c5fe159a27d46a37517797d8a1545f0920dc50234cc229977d02ecebf2445da5d4c641fbab574546d2c92c0ccb9cddc99be250967e2bb2ad9287 +SHA512 (go1.19.6.src.tar.gz) = f817ea6bcd83b60d9bf2ae9d0afdaa21651ac6cf5a32c260f40a691cd0ccce556ec9a483e10fa1a5dc244d6ea512407f5dae9c99ac004393b196a80284e63977 From 8efa82150f831d4f08c52120e61395abb0b8712f Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Thu, 23 Mar 2023 08:20:40 -0700 Subject: [PATCH 13/14] Update to 1.19.7 Resolves #2176528, in part. Provides list updated. --- golang.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/golang.spec b/golang.spec index 149e11d..48ec3ae 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.19 #global go_prerelease rc1 -%global go_patch 6 +%global go_patch 7 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -150,7 +150,7 @@ Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.2022031903 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.20221214163817.183621ab9c4e +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 @@ -538,6 +538,10 @@ fi %endif %changelog +* Mon Mar 20 2023 Bradley G Smith - 1.19.7-1 +- Update to 1.19.7 +- Resolves #2176528, in part + * Wed Feb 15 2023 Alejandro Sáez - 1.19.6-1 - Update to go1.19.6 - Remove tzdata patch diff --git a/sources b/sources index ec2b908..83aa10d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.19.6.src.tar.gz) = f817ea6bcd83b60d9bf2ae9d0afdaa21651ac6cf5a32c260f40a691cd0ccce556ec9a483e10fa1a5dc244d6ea512407f5dae9c99ac004393b196a80284e63977 +SHA512 (go1.19.7.src.tar.gz) = e6f0df2d381a424cf43e8ea0306a58a46a96464cff4665ca3da73f713d4f039687a6c9659cef577000b1fadca7c1a2114fac34ffb2017d6335f537ac235de823 From 5016072e662402ad80a1c6675f6e0e0ff219a21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Tue, 4 Apr 2023 23:20:55 +0200 Subject: [PATCH 14/14] Update to Go 1.19.8 --- .gitignore | 2 ++ golang.spec | 5 ++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b3d6d7b..8343fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,5 @@ /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 diff --git a/golang.spec b/golang.spec index 48ec3ae..604d044 100644 --- a/golang.spec +++ b/golang.spec @@ -108,7 +108,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.19 #global go_prerelease rc1 -%global go_patch 7 +%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} @@ -538,6 +538,9 @@ fi %endif %changelog +* Tue Apr 04 2023 Alejandro Sáez - 1.19.8-1 +- Update to go1.19.8 + * Mon Mar 20 2023 Bradley G Smith - 1.19.7-1 - Update to 1.19.7 - Resolves #2176528, in part diff --git a/sources b/sources index 83aa10d..66055ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.19.7.src.tar.gz) = e6f0df2d381a424cf43e8ea0306a58a46a96464cff4665ca3da73f713d4f039687a6c9659cef577000b1fadca7c1a2114fac34ffb2017d6335f537ac235de823 +SHA512 (go1.19.8.src.tar.gz) = d7ecbae3034211d7c64df4c0fce6894bae3e7e8de20bd2aa9f24b39cc040fa64d8a3bea311582cf4455a981dc3c8f319141f7f357db4eebd27d4451fee05727a