Skip to content

Commit 2b9c5ad

Browse files
mfrwjslobodzian
authored andcommitted
msft-golang: upgrade version 1.24.1 -> 1.24.5 (microsoft#14442)
Signed-off-by: Muhammad Falak R Wani <[email protected]>
1 parent 1e8f100 commit 2b9c5ad

File tree

6 files changed

+16
-239
lines changed

6 files changed

+16
-239
lines changed

SPECS/msft-golang/CVE-2025-22871.patch

Lines changed: 0 additions & 55 deletions
This file was deleted.

SPECS/msft-golang/CVE-2025-22874.patch

Lines changed: 0 additions & 117 deletions
This file was deleted.

SPECS/msft-golang/CVE-2025-4673.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"Signatures": {
3-
"go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
4-
"go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
5-
"go1.22.12-20250211.4.src.tar.gz": "e1cc3bff8fdf1f24843ffc9f0eaddfd344eb40fd9ca0d9ba2965165be519eeb7",
6-
"go1.24.1-20250304.4.src.tar.gz": "d3bba6c5f7ff729121d2104c250fe96e5a6d7c6cb555d4ea038cfe69524417f6",
7-
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
8-
}
2+
"Signatures": {
3+
"go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
4+
"go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
5+
"go1.22.12-20250211.4.src.tar.gz": "e1cc3bff8fdf1f24843ffc9f0eaddfd344eb40fd9ca0d9ba2965165be519eeb7",
6+
"go1.24.5-20250708.7.src.tar.gz": "c8dbbc78a39213d469cac915699a2581bd2d5d3f7f2f55394adedd365ecea46c",
7+
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
8+
}
99
}

SPECS/msft-golang/msft-golang.spec

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%global goroot %{_libdir}/golang
22
%global gopath %{_datadir}/gocode
3-
%global ms_go_filename go1.24.1-20250304.4.src.tar.gz
3+
%global ms_go_filename go1.24.5-20250708.7.src.tar.gz
44
%global ms_go_revision 1
55
%ifarch aarch64
66
%global gohostarch arm64
@@ -14,8 +14,8 @@
1414
%define __find_requires %{nil}
1515
Summary: Go
1616
Name: msft-golang
17-
Version: 1.24.1
18-
Release: 3%{?dist}
17+
Version: 1.24.5
18+
Release: 1%{?dist}
1919
License: BSD
2020
Vendor: Microsoft Corporation
2121
Distribution: Mariner
@@ -31,9 +31,6 @@ Source3: https://github.com/microsoft/go/releases/download/v1.20.14-1/go.
3131
# bootstrap 03
3232
Source4: https://github.com/microsoft/go/releases/download/v1.22.12-2/go1.22.12-20250211.4.src.tar.gz
3333
Patch0: go14_bootstrap_aarch64.patch
34-
Patch1: CVE-2025-22871.patch
35-
Patch2: CVE-2025-22874.patch
36-
Patch3: CVE-2025-4673.patch
3734
Conflicts: go
3835
Conflicts: golang
3936

@@ -56,9 +53,6 @@ tar xf %{SOURCE4} --no-same-owner
5653
mv -v go go-bootstrap-03
5754

5855
%setup -q -n go
59-
patch -Np1 --ignore-whitespace < %{PATCH1}
60-
patch -Np1 --ignore-whitespace < %{PATCH2}
61-
patch -Np1 --ignore-whitespace < %{PATCH3}
6256
%build
6357
# go 1.4 bootstraps with C.
6458
# go 1.20 bootstraps with go >= 1.17.13
@@ -164,6 +158,10 @@ fi
164158
%{_bindir}/*
165159

166160
%changelog
161+
* Wed Aug 06 2025 Muhammad Falak <[email protected]> - 1.24.5-1
162+
- Bump version to 1.24.5
163+
- Drop un-needed patches
164+
167165
* Mon Jun 30 2025 Archana Shettigar <[email protected]> - 1.24.1-3
168166
- Patch CVE-2025-22874 & CVE-2025-4673
169167

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13663,8 +13663,8 @@
1366313663
"type": "other",
1366413664
"other": {
1366513665
"name": "msft-golang",
13666-
"version": "1.24.1",
13667-
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.24.1-1/go1.24.1-20250304.4.src.tar.gz"
13666+
"version": "1.24.5",
13667+
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.24.5-1/go1.24.5-20250708.7.src.tar.gz"
1366813668
}
1366913669
}
1367013670
},

0 commit comments

Comments
 (0)