import libguestfs-1.40.2-25.module+el8.3.0+7421+642fe24f

2020-08-19 12:07:53 +00:00 · 2020-08-19 12:07:53 +00:00 · 7793b406bc
parent d78cb0ccaa
commit 7793b406bc
83 changed files with 156 additions and 116 deletions
--- a/SOURCES/0001-common-mlpcre-add-offset-flag-for-PCRE.matches.patch
+++ b/SOURCES/0001-common-mlpcre-add-offset-flag-for-PCRE.matches.patch
@ -122,5 +122,5 @@ index 346019c40..3e5981107 100644
     assert (replace ~global:true re0 "dd" "abcabcaabccca" = "ddcddcddccca");
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0002-v2v-add-Var_expander.patch
+++ b/SOURCES/0002-v2v-add-Var_expander.patch
@ -411,5 +411,5 @@ index 000000000..35b628369
 +  ignore (run_test_tt_main suite);
 +  Printf.fprintf stderr "\n"
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0003-v2v-add-o-json-output-mode.patch
+++ b/SOURCES/0003-v2v-add-o-json-output-mode.patch
@ -781,5 +781,5 @@ index cf9464834..9a555c3be 100644
 For I<-o rhv-upload>, this is the name of the destination Storage
 Domain.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0004-inspect-fix-icon-of-RHEL.patch
