Skip to content

Commit 3f48a1a

Browse files
dom0 packages: Update to dom0 release v2411.19.1 (#13648)
Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com>
1 parent 2899a81 commit 3f48a1a

14 files changed

+1235
-935
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
%define uname_r %{version}-%{release}
77
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
88
Name: kernel-mshv-signed-%{buildarch}
9-
Version: 5.15.157.mshv1
10-
Release: 3%{?dist}
9+
Version: 6.6.57.mshv4
10+
Release: 1%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -136,6 +136,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
136136
%exclude /lib/modules/%{uname_r}/build
137137

138138
%changelog
139+
* Tue May 06 2025 Manuel Huber <mahuber@microsoft.com> - 6.6.57.mshv4-1
140+
- Upgrade to 6.6.57.mshv4
141+
139142
* Fri Jan 24 2025 Cameron Baird <cameronbaird@microsoft.com> - 5.15.157.mshv1-3
140143
- Original version for Azure Linux.
141144
- license: MIT

SPECS/cloud-hypervisor-cvm/CVE-2024-12797.patch

Lines changed: 0 additions & 176 deletions
This file was deleted.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"Signatures": {
3-
"cloud-hypervisor-cvm-38.0.72.2-2-cargo.tar.gz": "68d1dc8f2a70fddad934e9131ccad7ce2c96323869433419e2f488062396bcc8",
4-
"cloud-hypervisor-cvm-38.0.72.2.tar.gz": "1a357a0805f7b6d90993d5ae246c2dedff88cf98c9c0eab0903dc8071be0dae2",
5-
"config.toml": "74c28b7520c157109b8990b325fe8f13504e56561a9bac51499d4c6bf4a66e52"
6-
}
7-
}
2+
"Signatures": {
3+
"config.toml": "06c9c9ca116704e883748cbed6fc4f080f68f649af8d759ecfbf3c36375c58d4",
4+
"cloud-hypervisor-cvm-41.0.79.tar.gz": "d7b63ed05863ed24c2ed5c141d405347d41718abc47b1eda80f61f065cb58f40",
5+
"cloud-hypervisor-cvm-41.0.79-vendor.tar.gz": "7c38df4bbf44a128a460fe380a6335ddf1b3ec77ed521078dfda851c988f5302"
6+
}
7+
}

SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.spec

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,24 @@
44

55
Name: cloud-hypervisor-cvm
66
Summary: Cloud Hypervisor CVM is an open source Virtual Machine Monitor (VMM) that enables running SEV SNP enabled VMs on top of MSHV using the IGVM file format as payload.
7-
Version: 38.0.72.2
8-
Release: 4%{?dist}
7+
Version: 41.0.79
8+
Release: 1%{?dist}
99
License: ASL 2.0 OR BSD-3-clause
1010
Vendor: Microsoft Corporation
1111
Distribution: Azure Linux
1212
Group: Applications/System
1313
URL: https://github.com/microsoft/cloud-hypervisor
1414
Source0: https://github.com/microsoft/cloud-hypervisor/archive/refs/tags/msft/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1515
%if 0%{?using_vendored_crates}
16-
# Note: the %%{name}-%%{version}-cargo.tar.gz file contains a cache created by capturing the contents downloaded into $CARGO_HOME.
16+
# Note: the %%{name}-%%{version}-vendor.tar.gz file contains a cache created by capturing the contents downloaded into $CARGO_HOME.
1717
# To update the cache and config.toml run:
1818
# tar -xf %%{name}-%%{version}.tar.gz
1919
# cd %%{name}-%%{version}
20-
# patch -u -p0 < ../upgrade-openssl-to-3.3.2-to-address-CVE-2024-6119.patch
2120
# cargo vendor > config.toml
22-
# tar -czf %%{name}-%%{version}-cargo.tar.gz vendor/
23-
# rename the tarball to %%{name}-%%{version}-2-cargo.tar.gz when updating version
24-
# (feel free to drop -2 and this comment on version change)
25-
Source1: %{name}-%{version}-2-cargo.tar.gz
21+
# tar -czf %%{name}-%%{version}-vendor.tar.gz vendor/
22+
Source1: %{name}-%{version}-vendor.tar.gz
2623
Source2: config.toml
2724
%endif
28-
# Generated using:
29-
# tar -xf %%{name}-%%{version}.tar.gz
30-
# cd %%{name}-%%{version}
31-
# cargo update -p openssl-src --precise 300.3.2+3.3.2
32-
# diff -u ../cloud-hypervisor-msft-v38.0.72.2.backup/Cargo.lock Cargo.lock > ../upgrade-openssl-to-3.3.2-to-address-CVE-2024-6119.patch
33-
Patch0: upgrade-openssl-to-3.3.2-to-address-CVE-2024-6119.patch
34-
Patch1: CVE-2024-12797.patch
3525

