Skip to content

Commit 6876686

Browse files
jslobodzianjslobodzian
committed
Merge branch 'main' into 2.0
2 parents a3f147d + 26d863a commit 6876686

File tree

207 files changed

+16856
-1094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+16856
-1094
lines changed

‎SPECS-EXTENDED/buildah/buildah.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Summary: A command line tool used for creating OCI Images
2222
Name: buildah
2323
Version: 1.18.0
24-
Release: 28%{?dist}
24+
Release: 29%{?dist}
2525
License: ASL 2.0
2626
Vendor: Microsoft Corporation
2727
Distribution: Mariner
@@ -32,7 +32,7 @@ BuildRequires: btrfs-progs-devel
3232
BuildRequires: device-mapper-devel
3333
BuildRequires: git
3434
BuildRequires: glib2-devel
35-
BuildRequires: glibc-static >= 2.35-9%{?dist}
35+
BuildRequires: glibc-static >= 2.35-10%{?dist}
3636
BuildRequires: go-md2man
3737
BuildRequires: go-rpm-macros
3838
BuildRequires: golang
@@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
123123
%{_datadir}/%{name}/test
124124

125125
%changelog
126+
* Tue Feb 03 2026 Aditya Singh <v-aditysing@microsoft.com> - 1.18.0-29
127+
- Bump to rebuild with updated glibc
128+
126129
* Wed Jan 28 2026 Kanishk Bansal <kanbansal@microsoft.com> - 1.18.0-28
127130
- Bump to rebuild with updated glibc
128131

‎SPECS-EXTENDED/catatonit/catatonit.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Distribution: Mariner
33

44
Name: catatonit
55
Version: 0.1.7
6-
Release: 12%{?dist}
6+
Release: 13%{?dist}
77
Summary: A signal-forwarding process manager for containers
88
License: GPLv3+
99
URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
1313
BuildRequires: file
1414
BuildRequires: gcc
1515
BuildRequires: git
16-
BuildRequires: glibc-static >= 2.35-9%{?dist}
16+
BuildRequires: glibc-static >= 2.35-10%{?dist}
1717
BuildRequires: libtool
1818
BuildRequires: make
1919

@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
6161
%{_libexecdir}/podman/%{name}
6262

6363
%changelog
64+
* Tue Feb 03 2026 Aditya Singh <v-aditysing@microsoft.com> - 0.1.7-13
65+
- Bump to rebuild with updated glibc
66+
6467
* Wed Jan 28 2026 Kanishk Bansal <kanbansal@microsoft.com> - 0.1.7-12
6568
- Bump to rebuild with updated glibc
6669

‎SPECS-EXTENDED/dyninst/dyninst.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: An API for Run-time Code Generation
22
License: LGPLv2+
33
Name: dyninst
4-
Release: 14%{?dist}
4+
Release: 15%{?dist}
55
Vendor: Microsoft Corporation
66
Distribution: Mariner
77
URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
3131

3232
# Extra requires just for the testsuite
3333
BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
34-
BuildRequires: glibc-static >= 2.35-9%{?dist}
34+
BuildRequires: glibc-static >= 2.35-10%{?dist}
3535

3636
# Testsuite files should not provide/require anything
3737
%{?filter_setup:
@@ -194,6 +194,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
194194
%attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
195195

196196
%changelog
197+
* Tue Feb 03 2026 Aditya Singh <v-aditysing@microsoft.com> - 10.1.0-15
198+
- Bump to rebuild with updated glibc
199+
197200
* Wed Jan 28 2026 Kanishk Bansal <kanbansal@microsoft.com> - 10.1.0-14
198201
- Bump to rebuild with updated glibc
199202

‎SPECS-EXTENDED/podman/podman.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
Name: podman
3838
Version: 4.1.1
39-
Release: 25%{?dist}
39+
Release: 26%{?dist}
4040
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
4141
Summary: Manage Pods, Containers and Container Images
4242
Vendor: Microsoft Corporation
@@ -51,7 +51,7 @@ BuildRequires: go-md2man
5151
BuildRequires: golang
5252
BuildRequires: gcc
5353
BuildRequires: glib2-devel
54-
BuildRequires: glibc-static >= 2.35-9%{?dist}
54+
BuildRequires: glibc-static >= 2.35-10%{?dist}
5555
BuildRequires: git
5656
BuildRequires: go-rpm-macros
5757
BuildRequires: gpgme-devel
@@ -387,6 +387,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
387387

388388
# rhcontainerbot account currently managed by lsm5
389389
%changelog
390+
* Tue Feb 03 2026 Aditya Singh <v-aditysing@microsoft.com> - 4.1.1-26
391+
- Bump to rebuild with updated glibc
392+
390393
* Wed Jan 28 2026 Kanishk Bansal <kanbansal@microsoft.com> - 4.1.1-25
391394
- Bump to rebuild with updated glibc
392395

‎SPECS-SIGNED/hvloader-signed/hvloader-signed.spec‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed HvLoader.efi for %{buildarch} systems
77
Name: hvloader-signed-%{buildarch}
88
Version: 1.0.1
9-
Release: 16%{?dist}
9+
Release: 18%{?dist}
1010
License: MIT
1111
Vendor: Microsoft Corporation
1212
Distribution: Mariner
@@ -69,12 +69,21 @@ popd
6969
/boot/efi/HvLoader.efi
7070

7171
%changelog
72+
* Sun Feb 15 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 1.0.1-18
73+
- Bump release for consistency with hvloader spec.
74+
75+
* Mon Feb 09 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 1.0.1-17
76+
- Bump release for consistency with hvloader spec.
77+
7278
* Tue Jan 06 2026 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 1.0.1-16
7379
- Bump release for consistency with hvloader spec.
7480

7581
* Thu Nov 20 2025 Jyoti kanase <v-jykanase@microsoft.com> - 1.0.1-15
7682
- Bump release for consistency with hvloader spec.
7783

84+
* Thu Nov 20 2025 Jyoti kanase <v-jykanase@microsoft.com> - 1.0.1-15
85+
- Bump release for consistency with hvloader spec.
86+
7887
* Tue Aug 12 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 1.0.1-14
7988
- Bump release for consistency with hvloader spec.
8089

‎SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.186.1
12+
Version: 5.15.200.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Feb 20 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.200.1-1
157+
- Auto-upgrade to 5.15.200.1
158+
156159
* Mon Jul 07 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.186.1-1
157160
- Auto-upgrade to 5.15.186.1
158161

‎SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.186.1
7+
Version: 5.15.200.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Fri Feb 20 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.200.1-1
153+
- Auto-upgrade to 5.15.200.1
154+
152155
* Mon Jul 07 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.186.1-1
153156
- Auto-upgrade to 5.15.186.1
154157

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.186.1
12+
Version: 5.15.200.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Feb 20 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.200.1-1
157+
- Auto-upgrade to 5.15.200.1
158+
156159
* Mon Jul 07 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.186.1-1
157160
- Auto-upgrade to 5.15.186.1
158161

‎SPECS/LICENSES-AND-NOTICES/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.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,6 @@
22402240
"livepatching",
22412241
"lld",
22422242
"lld16",
2243-
"local-path-provisioner",
22442243
"lsb-release",
22452244
"ltp",
22462245
"lttng-consume",

0 commit comments

Comments
 (0)