Skip to content

Commit eff2a20

Browse files
committed
Merge branch '1.0-dev' into 1.0
2 parents 94fe425 + 7893b57 commit eff2a20

File tree

70 files changed

+1564
-1138
lines changed

Some content is hidden

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

70 files changed

+1564
-1138
lines changed

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

+4-1
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.10.144.1
12+
Version: 5.10.145.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -147,6 +147,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
147147
%endif
148148

149149
%changelog
150+
* Tue Sep 27 2022 CBL-Mariner Servicing Account <[email protected]> - 5.10.145.1-1
151+
- Upgrade to 5.10.145.1
152+
150153
* Thu Sep 22 2022 CBL-Mariner Servicing Account <[email protected]> - 5.10.144.1-1
151154
- Upgrade to 5.10.144.1
152155

SPECS/ca-certificates/ca-certificates.signatures.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
1212
"bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
1313
"certdata.base.txt": "76c4cd1860b9a6f6ee9c2a0dcddcef46f65950b7ec12d2a7eeabeedca4e379f9",
14-
"certdata.microsoft.txt": "18075612875845029e53c423799e48f974a4e95aaa7b0e4a909ee25094120708",
14+
"certdata.microsoft.txt": "d833076cf0d544cb258e15e9d96509f190e63823b482ee8e976262f1749a6601",
1515
"certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
1616
"pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",
1717
"trust-fixes": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",

SPECS/ca-certificates/ca-certificates.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Name: ca-certificates
4444

4545
# When updating, "Version" AND "Release" tags must be updated in the "prebuilt-ca-certificates" package as well.
4646
Version: 20200720
47-
Release: 26%{?dist}
47+
Release: 27%{?dist}
4848
License: MPLv2.0
4949
Vendor: Microsoft Corporation
5050
Distribution: Mariner
@@ -317,6 +317,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
317317
%{_bindir}/bundle2pem.sh
318318

319319
%changelog
320+
* Fri Oct 07 2022 CBL-Mariner Service Account <[email protected]> - 20200720-27
321+
- Updating Microsoft trusted root CAs.
322+
320323
* Wed Aug 03 2022 CBL-Mariner Service Account <[email protected]> - 20200720-26
321324
- Updating Microsoft trusted root CAs.
322325

SPECS/ca-certificates/certdata.microsoft.txt

+497-611
Large diffs are not rendered by default.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"cryptsetup-2.3.3.tar.xz": "3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df"
3+
"cryptsetup-2.3.7.tar.xz": "61835132a5986217af17b8943013aa3fe6d47bdc1a07386343526765e2ce27a9"
44
}
55
}

0 commit comments

Comments
 (0)