From 98b7fd73414982d8ad7c94dfa0b4b875230b1fd7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 5 Nov 2019 14:39:58 -0500
Subject: [PATCH] import libguestfs-1.38.4-14.module+el8.1.0+4066+0f1aadab

---
 .gitignore                                    |  2 +-
 .libguestfs.metadata                          |  2 +-
 SOURCES/0060-inspect-fix-icon-of-RHEL.patch   | 32 ++++++++
 ...ction-of-partition-less-devices-RHB.patch} |  2 +-
 ...documentation-on-nbdkit-RHBZ-1605242.patch | 55 ++++++++++++++
 ...-Use-proper-label-for-nbdkit-sockets.patch | 63 +++++++++++++++
 ...p-T-option-if-available-to-unbreak-s.patch | 49 ++++++++++++
 ...-Remove-libguestfs-live-RHBZ-798980.patch} |  2 +-
 ...emove-9p-APIs-from-RHEL-RHBZ-921710.patch} |  2 +-
 ...supported-remote-drive-protocols-RH.patch} |  2 +-
 ...Remove-User-Mode-Linux-RHBZ-1144197.patch} |  2 +-
 ...-correct-qemu-binary-for-o-qemu-mod.patch} |  2 +-
 ...e-the-qemu-boot-option-RHBZ-1147313.patch} |  4 +-
 ...L-8-Disable-alternate-Augeas-lenses.patch} |  2 +-
 ...f-supported-sound-cards-to-match-RH.patch} |  2 +-
 ...-of-libguestfs-winsupport-features-.patch} |  2 +-
 ...Fix-tests-for-libguestfs-winsupport.patch} |  2 +-
 ...-Add-a-support-matrix-to-the-manual.patch} |  4 +-
 ...ble-daemon-tests-that-require-the-u.patch} |  2 +-
 ...isable-the-virt-v2v-in-place-option.patch} |  8 +-
 ...k-force-VNC-as-display-RHBZ-1372671.patch} |  2 +-
 ...-mention-SUSE-Xen-hosts-RHBZ-143020.patch} |  6 +-
 ...e-unconfig-of-manually-installed-VM.patch} |  2 +-
 ...load-Remove-restriction-on-oa-spars.patch} |  8 +-
 ...nore-rhv-upload-driver-RHBZ-1590220.patch} |  2 +-
 ...RHEL-8-use-python3-as-nbdkit-plugin.patch} |  4 +-
 ... => 0084-RHEL-8-use-platform-python.patch} |  4 +-
 SPECS/libguestfs.spec                         | 76 ++++++++++++-------
 28 files changed, 281 insertions(+), 64 deletions(-)
 create mode 100644 SOURCES/0060-inspect-fix-icon-of-RHEL.patch
 rename SOURCES/{0060-inspect-fix-inspection-of-partition-less-devices-RHB.patch => 0061-inspect-fix-inspection-of-partition-less-devices-RHB.patch} (96%)
 create mode 100644 SOURCES/0062-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
 create mode 100644 SOURCES/0063-Use-proper-label-for-nbdkit-sockets.patch
 create mode 100644 SOURCES/0064-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
 rename SOURCES/{0061-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch => 0065-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch} (93%)
 rename SOURCES/{0062-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch => 0066-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch} (99%)
 rename SOURCES/{0063-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch => 0067-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch} (99%)
 rename SOURCES/{0064-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch => 0068-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch} (96%)
 rename SOURCES/{0065-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch => 0069-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch} (94%)
 rename SOURCES/{0066-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch => 0070-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch} (96%)
 rename SOURCES/{0067-RHEL-8-Disable-alternate-Augeas-lenses.patch => 0071-RHEL-8-Disable-alternate-Augeas-lenses.patch} (96%)
 rename SOURCES/{0068-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch => 0072-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch} (92%)
 rename SOURCES/{0069-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch => 0073-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch} (95%)
 rename SOURCES/{0070-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch => 0074-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch} (97%)
 rename SOURCES/{0071-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch => 0075-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch} (96%)
 rename SOURCES/{0072-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch => 0076-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch} (90%)
 rename SOURCES/{0073-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch => 0077-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch} (98%)
 rename SOURCES/{0074-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch => 0078-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch} (93%)
 rename SOURCES/{0075-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch => 0079-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch} (83%)
 rename SOURCES/{0076-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch => 0080-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch} (94%)
 rename SOURCES/{0077-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch => 0081-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch} (93%)
 rename SOURCES/{0078-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch => 0082-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch} (94%)
 rename SOURCES/{0079-RHEL-8-use-python3-as-nbdkit-plugin.patch => 0083-RHEL-8-use-python3-as-nbdkit-plugin.patch} (88%)
 rename SOURCES/{0080-RHEL-8-use-platform-python.patch => 0084-RHEL-8-use-platform-python.patch} (92%)

