From 9fe63dc52eb8c649816ea6030b3ea7bb4a5368f9 Mon Sep 17 00:00:00 2001
From: Konstantin Kostiuk <kkostiuk@redhat.com>
Date: Wed, 4 Sep 2024 12:32:12 +0300
Subject: [PATCH] Rebase to QEMU v9.1.0

Resolves: RHEL-57013 - Rebase qemu-ga to 9.1.0
Resolves: RHEL-57012 - guest agent public ssh injection api support for Windows

Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 .gitignore                |  1 +
 0001-Change-Version.patch |  4 ++--
 mingw-qemu-ga-win.spec    | 14 ++++++++++----
 sources                   |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87c14ac..a9fdd17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /qemu-8.2.0
 /qemu-8.2.0.tar.bz2
 /qemu-9.0.0.tar.bz2
+/qemu-v9.1.0.tar.bz2
diff --git a/0001-Change-Version.patch b/0001-Change-Version.patch
index 6944b09..7738683 100644
--- a/0001-Change-Version.patch
+++ b/0001-Change-Version.patch
@@ -13,7 +13,7 @@ index 91ff57278e..586de296f5 100644
 --- a/VERSION
 +++ b/VERSION
 @@ -1 +1 @@
--9.0.0
-+108.0.2
+-9.1.0
++109.1.0
 --
 2.17.2
diff --git a/mingw-qemu-ga-win.spec b/mingw-qemu-ga-win.spec
index 80f8342..fc43e3e 100644
--- a/mingw-qemu-ga-win.spec
+++ b/mingw-qemu-ga-win.spec
@@ -1,12 +1,12 @@
 %{?mingw_package_header}
 
 %define with_vss 1
-%define qemu_version 9.0.0
+%define qemu_version 9.1.0
 %define ga_manufacturer "RedHat"
 %define ga_distro "RHEL"
 
 Name: mingw-qemu-ga-win
-Version: 108.0.2
+Version: 109.1.0
 Release: 1%{?dist}
 Summary: Qemus Guest agent for Windows
 
@@ -16,7 +16,7 @@ URL: http://www.qemu.org/
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-Source0: http://wiki.qemu.org/download/qemu-%{qemu_version}.tar.bz2
+Source0: https://gitlab.com/qemu-project/qemu/-/archive/v%{qemu_version}/qemu-v%{qemu_version}.tar.bz2
 
 Patch0001: 0001-Change-Version.patch
 
@@ -35,6 +35,7 @@ BuildRequires: libtool
 BuildRequires: zlib-devel
 BuildRequires: glib2-devel
 BuildRequires: python3-devel
+BuildRequires: python-tomli
 BuildRequires: gettext
 BuildRequires: gettext-devel
 BuildRequires: mingw32-pixman >= 0.42.2
@@ -64,7 +65,7 @@ with the host over a virtio-serial channel named "org.qemu.guest_agent.0"
 This package does not need to be installed on the host OS.
 
 %prep
-%setup -q -n qemu-%{qemu_version}
+%setup -q -n qemu-v%{qemu_version}
 %patch0001 -p1
 
 %build
@@ -122,6 +123,11 @@ cp build/qga/qemu-ga-x86_64.msi $RPM_BUILD_ROOT%{mingw64_bindir}
 %{mingw64_bindir}/qemu-ga*
 
 %changelog
+* Wed Sep 4 2024 Konstantin Kostiuk <kkostiuk@redhat.com> 109.1.0
+- RHEL-57013 - Rebase qemu-ga to 9.1.0
+- RHEL-57012 - guest agent public ssh injection api support for Windows
+- Set version to 109.1.0
+
 * Mon Jul 1 2024 Konstantin Kostiuk <kkostiuk@redhat.com> 108.0.2
 - RHEL-45598 - Set version to 108.0.2
 
diff --git a/sources b/sources
index 0ad655e..2eb8d07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-9.0.0.tar.bz2) = 24e7f335ec76930cf9fb66b42fa2dd3615a29c490b16b0dd2ebd0d2926f819f06dd3dddbf279a8ff5d9f7a2a5998156d0d4f1243d1016e39da9b2f347dde8d0e
+SHA512 (qemu-v9.1.0.tar.bz2) = 59b5bbf0e3eee4cf4f7505eb954c0bbd19b0a64b75835ba943f94c4d6aea9387c2426ac3505800bfc62d7fb6a7bc5afe4f635ceb7af677e7c4409b0cbbdd1ec4