Skip to content

Commit fc30f22

Browse files
Merge branch 'main' of https://github.com/microsoft/CBL-Mariner into mbykhovtsev/oct-2025-rel
2 parents 1fe046e + 7d2cf3d commit fc30f22

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

SPECS/coredns/coredns.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.11.1
6-
Release: 21%{?dist}
6+
Release: 22%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -85,6 +85,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
8585
%{_bindir}/%{name}
8686

8787
%changelog
88+
* Wed Oct 08 2025 Kanishk Bansal <[email protected]> - 1.11.1-22
89+
- Bump to build with latest msft-golang 1.24.8
90+
8891
* Fri Oct 03 2025 Azure Linux Security Servicing Account <[email protected]> - 1.11.1-21
8992
- Patch for CVE-2025-58063
9093
- Fix import order for ttl test

SPECS/etcd/etcd.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: A highly-available key value store for shared configuration
22
Name: etcd
33
Version: 3.5.21
4-
Release: 2%{?dist}
4+
Release: 3%{?dist}
55
License: ASL 2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -115,6 +115,9 @@ install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
115115
/%{_docdir}/%{name}-%{version}-tools/*
116116

117117
%changelog
118+
* Wed Oct 08 2025 Kanishk Bansal <[email protected]> - 3.5.21-3
119+
- Bump to build with latest msft-golang 1.24.8
120+
118121
* Thu Oct 02 2025 Kanishk Bansal <[email protected]> - 3.5.21-2
119122
- Bump to build with latest msft-golang 1.24.7
120123

SPECS/msft-golang/msft-golang.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
44
"go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
55
"go1.22.12-20250211.4.src.tar.gz": "e1cc3bff8fdf1f24843ffc9f0eaddfd344eb40fd9ca0d9ba2965165be519eeb7",
6-
"go1.24.7-20250903.8.src.tar.gz": "5ab5a299e1dca0508ad8631a46acf8b4101061dd41224693009e6dfea91f22d4",
6+
"go1.24.8-20251008.4.src.tar.gz": "5251bc4c047da3b7779980ecbb85e3829fd3186c31b8b736abc65b259be1cdb8",
77
"go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
88
}
9-
}
9+
}

SPECS/msft-golang/msft-golang.spec

Lines changed: 5 additions & 2 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.7-20250903.8.src.tar.gz
3+
%global ms_go_filename go1.24.8-20251008.4.src.tar.gz
44
%global ms_go_revision 1
55
%ifarch aarch64
66
%global gohostarch arm64
@@ -14,7 +14,7 @@
1414
%define __find_requires %{nil}
1515
Summary: Go
1616
Name: msft-golang
17-
Version: 1.24.7
17+
Version: 1.24.8
1818
Release: 1%{?dist}
1919
License: BSD
2020
Vendor: Microsoft Corporation
@@ -158,6 +158,9 @@ fi
158158
%{_bindir}/*
159159

160160
%changelog
161+
* Thu Oct 09 2025 Kanishk Bansal <[email protected]> - 1.24.8-1
162+
- Upgrade version to 1.24.8
163+
161164
* Wed Oct 01 2025 Kanishk Bansal <[email protected]> - 1.24.7-1
162165
- Upgrade version to 1.24.7
163166

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13653,8 +13653,8 @@
1365313653
"type": "other",
1365413654
"other": {
1365513655
"name": "msft-golang",
13656-
"version": "1.24.7",
13657-
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.24.7-1/go1.24.7-20250903.8.src.tar.gz"
13656+
"version": "1.24.8",
13657+
"downloadUrl": "https://github.com/microsoft/go/releases/download/v1.24.8-1/go1.24.8-20251008.4.src.tar.gz"
1365813658
}
1365913659
}
1366013660
},

0 commit comments

Comments
 (0)