From 3d328aa747d003fe544ccacf3e80288a0eab938b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 22 Dec 2025 06:35:42 +0000 Subject: [PATCH] import OL virt-v2v-2.7.1-18.0.1.el9_7 --- ...Fix-ESP-conversion-if-C-Windows-Temp.patch | 70 ++++ SOURCES/0061-Update-common-submodule.patch | 34 ++ .../1001-replaced-upstream-references.patch | 350 ++++++++++++++++++ SOURCES/copy-patches.sh | 0 SPECS/virt-v2v.spec | 19 +- 5 files changed, 472 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch create mode 100644 SOURCES/0061-Update-common-submodule.patch create mode 100644 SOURCES/1001-replaced-upstream-references.patch mode change 100755 => 100644 SOURCES/copy-patches.sh diff --git a/SOURCES/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch b/SOURCES/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch new file mode 100644 index 0000000..3454264 --- /dev/null +++ b/SOURCES/0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch @@ -0,0 +1,70 @@ +From 7f4e6125495f309190b8205c759d198228d8a7d6 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 28 Oct 2025 11:34:22 +0000 +Subject: [PATCH] convert: windows: Fix ESP conversion if C:\Windows\Temp has + alternate case + +We found a Windows guest which had the expected C:\Windows\Temp path, +but the actual name was TEMP rather than Temp. It's unclear if this +had been renamed, or if Windows can create this normally. In any +case, the unexpected casing caused this failure: + + virt-v2v: error: libguestfs error: mkdtemp: /Windows/Temp/ESP_XXXXXX: No such file or directory + +We have to use g#case_sensitive_path here since the directory is on +NTFS. + +I also removed the hard-coded "\Windows" in favour of %systemroot%, +and fixed the indentation. + +Fixes: https://issues.redhat.com/browse/RHEL-124569 +Reported-by: Ulhas Surse +(cherry picked from commit 277ddd1a9b84d9c1b1fa93ef9a2e7f52b68d7930) +(cherry picked from commit 0b1c9ccf4c5808db323554c5d55ded2c345ebcb9) +--- + convert/convert_windows.ml | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml +index d5a57d6e..b80128a7 100644 +--- a/convert/convert_windows.ml ++++ b/convert/convert_windows.ml +@@ -961,21 +961,25 @@ let convert (g : G.guestfs) source inspect i_firmware + match i_firmware with + | Firmware.I_BIOS -> () + | I_UEFI esp_list -> +- let esp_temp_path = g#mkdtemp "/Windows/Temp/ESP_XXXXXX" in +- let uefi_arch = get_uefi_arch_suffix inspect.i_arch in ++ let esp_temp_path = ++ let temp = inspect.i_windows_systemroot ^ "/Temp" in ++ let mp = g#case_sensitive_path temp in ++ let template = mp ^ "/ESP_XXXXXX" in ++ g#mkdtemp template in ++ let uefi_arch = get_uefi_arch_suffix inspect.i_arch in + +- List.iter ( +- fun dev_path -> +- g#mount dev_path esp_temp_path; +- fix_win_uefi_bcd esp_temp_path; +- (match uefi_arch with +- | Some uefi_arch -> fix_win_uefi_fallback esp_temp_path uefi_arch +- | None -> () +- ); +- g#umount esp_temp_path; +- ) esp_list; ++ List.iter ( ++ fun dev_path -> ++ g#mount dev_path esp_temp_path; ++ fix_win_uefi_bcd esp_temp_path; ++ (match uefi_arch with ++ | Some uefi_arch -> fix_win_uefi_fallback esp_temp_path uefi_arch ++ | None -> () ++ ); ++ g#umount esp_temp_path; ++ ) esp_list; + +- g#rmdir esp_temp_path ++ g#rmdir esp_temp_path + in + + do_convert () diff --git a/SOURCES/0061-Update-common-submodule.patch b/SOURCES/0061-Update-common-submodule.patch new file mode 100644 index 0000000..10d94b2 --- /dev/null +++ b/SOURCES/0061-Update-common-submodule.patch @@ -0,0 +1,34 @@ +From 2e00ab8d07b0a24c86dee0b038c244d62fd5a456 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 20 Sep 2025 17:20:25 +0100 +Subject: [PATCH] Update common submodule + + Richard W.M. Jones (2): + daemon, generator: Use power of 2 for initial size of Hashtbl.create + mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor + +Fixes: https://issues.redhat.com/browse/RHEL-128776 +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common b48c7d00..742c5f8b: +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index 7e46f318..07a91fc7 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -334,8 +334,13 @@ and ddb_regedits inspect drv_name drv_pciid = + * one must add keys into the DriverDatabase. + *) + ++ let winarch = ++ match inspect.i_arch with ++ | "i386" -> "x86" | "x86_64" -> "amd64" ++ | _ -> assert false in ++ + let drv_inf = "guestor.inf" in +- let drv_inf_label = drv_inf ^ "_tmp" in ++ let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in + let drv_config = "guestor_conf" in + + [ diff --git a/SOURCES/1001-replaced-upstream-references.patch b/SOURCES/1001-replaced-upstream-references.patch new file mode 100644 index 0000000..dc425f3 --- /dev/null +++ b/SOURCES/1001-replaced-upstream-references.patch @@ -0,0 +1,350 @@ +From 0fbfa66f95181c6e3b784c8ea86e6a9faa3f4ea1 Mon Sep 17 00:00:00 2001 +From: Darren Archibald +Date: Wed, 19 Feb 2025 01:33:28 -0800 +Subject: [PATCH] replaced upstream references + +Signed-off-by: Darren Archibald +--- + po/Makefile.am | 2 +- + po/cs.po | 3 +-- + po/de.po | 3 +-- + po/es.po | 3 +-- + po/fi.po | 3 +-- + po/fr.po | 3 +-- + po/gu.po | 3 +-- + po/hi.po | 3 +-- + po/ja.po | 3 +-- + po/ka.po | 3 +-- + po/kn.po | 3 +-- + po/ml.po | 3 +-- + po/mr.po | 3 +-- + po/nl.po | 3 +-- + po/or.po | 3 +-- + po/pa.po | 3 +-- + po/pl.po | 3 +-- + po/si.po | 3 +-- + po/uk.po | 3 +-- + po/virt-v2v.pot | 3 +-- + podwrapper.pl.in | 4 ++-- + website/index.html.in | 6 +++--- + 22 files changed, 25 insertions(+), 44 deletions(-) + +diff --git a/po/Makefile.am b/po/Makefile.am +index f1509d6..db4a502 100644 +--- a/po/Makefile.am ++++ b/po/Makefile.am +@@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk + + DOMAIN = $(PACKAGE_NAME) + COPYRIGHT_HOLDER = Red Hat Inc. +-MSGID_BUGS_ADDRESS = https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools ++MSGID_BUGS_ADDRESS = https://github.com/oracle/oracle-linux + + # Languages. + # Don't use LINGUAS (uppercase) as Gentoo defines it (RHBZ#804464). +diff --git a/po/cs.po b/po/cs.po +index 95b1124..8bbc891 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -2,8 +2,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-04-08 18:20+0000\n" + "Last-Translator: Pavel Borecki \n" +diff --git a/po/de.po b/po/de.po +index e5adfcf..e4cf209 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -9,8 +9,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:48+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/es.po b/po/es.po +index 97fa9cf..1a41da6 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -10,8 +10,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-03-16 07:04+0000\n" + "Last-Translator: Alex Puchades \n" +diff --git a/po/fi.po b/po/fi.po +index 04d6e7d..a7f6b9d 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -6,8 +6,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: virt-v2v 1.43.4\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2022-12-23 18:20+0000\n" + "Last-Translator: Jan Kuparinen \n" +diff --git a/po/fr.po b/po/fr.po +index b6571f3..c145c11 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -10,8 +10,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-03-21 09:20+0000\n" + "Last-Translator: grimst \n" +diff --git a/po/gu.po b/po/gu.po +index 9d34a97..e3eecfe 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:49+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/hi.po b/po/hi.po +index 279dd88..f07556d 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:49+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/ja.po b/po/ja.po +index 6a02097..6274047 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -9,8 +9,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2017-02-24 07:33+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/ka.po b/po/ka.po +index bae787b..4d189c4 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -6,8 +6,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: virt-v2v 2.1.1\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-11-26 21:01+0000\n" + "Last-Translator: Temuri Doghonadze \n" +diff --git a/po/kn.po b/po/kn.po +index bc830a0..43eab6a 100644 +--- a/po/kn.po ++++ b/po/kn.po +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:50+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/ml.po b/po/ml.po +index e0e3d49..4073d4b 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:50+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/mr.po b/po/mr.po +index 931374e..a729ba2 100644 +--- a/po/mr.po ++++ b/po/mr.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/nl.po b/po/nl.po +index f94cd75..bc85acd 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -9,8 +9,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/or.po b/po/or.po +index 2fe0840..38c1720 100644 +--- a/po/or.po ++++ b/po/or.po +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/pa.po b/po/pa.po +index f3237c9..c7082cb 100644 +--- a/po/pa.po ++++ b/po/pa.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:52+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/pl.po b/po/pl.po +index 4b6f1b8..c90994b 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -11,8 +11,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2024-01-15 13:36+0000\n" + "Last-Translator: Weblate Translation Memory \n" +diff --git a/podwrapper.pl.in b/podwrapper.pl.in +index c99563c..14198cf 100755 +--- a/podwrapper.pl.in ++++ b/podwrapper.pl.in +@@ -432,10 +432,10 @@ my $reporting_bugs = + "=head1 BUGS + + To get a list of bugs against libguestfs, use this link: +-L ++L + + To report a new bug against libguestfs, use this link: +-L ++L + + When reporting a bug, please supply: + +diff --git a/website/index.html.in b/website/index.html.in +index f578523..e1e1592 100644 +--- a/website/index.html.in ++++ b/website/index.html.in +@@ -160,12 +160,12 @@ For testers: +

Bug reports

+ +

+-List of bugs in libguestfs and +-in Fedora packaging of libguestfs ++List of bugs in libguestfs and ++in Community packaging of libguestfs +

+ +

+-Enter a new bug report ++Enter a new bug report +

+ + +-- +2.31.1 + diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh old mode 100755 new mode 100644 diff --git a/SPECS/virt-v2v.spec b/SPECS/virt-v2v.spec index 803bea7..d31e6c5 100644 --- a/SPECS/virt-v2v.spec +++ b/SPECS/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.1 -Release: 16%{?dist} +Release: 18.0.1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -87,6 +87,11 @@ Patch0056: 0056-vddk-Remove-io-vddk-noextents-option.patch Patch0057: 0057-Modify-configure_pnputil_install-script-to-check.patch Patch0058: 0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch Patch0059: 0059-remove-timeout-before-installing-virtio-win-drivers.patch +Patch0060: 0060-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch +Patch0061: 0061-Update-common-submodule.patch + +# Oracle patch +Patch1001: 1001-replaced-upstream-references.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -390,6 +395,18 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check %changelog +* Thu Dec 18 2025 EL Errata - 2.7.1-18.0.1 +- Replaced bugzilla.oracle.com references [Orabug: 34202300] +- replaced upstream references [Orabug:34089586] + +* Mon Nov 17 2025 Richard W.M. Jones - 1:2.7.1-18 +- Fix pnputil driver store after conversion + resolves: RHEL-128776 + +* Thu Oct 30 2025 Richard W.M. Jones - 1:2.7.1-17 +- Fix ESP conversion if C:\Windows\Temp has alternate case + resolves: RHEL-125120 + * Fri Jul 18 2025 Richard W.M. Jones - 1:2.7.1-16 - mlcustomize: Remove dnf --verbose option resolves: RHEL-83289