Hard depend on libnbd >= 1.24

This is not actually necessary for Fedora.  But for RHEL 10.2, where
we partially backported some 1.24 APIs to libnbd 1.22, the libnbd 1.22
package now provides LIBNBD_1.24 versioned symbols.  However not all
of them, so for example virt-v2v can fail with:

virt-v2v: symbol lookup error: virt-v2v: undefined symbol: nbd_get_handle_size, version LIBNBD_1.24

Practically this means that you can update virt-v2v to RHEL 10.2, but
leave libnbd from RHEL 10.1, and virt-v2v will then fail to run.

Adding a hard dependency avoids this problem, and is fine for Fedora too.

Related: https://issues.redhat.com/browse/RHEL-140894

.gitignore

@@ -1,11 +1,14 @@
+*~
+
 # RPM target directories
-/noarch
 /x86_64
 
 # Version-dependent build artifacts
 /.build-*.log
 /virt-v2v-v*/
 /virt-v2v-*.src.rpm
+/results_virt-v2v/
 
 # Source
-/virt-v2v-v*.tar.gz
+/virt-v2v-*.tar.gz
+/virt-v2v-*.tar.gz.sig

copy-patches.sh

@@ -0,0 +1,55 @@
+#!/bin/bash -
+
+set -e
+
+# Maintainer script to copy patches from the git repo to the current
+# directory.  Use it like this:
+#   ./copy-patches.sh
+
+rhel_version=av-8.3.0
+
+# Check we're in the right directory.
+if [ ! -f virt-v2v.spec ]; then
+    echo "$0: run this from the directory containing 'virt-v2v.spec'"
+    exit 1
+fi
+
+git_checkout=$HOME/d/virt-v2v-rhel-$rhel_version
+if [ ! -d $git_checkout ]; then
+    echo "$0: $git_checkout does not exist"
+    echo "This script is only for use by the maintainer when preparing a"
+    echo "virt-v2v release on RHEL."
+    exit 1
+fi
+
+# Get the base version of virt-v2v.
+version=`grep '^Version:' virt-v2v.spec | awk '{print $2}'`
+tag="v$version"
+
+# Remove any existing patches.
+git rm -f [0-9]*.patch ||:
+rm -f [0-9]*.patch
+
+# Get the patches.
+(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N --submodule=diff $tag)
+mv $git_checkout/[0-9]*.patch .
+
+# Remove any not to be applied.
+rm -f *NOT-FOR-RPM*.patch
+
+# Add the patches.
+git add [0-9]*.patch
+
+# Print out the patch lines.
+echo
+echo "--- Copy the following text into virt-v2v.spec file"
+echo
+
+echo "# Patches."
+for f in [0-9]*.patch; do
+    n=`echo $f | awk -F- '{print $1}'`
+    echo "Patch$n:     $f"
+done
+
+echo
+echo "--- End of text"

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: libvirt-ci.v2v.brew-build.gating.x86_64.tier1.functional}

sources

@@ -1 +1,2 @@
-2caf55a34ae086d34cbe82375c1b12c5  virt-v2v-v0.8.5.tar.gz
+SHA512 (virt-v2v-2.10.0.tar.gz) = 035f2181c1cc5f482e96d3e21b513b95939ca224d71ac6ad938842d5af5d60ef07db1600d2ccb609dc2042b1c74088f6f39ffbe595cb51e80278ecb50c314515
+SHA512 (virt-v2v-2.10.0.tar.gz.sig) = cb6301224ef00577a9cd0fc8fa504e583eb447341bd3849e6854f2d78ae72ca39bca68b70f30efd3d1d64480acf161c5e4bc9ba943595ef4dd2a654c3268aa66

tests/basic-test.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -
+set -e
+set -x
+
+# This only makes sure that virt-v2v isn't totally broken.
+# virt-v2v is extensively tested on real guests by the QE
+# team using a mix of automated and manual testing.
+
+# Fix libvirt.
+systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd
+
+virt-builder fedora-30
+virt-v2v -i disk fedora-30.img -o null

tests/tests.yml

@@ -0,0 +1,13 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - virt-v2v
+    - guestfs-tools
+    - libvirt-daemon-kvm
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh

virt-v2v-0.8.5-00-786a74f0.patch