3626
BuildRequires: binutils
3727
BuildRequires: gcc
@@ -40,8 +30,8 @@ BuildRequires: glibc-devel
4030
BuildRequires: openssl-devel
4131

4232
%if ! 0%{?using_rustup}
43-
BuildRequires: rust < 1.85.0
44-
BuildRequires: cargo < 1.85.0
33+
BuildRequires: rust >= 1.85.0
34+
BuildRequires: cargo >= 1.85.0
4535
%endif
4636

4737
Requires: bash
@@ -78,15 +68,12 @@ Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on to
7868

7969
%prep
8070

81-
%setup -q -n cloud-hypervisor-msft-v%{version}
71+
%setup -q -n cloud-hypervisor-%{version}
8272
%if 0%{?using_vendored_crates}
8373
tar xf %{SOURCE1}
8474
mkdir -p .cargo
8575
cp %{SOURCE2} .cargo/
8676
%endif
87-
# The vendored archive has been populated based on the patch, so we need to
88-
# repatch here as well in order to use the same versions
89-
%autopatch -p0
9077

9178
%install
9279
install -d %{buildroot}%{_bindir}
@@ -144,10 +131,14 @@ cargo build --release --target=%{rust_musl_target} %{cargo_pkg_feature_opts} %{c
144131
%{_libdir}/cloud-hypervisor/static/ch-remote
145132
%caps(cap_net_admim=ep) %{_libdir}/cloud-hypervisor/static/cloud-hypervisor
146133
%endif
147-
%license LICENSE-APACHE
148-
%license LICENSE-BSD-3-Clause
134+
%license LICENSES/Apache-2.0.txt
135+
%license LICENSES/BSD-3-Clause.txt
136+
%license LICENSES/CC-BY-4.0.txt
149137

150138
%changelog
139+
* Mon Apr 28 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 41.0.79-1
140+
- Auto-upgrade to 41.0.79
141+
151142
* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 38.0.72.2-4
152143
- Pin rust version
153144

SPECS/cloud-hypervisor-cvm/config.toml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,31 @@
11
[source.crates-io]
22
replace-with = "vendored-sources"
33

4-
[source."git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0"]
5-
git = "https://github.com/cloud-hypervisor/kvm-bindings"
6-
branch = "ch-v0.7.0"
7-
replace-with = "vendored-sources"
8-
9-
[source."git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch-0.1.6"]
10-
git = "https://github.com/cloud-hypervisor/versionize_derive"
11-
branch = "ch-0.1.6"
4+
[source."git+https://github.com/NunoDasNeves/vfio?branch=nudasnev/mshv-ioctls-v0.3.0"]
5+
git = "https://github.com/NunoDasNeves/vfio"
6+
branch = "nudasnev/mshv-ioctls-v0.3.0"
127
replace-with = "vendored-sources"
138

149
[source."git+https://github.com/firecracker-microvm/micro-http?branch=main"]
1510
git = "https://github.com/firecracker-microvm/micro-http"
1611
branch = "main"
1712
replace-with = "vendored-sources"
1813

19-
[source."git+https://github.com/microsoft/igvm?branch=main"]
20-
git = "https://github.com/microsoft/igvm"
21-
branch = "main"
22-
replace-with = "vendored-sources"
23-
2414
[source."git+https://github.com/rust-vmm/acpi_tables?branch=main"]
2515
git = "https://github.com/rust-vmm/acpi_tables"
2616
branch = "main"
2717
replace-with = "vendored-sources"
2818

29-
[source."git+https://github.com/rust-vmm/mshv?branch=main"]
19+
[source."git+https://github.com/rust-vmm/mshv?tag=v0.3.0"]
3020
git = "https://github.com/rust-vmm/mshv"
31-
branch = "main"
21+
tag = "v0.3.0"
3222
replace-with = "vendored-sources"
3323

3424
[source."git+https://github.com/rust-vmm/vfio-user?branch=main"]
3525
git = "https://github.com/rust-vmm/vfio-user"
3626
branch = "main"
3727
replace-with = "vendored-sources"
3828

39-
[source."git+https://github.com/rust-vmm/vfio?branch=main"]
40-
git = "https://github.com/rust-vmm/vfio"
41-
branch = "main"
42-
replace-with = "vendored-sources"
43-
4429
[source."git+https://github.com/rust-vmm/vm-fdt?branch=main"]
4530
git = "https://github.com/rust-vmm/vm-fdt"
4631
branch = "main"

SPECS/cloud-hypervisor-cvm/upgrade-openssl-to-3.3.2-to-address-CVE-2024-6119.patch

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

0 commit comments

Comments
 (0)