+++ b/SOURCES/0004-inspect-fix-icon-of-RHEL.patch
@ -28,5 +28,5 @@ index 623591aa6..19f3f87af 100644
   return get_png (g, shadowman, size_r, 102400);
 }
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0005-v2v-warn-when-the-guest-has-direct-network-interface.patch
+++ b/SOURCES/0005-v2v-warn-when-the-guest-has-direct-network-interface.patch
@ -44,5 +44,5 @@ index d5d78d367..b9970cee8 100644
     s_hypervisor = hypervisor;
     s_name = name; s_orig_name = name;
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0006-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
+++ b/SOURCES/0006-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
@ -51,5 +51,5 @@ index 2b6dbaeec..b3ebda182 100644
 =item 3.
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0007-v2v-linux-do-not-uninstall-open-vm-tools-w-ubuntu-se.patch
+++ b/SOURCES/0007-v2v-linux-do-not-uninstall-open-vm-tools-w-ubuntu-se.patch
@ -53,5 +53,5 @@ index 3d61400b5..b4b2f24c4 100644
     ) inspect.i_apps;
     let libraries = !libraries in
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0008-v2v-linux-canonicalize-module-path-for-arch-detectio.patch
+++ b/SOURCES/0008-v2v-linux-canonicalize-module-path-for-arch-detectio.patch
@ -32,5 +32,5 @@ index 3313aabc7..889ec2f2a 100644
              (* Just return the module names, without path or extension. *)
              let modules = List.filter_map (
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0009-v2v-linux-improve-arch-detection-from-modules-RHBZ-1.patch
+++ b/SOURCES/0009-v2v-linux-improve-arch-detection-from-modules-RHBZ-1.patch
@ -57,5 +57,5 @@ index 889ec2f2a..30160f0da 100644
              (* Just return the module names, without path or extension. *)
              let modules = List.filter_map (
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0010-Use-proper-label-for-nbdkit-sockets.patch
+++ b/SOURCES/0010-Use-proper-label-for-nbdkit-sockets.patch
@ -59,5 +59,5 @@ index 77c39107e..c2a5c72c7 100644
     args in
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0011-v2v-start-reading-the-new-libvirt-firmware-autoselec.patch
+++ b/SOURCES/0011-v2v-start-reading-the-new-libvirt-firmware-autoselec.patch
@ -41,5 +41,5 @@ index b9970cee8..14cd82afd 100644
     s_video = video;
     s_sound = sound;
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0012-common-mltools-move-the-code-for-machine-readable-up.patch
+++ b/SOURCES/0012-common-mltools-move-the-code-for-machine-readable-up.patch
@ -92,5 +92,5 @@ index 24641369e..5a35708cd 100644
   getopt : Getopt.t;
   ks : key_store;
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0013-common-mltools-make-sure-machine-readable-output-is-.patch
+++ b/SOURCES/0013-common-mltools-make-sure-machine-readable-output-is-.patch
@ -30,5 +30,5 @@ index 5a35708cd..ade4cb37f 100644
     Some { pr }
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0014-common-mltools-allow-fd-for-machine-readable-output.patch
+++ b/SOURCES/0014-common-mltools-allow-fd-for-machine-readable-output.patch
@ -83,5 +83,5 @@ index 53cece2da..f11028466 100644
 
 The output goes to the specified F<filename>.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0015-OCaml-tools-output-messages-into-JSON-for-machine-re.patch
+++ b/SOURCES/0015-OCaml-tools-output-messages-into-JSON-for-machine-re.patch
@ -510,5 +510,5 @@ index f11028466..3c1d635c5 100644
 passed to the I<--machine-readable> option: this string specifies
 where the machine-readable output will go.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0016-OCaml-tools-fix-3999-3339-typo.patch
+++ b/SOURCES/0016-OCaml-tools-fix-3999-3339-typo.patch
@ -73,5 +73,5 @@ index 3c1d635c5..af944ddb7 100644
 
 In addition to that, a subset of these tools support an extra string
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0017-v2v-remove-extra-nbdkit-bit-from-documentation-RHBZ-.patch
+++ b/SOURCES/0017-v2v-remove-extra-nbdkit-bit-from-documentation-RHBZ-.patch
@ -27,5 +27,5 @@ index b3ebda182..3acdd773e 100644
      -ic 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' \
      -it vddk \
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0018-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
+++ b/SOURCES/0018-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
@ -45,5 +45,5 @@ index b169b2537..e3469308d 100644
              | None -> ""
              | Some port -> sprintf " -P %d" port)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0019-v2v-Allow-Windows-virtio-ISO-to-be-a-block-device-as.patch
+++ b/SOURCES/0019-v2v-Allow-Windows-virtio-ISO-to-be-a-block-device-as.patch
@ -24,5 +24,5 @@ index 92bf3ec60..a6dc29f2c 100644
 
     try
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0020-v2v-Set-DISKTYPE-2-in-RHV-and-VDSM-meta-files-RHBZ-1.patch
+++ b/SOURCES/0020-v2v-Set-DISKTYPE-2-in-RHV-and-VDSM-meta-files-RHBZ-1.patch
@ -42,5 +42,5 @@ index 91ff5198d..9aad5dd15 100644
       bpf "LEGALITY=LEGAL\n";
       bpf "POOL_UUID=\n";
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0021-v2v-rhv-upload-plugin-improve-wait-logic-after-final.patch
+++ b/SOURCES/0021-v2v-rhv-upload-plugin-improve-wait-logic-after-final.patch
@ -51,5 +51,5 @@ index 2a950c5ed..4d61a089b 100644
         # Write the disk ID file.  Only do this on successful completion.
         with builtins.open(params['diskid_file'], 'w') as fp:
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0022-v2v-o-rhv-upload-check-whether-the-cluster-exists.patch
+++ b/SOURCES/0022-v2v-o-rhv-upload-check-whether-the-cluster-exists.patch
@ -57,5 +57,5 @@ index 8d1058d67..cc4224ccd 100644
     def list(self, search=None, case_sensitive=False):
         return []
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0023-v2v-o-rhv-upload-split-vmcheck-out-of-precheck.patch
+++ b/SOURCES/0023-v2v-o-rhv-upload-split-vmcheck-out-of-precheck.patch
@ -260,5 +260,5 @@ index 000000000..fbb884b94
 +
 +# Otherwise everything is OK, exit with no error.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0024-v2v-o-rhv-upload-change-precheck-script-to-return-a-.patch
+++ b/SOURCES/0024-v2v-o-rhv-upload-change-precheck-script-to-return-a-.patch
@ -49,5 +49,5 @@ index d6a58f0fc..de8a66c05 100644
 +
 +json.dump(results, sys.stdout)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0025-v2v-o-rhv-upload-improve-lookup-of-specified-resourc.patch
+++ b/SOURCES/0025-v2v-o-rhv-upload-improve-lookup-of-specified-resourc.patch
@ -165,5 +165,5 @@ index de8a66c05..725a8dc9e 100644
 
 json.dump(results, sys.stdout)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0026-v2v-o-rhv-upload-tell-whether-a-SD-actually-exists.patch
+++ b/SOURCES/0026-v2v-o-rhv-upload-tell-whether-a-SD-actually-exists.patch
@ -32,5 +32,5 @@ index 725a8dc9e..1b344ba27 100644
     # (shouldn't happen, would fail on disk creation).
     raise RuntimeError("The storage domain ‘%s’ is not attached to a DC" %
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0027-v2v-add-output-disk_copied-hook.patch
+++ b/SOURCES/0027-v2v-add-output-disk_copied-hook.patch
@ -72,5 +72,5 @@ index 277d8f2c7..63e809030 100644
 
 (* Update the target_actual_size field in the target structure. *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0028-v2v-o-rhv-upload-collect-disks-UUIDs-right-after-cop.patch
+++ b/SOURCES/0028-v2v-o-rhv-upload-collect-disks-UUIDs-right-after-cop.patch
@ -80,5 +80,5 @@ index 19bdfcf05..382ad0d93 100644
     let ovf = DOM.doc_to_string ovf in
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0029-v2v-o-rhv-upload-add-oo-rhv-disk-uuid-option.patch
+++ b/SOURCES/0029-v2v-o-rhv-upload-add-oo-rhv-disk-uuid-option.patch
@ -197,5 +197,5 @@ index 651f61dae..e840ca78d 100644
 
 If this option is given then virt-v2v will attempt to directly upload
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0030-v2v-o-rhv-upload-make-oo-rhv-cafile-optional.patch
+++ b/SOURCES/0030-v2v-o-rhv-upload-make-oo-rhv-cafile-optional.patch
@ -83,5 +83,5 @@ index e840ca78d..04a894268 100644
 
 Set the RHV Cluster Name.  If not given it uses C<Default>.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0031-v2v-Fix-default-graphics-driver-for-SUSE-guests.patch
+++ b/SOURCES/0031-v2v-Fix-default-graphics-driver-for-SUSE-guests.patch
@ -36,5 +36,5 @@ index b4b2f24c4..f9e811c8d 100644
     let video_driver = match video with QXL -> "qxl" | Cirrus -> "cirrus" in
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0032-v2v-windows-Add-a-helper-function-for-installing-Pow.patch
+++ b/SOURCES/0032-v2v-windows-Add-a-helper-function-for-installing-Pow.patch
@ -69,5 +69,5 @@ index 016ef2a78..6db7874b0 100644
 +    Powershell script (the lines of code) as a firstboot script in
 +    the Windows VM. *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0033-v2v-Copy-static-IP-address-information-over-for-Wind.patch
+++ b/SOURCES/0033-v2v-Copy-static-IP-address-information-over-for-Wind.patch
@ -419,5 +419,5 @@ index 9a555c3be..0642d158f 100644
 
 =item B<--machine-readable>=format
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0034-New-API-luks_uuid.patch
+++ b/SOURCES/0034-New-API-luks_uuid.patch
@ -83,5 +83,5 @@ index 80e3e6eab..055b6671a 100644
 -506
 +507
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0035-options-Fix-segfault-when-multiple-key-parameters-gi.patch
+++ b/SOURCES/0035-options-Fix-segfault-when-multiple-key-parameters-gi.patch
@ -43,5 +43,5 @@ index 7f689866b..f783066ff 100644
     error (EXIT_FAILURE, errno, "realloc");
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0036-options-Simplify-selector-parsing-for-key-options.patch
+++ b/SOURCES/0036-options-Simplify-selector-parsing-for-key-options.patch
@ -81,5 +81,5 @@ index f783066ff..74b549731 100644
       error (EXIT_FAILURE, errno, "strdup");
     break;
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0037-options-Allow-multiple-key-parameters.patch
+++ b/SOURCES/0037-options-Allow-multiple-key-parameters.patch
@ -177,5 +177,5 @@ index 6fadf1e76..510e8a8a9 100644
 extern struct key_store *key_store_import_key (struct key_store *ks, const struct key_store_key *key);
 extern void free_key_store (struct key_store *ks);
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0038-options-rename-key.device-as-key.id.patch
+++ b/SOURCES/0038-options-rename-key.device-as-key.id.patch
@ -433,5 +433,5 @@ index 0642d158f..8c2867814 100644
 Read the passphrase from F<FILENAME>.
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0039-options-allow-a-UUID-as-identifier-for-key.patch
+++ b/SOURCES/0039-options-allow-a-UUID-as-identifier-for-key.patch
@ -309,5 +309,5 @@ index 8c2867814..25041d0ec 100644
 =over 4
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0040-docs-remove-paragraph-about-VMware-tools-on-Windows-.patch
+++ b/SOURCES/0040-docs-remove-paragraph-about-VMware-tools-on-Windows-.patch
@ -78,5 +78,5 @@ index 3acdd773e..16ddb045f 100644
 
 The libvirt URI of a vCenter server looks something like this:
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0041-mlcustomize-Trim-whitespaces-from-commands-read-from.patch
+++ b/SOURCES/0041-mlcustomize-Trim-whitespaces-from-commands-read-from.patch
@ -25,5 +25,5 @@ index c278347c1..0b256e2d2 100644
       fun line ->
         String.length line > 0 && line.[0] <> '#'
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0042-openstack-Increase-Cinder-volume-attach-timeout-to-5.patch
+++ b/SOURCES/0042-openstack-Increase-Cinder-volume-attach-timeout-to-5.patch
@ -39,5 +39,5 @@ index d187f1d5d..bebf9af18 100644
       attach_timeout
       (fun () ->
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0043-v2v-o-rhv-upload-check-for-a-valid-image-transfer-ri.patch
+++ b/SOURCES/0043-v2v-o-rhv-upload-check-for-a-valid-image-transfer-ri.patch
@ -31,5 +31,5 @@ index 6ec74a5d4..7f62b4e3b 100644
     # Now we have permission to start the transfer.
     if params['rhv_direct']:
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0044-rhv-upload-Check-status-more-frequently.patch
+++ b/SOURCES/0044-rhv-upload-Check-status-more-frequently.patch
@ -45,5 +45,5 @@ index 7f62b4e3b..f13405df1 100644
     # Now we have permission to start the transfer.
     if params['rhv_direct']:
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0045-rhv-upload-Show-transfer-id-in-error-message.patch
+++ b/SOURCES/0045-rhv-upload-Show-transfer-id-in-error-message.patch
@ -27,5 +27,5 @@ index f13405df1..9b83d1cfa 100644
 
     # Now we have permission to start the transfer.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0046-rhv-upload-Fix-waiting-for-transfer.patch
+++ b/SOURCES/0046-rhv-upload-Fix-waiting-for-transfer.patch
@ -85,5 +85,5 @@ index 9b83d1cfa..14d4e37fb 100644
     # Now we have permission to start the transfer.
     if params['rhv_direct']:
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0047-v2v-Optimize-convert-for-images-with-small-holes.patch
+++ b/SOURCES/0047-v2v-Optimize-convert-for-images-with-small-holes.patch
@ -80,5 +80,5 @@ index d7a868659..a81a2320a 100644
       let start_time = gettimeofday () in
       if run_command cmd <> 0 then
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0048-v2v-o-rhv-upload-Make-oo-rhv-cafile-optional-in-all-.patch
+++ b/SOURCES/0048-v2v-o-rhv-upload-Make-oo-rhv-cafile-optional-in-all-.patch
@ -45,5 +45,5 @@ index 04a894268..4520c9184 100644
 =item I<-oo rhv-cluster=>C<CLUSTERNAME>
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0049-docs-Fix-update-crypto-policies-command-RHBZ-1791257.patch
+++ b/SOURCES/0049-docs-Fix-update-crypto-policies-command-RHBZ-1791257.patch
@ -29,5 +29,5 @@ index 4bb5d2dc2..9fd5065f1 100644
 =head2 Test libvirt connection to remote Xen host
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0050-add-versioned-directory-for-guest-agent-on-EL8.patch
+++ b/SOURCES/0050-add-versioned-directory-for-guest-agent-on-EL8.patch
@ -31,5 +31,5 @@ index a6dc29f2c..7be63a316 100644
     | "sles" | "suse-based" | "opensuse" -> Some "lp151"
     | _ -> None in
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0051-v2v-fix-path-to-source-when-copying-files-from-guest.patch
+++ b/SOURCES/0051-v2v-fix-path-to-source-when-copying-files-from-guest.patch
@ -37,5 +37,5 @@ index 7be63a316..70f0bf09d 100644
       let cmd = sprintf "cd %s && find -L -type f" (quote dir) in
       let paths = external_command cmd in
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0052-v2v-windows-install-QEMU-Guest-Agent-MSI.patch
+++ b/SOURCES/0052-v2v-windows-install-QEMU-Guest-Agent-MSI.patch
@ -115,5 +115,5 @@ index ae3b7e865..731dbd6f0 100644
 
 (* The following function is only exported for unit tests. *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0053-windows-small-tweaks-of-qemu-ga-firstboot-script.patch
+++ b/SOURCES/0053-windows-small-tweaks-of-qemu-ga-firstboot-script.patch
@ -38,5 +38,5 @@ index bdb0092c3..43c1f85de 100644
       Firstboot.add_firstboot_script g inspect.i_root
         ("install " ^ msi_path) fb_script;
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0054-windows-fix-detection-of-qemu-ga-installer-on-RHV.patch
+++ b/SOURCES/0054-windows-fix-detection-of-qemu-ga-installer-on-RHV.patch
@ -39,5 +39,5 @@ index ea7e5c02d..9a7297344 100644
 
 (* The following function is only exported for unit tests. *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0055-windows-delay-installation-of-qemu-ga-MSI.patch
+++ b/SOURCES/0055-windows-delay-installation-of-qemu-ga-MSI.patch
@ -63,5 +63,5 @@ index 43c1f85de..088cd33d9 100644
         ("install " ^ msi_path) fb_script;
     ) files
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0056-daemon-xattr-Refactor-code-which-splits-attr-names-f.patch
+++ b/SOURCES/0056-daemon-xattr-Refactor-code-which-splits-attr-names-f.patch
@ -279,5 +279,5 @@ index bc5c2df97..3e1144963 100644
     }
   }
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0057-daemon-Add-filter_list-utility-function.patch
+++ b/SOURCES/0057-daemon-Add-filter_list-utility-function.patch
@ -80,5 +80,5 @@ index c3f88bcab..e87233d0f 100644
  * Skip leading and trailing whitespace, updating the original string
  * in-place.
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0058-daemon-xattr-Filter-out-user.WofCompressedData-from-.patch
+++ b/SOURCES/0058-daemon-xattr-Filter-out-user.WofCompressedData-from-.patch
@ -116,5 +116,5 @@ index 3e1144963..43e49384f 100644
     goto error;
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0059-mltools-add-run_in_guest_command-helper.patch
+++ b/SOURCES/0059-mltools-add-run_in_guest_command-helper.patch
@ -91,5 +91,5 @@ index ab70f583e..102abff4d 100644
 +    [?logfile] is an optional file in the guest to where redirect
 +    stdout and stderr of the command. *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0060-customize-port-do_run-to-run_in_guest_command.patch
+++ b/SOURCES/0060-customize-port-do_run-to-run_in_guest_command.patch
@ -79,5 +79,5 @@ index 3eacdaca0..f2ee20413 100644
       G.Error msg ->
         debug_logfile ();
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0061-sysprep-add-a-update_system_ca_store-side-effect.patch
+++ b/SOURCES/0061-sysprep-add-a-update_system_ca_store-side-effect.patch
@ -134,5 +134,5 @@ index a57a0d876..82779620e 100644
 +(** Update the system CA store on the guest for the specified root
 +    (which is fully mounted). *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0062-sysprep-ca-certificates-request-system-CA-store-upda.patch
+++ b/SOURCES/0062-sysprep-ca-certificates-request-system-CA-store-upda.patch
@ -38,5 +38,5 @@ index e481cebf8..a2b7986c1 100644
 }
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0063-sysprep-add-IPA-offline-unenrollment-RHBZ-1789592.patch
+++ b/SOURCES/0063-sysprep-add-IPA-offline-unenrollment-RHBZ-1789592.patch
@ -103,5 +103,5 @@ index 000000000..6e64a754a
 +
 +let () = register_operation op
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0064-sysprep-add-Kerberos-keytab-file-removal.patch
+++ b/SOURCES/0064-sysprep-add-Kerberos-keytab-file-removal.patch
@ -77,5 +77,5 @@ index 000000000..cb3023353
 +
 +let () = register_operation op
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0065-vCenter-fix-parsing-of-HTTP-status-string-RHBZ-18373.patch
+++ b/SOURCES/0065-vCenter-fix-parsing-of-HTTP-status-string-RHBZ-18373.patch
@ -0,0 +1,35 @@
+From 2125023a89779abde57c52323bec7a9e3f75af77 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <ptoscano@redhat.com>
+Date: Tue, 19 May 2020 12:14:18 +0200
+Subject: [PATCH] vCenter: fix parsing of HTTP status string (RHBZ#1837328)
+
+vCenter 7 answers with an HTTP/2 status string, so we cannot extract
+the status code from it by using fixed positions in that string.
+Hence, pick the status code by reading what's after the whitespace.
+
+Tested with vCenter 6.5 and 7.
+
+(cherry picked from commit d2aa82317964d62fcc8dc7b6737773003d04b998
+in virt-v2v)
+---
+ v2v/vCenter.ml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml
+index b1b9f9b15..b15e2f7d0 100644
+--- a/v2v/vCenter.ml
+++ b/v2v/vCenter.ml
+@@ -213,7 +213,9 @@ and fetch_headers_from_url password_file uri sslverify https_url =
+     | [] ->
+        dump_response stderr;
+        error (f_"vcenter: no status code in output of ‘curl’ command.  Is ‘curl’ installed?")
+-    | ss -> String.sub (List.hd (List.rev ss)) 9 3 in
+    | ss ->
+      let s = List.hd (List.rev ss) in
+      String.sub s (String.index s ' ' + 1) 3 in
+ 
+   let headers =
+     List.map (
+-- 
+2.26.2
+
--- a/SOURCES/0066-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
+++ b/SOURCES/0066-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
@ -1,4 +1,4 @@
-From 0647a3a475c647d363205bdbdaca8a79614460c3 Mon Sep 17 00:00:00 2001
+From 00007f9d38f3a0dbf2a8d23ff032b5a6dd9d214f 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).
@ -34,5 +34,5 @@ index 4794a7b13..993b83601 100644
 
 static int
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0067-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
+++ b/SOURCES/0067-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
@ -1,4 +1,4 @@
-From 3341114876c1a2df330b68d15026ba266d557d6e Mon Sep 17 00:00:00 2001
+From bdca6cb09e0d6f98031685a5a3b950a1b96e4dd9 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).
@ -368,5 +368,5 @@ index 79f4b8c56..b99333d0d 100644
 gobject/src/optargs-ntfsclone_out.c
 gobject/src/optargs-ntfsfix.c
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0068-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
+++ b/SOURCES/0068-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
@ -1,4 +1,4 @@
-From 717d8b6a2d0bb559684a436b4f1bc115ac36d3dd Mon Sep 17 00:00:00 2001
+From 8ada76f33594f025bb39083b44306a1b159c4120 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
@ -605,5 +605,5 @@ index 19dd60a2f..583e031bd 100755
 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
 -rm "$DEBUG_QEMU_FILE"
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0069-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
+++ b/SOURCES/0069-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
@ -1,4 +1,4 @@
-From 3d30c10f351b61c9c9aae54fd8a250af5cd8a61a Mon Sep 17 00:00:00 2001
+From 73ed1239122ea4d22f878af33ec3586b1affbe77 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).
@ -68,5 +68,5 @@ index da20c17d9..a5e0e8179 100644
 static int
 shutdown_uml (guestfs_h *g, void *datav, int check_for_errors)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0070-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
+++ b/SOURCES/0070-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
@ -1,4 +1,4 @@
-From fbc5eea00f9f9cd27a1c53913e58f8a4937fd067 Mon Sep 17 00:00:00 2001
+From c5b1a209eb320496fb5e8d905624965908c352ae 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
@ -29,5 +29,5 @@ index 1f6798aaf..8665d7b5c 100644
     let flag = Qemuopts.flag cmd
     and arg = Qemuopts.arg cmd
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0071-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
+++ b/SOURCES/0071-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
@ -1,4 +1,4 @@
-From ec11bac4af65a54400739e476bf90fe815073619 Mon Sep 17 00:00:00 2001
+From 5104b5d5141af5c8589b5b62f4a642ae2a78efe8 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).
@ -101,5 +101,5 @@ index 25041d0ec..bd606592b 100644
 
 =item B<--quiet>
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0072-RHEL-8-Disable-alternate-Augeas-lenses.patch
+++ b/SOURCES/0072-RHEL-8-Disable-alternate-Augeas-lenses.patch
@ -1,4 +1,4 @@
-From 0abf9c24495d577d20fe0d972212dec4eb2b2e73 Mon Sep 17 00:00:00 2001
+From 7f6221bd32b7d668ae8cf12c9648241952f45098 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.
@ -56,5 +56,5 @@ index 453251337..5bbfffa2d 100644
   return 0;
 }
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0073-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
+++ b/SOURCES/0073-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
@ -1,4 +1,4 @@
-From c5db36832644bb6330f90670e799d59cef3d6771 Mon Sep 17 00:00:00 2001
+From 4fe5014634bd20c644aabc1b18523942b6a73837 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
@ -30,5 +30,5 @@ index 74b501f81..21e9c9c15 100644
 (* Find the UEFI firmware. *)
 let find_uefi_firmware guest_arch =
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0074-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
+++ b/SOURCES/0074-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
@ -1,4 +1,4 @@
-From dcd37841d19c43f5874b11a1f81e578df49d58e6 Mon Sep 17 00:00:00 2001
+From eaae3564f0d08f4939d580caab103abc0ea70bea 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
@ -36,5 +36,5 @@ index 86f7d89a3..b5bb99f53 100644
      * as a progress bar hint.
      *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0075-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
