Skip to content

Commit d1598f3

Browse files
authored
golang: support v1.22 and v1.23 (#10654)
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
1 parent 6836510 commit d1598f3

14 files changed

Lines changed: 437 additions & 26 deletions

File tree

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSES-AND-NOTICES/SPECS/data/licenses.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,6 +2713,7 @@
27132713
"gnutls",
27142714
"gobject-introspection",
27152715
"golang",
2716+
"golang-1.22",
27162717
"gperf",
27172718
"gperftools",
27182719
"gpgme",

SPECS/containerd/containerd.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: Industry-standard container runtime
55
Name: containerd
66
Version: 1.7.13
7-
Release: 3%{?dist}
7+
Release: 4%{?dist}
88
License: ASL 2.0
99
Group: Tools/Container
1010
URL: https://www.containerd.io
@@ -22,7 +22,7 @@ Patch3: CVE-2023-47108.patch
2222
%{?systemd_requires}
2323

2424
BuildRequires: git
25-
BuildRequires: golang
25+
BuildRequires: golang < 1.23
2626
BuildRequires: go-md2man
2727
BuildRequires: make
2828
BuildRequires: systemd-rpm-macros
@@ -87,6 +87,9 @@ fi
8787
%dir /opt/containerd/lib
8888

8989
%changelog
90+
* Tue Oct 15 2024 Muhammad Falak <mwani@microsoft.com> - 1.7.13-4
91+
- Pin golang version to <= 1.22
92+
9093
* Wed Jun 26 2024 Nicolas Guibourge <nicolasg@microsoft.com> - 1.7.13-3
9194
- Address CVE-2023-44487 and CVE-2023-47108
9295

SPECS/gh/gh.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: GitHub official command line tool
22
Name: gh
33
Version: 2.43.1
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
@@ -28,7 +28,7 @@ Source0: https://github.com/cli/cli/archive/refs/tags/v%{version}.tar.gz#
2828
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
2929
Source1: %{name}-%{version}-vendor.tar.gz
3030

31-
BuildRequires: golang >= 1.21.1
31+
BuildRequires: golang < 1.23
3232
BuildRequires: git
3333
Requires: git
3434
%global debug_package %{nil}
@@ -70,6 +70,9 @@ make test
7070
%{_datadir}/zsh/site-functions/_gh
7171

7272
%changelog
73+
* Tue Oct 15 2024 Muhammad Falak <mwani@microsoft.com> - 2.43.1-2
74+
- Pin golang version to <= 1.22
75+
7376
* Mon Feb 26 2024 Neha Agarwal <nehaagarwal@microsoft.com> - 2.43.1-1
7477
- Update to v2.43.1
7578

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"Signatures": {
3+
"go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
4+
"go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
5+
"go1.22.7-20240925.5.src.tar.gz": "6577057080f0d61f9b7b1c5e3a029c8a24f8c4b38a91a497115ecd259bd987ab",
6+
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
7+
}
8+
}

0 commit comments

Comments
 (0)