From a6042e8121a7b56f06bf1dc966099551b5f5f682 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Wed, 8 Apr 2026 04:42:49 -0400 Subject: [PATCH] import Oracle_OSS virt-v2v-2.8.1-20.0.1.el10_1 --- 0042-Update-common-submodule.patch | 1 - ...tion-to-disable-fstrim-during-conver.patch | 303 +++++++++++++++ 1001-replaced-upstream-references.patch | 351 ++++++++++++++++++ virt-v2v.spec | 14 +- 4 files changed, 667 insertions(+), 2 deletions(-) create mode 100644 0043-Add-no-fstrim-option-to-disable-fstrim-during-conver.patch create mode 100644 1001-replaced-upstream-references.patch diff --git a/0042-Update-common-submodule.patch b/0042-Update-common-submodule.patch index 106852c..65b6357 100644 --- a/0042-Update-common-submodule.patch +++ b/0042-Update-common-submodule.patch @@ -2,7 +2,6 @@ From 69c4b5280893793771f6514357ab56348420fcf7 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 11 Feb 2026 19:09:26 -0500 Subject: [PATCH] Update common submodule -Content-type: text/plain Update to fix: https://issues.redhat.com/browse/RHEL-148423 diff --git a/0043-Add-no-fstrim-option-to-disable-fstrim-during-conver.patch b/0043-Add-no-fstrim-option-to-disable-fstrim-during-conver.patch new file mode 100644 index 0000000..c5a921c --- /dev/null +++ b/0043-Add-no-fstrim-option-to-disable-fstrim-during-conver.patch @@ -0,0 +1,303 @@ +From ce2cb1b89e8431c1090c327246ff11a17a89d012 Mon Sep 17 00:00:00 2001 +From: sarika +Date: Tue, 9 Dec 2025 16:12:14 +0530 +Subject: [PATCH] Add --no-fstrim option to disable fstrim during conversion + +In particular, fstrim on NTFS is a serialized operation which can be +very slow on large partitions. + +Closes: https://github.com/libguestfs/virt-v2v/pull/121 +Fixes: https://redhat.atlassian.net/browse/RHEL-164271 + +RWMJ: Added documentation, a test, and larger commit message. +(cherry picked from commit 251639458907f06148ecdd5acbac5c43136e7662) +(cherry picked from commit f937f290a4c032c971ad78d1b07e8aefe15eab8a) +--- + convert/convert.ml | 10 +++++++-- + convert/convert.mli | 1 + + docs/virt-v2v-in-place.pod | 4 ++++ + docs/virt-v2v-inspector.pod | 2 ++ + docs/virt-v2v.pod | 6 +++++ + in-place/in_place.ml | 5 +++++ + inspector/inspector.ml | 6 +++++ + tests/Makefile.am | 2 ++ + tests/test-no-fstrim.sh | 44 +++++++++++++++++++++++++++++++++++++ + v2v/v2v.ml | 6 +++++ + 10 files changed, 84 insertions(+), 2 deletions(-) + create mode 100755 tests/test-no-fstrim.sh + +diff --git a/convert/convert.ml b/convert/convert.ml +index 0b6c88f9..f2676fe9 100644 +--- a/convert/convert.ml ++++ b/convert/convert.ml +@@ -40,6 +40,7 @@ type options = { + smp : int option; + static_ips : static_ip list; + customize_ops : Customize_cmdline.ops; ++ no_fstrim : bool; + } + + (* Mountpoint stats, used for free space estimation. *) +@@ -135,8 +136,13 @@ let rec convert input_disks options source = + * because unused blocks are marked in the overlay and thus do + * not have to be copied. + *) +- message (f_"Mapping filesystem data to avoid copying unused and blank areas"); +- do_fstrim g inspect; ++ if not options.no_fstrim then ( ++ message ++ (f_"Mapping filesystem data to avoid copying unused and blank areas"); ++ do_fstrim g inspect ++ ) else ( ++ message (f_"Skipping fstrim (--no-fstrim specified)") ++ ); + + (* Check (fsck) the filesystems after conversion. *) + g#umount_all (); +diff --git a/convert/convert.mli b/convert/convert.mli +index 85ed05cb..13d80351 100644 +--- a/convert/convert.mli ++++ b/convert/convert.mli +@@ -26,6 +26,7 @@ type options = { + smp : int option; (** [--smp] option *) + static_ips : Types.static_ip list; (** [--mac :ip:] option *) + customize_ops : Customize_cmdline.ops; (** virt-customize options *) ++ no_fstrim : bool; (** [--no-fstrim] option *) + } + + val convert : NBD_URI.t list -> options -> Types.source -> +diff --git a/docs/virt-v2v-in-place.pod b/docs/virt-v2v-in-place.pod +index 2d1857b9..78a3314e 100644 +--- a/docs/virt-v2v-in-place.pod ++++ b/docs/virt-v2v-in-place.pod +@@ -227,6 +227,10 @@ are mapped to C. + + See L. + ++=item B<--no-fstrim> ++ ++Do not trim the filesystem. See L. ++ + =item B<-O> output.xml + + =item B<-O -> +diff --git a/docs/virt-v2v-inspector.pod b/docs/virt-v2v-inspector.pod +index 26770459..65ce71ce 100644 +--- a/docs/virt-v2v-inspector.pod ++++ b/docs/virt-v2v-inspector.pod +@@ -202,6 +202,8 @@ virt-v2v-inspector. + + =item B<--network> ... + ++=item B<--no-fstrim> ++ + =item B<-q> + + =item B<--quiet> +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index ff31bb00..38dc475a 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -418,6 +418,10 @@ are mapped to C. + + See L below. + ++=item B<--no-fstrim> ++ ++Do not trim the filesystem. See L below. ++ + =item B<-o> B + + This is the same as I<-o local>. +@@ -792,6 +796,8 @@ fstrim support in the Linux kernel is improving gradually, so over + time some of these restrictions will be lifted and virt-v2v will work + faster. + ++Use I<--no-fstrim> to disable trimming. ++ + =head2 Free space for conversion + + =head3 Free space in the guest +diff --git a/in-place/in_place.ml b/in-place/in_place.ml +index 2ee3abc4..0021089f 100644 +--- a/in-place/in_place.ml ++++ b/in-place/in_place.ml +@@ -150,6 +150,7 @@ let rec main () = + let set_root_choice = Types.set_root_choice root_choice in + + (* Other options that we handle here. *) ++ let no_fstrim = ref false in + let print_source = ref false in + + let input_modes = +@@ -184,6 +185,8 @@ let rec main () = + s_"Map network ‘in’ to ‘out’"; + [ S 'O' ], Getopt.String ("output.xml", set_output_xml_option), + s_"Set the output filename"; ++ [ L"no-fstrim" ], Getopt.Set no_fstrim, ++ s_"Don't trim filesystems before conversion"; + [ L"print-source" ], Getopt.Set print_source, + s_"Print source and stop"; + [ L"root" ], Getopt.String ("ask|... ", set_root_choice), +@@ -242,6 +245,7 @@ read the man page virt-v2v-in-place(1). + let customize_ops = get_customize_ops () in + let input_conn = !input_conn in + let input_mode = !input_mode in ++ let no_fstrim = !no_fstrim in + let memsize = !memsize in + let output_xml = !output_xml in + let print_source = !print_source in +@@ -312,6 +316,7 @@ read the man page virt-v2v-in-place(1). + smp; + static_ips; + customize_ops; ++ no_fstrim; + } in + + (* Before starting the input module, check there is sufficient +diff --git a/inspector/inspector.ml b/inspector/inspector.ml +index 752a5c1c..137d5f61 100644 +--- a/inspector/inspector.ml ++++ b/inspector/inspector.ml +@@ -70,6 +70,8 @@ let rec main () = + let smp = ref None in + let set_smp arg = smp := Some arg in + ++ let no_fstrim = ref false in ++ + let network_map = Networks.create () in + let static_ips = ref [] in + let rec add_network str = +@@ -171,6 +173,8 @@ let rec main () = + s_"Map NIC to network or bridge or assign static IP"; + [ S 'm'; L"memsize" ], Getopt.Int ("mb", set_memsize), + s_"Set memory size"; ++ [ L"no-fstrim" ], Getopt.Set no_fstrim, ++ s_"Don't trim filesystems before conversion"; + [ S 'n'; L"network" ], Getopt.String ("in:out", add_network), + s_"Map network ‘in’ to ‘out’"; + [ S 'O' ], Getopt.String ("output.xml", set_output_file_option), +@@ -233,6 +237,7 @@ read the man page virt-v2v-inspector(1). + | Some transport -> + error (f_"unknown input transport ‘-it %s’") transport in + let memsize = !memsize in ++ let no_fstrim = !no_fstrim in + let root_choice = !root_choice in + let smp = !smp in + let static_ips = !static_ips in +@@ -293,6 +298,7 @@ read the man page virt-v2v-inspector(1). + smp; + static_ips; + customize_ops; ++ no_fstrim; + } in + + (* Before starting the input module, check there is sufficient +diff --git a/tests/Makefile.am b/tests/Makefile.am +index df221b73..8048612e 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -91,6 +91,7 @@ TESTS = \ + test-mac.sh \ + test-machine-readable.sh \ + test-networks-and-bridges.sh \ ++ test-no-fstrim.sh \ + test-o-glance.sh \ + test-o-kubevirt-fedora.sh \ + test-o-kubevirt-oo-disk.sh \ +@@ -279,6 +280,7 @@ EXTRA_DIST += \ + test-machine-readable.sh \ + test-networks-and-bridges-expected.xml \ + test-networks-and-bridges.sh \ ++ test-no-fstrim.sh \ + test-o-glance.sh \ + test-o-kubevirt-fedora.sh \ + test-o-kubevirt-fedora.yaml.expected \ +diff --git a/tests/test-no-fstrim.sh b/tests/test-no-fstrim.sh +new file mode 100755 +index 00000000..ba84ad96 +--- /dev/null ++++ b/tests/test-no-fstrim.sh +@@ -0,0 +1,44 @@ ++#!/bin/bash - ++# libguestfs virt-v2v test script ++# Copyright (C) 2014-2026 Red Hat Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ ++# Test --no-fstrim option. ++ ++source ./functions.sh ++set -e ++set -x ++ ++skip_if_skipped ++requires test -s ../test-data/phony-guests/windows.img ++ ++export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools" ++ ++d=test-no-fstrim.d ++rm -rf $d ++cleanup_fn rm -rf $d ++mkdir $d ++ ++$VG virt-v2v --debug-gc \ ++ -i disk ../test-data/phony-guests/windows.img \ ++ --no-fstrim \ ++ -o local -os $d ++ ++# Test the libvirt XML metadata and a disk was created. ++test -f $d/windows.xml ++test -f $d/windows-sda ++ ++cat $d/windows.xml +diff --git a/v2v/v2v.ml b/v2v/v2v.ml +index 20082544..0cad36af 100644 +--- a/v2v/v2v.ml ++++ b/v2v/v2v.ml +@@ -79,6 +79,8 @@ let rec main () = + let smp = ref None in + let set_smp arg = smp := Some arg in + ++ let no_fstrim = ref false in ++ + let network_map = Networks.create () in + let static_ips = ref [] in + let rec add_network str = +@@ -241,6 +243,8 @@ let rec main () = + s_"Use password from file to connect to output hypervisor"; + [ M"os" ], Getopt.String ("storage", set_string_option_once "-os" output_storage), + s_"Set output storage location"; ++ [ L"no-fstrim" ], Getopt.Set no_fstrim, ++ s_"Don't trim filesystems before conversion"; + [ L"parallel" ], Getopt.Set_int ("N", parallel), + s_"Run up to N instances of nbdcopy in parallel"; + [ L"print-source" ], Getopt.Set print_source, +@@ -309,6 +313,7 @@ read the man page virt-v2v(1). + | Some transport -> + error (f_"unknown input transport ‘-it %s’") transport in + let memsize = !memsize in ++ let no_fstrim = !no_fstrim in + let output_alloc = + match !output_alloc with + | `Not_set | `Sparse -> Types.Sparse +@@ -419,6 +424,7 @@ read the man page virt-v2v(1). + smp; + static_ips; + customize_ops; ++ no_fstrim; + } in + + (* Before starting the input module, check there is sufficient diff --git a/1001-replaced-upstream-references.patch b/1001-replaced-upstream-references.patch new file mode 100644 index 0000000..b5bc13e --- /dev/null +++ b/1001-replaced-upstream-references.patch @@ -0,0 +1,351 @@ +From 9bd7e17d0b34f939eab0c18cef7fd4bb74269c20 Mon Sep 17 00:00:00 2001 +From: Darren Archibald +Date: Tue, 9 Sep 2025 04:07:35 -0700 +Subject: [PATCH] replaced upstream references + +Signed-off-by: Darren Archibald +Signed-off-by: Akshata Konala +--- + 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 08d9dbe..61f472b 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 55c4fdc..5003e14 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: 2025-02-27 18:15+0000\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 e8d9053..835535e 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: 2025-02-27 18:15+0000\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 1a63337..8800235 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: 2025-02-27 18:15+0000\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 56f9917..b077010 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: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2025-01-09 11:33+0000\n" + "Last-Translator: Ricky Tigg \n" +diff --git a/po/fr.po b/po/fr.po +index 2db1ae1..2ba25d0 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: 2025-02-27 18:15+0000\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 5b4e798..9c540cd 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: 2025-02-27 18:15+0000\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 a3983ed..0364d75 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: 2025-02-27 18:15+0000\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 23d34f2..c14299e 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: 2025-02-27 18:15+0000\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 78ebee4..b116e86 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: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2025-01-09 09:27+0000\n" + "Last-Translator: Weblate Translation Memory \n" +diff --git a/po/ml.po b/po/ml.po +index 7a3f071..7de8c16 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: 2025-02-27 18:15+0000\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 8222d63..7f55091 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: 2025-02-27 18:15+0000\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 06df912..b25b908 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: 2025-02-27 18:15+0000\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 2422cc3..92a2500 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: 2025-02-27 18:15+0000\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 e2465b6..73a8db6 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: 2025-02-27 18:15+0000\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 77f4651..16c7459 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: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2024-01-15 13:36+0000\n" + "Last-Translator: Weblate Translation Memory \n" +diff --git a/po/virt-v2v.pot b/po/virt-v2v.pot +index 60bbf0c..ea2fb85 100644 +--- a/po/virt-v2v.pot ++++ b/po/virt-v2v.pot +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: virt-v2v 2.8.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: 2025-06-26 16:05+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" +diff --git a/podwrapper.pl.in b/podwrapper.pl.in +index d7973fc..0a196f3 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/virt-v2v.spec b/virt-v2v.spec index b3b5c22..213164d 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.8.1 -Release: 19%{?dist} +Release: 20.0.1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -69,6 +69,10 @@ Patch0039: 0039-docs-Add-more-description-for-memsize-option.patch Patch0040: 0040-convert-convert_linux.ml-Add-debian-12-UEFI.patch Patch0041: 0041-input-vcenter-double-uri_encode-dcPath-and-dsName.patch Patch0042: 0042-Update-common-submodule.patch +Patch0043: 0043-Add-no-fstrim-option-to-disable-fstrim-during-conver.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 @@ -359,6 +363,14 @@ done %changelog +* Tue Apr 07 2026 EL Errata - 2.8.1-20.0.1 +- Replaced bugzilla.oracle.com references [Orabug: 34202300] +- replaced upstream references [Orabug:34089586] + +* Fri Apr 03 2026 Richard W.M. Jones - 1:2.8.1-20 +- Add --no-fstrim option + resolves: RHEL-164582 + * Sun Feb 15 2026 Cole Robinson - 1:2.8.1-19 - Install blnsvr.exe to \Windows\Drivers\VirtIO resolves: RHEL-149474