@@ -1,101 +0,0 @@
-commit 786a74f0f1c14cfb54a65ea8c5fc097f612b03a5
-Author: Matthew Booth <mbooth@redhat.com>
-Date:   Tue Dec 13 14:18:10 2011 +0000
-
-    Fix crash during format conversions
-    
-    Fix a regression introduced by commit 6dec2753fd9e7d726e140bb246ccf32df8af9fb5.
-    We didn't update the format conversion code when updating the GuestfsHandle API.
-    This change updates the API again, removing an unnecessary dependency between
-    GuestfsHandle and Volume.
-
-diff --git a/lib/Sys/VirtConvert/GuestfsHandle.pm b/lib/Sys/VirtConvert/GuestfsHandle.pm
-index f6fa63f..fe34d14 100644
---- a/lib/Sys/VirtConvert/GuestfsHandle.pm
-+++ b/lib/Sys/VirtConvert/GuestfsHandle.pm
-@@ -57,9 +57,9 @@ close() method, and the ability to register pre-close callbacks.
- =item new(disks, transferiso, isrhev)
- 
- Create a new object. Open a new Sys::Guestfs handle to proxy, using the disks
--defined in I<disks>, which is taken from the guest metadata. Add I<transferiso>
--as a read-only drive if it is given. If I<isrhev> is true, the handle will use
--user and group 36:36.
-+defined in I<disks>, which is list of disk metadata defined as: [ [ name, path,
-+format ], ... ]. Add I<transferiso> as a read-only drive if it is given. If
-+I<isrhev> is true, the handle will use user and group 36:36.
- 
- =cut
- 
-@@ -77,12 +77,12 @@ sub new
- 
-         $g = Sys::Guestfs->new();
-         foreach my $disk (@{$disks}) {
--            my $vol = $disk->{dst};
-+            my ($name, $path, $format) = @$disk;
- 
--            $g->add_drive_opts($vol->get_path(),
--                               format => $vol->get_format(),
-+            $g->add_drive_opts($path,
-+                               format => $format,
-                                iface => $interface,
--                               name => $disk->{device});
-+                               name => $name);
-         }
- 
-         # Add the transfer iso if there is one
-diff --git a/lib/Sys/VirtConvert/Transfer/Local.pm b/lib/Sys/VirtConvert/Transfer/Local.pm
-index 667b282..5053ccb 100644
---- a/lib/Sys/VirtConvert/Transfer/Local.pm
-+++ b/lib/Sys/VirtConvert/Transfer/Local.pm
-@@ -179,12 +179,13 @@ package Sys::VirtConvert::Transfer::GuestfsStream;
- sub new
- {
-     my $class = shift;
--    my ($path) = @_;
-+    my ($path, $format) = @_;
- 
-     my $self = {};
-     bless($self, $class);
- 
--    $self->{g} = new Sys::VirtConvert::GuestfsHandle([$path], undef, 0);
-+    $self->{g} = new Sys::VirtConvert::GuestfsHandle([['sda', $path, $format]],
-+                                                     undef, 0);
- 
-     return $self;
- }
-diff --git a/p2v/server/virt-p2v-server.pl b/p2v/server/virt-p2v-server.pl
-index 8c52b08..7427055 100755
---- a/p2v/server/virt-p2v-server.pl
-+++ b/p2v/server/virt-p2v-server.pl
-@@ -343,8 +343,12 @@ sub convert
-     eval {
-         my $transferiso = $config->get_transfer_iso();
- 
-+        my @disks = map { [ $_->{device},
-+                            $_->{dst}->get_path(),
-+                            $_->{dst}->get_format() ] } @{$meta->{disks}};
-+
-         $g = new Sys::VirtConvert::GuestfsHandle(
--            $meta->{disks},
-+            \@disks,
-             $transferiso,
-             $target->isa('Sys::VirtConvert::Connection::RHEVTarget')
-         );
-diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl
-index dead384..b438766 100755
---- a/v2v/virt-v2v.pl
-+++ b/v2v/virt-v2v.pl
-@@ -518,8 +518,12 @@ v2vdie __('Guest doesn\'t define any storage devices')
- $source->copy_storage($target, $output_format, $output_sparse);
- 
- # Open a libguestfs handle on the guest's storage devices
-+my @disks = map { [ $_->{device},
-+                    $_->{dst}->get_path(),
-+                    $_->{dst}->get_format() ] } @{$meta->{disks}};
-+
- my $g = new Sys::VirtConvert::GuestfsHandle(
--    $meta->{disks},
-+    \@disks,
-     $transferiso,
-     $output_method eq 'rhev'
- );