Rebase to upstream development version 2.7.1

resolves: RHEL-56813
Replace Jansson with json-c
resolves: RHEL-65296
Find drivers for win2025 guests
resolves: RHEL-65010

0001-lib-OVF-Add-preliminary-support-for-Windows-Server-2.patch

@@ -0,0 +1,60 @@
+From 8dd5577174fe23ace5ecba7a81d2516315a0b301 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Wed, 30 Oct 2024 10:16:35 +0000
+Subject: [PATCH] lib: OVF: Add preliminary support for Windows Server 2025
+
+Unfortunately support has not yet been added to oVirt.  However I have
+inferred the correct ostype value based on existing entries.
+
+Also pull in the following commit from the common submodule:
+
+  Richard W.M. Jones (1):
+      mlcustomize: Add heuristic support for Windows Server 2025
+
+Related: https://issues.redhat.com/browse/RHEL-65009
+Related: https://issues.redhat.com/browse/RHEL-65010
+Reported-by: Ming Xie
+---
+ common            | 2 +-
+ lib/create_ovf.ml | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+Submodule common e9eea65a..2d42128e:
+diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml
+index 88c1c8cf..7e46f318 100644
+--- a/common/mlcustomize/inject_virtio_win.ml
++++ b/common/mlcustomize/inject_virtio_win.ml
+@@ -522,6 +522,8 @@ and virtio_iso_path_matches_guest_os t path =
+         (10, 0, not_client, ((=) "win2k19"))
+       else if pathelem "2k22" || pathelem "win2022" then
+         (10, 0, not_client, ((=) "win2k22"))
++      else if pathelem "2k25" || pathelem "win2025" then
++        (10, 0, not_client, ((=) "win2k25"))
+       else
+         raise Not_found in
+ 
+diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml
+index f0b32e01..e2c19b08 100644
+--- a/lib/create_ovf.ml
++++ b/lib/create_ovf.ml
+@@ -242,10 +242,11 @@ and get_ostype = function
+       | "win2k16" -> "windows_2016x64"
+       | "win2k19" -> "windows_2019x64"
+       | "win2k22" -> "windows_2022"
++      | "win2k25" -> "windows_2025"
+       | _ ->
+          warning (f_"unknown Windows 10 variant: %s (%s)")
+            osinfo product;
+-         "windows_2022"
++         "windows_2025"
+      )
+ 
+   | { i_type = typ; i_distro = distro;
+@@ -448,6 +449,7 @@ and get_ovirt_osid = function
+       | "win2k16" -> (* windows_2016x64 *) 29
+       | "win2k19" -> (* windows_2019x64 *) 31
+       | "win2k22" -> (* windows_2022 *) 37
++      (*| "win2k25" -> (* windows_2025 *) not yet known - 2024/10 *)
+       | _ ->
+          warning (f_"unknown Windows 10 variant: %s (%s)")
+            osinfo product;

0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch

@@ -1,4 +1,4 @@
-From deadbd0e20075ebb7048c296ed4c1afe3a3c1468 Mon Sep 17 00:00:00 2001
+From 76d765ce4b8ea64a9b2c36b68ceacd1517c62aa7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 28 Sep 2014 19:14:43 +0100
 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode

0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch

@@ -1,4 +1,4 @@
-From 77ea342ea0ddd3bebc782d0e901cccc61e99e4ac Mon Sep 17 00:00:00 2001
+From efba6c869424b27fc5946acc230dd486906e721a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 30 Sep 2014 10:50:27 +0100
 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option

0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch

@@ -1,4 +1,4 @@
-From e364d77b017dd10ec9e60d6cb0a75e92109dd321 Mon Sep 17 00:00:00 2001
+From f43f6b4a5ab2387f192a871c366598194a5c1e43 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Apr 2015 09:45:41 -0400
 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu

0005-RHEL-Fixes-for-libguestfs-winsupport.patch

@@ -1,4 +1,4 @@
-From f20f654504d7d855b0fddf44dde6c8b5b229636f Mon Sep 17 00:00:00 2001
+From 0d6280e2be92bef1246adc70830a6ae18359f121 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 30 Aug 2015 03:21:57 -0400
 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport.

0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch

@@ -1,4 +1,4 @@
-From 6c75da5b223fc205ac72ed2e01fe25e4f2b162d3 Mon Sep 17 00:00:00 2001
+From 421a6ec290e90add03f9ddf4ca8436fdf80f885c Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 14:21:37 +0100
 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)

