From 180e181d7c2793f8c8114a544eb2697780b655ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 20 Dec 2023 08:44:51 +0100 Subject: [PATCH 1/6] Update to go1.22rc1 --- .gitignore | 1 + .packit.yaml | 1 + golang.spec | 28 ++++++++++++++-------------- sources | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index dfd60b3..90d5a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ /go1.21.4.src.tar.gz /go1.21.5.src.tar.gz /go1.21.6.src.tar.gz +/go1.22rc1.src.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 7527ea8..502dae6 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -28,6 +28,7 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: fedora-rawhide + upstream_tag_include: "^go1.22.+" # Run Koji builds when Packit pull requests are merged - job: koji_build diff --git a/golang.spec b/golang.spec index cb2a695..7819116 100644 --- a/golang.spec +++ b/golang.spec @@ -95,9 +95,9 @@ %endif # Comment out go_prerelease and go_patch as needed -%global go_api 1.21 -#global go_prerelease rc3 -%global go_patch 6 +%global go_api 1.22 +%global go_prerelease rc1 +#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} @@ -130,17 +130,17 @@ BuildRequires: pcre2-devel, glibc-static, perl-interpreter, procps-ng Provides: go = %{version}-%{release} # Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data -Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20221118152302.e6195bd50e26 -Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20220319035150.800ac71e25c2 -Provides: bundled(golang(golang.org/x/arch)) = 0.4.0 -Provides: bundled(golang(golang.org/x/crypto)) = 0.11.1.0.20230711161743.2e82bdd1719d -Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net)) = 0.12.1.0.20231027154334.5ca955b1789c -Provides: bundled(golang(golang.org/x/sync)) = 0.3.0 -Provides: bundled(golang(golang.org/x/sys)) = 0.10.0 -Provides: bundled(golang(golang.org/x/term)) = 0.10.0 -Provides: bundled(golang(golang.org/x/text)) = 0.11.0 -Provides: bundled(golang(golang.org/x/tools)) = 0.11.1.0.20230712164437.1ca21856af7b +Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20230811205829.9131a7e9cc17 +Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20230524184225.eabc099b10ab +Provides: bundled(golang(golang.org/x/arch)) = 0.6.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.16.1.0.20231129163542.152cdb1503eb +Provides: bundled(golang(golang.org/x/mod)) = 0.14.0 +Provides: bundled(golang(golang.org/x/net)) = 0.19.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.5.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.15.0 +Provides: bundled(golang(golang.org/x/term)) = 0.15.0 +Provides: bundled(golang(golang.org/x/text)) = 0.14.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.16.2.0.20231218185909.83bceaf2424d Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} diff --git a/sources b/sources index 9cdba27..4794700 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.21.6.src.tar.gz) = 8472c1c6c3fae9fecfb512a16f18ed531c04c087429a75086b9999069330c1b1e4a01a30c6561b5092169144cbc0d787ec2f5f4a50dfc4f79e74398f16423cfd +SHA512 (go1.22rc1.src.tar.gz) = bf65920b674b3d8dd42a8bdfa9ff8e960d8318cf0398bec077cb2b51042f9bf0decb63a8d47d583a8b806da9038998988a63ad0712867b7e26a38692fd298a1b From 20d9dbe9ec7fee60c2b3b91963f04f5222908a95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 23:19:07 +0000 Subject: [PATCH 2/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ba5f452fd69f88ea769c760d83808774aa39d5b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 15:53:12 +0000 Subject: [PATCH 3/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 31f7d745bfb427ce27be4fd13b96bceb03d11150 Mon Sep 17 00:00:00 2001 From: Mike Rochefort Date: Wed, 24 Jan 2024 11:54:29 -0500 Subject: [PATCH 4/6] Update to go1.22rc2 --- .gitignore | 1 + golang.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 90d5a6f..461702f 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ /go1.21.5.src.tar.gz /go1.21.6.src.tar.gz /go1.22rc1.src.tar.gz +/go1.22rc2.src.tar.gz diff --git a/golang.spec b/golang.spec index 7819116..74f4561 100644 --- a/golang.spec +++ b/golang.spec @@ -96,7 +96,7 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.22 -%global go_prerelease rc1 +%global go_prerelease rc2 #global go_patch 6 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} diff --git a/sources b/sources index 4794700..97f1841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.22rc1.src.tar.gz) = bf65920b674b3d8dd42a8bdfa9ff8e960d8318cf0398bec077cb2b51042f9bf0decb63a8d47d583a8b806da9038998988a63ad0712867b7e26a38692fd298a1b +SHA512 (go1.22rc2.src.tar.gz) = 4d412c3599519f44a6322dd0148ab0e5b0405f360b0a0b2498951d2968273c9f04700e475c53d1b3e5b88f2308f08be61fcc828eb4ea0408a34e44b75d746e08 From a0ae3bce4e9c8fa1aec6ecaa5dbedbff8f0f984d Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 7 Feb 2024 07:59:19 +0000 Subject: [PATCH 5/6] [packit] 1.22.0 upstream release Upstream tag: go1.22.0 Upstream commit: a10e42f2 Skip TestCrashDumpsAllThreads on s390x --- .gitignore | 1 + 0005-Skip-TestCrashDumpsAllThreads.patch | 28 ++++++++++++++++++++++++ README.packit | 2 +- golang.spec | 6 +++-- sources | 2 +- 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 0005-Skip-TestCrashDumpsAllThreads.patch diff --git a/.gitignore b/.gitignore index 461702f..de4218f 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ /go1.21.6.src.tar.gz /go1.22rc1.src.tar.gz /go1.22rc2.src.tar.gz +/go1.22.0.src.tar.gz diff --git a/0005-Skip-TestCrashDumpsAllThreads.patch b/0005-Skip-TestCrashDumpsAllThreads.patch new file mode 100644 index 0000000..34a84b3 --- /dev/null +++ b/0005-Skip-TestCrashDumpsAllThreads.patch @@ -0,0 +1,28 @@ +From c0c22e2aa7d1901c97da04f834ce9c7b9e38be80 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= +Date: Sun, 11 Feb 2024 12:08:35 +0100 +Subject: [PATCH] Skip TestCrashDumpsAllThreads + +See golang.org/issues/64650 +--- + src/runtime/crash_unix_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go +index 123a462423..a0034d6455 100644 +--- a/src/runtime/crash_unix_test.go ++++ b/src/runtime/crash_unix_test.go +@@ -74,6 +74,10 @@ func TestCrashDumpsAllThreads(t *testing.T) { + t.Skip("skipping; SIGQUIT is blocked, see golang.org/issue/19196") + } + ++ if runtime.GOOS == "linux" && runtime.GOARCH == "s390x" { ++ t.Skip("skipping; frequent TestCrashDumpsAllThreads failures on linux/s390x, see golang.org/issue/64650") ++ } ++ + testenv.MustHaveGoBuild(t) + + if strings.Contains(os.Getenv("GOFLAGS"), "mayMoreStackPreempt") { +-- +2.43.0 + diff --git a/README.packit b/README.packit index 115b422..29cc7d8 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.88.0.post1.dev4+gc070191b. +The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. diff --git a/golang.spec b/golang.spec index 74f4561..0538869 100644 --- a/golang.spec +++ b/golang.spec @@ -96,8 +96,8 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.22 -%global go_prerelease rc2 -#global go_patch 6 +#global go_prerelease rc2 +%global go_patch 0 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} @@ -142,12 +142,14 @@ Provides: bundled(golang(golang.org/x/term)) = 0.15.0 Provides: bundled(golang(golang.org/x/text)) = 0.14.0 Provides: bundled(golang(golang.org/x/tools)) = 0.16.2.0.20231218185909.83bceaf2424d + Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} Requires: go-filesystem Patch1: 0001-Modify-go.env.patch Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch +Patch5: 0005-Skip-TestCrashDumpsAllThreads.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 diff --git a/sources b/sources index 97f1841..ddd1e97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.22rc2.src.tar.gz) = 4d412c3599519f44a6322dd0148ab0e5b0405f360b0a0b2498951d2968273c9f04700e475c53d1b3e5b88f2308f08be61fcc828eb4ea0408a34e44b75d746e08 +SHA512 (go1.22.0.src.tar.gz) = f47fdac3281463757b3db9f6ab747f86ed7263beed52c820ec2571375a578034df02c0b76912c19fab3a58df3b04d79b6aae084163d1d5847c907aeb30b936e3 From 286b9358942f2430933bce676df8cdbaaf3a4759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 14 Feb 2024 18:09:48 +0100 Subject: [PATCH 6/6] Make F38 follow Go 1.21 --- .packit.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 502dae6..420f0da 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -12,16 +12,13 @@ actions: - bash -c "echo - New release ${PACKIT_PROJECT_VERSION}" jobs: - # Fedora 38 follows Go 1.20 - - job: pull_from_upstream - trigger: release - dist_git_branches: fedora-38 - upstream_tag_include: "^go1.20.+" - # Fedora 39 follows Go 1.21 + # Fedora 38 now follows Go 1.21 since Go 1.20 went EOL - job: pull_from_upstream trigger: release - dist_git_branches: fedora-39 + dist_git_branches: + - fedora-38 + - fedora-39 upstream_tag_include: "^go1.21.+" # Fedora Rawhide follows the latest version