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-0.8.1-1.fc*.log
-/virt-v2v-v0.8.1
-/virt-v2v-0.8.1-1.fc*.src.rpm
+/.build-*.log
+/virt-v2v-v*/
+/virt-v2v-*.src.rpm
+/results_virt-v2v/
 
 # Source
-/virt-v2v-v0.8.1.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 @@
-e850297f55ae839b28c8417d0acd080b  virt-v2v-v0.8.1.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.1-01-e34a8c09.patch

@@ -1,57 +0,0 @@
-commit e34a8c0911f53cff64f9a33d3802ac7361f3fe19
-Author: Matthew Booth <mbooth@redhat.com>
-Date:   Wed May 11 16:05:18 2011 +0100
-
-    p2v-client: Drop echoe for build
-    
-    echoe changes incompatibly from F14->F15. We're not using the vast majority of
-    its features, and it remains completely undocumented as far as I can tell. This
-    patch drops it in favour of a simple, explicit gem build task.
-
-diff --git a/p2v/client/Rakefile b/p2v/client/Rakefile
-index d190f08..23c26f5 100644
---- a/p2v/client/Rakefile
-+++ b/p2v/client/Rakefile
-@@ -14,24 +14,10 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--require 'rubygems'
--require 'echoe'
-+require 'rake'
-+require 'rake/gempackagetask'
- 
--Echoe.new("virt-p2v") do |p|
--  p.project     = "Virt P2V"
--  p.version     = `../../Build version`
--  p.author      = "Matthew Booth"
--  p.summary     = "Send a machine's storage and metadata to virt-p2v-server"
--  p.description = <<EOF
--virt-p2v is a client which connects to a virt-p2v-server and transfer's the host
--machine's storage and metadata. virt-p2v is intended to be run from a live
--image, so it is unlikely you want to install it.
--EOF
--  p.url         = "http://libguestfs.org"
--  p.email       = "libguestfs@redhat.com"
--  p.runtime_dependencies = [
--      'gtk2',
--      'gettext',
--      'net-ssh'
--  ]
--end
-+task :default => :gem
-+
-+load 'virt-p2v.gemspec'
-+Rake::GemPackageTask.new(GEMSPEC) {}
-diff --git a/virt-v2v.spec.PL b/virt-v2v.spec.PL
-index 2249b01..6a155e2 100644
---- a/virt-v2v.spec.PL
-+++ b/virt-v2v.spec.PL
-@@ -79,7 +79,6 @@ BuildRequires:  perl-hivex >= 1.2.2
- 
- # virt-p2v build requirements
- BuildRequires:  rubygem(rake)
--BuildRequires:  rubygem(echoe)
- 
- Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
- 

virt-v2v-0.8.1-02-fadb1929.patch