+++ b/SOURCES/0075-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
@ -1,4 +1,4 @@
-From e17bc8207168c45b2e887decc0a19b5689798b0b Mon Sep 17 00:00:00 2001
+From 1e02333d395f695e05c9ac884bf4984448269ce2 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.
@ -89,5 +89,5 @@ index f1da222a9..ff94fe39b 100755
 
 # We also update the Registry several times, for firstboot, and (ONLY
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0076-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 fbda37c7b2819300b6b09d2b0b84cec547fdd00e Mon Sep 17 00:00:00 2001
+From 76da9d0e3d7c3dedf65aeb30874a51127aaa41df 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'
@ -24,5 +24,5 @@ index 053cad3e1..0d723fee4 100644
 TESTS_ENVIRONMENT = $(top_builddir)/run --test
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0077-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 d6e49b3cd141cdf573e1e4f59d248007f3658435 Mon Sep 17 00:00:00 2001
+From 38abe40ffa9d6898a13b25b536122dd5c9da5a81 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.
@ -282,5 +282,5 @@ index bd606592b..092d88635 100644
 
 The I<--machine-readable> option can be used to make the output more
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0078-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 ce7a5cc371d6f6e0f96c2cd897245a2e83839c20 Mon Sep 17 00:00:00 2001
+From 0fe5bafac4ca3cd9cd71995ebcba47f5784e028d 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)
@ -22,5 +22,5 @@ index 8321a2a8c..6bd9f43f8 100644
       s_video = None;
       s_sound = None;
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0079-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 0cf211cc08f0f0b886021dc10b52a03aa2d22b1f Mon Sep 17 00:00:00 2001
+From 422dbeb2dcc22f455b8e7bc48bff785a644d8362 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)
@ -22,5 +22,5 @@ index 9fd5065f1..c3c20a6b6 100644
 =head1 INPUT FROM XEN
 
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0080-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
+++ b/SOURCES/0080-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
@ -1,4 +1,4 @@
-From 2009eb2439c8112789728856f08a9f92c6883ad8 Mon Sep 17 00:00:00 2001
+From df499286f518f16efef2ee975a3a2a53df7287a6 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.
@ -87,5 +87,5 @@ index 4520c9184..f6579a48e 100644
 
 A file containing a password to be used when connecting to the oVirt
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0081-RHEL-8-use-platform-python.patch
+++ b/SOURCES/0081-RHEL-8-use-platform-python.patch
@ -1,4 +1,4 @@
-From 58a4b8f9a1a8590728dd169f8c481171ab859b7d Mon Sep 17 00:00:00 2001
+From 152d9987286c8050d3033d09e8ef593fa41dc86e 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
@ -23,5 +23,5 @@ index 3159373a1..f2c00c40f 100644
 type script = {
   tmpdir : string;              (* Temporary directory. *)
 -- 
-2.25.4
+2.26.2

--- a/SOURCES/0082-RHEL-8-point-to-KB-for-supported-v2v-hypervisors-gue.patch
+++ b/SOURCES/0082-RHEL-8-point-to-KB-for-supported-v2v-hypervisors-gue.patch
@ -1,4 +1,4 @@
-From a53675a2b1142654fa3cacc775e44692419d10e0 Mon Sep 17 00:00:00 2001
+From 497e04f97b8d8d7d4e44e037569961043e7d7aba Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH] RHEL 8: point to KB for supported v2v hypervisors/guests
@ -121,5 +121,5 @@ index a22506068..4ec1a07c1 100644
 =head2 Guest firmware
 
 -- 