diff --git a/.gitignore b/.gitignore
index cc30818..2a668bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/RHEV-Application-Provisioning-Tool.exe_4.42
+SOURCES/RHEV-Application-Provisioning-Tool.exe_4.43-3
 SOURCES/libguestfs-1.38.4.tar.gz
 SOURCES/libguestfs.keyring
 SOURCES/rhsrvany.exe
diff --git a/.libguestfs.metadata b/.libguestfs.metadata
index df79589..2cd3223 100644
--- a/.libguestfs.metadata
+++ b/.libguestfs.metadata
@@ -1,4 +1,4 @@
-c44dcbd8c9b390e151c16821ff093e4dc408be66 SOURCES/RHEV-Application-Provisioning-Tool.exe_4.42
+ac8722917cc31c36836e241bd7a4beb5f8a8b0c8 SOURCES/RHEV-Application-Provisioning-Tool.exe_4.43-3
 15c8f487ee163374cb7be9436fb1bb697cef7d9e SOURCES/libguestfs-1.38.4.tar.gz
 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
 2bd96e478fc004cd323b5bd754c856641877dac6 SOURCES/rhsrvany.exe
diff --git a/SOURCES/0060-inspect-fix-icon-of-RHEL.patch b/SOURCES/0060-inspect-fix-icon-of-RHEL.patch
new file mode 100644
index 0000000..dec3e9d
--- /dev/null
+++ b/SOURCES/0060-inspect-fix-icon-of-RHEL.patch
@@ -0,0 +1,32 @@
+From 31af609ecc65424bb3671c6873005f31fd1b80d4 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <ptoscano@redhat.com>
+Date: Mon, 11 Feb 2019 19:28:00 +0100
+Subject: [PATCH] inspect: fix icon of RHEL
+
+Use a better icon for RHEL guests, still provided by redhat-logos (or
+equivalent in downstream distributions), and which fits a better
+definition of logo for the distribution.
+
+Thanks to Ray Strode for the hints.
+
+(cherry picked from commit c648052690a4a07a59c741308e0e8497d6f18057)
+---
+ lib/inspect-icon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c
+index 0edd3d1b0..443dc6dd3 100644
+--- a/lib/inspect-icon.c
++++ b/lib/inspect-icon.c
+@@ -301,7 +301,7 @@ icon_rhel (guestfs_h *g, int major, size_t *size_r)
+   if (major < 7)
+     shadowman = "/usr/share/pixmaps/redhat/shadowman-transparent.png";
+   else
+-    shadowman = "/usr/share/pixmaps/fedora-logo-sprite.png";
++    shadowman = "/usr/share/icons/hicolor/96x96/apps/system-logo-icon.png";
+ 
+   return get_png (g, shadowman, size_r, 102400);
+ }
+-- 
+2.21.0
+
diff --git a/SOURCES/0060-inspect-fix-inspection-of-partition-less-devices-RHB.patch b/SOURCES/0061-inspect-fix-inspection-of-partition-less-devices-RHB.patch
similarity index 96%
rename from SOURCES/0060-inspect-fix-inspection-of-partition-less-devices-RHB.patch
rename to SOURCES/0061-inspect-fix-inspection-of-partition-less-devices-RHB.patch
index 88486aa..57e7aef 100644
--- a/SOURCES/0060-inspect-fix-inspection-of-partition-less-devices-RHB.patch
+++ b/SOURCES/0061-inspect-fix-inspection-of-partition-less-devices-RHB.patch
@@ -1,4 +1,4 @@
-From 02d16cdeada455e692a972b34cd86e18a6081c05 Mon Sep 17 00:00:00 2001
+From 751afe91e07286effcc9af81c5d29b19cfa278ec Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Mon, 14 Jan 2019 17:07:45 +0100
 Subject: [PATCH] inspect: fix inspection of partition-less devices