0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch

@@ -1,4 +1,4 @@
-From 4cf6260b7ba2f59897efd35d5b31a5c3fa280839 Mon Sep 17 00:00:00 2001
+From 8e52f84563cf8f6eaa68ed60d1f46b39c9b73b50 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

0008-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch

@@ -1,17 +1,17 @@
-From e5b655eca178aedb56db32af4dddc013cc08d767 Mon Sep 17 00:00:00 2001
+From dc02d123d578511f9c4dffd3df5d797af14a1f3b Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests
 
 ---
- docs/virt-v2v-support.pod | 104 ++------------------------------------
+ docs/virt-v2v-support.pod | 96 ++-------------------------------------
- 1 file changed, 4 insertions(+), 100 deletions(-)
+ 1 file changed, 4 insertions(+), 92 deletions(-)
 
 diff --git a/docs/virt-v2v-support.pod b/docs/virt-v2v-support.pod
-index 8b64a5ea..1ffc0f9d 100644
+index e6415692..1ffc0f9d 100644
 --- a/docs/virt-v2v-support.pod
 +++ b/docs/virt-v2v-support.pod
-@@ -8,106 +8,10 @@ systems and guests in virt-v2v
+@@ -8,98 +8,10 @@ systems and guests in virt-v2v
  This page documents which foreign hypervisors, virtualization
  management systems and guest types that L<virt-v2v(1)> can support.
  
@@ -84,9 +84,9 @@ index 8b64a5ea..1ffc0f9d 100644
 -
 -=over 4
 -
--=item Red Hat Enterprise Linux 4, 5, 6, 7
+-=item Red Hat Enterprise Linux 4, 5, 6, 7, 8, 9, 10
 -
--=item CentOS 4, 5, 6, 7
+-=item CentOS 4, 5, 6, 7, 8, 9, 10
 -
 -=item Scientific Linux 4, 5, 6, 7
 -
@@ -104,15 +104,7 @@ index 8b64a5ea..1ffc0f9d 100644
 -
 -=item Ubuntu 10.04, 12.04, 14.04, 16.04, and up
 -
--=item Windows XP to Windows 10 / Windows Server 2016
+-=item Windows XP to Windows 11 / Windows Server 2025
--
--We use Windows internal version numbers, see
--L<https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions>
--
--Currently NT 5.2 to NT 6.3 are supported.
--
--See L</WINDOWS> below for additional notes on converting Windows
--guests.
 -
 -=back
 +For more information on supported hypervisors, and guest types in

0009-RHEL-Disable-o-glance.patch

@@ -1,4 +1,4 @@
-From a3809a71fc76ccc9e9bdd73253ab9f40485223e3 Mon Sep 17 00:00:00 2001
+From 6593a1970703eee10c3ef9f41279d80a133a611d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 30 Jun 2021 11:15:52 +0100
 Subject: [PATCH] RHEL: Disable -o glance

0010-RHEL-Remove-the-in-place-option.patch

@@ -1,4 +1,4 @@
-From f367702871f1f07277377f07cb28c8f51b9cfd10 Mon Sep 17 00:00:00 2001
+From efc69fffda1c881099a30077e70335cf381765eb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Dec 2021 11:56:05 +0000
 Subject: [PATCH] RHEL: Remove the --in-place option

0011-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch

@@ -1,4 +1,4 @@
-From 0531138b197fe35a8867849ee9af1ce8a9e5976f Mon Sep 17 00:00:00 2001
+From 077fa5f47c842f7ac1613e061c0893745febd0f7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:56:54 +0100
 Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test

0012-RHEL-9-tests-Remove-btrfs-test.patch

@@ -1,4 +1,4 @@
-From ea468389280864bd7519782018f5b66e6b2ca4bd Mon Sep 17 00:00:00 2001
+From a10fdcb822886c5fac37bd21dc7b214d93b95670 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:58:09 +0100
 Subject: [PATCH] RHEL 9: tests: Remove btrfs test

0013-RHEL-9-Remove-block-driver-option.patch