@@ -1,111 +0,0 @@
-commit fadb1929b4a8447a719a34f07e5934badf694f45
-Author: Matthew Booth <mbooth@redhat.com>
-Date:   Wed May 11 16:46:37 2011 +0100
-
-    p2v-client: Add missing gemspec
-    
-    gemspec used to be auto-generated, so was explicitly ignored. It's no longer
-    auto-generated, so we need it.
-
-diff --git a/p2v/client/virt-p2v.gemspec b/p2v/client/virt-p2v.gemspec
-new file mode 100644
-index 0000000..d8edde8
---- /dev/null
-+++ b/p2v/client/virt-p2v.gemspec
-@@ -0,0 +1,96 @@
-+# Copyright (C) 2011 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+V2V_VERSION = `../../Build version`
-+abort "Failed to get version" unless $? == 0
-+
-+GEMSPEC = Gem::Specification.new do |s|
-+    s.name = %q{virt-p2v}
-+    s.version = V2V_VERSION
-+
-+    s.authors = ["Matthew Booth"]
-+    s.date = %q{2011-05-10}
-+    s.summary = %q{Send a machine's storage and metadata to virt-p2v-server}
-+    s.description = %q{
-+        virt-p2v is a client which connects to a virt-p2v-server and transfer's
-+        the host machine's storage and metadata. virt-p2v is intended to be run
-+        from a live image, so it is unlikely you want to install it.
-+    }
-+    s.email = %q{libguestfs@redhat.com}
-+    s.homepage = %q{http://libguestfs.org}
-+
-+    s.default_executable = %q{virt-p2v}
-+    s.executables = ["virt-p2v"]
-+    s.files = [
-+        "Rakefile",
-+        "bin/virt-p2v",
-+        "lib/virt-p2v/blockdevice.rb",
-+        "lib/virt-p2v/connection.rb",
-+        "lib/virt-p2v/converter.rb",
-+        "lib/virt-p2v/gtk-queue.rb",
-+        "lib/virt-p2v/netdevice.rb",
-+        "lib/virt-p2v/ui/connect.rb",
-+        "lib/virt-p2v/ui/convert.rb",
-+        "lib/virt-p2v/ui/main.rb",
-+        "lib/virt-p2v/ui/network.rb",
-+        "lib/virt-p2v/ui/p2v.ui",
-+        "lib/virt-p2v/ui/success.rb",
-+        "virt-p2v.gemspec",
-+        "Manifest"
-+    ]
-+    s.require_paths = ["lib"]
-+
-+    if s.respond_to? :specification_version then
-+        current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-+        s.specification_version = 3
-+
-+        if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-+            s.add_runtime_dependency(%q<gtk2>, [">= 0"])
-+            s.add_runtime_dependency(%q<gettext>, [">= 0"])
-+            s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
-+        else
-+            s.add_dependency(%q<gtk2>, [">= 0"])
-+            s.add_dependency(%q<gettext>, [">= 0"])
-+            s.add_dependency(%q<net-ssh>, [">= 0"])
-+        end
-+    else
-+        s.add_dependency(%q<gtk2>, [">= 0"])
-+        s.add_dependency(%q<gettext>, [">= 0"])
-+        s.add_dependency(%q<net-ssh>, [">= 0"])
-+    end
-+
-+# Source doesn't contain any rdoc
-+#    s.extra_rdoc_files = [
-+#        "bin/virt-p2v",
-+#        "lib/virt-p2v/blockdevice.rb",
-+#        "lib/virt-p2v/connection.rb",
-+#        "lib/virt-p2v/converter.rb",
-+#        "lib/virt-p2v/gtk-queue.rb",
-+#        "lib/virt-p2v/netdevice.rb",
-+#        "lib/virt-p2v/ui/connect.rb",
-+#        "lib/virt-p2v/ui/convert.rb",
-+#        "lib/virt-p2v/ui/main.rb",
-+#        "lib/virt-p2v/ui/network.rb",
-+#        "lib/virt-p2v/ui/p2v.ui",
-+#        "lib/virt-p2v/ui/success.rb"
-+#    ]
-+#    s.rdoc_options = [
-+#        "--line-numbers",
-+#        "--inline-source",
-+#        "--title",
-+#        "Virt-p2v"
-+#    ]
-+end

virt-v2v-0.8.1-03-a965f7e0.patch

@@ -1,57 +0,0 @@
-commit a965f7e0609acc6107ffbbf70054776ee3c81918
-Author: Matthew Booth <mbooth@redhat.com>
-Date:   Thu May 12 10:07:06 2011 +0100
-
-    p2v-client: Build rdoc with options
-    
-    Use rdoc options taken from gemspec generated by echoe.
-
-diff --git a/p2v/client/virt-p2v.gemspec b/p2v/client/virt-p2v.gemspec
-index d8edde8..610c2a3 100644
---- a/p2v/client/virt-p2v.gemspec
-+++ b/p2v/client/virt-p2v.gemspec
-@@ -72,25 +72,23 @@ GEMSPEC = Gem::Specification.new do |s|
-         s.add_dependency(%q<net-ssh>, [">= 0"])
-     end
- 
--# Source doesn't contain any rdoc
--#    s.extra_rdoc_files = [
--#        "bin/virt-p2v",
--#        "lib/virt-p2v/blockdevice.rb",
--#        "lib/virt-p2v/connection.rb",
--#        "lib/virt-p2v/converter.rb",
--#        "lib/virt-p2v/gtk-queue.rb",
--#        "lib/virt-p2v/netdevice.rb",
--#        "lib/virt-p2v/ui/connect.rb",
--#        "lib/virt-p2v/ui/convert.rb",
--#        "lib/virt-p2v/ui/main.rb",
--#        "lib/virt-p2v/ui/network.rb",
--#        "lib/virt-p2v/ui/p2v.ui",
--#        "lib/virt-p2v/ui/success.rb"
--#    ]
--#    s.rdoc_options = [
--#        "--line-numbers",
--#        "--inline-source",
--#        "--title",
--#        "Virt-p2v"
--#    ]
-+    s.extra_rdoc_files = [
-+        "bin/virt-p2v",
-+        "lib/virt-p2v/blockdevice.rb",
-+        "lib/virt-p2v/connection.rb",
-+        "lib/virt-p2v/converter.rb",
-+        "lib/virt-p2v/gtk-queue.rb",
-+        "lib/virt-p2v/netdevice.rb",
-+        "lib/virt-p2v/ui/connect.rb",
-+        "lib/virt-p2v/ui/convert.rb",
-+        "lib/virt-p2v/ui/main.rb",
-+        "lib/virt-p2v/ui/network.rb",
-+        "lib/virt-p2v/ui/p2v.ui",
-+        "lib/virt-p2v/ui/success.rb"
-+    ]
-+    s.rdoc_options = [
-+        "--line-numbers",
-+        "--inline-source",
-+        "--title", "virt-p2v"
-+    ]
- end

virt-v2v-0.8.1-04-77bd7908.patch

@@ -1,29 +0,0 @@
-commit 77bd79083879c7bca15c00d96c570da6faa16839
-Author: Matthew Booth <mbooth@redhat.com>
-Date:   Tue May 17 10:00:34 2011 +0100
-
-    p2v-server: Fix YAML error parsing metadata
-    
-    The YAML perl module will produce a parse error when receiving metadata YAML
-    produced by virt-p2v. YAML::Tiny and YAML::Syck both parse it fine.
-    Unfortunately, YAML::Any is only provided by the YAML module, so it will always
-    be installed on Fedora, and will always break. We therefore need to pick one of
-    the others explicitly. I picked YAML::Tiny as it has fewer dependencies.
-
-diff --git a/p2v/server/virt-p2v-server.pl b/p2v/server/virt-p2v-server.pl
-index d062d9d..2dfae24 100755
---- a/p2v/server/virt-p2v-server.pl
-+++ b/p2v/server/virt-p2v-server.pl
-@@ -20,7 +20,11 @@ use warnings;
- use strict;
- 
- use IO::Handle;
--use YAML::Any;
-+
-+# The YAML module doesn't support YAML generated by Ruby. YAML::Tiny and
-+# YAML::Syck are both fine. We can't use YAML::Any here because that breaks by
-+# default.
-+use YAML::Tiny;
- 
- use Locale::TextDomain 'virt-v2v';
-