diff --git a/SOURCES/0062-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch b/SOURCES/0062-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
new file mode 100644
index 0000000..2147188
--- /dev/null
+++ b/SOURCES/0062-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
@@ -0,0 +1,55 @@
+From 6ea20c9a03cb9ecadd60a1197499a4eaa4593416 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <ptoscano@redhat.com>
+Date: Fri, 12 Apr 2019 16:19:43 +0200
+Subject: [PATCH] v2v: update documentation on nbdkit (RHBZ#1605242)
+
+nbdkit >= 1.6 ships a VDDK plugin always built, so recommend that
+version instead of recommending to build nbdkit from sources.
+
+(cherry picked from commit 0704d8eb0bcc8139886eb4291f75a3ca49a91e58)
+---
+ v2v/virt-v2v.pod | 28 ++--------------------------
+ 1 file changed, 2 insertions(+), 26 deletions(-)
+
+diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
+index f4d200e3d..74536a2a6 100644
+--- a/v2v/virt-v2v.pod
++++ b/v2v/virt-v2v.pod
+@@ -1657,32 +1657,8 @@ library is permitted by the license.
+ 
+ =item 2.
+ 
+-You must also compile nbdkit, enabling the VDDK plugin.  nbdkit E<ge>
+-1.1.25 is recommended, but it is usually best to compile from the git
+-tree.
+-
+-=over 4
+-
+-=item *
+-
+-L<https://github.com/libguestfs/nbdkit>
+-
+-=item *
+-
+-L<https://github.com/libguestfs/nbdkit/tree/master/plugins/vddk>
+-
+-=back
+-
+-Compile nbdkit as described in the sources (see link above).
+-
+-You do B<not> need to run C<make install> because you can run nbdkit
+-from its source directory.  The source directory has a shell script
+-called F<nbdkit> which runs the locally built copy of nbdkit and its
+-plugins.  So set C<$PATH> to point to the nbdkit top build directory
+-(that is, the directory containing the shell script called F<nbdkit>),
+-eg:
+-
+- export PATH=/path/to/nbdkit-1.1.x:$PATH
++nbdkit E<ge> 1.6 is recommended, as it ships with the VDDK plugin
++enabled unconditionally.
+ 
+ =item 3.
+ 
+-- 
+2.21.0
+
diff --git a/SOURCES/0063-Use-proper-label-for-nbdkit-sockets.patch b/SOURCES/0063-Use-proper-label-for-nbdkit-sockets.patch
new file mode 100644
index 0000000..7dea3ce
--- /dev/null
+++ b/SOURCES/0063-Use-proper-label-for-nbdkit-sockets.patch
@@ -0,0 +1,63 @@
+From c7942097bff8cbbfbee34e1750223c308f32f8a4 Mon Sep 17 00:00:00 2001
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Mon, 27 May 2019 13:30:05 +0200
+Subject: [PATCH] Use proper label for nbdkit sockets
+
+While svirt_t can be used for sockets it does not always guarantee that it will
+be accessible from a virtual machine.  The VM might be running under svirt_tcg_t
+context which will need a svirt_tcg_t label on the socket in order to access it.
+
+There is, however, another label, svirt_socket_t, which is accessible from
+virt_domain:
+
+  # sesearch -A -s svirt_t -c unix_stream_socket -p connectto
+  ...
+  allow virt_domain svirt_socket_t:unix_stream_socket { ... connectto ... };
+  ...
+
+And virt_domain is a type attribute of both svirt_t and svirt_tcg_t:
+
+  # seinfo -x -a virt_domain
+  Type Attributes: 1
+     attribute virt_domain;
+          svirt_t
+          svirt_tcg_t
+
+Resolves: https://bugzilla.redhat.com/1698437
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit c2918b8b74506523a723b804d452816a059c5e50)
+---
+ v2v/input_libvirt_vddk.ml | 2 +-
+ v2v/output_rhv_upload.ml  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/v2v/input_libvirt_vddk.ml b/v2v/input_libvirt_vddk.ml
+index 0b3ed7af9..5e8e60bd2 100644
+--- a/v2v/input_libvirt_vddk.ml
++++ b/v2v/input_libvirt_vddk.ml
+@@ -292,7 +292,7 @@ object
+       add_arg "--newstyle";         (* use newstyle NBD protocol *)
+       add_arg "--exportname"; add_arg "/";
+       if have_selinux then (        (* label the socket so qemu can open it *)
+-        add_arg "--selinux-label"; add_arg "system_u:object_r:svirt_t:s0"
++        add_arg "--selinux-label"; add_arg "system_u:object_r:svirt_socket_t:s0"
+       );
+ 
+       (* Name of the plugin.  Everything following is a plugin parameter. *)
+diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
+index 79a2fc8fd..fc33e5033 100644
+--- a/v2v/output_rhv_upload.ml
++++ b/v2v/output_rhv_upload.ml
+@@ -230,7 +230,7 @@ See also \"OUTPUT TO RHV\" in the virt-v2v(1) manual.")
+     let args =
+       (* label the socket so qemu can open it *)
+       if have_selinux then
+-        args @ ["--selinux-label"; "system_u:object_r:svirt_t:s0"]
++        args @ ["--selinux-label"; "system_u:object_r:svirt_socket_t:s0"]
+       else args in
+     args in
+ 
+-- 
+2.21.0
+
diff --git a/SOURCES/0064-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch b/SOURCES/0064-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
new file mode 100644
index 0000000..cc158d0
--- /dev/null
+++ b/SOURCES/0064-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
@@ -0,0 +1,49 @@
+From 06e5cfb90bc63f1d6c56821f0745c6fa8d3f8259 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 25 Jul 2019 14:52:42 +0100
+Subject: [PATCH] v2v: -i vmx: Use scp -T option if available to unbreak scp
+ (RHBZ#1733168).
+
+Tested using:
+
+cd v2v
+LIBGUESTFS_BACKEND=direct ../run virt-v2v -i vmx -it ssh "ssh://localhost/$PWD/test-v2v-i-vmx-1.vmx" -o null -v -x
+
+and manually examining the debug output.
+
+Thanks: Ming Xie, Jakub Jelen.
+(cherry picked from commit 7692c31494f7b1d37e380eed9eb99c5952940dbf)
+---
+ v2v/input_vmx.ml | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml
+index f79e89139..695266313 100644
+--- a/v2v/input_vmx.ml
++++ b/v2v/input_vmx.ml
+@@ -61,6 +61,11 @@ let server_of_uri { Xml.uri_server } =
+ let path_of_uri { Xml.uri_path } =
+   match uri_path with None -> assert false | Some p -> p
+ 
++let scp_supports_T_option = lazy (
++  let cmd = "LANG=C scp -T |& grep \"unknown option\"" in
++  shell_command cmd <> 0
++)
++
+ (* 'scp' a remote file into a temporary local file, returning the path
+  * of the temporary local file.
+  *)
+@@ -68,8 +73,9 @@ let scp_from_remote_to_temporary uri tmpdir filename =
+   let localfile = tmpdir // filename in
+ 
+   let cmd =
+-    sprintf "scp%s%s %s%s:%s %s"
++    sprintf "scp%s%s%s %s%s:%s %s"
+             (if verbose () then "" else " -q")
++            (if Lazy.force scp_supports_T_option then " -T" else "")
+             (match port_of_uri uri with
+              | None -> ""
+              | Some port -> sprintf " -P %d" port)
+-- 
+2.21.0
+
diff --git a/SOURCES/0061-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch b/SOURCES/0065-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
similarity index 93%
rename from SOURCES/0061-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
rename to SOURCES/0065-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
index 29c9352..72e3cfd 100644
--- a/SOURCES/0061-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
+++ b/SOURCES/0065-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
@@ -1,4 +1,4 @@
-From ba47c0afc593c329189d9064e718ca81e7d6ef49 Mon Sep 17 00:00:00 2001
+From 23dcb04f1c8365df1a8ed7c0dd25081169f41571 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 21 Dec 2012 15:50:11 +0000
 Subject: [PATCH] RHEL 8: Remove libguestfs live (RHBZ#798980).
diff --git a/SOURCES/0062-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch b/SOURCES/0066-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
similarity index 99%
rename from SOURCES/0062-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
rename to SOURCES/0066-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
index 45b3132..25cdf4b 100644
--- a/SOURCES/0062-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
+++ b/SOURCES/0066-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
@@ -1,4 +1,4 @@
-From 51b21bfa82b78690f1bf8836d182e51c20ba7af4 Mon Sep 17 00:00:00 2001
+From 192ac41979f7b7b1f029843a7915cf40b0535e5f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 18 Jul 2013 18:31:53 +0100
 Subject: [PATCH] RHEL 8: Remove 9p APIs from RHEL (RHBZ#921710).
diff --git a/SOURCES/0063-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch b/SOURCES/0067-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
similarity index 99%
rename from SOURCES/0063-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
rename to SOURCES/0067-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
index eab7488..ddf1ce3 100644
--- a/SOURCES/0063-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
+++ b/SOURCES/0067-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
@@ -1,4 +1,4 @@
-From f60a4cc89c5c06360b0bc5ebc6fab10b5ef24077 Mon Sep 17 00:00:00 2001
+From 2555618f32772df00f3ceb4a780d6c13f7b3d93c Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 29 Jul 2013 14:47:56 +0100
 Subject: [PATCH] RHEL 8: Disable unsupported remote drive protocols
diff --git a/SOURCES/0064-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch b/SOURCES/0068-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
similarity index 96%
rename from SOURCES/0064-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
rename to SOURCES/0068-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
index 88a3d19..1f202aa 100644
--- a/SOURCES/0064-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
+++ b/SOURCES/0068-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
@@ -1,4 +1,4 @@
-From a981faec152d26fc98e6a6ed9bf0a338b7dda934 Mon Sep 17 00:00:00 2001
+From 8d63a3e4116dfe165b7d68086195b5ed2be5cd14 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 19 Sep 2014 13:38:20 +0100
 Subject: [PATCH] RHEL 8: Remove User-Mode Linux (RHBZ#1144197).
diff --git a/SOURCES/0065-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch b/SOURCES/0069-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
similarity index 94%
rename from SOURCES/0065-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
rename to SOURCES/0069-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
index e20dfad..a565f6d 100644
--- a/SOURCES/0065-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
+++ b/SOURCES/0069-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
@@ -1,4 +1,4 @@
-From f0c89d705d1fe68b456ddadb5da10437c69f16ca Mon Sep 17 00:00:00 2001
+From 21ef3ee84af1b42d19659033132b2c22f7c611e4 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 8: v2v: Select correct qemu binary for -o qemu mode
diff --git a/SOURCES/0066-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch b/SOURCES/0070-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
similarity index 96%
rename from SOURCES/0066-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
rename to SOURCES/0070-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
index 4535cc8..6e23ee1 100644
--- a/SOURCES/0066-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
+++ b/SOURCES/0070-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
@@ -1,4 +1,4 @@
-From adb584859d0f894b6e228b124ac6678f15b5a6b7 Mon Sep 17 00:00:00 2001
+From 1219acf26ca0805cabe43c1841e4d4a82095f60d 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 8: v2v: Disable the --qemu-boot option (RHBZ#1147313).
@@ -35,7 +35,7 @@ index 97d4f4377..6bca12ce3 100644
        output_format, output_alloc
  
 diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
-index f4d200e3d..a5b1c218a 100644
+index 74536a2a6..30ed059e7 100644
 --- a/v2v/virt-v2v.pod
 +++ b/v2v/virt-v2v.pod
 @@ -115,11 +115,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
diff --git a/SOURCES/0067-RHEL-8-Disable-alternate-Augeas-lenses.patch b/SOURCES/0071-RHEL-8-Disable-alternate-Augeas-lenses.patch
similarity index 96%
rename from SOURCES/0067-RHEL-8-Disable-alternate-Augeas-lenses.patch
rename to SOURCES/0071-RHEL-8-Disable-alternate-Augeas-lenses.patch
index 2ff40d8..42955fb 100644
--- a/SOURCES/0067-RHEL-8-Disable-alternate-Augeas-lenses.patch
+++ b/SOURCES/0071-RHEL-8-Disable-alternate-Augeas-lenses.patch
@@ -1,4 +1,4 @@
-From 45879864c06bc7e293302d1025a6cdc92af654ca Mon Sep 17 00:00:00 2001
+From 36cf9904d4a5f2662cb5ffcca732fc2b57450aba Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Fri, 24 Oct 2014 16:33:50 +0100
 Subject: [PATCH] RHEL 8: Disable alternate Augeas lenses.
diff --git a/SOURCES/0068-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch b/SOURCES/0072-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
similarity index 92%
rename from SOURCES/0068-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
rename to SOURCES/0072-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
index f5b721a..32f01aa 100644
--- a/SOURCES/0068-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
+++ b/SOURCES/0072-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
@@ -1,4 +1,4 @@
-From d7263adc656e8a23a9707984ae0fcc6761ef3ca0 Mon Sep 17 00:00:00 2001
+From 61ef6194eeb687b4fbfa73e6392091aaf2404241 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 8: Fix list of supported sound cards to match RHEL qemu
diff --git a/SOURCES/0069-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch b/SOURCES/0073-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
similarity index 95%
rename from SOURCES/0069-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
rename to SOURCES/0073-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
index f858fb3..dbc31fe 100644
--- a/SOURCES/0069-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
+++ b/SOURCES/0073-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
@@ -1,4 +1,4 @@
-From 75c3b624fd9d86906363ae5a433458ce6e853a83 Mon Sep 17 00:00:00 2001
+From 6ddcb894bc275079d1fb25554d91ca9f4b921406 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 7 Jul 2015 09:28:03 -0400
 Subject: [PATCH] RHEL 8: Reject use of libguestfs-winsupport features except
diff --git a/SOURCES/0070-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch b/SOURCES/0074-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
similarity index 97%
rename from SOURCES/0070-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
rename to SOURCES/0074-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
index ce0a201..6cf822e 100644
--- a/SOURCES/0070-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
+++ b/SOURCES/0074-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
@@ -1,4 +1,4 @@
-From 056a6a9d07619008622d4d0bd0594654b6c02e70 Mon Sep 17 00:00:00 2001
+From 57bbc9d79d21c23becc9391b46944e8a992bd6ec 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 8: Fix tests for libguestfs-winsupport.
diff --git a/SOURCES/0071-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch b/SOURCES/0075-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
similarity index 96%
rename from SOURCES/0071-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
rename to SOURCES/0075-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
index 43a96c0..f7d74e0 100644
--- a/SOURCES/0071-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
+++ b/SOURCES/0075-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
@@ -1,4 +1,4 @@
-From 97261c9b087afa7bc9b48a6bfd132fcf98f7897a Mon Sep 17 00:00:00 2001
+From b0399c4e709f9d94e796bbeda90d27e3ed0dc43d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 21 Sep 2015 15:49:17 +0100
 Subject: [PATCH] RHEL 8: Revert "v2v: Add a support matrix to the manual
@@ -10,7 +10,7 @@ This reverts commit a03bffa15a5357d5d0244595caf99607be1ec3ab.
  1 file changed, 100 deletions(-)
 
 diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
-index a5b1c218a..86046f891 100644
+index 30ed059e7..276fcea85 100644
 --- a/v2v/virt-v2v.pod
 +++ b/v2v/virt-v2v.pod
 @@ -167,106 +167,6 @@ only used when virt-v2v runs under VDSM control.
diff --git a/SOURCES/0072-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch b/SOURCES/0076-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
similarity index 90%
rename from SOURCES/0072-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
rename to SOURCES/0076-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
index 0815890..e53fe10 100644
--- a/SOURCES/0072-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
+++ b/SOURCES/0076-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
@@ -1,4 +1,4 @@
-From e9ba6411d8a2535db43f59e32cd4dd61acdadd6a Mon Sep 17 00:00:00 2001
+From 6918c7618f6e1b48704e7aa6f6b05ed8b926d589 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 21 Sep 2015 13:12:43 -0400
 Subject: [PATCH] RHEL 8: tests: Disable daemon tests that require the 'unix'
diff --git a/SOURCES/0073-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch b/SOURCES/0077-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
similarity index 98%
rename from SOURCES/0073-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
rename to SOURCES/0077-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
index 8ce1832..47f9e5e 100644
--- a/SOURCES/0073-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
+++ b/SOURCES/0077-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
@@ -1,4 +1,4 @@
-From e62ba81a68c66cbe15f182c9baa3667c5646e348 Mon Sep 17 00:00:00 2001
+From 690b8d0d2bcd7dc1b5f3c37a3133e89bae97863e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Jan 2016 11:53:42 -0500
 Subject: [PATCH] RHEL 8: v2v: Disable the virt-v2v --in-place option.
@@ -195,7 +195,7 @@ index 6f7d78f39..000000000
 -# Clean up.
 -rm -r $d
 diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
-index 86046f891..e095a6f82 100644
+index 276fcea85..e60011fac 100644
 --- a/v2v/virt-v2v.pod
 +++ b/v2v/virt-v2v.pod
 @@ -18,8 +18,6 @@ virt-v2v - Convert a guest to use KVM
@@ -238,7 +238,7 @@ index 86046f891..e095a6f82 100644
  =item B<-io> OPTION=VALUE
  
  Set input option(s) related to the current input mode or transport.
-@@ -2160,7 +2141,7 @@ Minimum free space: 10 MB
+@@ -2136,7 +2117,7 @@ Minimum free space: 10 MB
  =head2 Minimum free space check in the host
  
  You must have sufficient free space in the host directory used to
@@ -247,7 +247,7 @@ index 86046f891..e095a6f82 100644
  which directory this is, use:
  
   $ df -h "`guestfish get-cachedir`"
-@@ -2292,31 +2273,6 @@ that instead.
+@@ -2268,31 +2249,6 @@ that instead.
     </devices>
   </domain>
  
diff --git a/SOURCES/0074-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/SOURCES/0078-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
similarity index 93%
rename from SOURCES/0074-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
rename to SOURCES/0078-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
index 45f3171..9a5edc2 100644
--- a/SOURCES/0074-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+++ b/SOURCES/0078-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
@@ -1,4 +1,4 @@
-From 97a0e8b9a0e9da9c10f739e3234cb2442011dff3 Mon Sep 17 00:00:00 2001
+From 86447cac9a58c0a6499fff76d45dd56423979bbe 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 8: v2v: -i disk: force VNC as display (RHBZ#1372671)
diff --git a/SOURCES/0075-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch b/SOURCES/0079-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
similarity index 83%
rename from SOURCES/0075-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
rename to SOURCES/0079-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
index 3bd38d7..1a56601 100644
--- a/SOURCES/0075-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
+++ b/SOURCES/0079-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
@@ -1,4 +1,4 @@
-From 8ac67cd2284a3ec92429aea7688a0467d6cffc3b Mon Sep 17 00:00:00 2001
+From 91c7b5c4042b07fb4e35669dec6d445252c8c9f6 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH] RHEL 8: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)
@@ -9,10 +9,10 @@ They are not supported in RHEL 8.
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
-index e095a6f82..8e3a06434 100644
+index e60011fac..9f93c00ee 100644
 --- a/v2v/virt-v2v.pod
 +++ b/v2v/virt-v2v.pod
-@@ -1639,8 +1639,7 @@ verbose messages.
+@@ -1615,8 +1615,7 @@ verbose messages.
  
  =head1 INPUT FROM XEN
  
diff --git a/SOURCES/0076-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch b/SOURCES/0080-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
similarity index 94%
rename from SOURCES/0076-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
rename to SOURCES/0080-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
index 288ed40..b2e5e81 100644
--- a/SOURCES/0076-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
+++ b/SOURCES/0080-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
@@ -1,4 +1,4 @@
-From aabd2d506e60d0b7bb69fb7582ae1b4ecb8f19e6 Mon Sep 17 00:00:00 2001
+From c7c2cc23088861d032a59d4886973eab78958962 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Mon, 14 Aug 2017 10:02:13 +0200
 Subject: [PATCH] RHEL 8: v2v: disable unconfig of manually installed VMware
diff --git a/SOURCES/0077-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch b/SOURCES/0081-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
similarity index 93%
rename from SOURCES/0077-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
rename to SOURCES/0081-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
index ff6f1d3..ee1e626 100644
--- a/SOURCES/0077-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
+++ b/SOURCES/0081-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
@@ -1,4 +1,4 @@
-From 8f6c76fcf64ee5adcdce7ea3808c0d776079f228 Mon Sep 17 00:00:00 2001
+From a609448f0401c82b306c44fb015893a7d4a6be27 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 14 May 2018 10:16:58 +0100
 Subject: [PATCH] RHEL 8: v2v: rhv-upload: Remove restriction on -oa sparse.
@@ -12,7 +12,7 @@ and the v2v-devel private thread "Do we already support migration using FC?"
  3 files changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
-index 79a2fc8fd..59911f32c 100644
+index fc33e5033..3977c0296 100644
 --- a/v2v/output_rhv_upload.ml
 +++ b/v2v/output_rhv_upload.ml
 @@ -177,19 +177,11 @@ See also \"OUTPUT TO RHV\" in the virt-v2v(1) manual.")
@@ -61,10 +61,10 @@ index 4fad27fb8..41cb29992 100644
                  types.StorageDomain(
                      name = params['output_storage'],
 diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
-index 8e3a06434..944b0fade 100644
+index 9f93c00ee..2603d38a7 100644
 --- a/v2v/virt-v2v.pod
 +++ b/v2v/virt-v2v.pod
-@@ -1846,12 +1846,6 @@ username is not specified then virt-v2v defaults to using
+@@ -1822,12 +1822,6 @@ username is not specified then virt-v2v defaults to using
  C<admin@internal> which is the typical superuser account for oVirt
  instances.
  
diff --git a/SOURCES/0078-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch b/SOURCES/0082-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
similarity index 94%
rename from SOURCES/0078-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
rename to SOURCES/0082-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
index 3de5cf5..36c0b8a 100644
--- a/SOURCES/0078-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
+++ b/SOURCES/0082-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
@@ -1,4 +1,4 @@
-From 03a9d67f1c101b883838a8f20f7173d12d6b715e Mon Sep 17 00:00:00 2001
+From 93f372409647c43c0a67b5491c84f262938d517e Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Thu, 19 Jul 2018 13:30:17 +0200
 Subject: [PATCH] RHEL 8: p2v: ignore 'rhv-upload' driver (RHBZ#1590220)
diff --git a/SOURCES/0079-RHEL-8-use-python3-as-nbdkit-plugin.patch b/SOURCES/0083-RHEL-8-use-python3-as-nbdkit-plugin.patch
similarity index 88%
rename from SOURCES/0079-RHEL-8-use-python3-as-nbdkit-plugin.patch
rename to SOURCES/0083-RHEL-8-use-python3-as-nbdkit-plugin.patch
index f79d909..27673b0 100644
--- a/SOURCES/0079-RHEL-8-use-python3-as-nbdkit-plugin.patch
+++ b/SOURCES/0083-RHEL-8-use-python3-as-nbdkit-plugin.patch
@@ -1,4 +1,4 @@
-From 30a1bab00d15a5502b16c018a7bbba26ff983c81 Mon Sep 17 00:00:00 2001
+From 4cab81b3b3d69d618c7e36d9767b49834fa63b98 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Sun, 16 Dec 2018 16:32:46 +0100
 Subject: [PATCH] RHEL 8: use "python3" as nbdkit plugin
@@ -9,7 +9,7 @@ RHEL uses "python3" as name for the nbdkit Python plugin.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
-index 59911f32c..1c102dc24 100644
+index 3977c0296..13c175f2d 100644
 --- a/v2v/output_rhv_upload.ml
 +++ b/v2v/output_rhv_upload.ml
 @@ -79,7 +79,7 @@ let parse_output_options options =
diff --git a/SOURCES/0080-RHEL-8-use-platform-python.patch b/SOURCES/0084-RHEL-8-use-platform-python.patch
similarity index 92%
rename from SOURCES/0080-RHEL-8-use-platform-python.patch
rename to SOURCES/0084-RHEL-8-use-platform-python.patch
index f382590..1f43058 100644
--- a/SOURCES/0080-RHEL-8-use-platform-python.patch
+++ b/SOURCES/0084-RHEL-8-use-platform-python.patch
@@ -1,4 +1,4 @@
-From 28677fd0f1eeb7d2ace15375cadfe8cc53c35ac9 Mon Sep 17 00:00:00 2001
+From 04e1cfaae9deaf43774fcdbe6ef57aeba332ba81 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Sun, 16 Dec 2018 16:42:46 +0100
 Subject: [PATCH] RHEL 8: use platform-python
@@ -10,7 +10,7 @@ some arbitrary version installed by the user.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
-index 1c102dc24..4e1362d98 100644
+index 13c175f2d..f95ac0d65 100644
 --- a/v2v/output_rhv_upload.ml
 +++ b/v2v/output_rhv_upload.ml
 @@ -78,7 +78,7 @@ let parse_output_options options =
diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec
index 0b2d8a1..8a230f0 100644
--- a/SPECS/libguestfs.spec
+++ b/SPECS/libguestfs.spec
@@ -37,7 +37,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.38.4
-Release:       11.1%{?dist}
+Release:       14%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
@@ -114,27 +114,31 @@ Patch0056:     0056-v2v-further-doc-update-for-VMware-roles.patch
 Patch0057:     0057-python-fix-call-of-Python-handlers-of-events.patch
 Patch0058:     0058-python-change-types-for-RBufferOut-FBuffer-with-Pyth.patch
 Patch0059:     0059-Revert-launch-libvirt-Use-qemu-bridge-helper-to-impl.patch
-Patch0060:     0060-inspect-fix-inspection-of-partition-less-devices-RHB.patch
-Patch0061:     0061-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
-Patch0062:     0062-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
-Patch0063:     0063-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
-Patch0064:     0064-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
-Patch0065:     0065-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
-Patch0066:     0066-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
-Patch0067:     0067-RHEL-8-Disable-alternate-Augeas-lenses.patch
-Patch0068:     0068-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
-Patch0069:     0069-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
-Patch0070:     0070-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
-Patch0071:     0071-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
-Patch0072:     0072-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
-Patch0073:     0073-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
-Patch0074:     0074-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
-Patch0075:     0075-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
-Patch0076:     0076-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
-Patch0077:     0077-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
-Patch0078:     0078-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
-Patch0079:     0079-RHEL-8-use-python3-as-nbdkit-plugin.patch
-Patch0080:     0080-RHEL-8-use-platform-python.patch
+Patch0060:     0060-inspect-fix-icon-of-RHEL.patch
+Patch0061:     0061-inspect-fix-inspection-of-partition-less-devices-RHB.patch
+Patch0062:     0062-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
+Patch0063:     0063-Use-proper-label-for-nbdkit-sockets.patch
+Patch0064:     0064-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
+Patch0065:     0065-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
+Patch0066:     0066-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
+Patch0067:     0067-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
+Patch0068:     0068-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
+Patch0069:     0069-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
+Patch0070:     0070-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
+Patch0071:     0071-RHEL-8-Disable-alternate-Augeas-lenses.patch
+Patch0072:     0072-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
+Patch0073:     0073-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
+Patch0074:     0074-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
+Patch0075:     0075-RHEL-8-Revert-v2v-Add-a-support-matrix-to-the-manual.patch
+Patch0076:     0076-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
+Patch0077:     0077-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
+Patch0078:     0078-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+Patch0079:     0079-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
+Patch0080:     0080-RHEL-8-v2v-disable-unconfig-of-manually-installed-VM.patch
+Patch0081:     0081-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
+Patch0082:     0082-RHEL-8-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch
+Patch0083:     0083-RHEL-8-use-python3-as-nbdkit-plugin.patch
+Patch0084:     0084-RHEL-8-use-platform-python.patch
 
 # Use git for patch management.
 BuildRequires: git
@@ -162,7 +166,7 @@ Source7:       libguestfs.keyring
 # RHEV-APT is taken from the RHEV Tools CD
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1186850
 Source96:      rhsrvany.exe
-Source97:      RHEV-Application-Provisioning-Tool.exe_4.42
+Source97:      RHEV-Application-Provisioning-Tool.exe_4.43-3
 
 Source98:      brew-overrides.sh
 Source99:      copy-patches.sh
@@ -1301,14 +1305,28 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 
 
 %changelog
-* Sun Jun 30 2019 Danilo de Paula <ddepaula@redhat.com>
-- Rebuild all virt packages to fix RHEL's upgrade path
-- Resolves: rhbz#1696354
-  (Ensure modular RPM upgrade path [ZStream Clone] [rhel-8.0.0.z])
+* Thu Aug 08 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.38.4-14
+- v2v: use -T as argument of scp when copying vmx files via ssh
+  resolves: rhbz#1738886
 
-* Wed May 29 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.38.4-10.1
+* Fri Jun 28 2019 Danilo de Paula <ddepaula@redhat.com>
+- Rebuild all virt packages to fix RHEL's upgrade path
+- Resolves: rhbz#1695587
+  (Ensure modular RPM upgrade path)
+
+* Wed Jun 05 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.38.4-12
+- v2v: update nbdkit information in documentation
+  resolves: rhbz#1651115
+- v2v: use proper SELinux label for nbdkit sockets
+  resolves: rhbz#1717088
+
+* Thu Apr 11 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.38.4-11
+- Use a better icon for RHEL 7+ guests
+  resolves: rhbz#1679483
 - Fix inspection of partition-less devices
-  resolves: rhbz#1714747
+  resolves: rhbz#1679966
+- v2v: ship a newer version of rhev-apt.exe
+  resolves: rhbz#1688062
 
 * Wed Jan 23 2019 Pino Toscano <ptoscano@redhat.com> - 1:1.38.4-10
 - Rebase to libguestfs 1.38.4 in RHEL 8.0.