-2.25.4
+2.26.2

--- a/SPECS/libguestfs.spec
+++ b/SPECS/libguestfs.spec
@ -36,7 +36,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.40.2
-Release:       24%{?dist}
+Release:       25%{?dist}
 License:       LGPLv2+

 # Source and patches.
@ -118,23 +118,24 @@ Patch0061:     0061-sysprep-add-a-update_system_ca_store-side-effect.patch
 Patch0062:     0062-sysprep-ca-certificates-request-system-CA-store-upda.patch
 Patch0063:     0063-sysprep-add-IPA-offline-unenrollment-RHBZ-1789592.patch
 Patch0064:     0064-sysprep-add-Kerberos-keytab-file-removal.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-tests-Disable-daemon-tests-that-require-the-u.patch
-Patch0076:     0076-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
-Patch0077:     0077-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
-Patch0078:     0078-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
-Patch0079:     0079-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
-Patch0080:     0080-RHEL-8-use-platform-python.patch
-Patch0081:     0081-RHEL-8-point-to-KB-for-supported-v2v-hypervisors-gue.patch
+Patch0065:     0065-vCenter-fix-parsing-of-HTTP-status-string-RHBZ-18373.patch
+Patch0066:     0066-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
+Patch0067:     0067-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
+Patch0068:     0068-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
+Patch0069:     0069-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
+Patch0070:     0070-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
+Patch0071:     0071-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
+Patch0072:     0072-RHEL-8-Disable-alternate-Augeas-lenses.patch
+Patch0073:     0073-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
+Patch0074:     0074-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
+Patch0075:     0075-RHEL-8-Fix-tests-for-libguestfs-winsupport.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-rhv-upload-Remove-restriction-on-oa-spars.patch
+Patch0081:     0081-RHEL-8-use-platform-python.patch
+Patch0082:     0082-RHEL-8-point-to-KB-for-supported-v2v-hypervisors-gue.patch

 # Use git for patch management.
 BuildRequires: git
@ -1265,6 +1266,10 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/


 %changelog
+* Mon Jul 20 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.40.2-25
+- v2v: handle HTTP/2 replies from vCenter
+  resolves: rhbz#1854380
+
 * Wed Jun 24 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.40.2-24
 - v2v: ship a newer version of rhev-apt.exe
  resolves: rhbz#1849997