Rebase to virt-v2v 2.11.7

resolves: RHEL-153361 Fix binary LUKS keys resolves: RHEL-170864
2026-04-30 10:01:13 +01:00 · 2026-04-30 10:01:13 +01:00 · 6281f7ee8c
commit 6281f7ee8c
parent 6335af7d4c
12 changed files with 27 additions and 65 deletions
--- a/0001-RHEL-Fixes-for-libguestfs-winsupport.patch
+++ b/0001-RHEL-Fixes-for-libguestfs-winsupport.patch
@ -1,4 +1,4 @@
-From 65b3a6e92294ad0e864bb1c134d3f6c5017708c7 Mon Sep 17 00:00:00 2001
+From 44b3ab7189fc25ddfaeb77c25436205ad0a0ec35 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.
--- a/0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch
+++ b/0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch
@ -1,37 +0,0 @@
-From e4d213c7dcc941b3a1f68280a74d2bfe6415add2 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 26 Jan 2026 16:26:27 +0000
-Subject: [PATCH] RHEL: Update v2v: Enhance inspection with filesystems
- information
-
-For RHEL 10:
-
-This is an update for commit 6bd4ab3a5da9bf3bb3b22585d2226d6e338f23ba.
-
-Adjust minimum version of libguestfs since we will backport the new
-API to libguestfs 1.58.1-2.el10.
-
-Original commit message:
-
-  Add the list of filesystems found by inspection to the internal
-  inspection struct.  This is not actually used by virt-v2v itself (it
-  is used by virt-v2v-inspector), so this change should have no effect.
---
- m4/guestfs-libraries.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
-index a7a279e8..11c9974c 100644
--- a/m4/guestfs-libraries.m4
-+++ b/m4/guestfs-libraries.m4
-@@ -19,8 +19,8 @@ dnl Any C libraries required by virt-v2v.
- 
- dnl Of course we need libguestfs.
- dnl
-dnl We need libguestfs 1.59.2 for guestfs_xfs_info2.
-PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.59.2])
-+dnl We need libguestfs >= 1.58.1-2.el10 for guestfs_xfs_info2.
-+PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.58.1])
- printf "libguestfs version is "; $PKG_CONFIG --modversion libguestfs
- 
- dnl And libnbd.
--- a/0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+++ b/0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
@ -1,4 +1,4 @@
-From d5557e6eba7421b47bdb785f7aa47d720dab04d9 Mon Sep 17 00:00:00 2001
+From 4eda0e2779d18337826e3e2358096802767b5240 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
--- a/0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+++ b/0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
@ -1,4 +1,4 @@
-From 9c4fd441d42369d7cb0052b75053d9d2551a5558 Mon Sep 17 00:00:00 2001
+From a64486bd10e82128b645f86bfdde31eacd0a2a0f 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
--- a/0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+++ b/0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
@ -1,4 +1,4 @@
-From 83d7be6e5a69984f3829ce6bd6a46faac1f866ee Mon Sep 17 00:00:00 2001
+From b7e1fc4f8244d9d6dbbcc1a0d2ac80a3761e0830 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
--- a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+++ b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
@ -1,4 +1,4 @@
-From b4978bf26407fdd0479392ba80c39471686e2478 Mon Sep 17 00:00:00 2001
+From 6b60ca9ebbc68982ad8c0297cc791cc1f55b74b2 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)
--- a/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+++ b/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
@ -1,4 +1,4 @@
-From 85b4b04ef3a9b57ec0711cb39af12bc718f5f2b6 Mon Sep 17 00:00:00 2001
+From f5cedad0e5d3c855f4f727055b8e188ef7e18b05 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
--- a/0007-RHEL-tests-Remove-btrfs-test.patch
+++ b/0007-RHEL-tests-Remove-btrfs-test.patch
@ -1,4 +1,4 @@
-From 502bde113b738a0e35f654e5e77a7c18e9127cd0 Mon Sep 17 00:00:00 2001
+From 39edcdad1cba6d3cf7832eb9dcc4766ecb2a4c08 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: tests: Remove btrfs test
--- a/0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
+++ b/0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
@ -1,4 +1,4 @@
-From 21b655aa86c1e8ffaaa0f3516c854342f3decdb0 Mon Sep 17 00:00:00 2001
+From 42f460c1965bc66a5f9c0338ebb2e7439e37761c 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
--- a/0009-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
+++ b/0009-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
@ -1,4 +1,4 @@
-From 4382b8ab6033d23b1df35ddcc35e0632aa4081c9 Mon Sep 17 00:00:00 2001
+From ab2f7107239ce7a899ec80b99aaad032b873c2f3 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 12 Dec 2025 16:18:15 +0000
 Subject: [PATCH] RHEL: output/output.ml: Remove reduce-memory-pressure=on
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.11.6.tar.gz) = 4f89bfe3a45636562f3ac0279f38cff5194a3e8ae2922bae8b36fee45639ff9dca18488b83e81fd287e3531a79734dabbfccc821d0ae7a6c6b51618a78a890f6
-SHA512 (virt-v2v-2.11.6.tar.gz.sig) = d286ed23da3f9a2f9491b07912091e27f1a678ef18a4043fa0fe747e7a2645a96f110c54980d8203c2f9be169c5e1a83271a31e2ca2f80b0ca6d06e251a824e3
+SHA512 (virt-v2v-2.11.7.tar.gz) = 5db0edb8951526846e608cea66f1d5815e8e0c11cc51ab4af18648db1cff03a05807f2de081a7519d8bc4adb004847f827f7ce0c63e800ddd057aba48a6d517e
+SHA512 (virt-v2v-2.11.7.tar.gz.sig) = 91cfab3cc5da6e7e764cab73a82b660bac6ae3382ba6bc1f0d258c714affcfe8e28487e740dbf310d169b5ad1a9d3656fd931a3fb1db38656b2155d2a5d910c9
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@ -44,7 +44,7 @@ ExclusiveArch: x86_64

 Name:          virt-v2v
 Epoch:         1