@@ -1,4 +1,4 @@
-From de92c507f1b17bfbf9e6e302f392d0bac8e0785f Mon Sep 17 00:00:00 2001
+From 8b57ac179cdcdb221a537fd51750e94fdc96ef97 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 28 Apr 2023 12:28:19 +0100
 Subject: [PATCH] RHEL 9: Remove --block-driver option

0014-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch

@@ -1,4 +1,4 @@
-From 0fd391a93010e85d60b34e21404234fc490f10af Mon Sep 17 00:00:00 2001
+From 308738b0d2a41427c1aac6a912c92a2f711f7d1a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Jul 2024 11:30:09 +0100
 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported

sources

@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.6.0.tar.gz) = bc7ecf99e66bae057eaf5d7c82ca38ded4aa6ef8732544bc7079f2894c9c79542a415fede02cf8c2cb7e83756683457c705f816b1da57e5ca9565350b9376a73
+SHA512 (virt-v2v-2.7.1.tar.gz) = 11f5528a48208050fda9c64c8aa6dcfd28352e26c96f15059ef66230577e87cae79286dbe035ee5fdf3c43398cba1f94569e11ff3871b26f21e7a6265a4bfa6d
-SHA512 (virt-v2v-2.6.0.tar.gz.sig) = 630166caf41d48ac2efca646611248263e58a4e7e644a7606b647911164a39a449ae3916d05248d48e80925f3f9179b1cfb850001b0f3dd30a48c301d62b11a0
+SHA512 (virt-v2v-2.7.1.tar.gz.sig) = a73bce78f116f68565e1288c130c0ea4adc4e1d87174f72fc9aeff747c541afd16404d59d12d0431d50b83a9d0dbe5ff12dddbfed97d2e1d431212a895078cad

virt-v2v.spec

@@ -3,11 +3,11 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 2.6-stable
+%global source_directory 2.7-development
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.6.0
+Version:       2.7.1
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -28,19 +28,20 @@ Source3:       copy-patches.sh
 # https://github.com/libguestfs/virt-v2v/commits/rhel-9.6
 
 # Patches.
-Patch0001:     0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+Patch0001:     0001-lib-OVF-Add-preliminary-support-for-Windows-Server-2.patch
-Patch0002:     0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+Patch0002:     0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
-Patch0003:     0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+Patch0003:     0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
-Patch0004:     0004-RHEL-Fixes-for-libguestfs-winsupport.patch
+Patch0004:     0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
-Patch0005:     0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+Patch0005:     0005-RHEL-Fixes-for-libguestfs-winsupport.patch
-Patch0006:     0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
+Patch0006:     0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
-Patch0007:     0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+Patch0007:     0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
-Patch0008:     0008-RHEL-Disable-o-glance.patch
+Patch0008:     0008-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
-Patch0009:     0009-RHEL-Remove-the-in-place-option.patch
+Patch0009:     0009-RHEL-Disable-o-glance.patch
-Patch0010:     0010-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
+Patch0010:     0010-RHEL-Remove-the-in-place-option.patch
-Patch0011:     0011-RHEL-9-tests-Remove-btrfs-test.patch
+Patch0011:     0011-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
-Patch0012:     0012-RHEL-9-Remove-block-driver-option.patch
+Patch0012:     0012-RHEL-9-tests-Remove-btrfs-test.patch
-Patch0013:     0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
+Patch0013:     0013-RHEL-9-Remove-block-driver-option.patch
+Patch0014:     0014-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
 
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@@ -70,7 +71,7 @@ BuildRequires: augeas-devel
 BuildRequires: bash-completion
 BuildRequires: file-devel
 BuildRequires: gettext-devel
-BuildRequires: jansson-devel
+BuildRequires: json-c-devel
 BuildRequires: libnbd-devel
 BuildRequires: libosinfo-devel
 BuildRequires: libvirt-daemon-kvm
@@ -342,9 +343,13 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
 
 
 %changelog
-* Wed Oct 09 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.6.0-1
+* Wed Oct 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-1
-- Rebase to upstream development version 2.6.0
+- Rebase to upstream development version 2.7.1
   resolves: RHEL-56813
+- Replace Jansson with json-c
+  resolves: RHEL-65296
+- Find drivers for win2025 guests
+  resolves: RHEL-65010
 
 * Thu Sep 05 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.9-1
 - Rebase to upstream development version 2.5.9