From e0926f3f9f4528ac0fbb5a62293241cc7e07cf05 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Sun, 29 Oct 2023 22:18:33 +0000
Subject: [PATCH] import virtio-win-1.9.35-0.el9
---
.virtio-win.checksum | 1 +
.virtio-win.metadata | 30 +++++-----
SOURCES/agents.json | 4 +-
...tio-win-pre-installable-drivers-win-10.xml | 10 ++--
...tio-win-pre-installable-drivers-win-11.xml | 5 +-
...io-win-pre-installable-drivers-win-8.1.xml | 14 +++++
...rtio-win-pre-installable-drivers-win-8.xml | 14 +++++
SPECS/virtio-win.spec | 57 +++++++------------
8 files changed, 75 insertions(+), 60 deletions(-)
create mode 100644 .virtio-win.checksum
diff --git a/.virtio-win.checksum b/.virtio-win.checksum
new file mode 100644
index 0000000..55c1e83
--- /dev/null
+++ b/.virtio-win.checksum
@@ -0,0 +1 @@
+5bc4a43a46f7e4441499290919a986d02f6cc35ec66704f3bc7832b63fcd0c40
diff --git a/.virtio-win.metadata b/.virtio-win.metadata
index f1678b2..552da68 100644
--- a/.virtio-win.metadata
+++ b/.virtio-win.metadata
@@ -1,14 +1,16 @@
-60ece31ee2de0fe6fe16098616aca96b06da126e SOURCES/mingw-qemu-ga-win-104.0.2-1.el9.src.rpm
-ba9ab071d3cc39ff777a2730014cd95df2f64397 SOURCES/qemu-ga-win-104.0.2-1.el9.noarch.rpm
-1cb09750a3a1965a147889f5db3ec7b8feb005b8 SOURCES/qxl-win-unsigned-0.1-24-sources.zip
-95dab7088166ba71366bcbcb099267d771d61661 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm
-055c8fe47a378ef48b89846ba9c2474238ad9aea SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm
-085728c7db3503db1f7c8f1d264ca45b365d6837 SOURCES/spice-vdagent-win-0.10.0-5.el8.src.rpm
-fb35d3c12b9069133e651f54c35ae6ee68537959 SOURCES/spice-vdagent-win-x64-0.10.0-5.el8.noarch.rpm
-2d4bd6f8fb1b306f4d49a5a990e2da9c5f5baeac SOURCES/spice-vdagent-win-x86-0.10.0-5.el8.noarch.rpm
-2771f95632887c40967ebaefd04d27af0905e6b7 SOURCES/virtio-win-1.9.28-bin-for-rpm.tar.gz
-81f56399304c04a291fc94bb7898a8d999cc36c3 SOURCES/virtio-win-gt-x64.msi
-56af7d695ba5b613dc6079b139ac851ff946402f SOURCES/virtio-win-gt-x86.msi
-c44ffa23e6bbdf10274a6017f692215b8f7689bf SOURCES/virtio-win-guest-tools.exe
-9c1c0f24b8427b5c5847092834bec43fa60898a8 SOURCES/virtio-win-installer-1.9.28-0-sources.zip
-5b3c6e13c9f8847a5d8964d8e1d9154ecafcea2b SOURCES/virtio-win-prewhql-0.1-221-sources.zip
+31128f229949de63de7b43448918021f6fc71752cda71bd9f78789dac1afb99d SOURCES/mingw-qemu-ga-win-106.0.1-1.el9.src.rpm
+55d336cbcd98ea65d490731a608b17191e34b286d1165b1274a29930d3521819 SOURCES/qemu-ga-win-106.0.1-1.el9.noarch.rpm
+9c9159d8f7194b07506a40ac8538281b95bd4142e0564a261be9079cd53b7473 SOURCES/qxl-win-unsigned-0.1-24-sources.zip
+f8aed8bfb4cd323818c367a1d9f0564347ae93424a4d5e826b39ec734d452d92 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm
+50f1d9d3a2a320e30bc801225a7c27077a3a709a52961a10785858d7a8c38c73 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm
+cf72c76a32ad14de634825f127255ad2409c81e33ba4dfe7b23c95b75f913271 SOURCES/spice-vdagent-win-0.10.0-5.el8.src.rpm
+ac70ca6395a9fe0c701200a5d88556ba4cf6ecea129fe40dc6e22bebf71dd7c6 SOURCES/spice-vdagent-win-x64-0.10.0-5.el8.noarch.rpm
+e2825ab6ec6cb7fa927c47425861058a11e88c8218fb716562f6f1c9f42008b1 SOURCES/spice-vdagent-win-x86-0.10.0-5.el8.noarch.rpm
+737fd1f223ea7451cec57d5f19d9448611ddae78b9fb8623c8334bc393be7a03 SOURCES/virtio-win-1.9.35-bin-for-rpm.tar.gz
+f1373e45425f33d88c6c7605fb2848138a72d4b45ff4a9166c01b3c25d7bfc63 SOURCES/virtio-win-gt-x64.msi
+4d1aa631a9d21e846052238d21f51fa2a4e37dce33c3ad1e12bc4c9eb92868d9 SOURCES/virtio-win-gt-x86.msi
+03c749460509787a357b6ff6a8c094e0d38c12255acdb0d7bdd5920845f90076 SOURCES/virtio-win-guest-tools.exe
+2e62052f9f1c90fa9ffc529b5f717e921f751c24b0ecd971872f7895f5715a2b SOURCES/virtio-win-installer-1.9.35-0-sources.zip
+20b92aab0490326116a6564a87a005d99b637888ae5db8d5a07546b78bd7bf85 SOURCES/virtio-win-prewhql-0.1-240-sources.zip
+c9ca492b2d30f8c3b350100a91bfb79caafebc4ec2b9d8c039401879146cba71 SOURCES/winfsp-1.12.22339-sources.zip
+45552d9c11f9681471108703f3ed600feda5b756a91863a5397c348cd01b193d SOURCES/winfsp-1.12.22339.msi
diff --git a/SOURCES/agents.json b/SOURCES/agents.json
index 55b469f..c79af99 100644
--- a/SOURCES/agents.json
+++ b/SOURCES/agents.json
@@ -2,12 +2,12 @@
"agents": [
{
"arch": "x86",
- "agent_version": "104.0.2-1",
+ "agent_version": "106.0.1-1",
"name": "Red Hat QEMU guest agent"
},
{
"arch": "amd64",
- "agent_version": "104.0.2-1",
+ "agent_version": "106.0.1-1",
"name": "Red Hat QEMU guest agent"
},
{
diff --git a/SOURCES/virtio-win-pre-installable-drivers-win-10.xml b/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
index 083e3e8..a020c3e 100644
--- a/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
@@ -44,8 +44,9 @@
<file>pvpanic.inf</file>
<file>pvpanic.sys</file>
- <file>qemufwcfg.cat</file>
- <file>qemufwcfg.inf</file>
+ <file>fwcfg64.cat</file>
+ <file>fwcfg64.inf</file>
+ <file>fwcfg64.sys</file>
<file>qemupciserial.cat</file>
<file>qemupciserial.inf</file>
@@ -116,8 +117,9 @@
<file>pvpanic.inf</file>
<file>pvpanic.sys</file>
- <file>qemufwcfg.cat</file>
- <file>qemufwcfg.inf</file>
+ <file>fwcfg64.cat</file>
+ <file>fwcfg64.inf</file>
+ <file>fwcfg64.sys</file>
<file>qemupciserial.cat</file>
<file>qemupciserial.inf</file>
diff --git a/SOURCES/virtio-win-pre-installable-drivers-win-11.xml b/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
index 766758f..53d92a4 100644
--- a/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
@@ -44,8 +44,9 @@
<file>pvpanic.inf</file>
<file>pvpanic.sys</file>
- <file>qemufwcfg.cat</file>
- <file>qemufwcfg.inf</file>
+ <file>fwcfg64.cat</file>
+ <file>fwcfg64.inf</file>
+ <file>fwcfg64.sys</file>
<file>qemupciserial.cat</file>
<file>qemupciserial.inf</file>
diff --git a/SOURCES/virtio-win-pre-installable-drivers-win-8.1.xml b/SOURCES/virtio-win-pre-installable-drivers-win-8.1.xml
index ff5b27d..ea4fdc6 100644
--- a/SOURCES/virtio-win-pre-installable-drivers-win-8.1.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-8.1.xml
@@ -86,6 +86,11 @@
<file>viofs.inf</file>
<file>viofs.sys</file>
<device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
</driver>
<driver signed="true" pre-installable="true" location="file:///usr/share/virtio-win/drivers/by-os/amd64/w8.1/" arch="x86_64">
@@ -108,6 +113,10 @@
<file>pvpanic.inf</file>
<file>pvpanic.sys</file>
+ <file>fwcfg64.cat</file>
+ <file>fwcfg64.inf</file>
+ <file>fwcfg64.sys</file>
+
<file>qemupciserial.cat</file>
<file>qemupciserial.inf</file>
@@ -147,6 +156,11 @@
<file>viofs.inf</file>
<file>viofs.sys</file>
<device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
</driver>
</os>
</libosinfo>
diff --git a/SOURCES/virtio-win-pre-installable-drivers-win-8.xml b/SOURCES/virtio-win-pre-installable-drivers-win-8.xml
index f4fc0da..2c7f5d9 100644
--- a/SOURCES/virtio-win-pre-installable-drivers-win-8.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-8.xml
@@ -88,6 +88,11 @@
<file>viofs.inf</file>
<file>viofs.sys</file>
<device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
</driver>
<driver signed="true" pre-installable="true" location="file:///usr/share/virtio-win/drivers/by-os/amd64/w8/" arch="x86_64">
@@ -110,6 +115,10 @@
<file>pvpanic.inf</file>
<file>pvpanic.sys</file>
+ <file>fwcfg64.cat</file>
+ <file>fwcfg64.inf</file>
+ <file>fwcfg64.sys</file>
+
<file>qemupciserial.cat</file>
<file>qemupciserial.inf</file>
@@ -149,6 +158,11 @@
<file>viofs.inf</file>
<file>viofs.sys</file>
<device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
</driver>
</os>
</libosinfo>
diff --git a/SPECS/virtio-win.spec b/SPECS/virtio-win.spec
index a17685c..6b336af 100644
--- a/SPECS/virtio-win.spec
+++ b/SPECS/virtio-win.spec
@@ -8,37 +8,25 @@
# If you make any changes to this file that affect the RPM content (but not
# version numbers or changelogs, etc), submit a patch to the upstream spec.
-%global virtio_win_prewhql_build virtio-win-prewhql-0.1-221
-%global qemu_ga_win_build qemu-ga-win-104.0.2-1.el9
+%global virtio_win_prewhql_build virtio-win-prewhql-0.1-240
+%global qemu_ga_win_build qemu-ga-win-106.0.1-1.el9
%global qxl_build qxl-win-unsigned-0.1-24
%global spice_vdagent_build 0.10.0-5.el8
%global qxlwddm_build spice-qxl-wddm-dod-0.21-2.el8
-%global windows_installer_version -1.9.28-0
+%global windows_installer_version -1.9.35-0
+%global winfsp_version -1.12.22339
Summary: VirtIO para-virtualized drivers for Windows(R)
Name: virtio-win
-Version: 1.9.28
+Version: 1.9.35
Release: 0%{?dist}
Group: Applications/System
+License: Apache-2.0 AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later
URL: http://www.redhat.com/
BuildArch: noarch
-%if 0%{?rhel}
-# RHEL RPM ships WHQL signed drivers, which are under a proprietary license
-# qemu-ga builds are GPLv2
-License: BSD-3-Clause and Apache-2.0 and GPLv2
-%else
-# virtio-win drivers are licensed under the BSD license, qxldod under Apache-2.0,
-# everything else is GPLv2
-# virtio-win: https://github.com/virtio-win/kvm-guest-drivers-windows/blob/master/LICENSE
-# qxl: http://cgit.freedesktop.org/spice/win32/qxl/tree/xddm/COPYING
-# qxldod: https://github.com/vrozenfe/qxl-dod/blob/master/LICENSE
-# qemu-ga: http://git.qemu.org/?p=qemu.git;a=blob;f=COPYING
-License: BSD and Apache and GPLv2
-%endif
-
-# Already built files
+# Already built/ files
Source1: %{name}-%{version}-bin-for-rpm.tar.gz
Source2: %{qemu_ga_win_build}.noarch.rpm
@@ -51,6 +39,8 @@ Source7: %{qxlwddm_build}.noarch.rpm
Source8: spice-vdagent-win-%{spice_vdagent_build}.src.rpm
Source9: spice-vdagent-win-x64-%{spice_vdagent_build}.noarch.rpm
Source10: spice-vdagent-win-x86-%{spice_vdagent_build}.noarch.rpm
+Source11: winfsp%{winfsp_version}-sources.zip
+
Source20: virtio-win-guest-tools.exe
Source21: virtio-win-gt-x86.msi
@@ -60,6 +50,7 @@ Source23: virtio-win-guest-tools-installer-%{version}.tar.gz
%else
Source23: virtio-win-installer%{windows_installer_version}-sources.zip
%endif
+Source24: winfsp%{winfsp_version}.msi
%if 0%{?rhel}
Source70: virtio-win-pre-installable-drivers-win-7.xml
@@ -116,6 +107,7 @@ popd
%{__cp} %{SOURCE20} iso-content/
%{__cp} %{SOURCE21} iso-content/
%{__cp} %{SOURCE22} iso-content/
+%{__cp} %{SOURCE24} iso-content/
%if 0%{?rhel} > 7
@@ -216,7 +208,7 @@ add_link _servers_amd64.vfd
%{__install} -p -m0644 iso-content/virtio-win-guest-tools.exe %{buildroot}%{_datadir}/%{name}/installer/
%{__install} -p -m0644 iso-content/virtio-win-gt-x86.msi %{buildroot}%{_datadir}/%{name}/installer/
%{__install} -p -m0644 iso-content/virtio-win-gt-x64.msi %{buildroot}%{_datadir}/%{name}/installer/
-
+%{__install} -p -m0644 iso-content/winfsp%{winfsp_version}.msi %{buildroot}%{_datadir}/%{name}/installer/
%files
%doc iso-content/virtio-win_license.txt
@@ -247,6 +239,7 @@ add_link _servers_amd64.vfd
%{_datadir}/%{name}/drivers/by-driver/sriov
%{_datadir}/%{name}/drivers/by-driver/qxldod
%{_datadir}/%{name}/drivers/by-driver/viogpudo
+%{_datadir}/%{name}/drivers/by-driver/fwcfg
%exclude %{_datadir}/%{name}/drivers/by-driver/virtio-win_license.txt
%if 0%{?fedora}
%{_datadir}/%{name}/drivers/by-driver/smbus
@@ -280,25 +273,13 @@ add_link _servers_amd64.vfd
%endif
%changelog
-* Sat Jul 23 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.28-0.el9
-- Resolves: rhbz#2082607
-
-* Fri Jun 09 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.27-0.el9
-- Resolves: rhbz#2082607
-
-* Thu Jun 09 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.26-1.el9
-- Resolves: rhbz#2082607
-
-* Thu Apr 07 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.25-2.el9_0
-- Resolves: rhbz#2044343
-
-* Sun Apr 03 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.25-1.el9
-- Update installer to 1.0.20.2
-- Resolves: rhbz#2044343
+* Sun Aug 27 2023 Vadim Rozenfeld <vrozenfe@redhat.com>
+- Update installer 1.9.35.0 with the latest agents RHEL-9.3.0
+- Related: #420
-* Tue Jan 15 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.24-3.el9
-- Update installer to 1.0.19.11
-- Resolves: rhbz#2044343
+* Sat Jul 10 2023 Vadim Rozenfeld <vrozenfe@redhat.com>
+- Update installer 1.9.34.0 with the latest agents RHEL-9.3.0
+- Related: #420
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
--
GitLab