-Version:       2.11.6
+Version:       2.11.7
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM

@ -65,16 +65,15 @@ Source3:       copy-patches.sh
 # https://github.com/libguestfs/virt-v2v/commits/rhel-10.3

 # Patches.
-Patch0001:     0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch
-Patch0002:     0002-RHEL-Fixes-for-libguestfs-winsupport.patch
-Patch0003:     0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
-Patch0004:     0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
-Patch0005:     0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.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
-Patch0008:     0008-RHEL-tests-Remove-btrfs-test.patch
-Patch0009:     0009-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
-Patch0010:     0010-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
+Patch0001:     0001-RHEL-Fixes-for-libguestfs-winsupport.patch
+Patch0002:     0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+Patch0003:     0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.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
+Patch0006:     0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+Patch0007:     0007-RHEL-tests-Remove-btrfs-test.patch
+Patch0008:     0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
+Patch0009:     0009-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch

 BuildRequires: autoconf, automake, libtool
 BuildRequires: make
@ -85,8 +84,7 @@ BuildRequires: perl(IPC::Run3)
 BuildRequires: gcc
 BuildRequires: ocaml >= 4.08

-# In Fedora this is: libguestfs-devel >= 1:1.59.2-1
-BuildRequires: libguestfs-devel >= 1:1.58.1-2
+BuildRequires: libguestfs-devel >= 1:1.59.7-1
 BuildRequires: augeas-devel
 BuildRequires: bash-completion
 %if 0%{?fedora} || 0%{?rhel} >= 11
@ -132,8 +130,7 @@ BuildRequires: glibc-static
 BuildRequires: gnupg2
 %endif

-# In Fedora this is: libguestfs%%{?_isa} >= 1:1.59.2-1
-Requires:      libguestfs%{?_isa} >= 1:1.58.1-2
+Requires:      libguestfs%{?_isa} >= 1:1.59.7-1
 Requires:      guestfs-tools >= 1.54

 # XFS is the default filesystem in Fedora and RHEL.
@ -382,8 +379,8 @@ done


 %changelog
-* Thu Apr 23 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.11.6-1
- Rebase to virt-v2v 2.11.5
+* Thu Apr 30 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.11.7-1
+- Rebase to virt-v2v 2.11.7
  Synchronize spec file with Fedora
  resolves: RHEL-153361
 - Fixes incorrect driver location for Windows 2008 SP2
@ -398,6 +395,8 @@ done
  resolves: RHEL-165677
 - Fix CHS geometry error for Veritas/Sun partitions
  resolves: RHEL-165220
+- Fix binary LUKS keys
+  resolves: RHEL-170864

 * Fri Apr 03 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.10.0-9
 - Add --no-fstrim option