From 794d912a466fb4d2cc48c475e381189c517bce6f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 17 Oct 2025 13:25:55 +0100
Subject: [PATCH] Rebase to libguestfs 1.57.5 resolves: RHEL-111240 Add -cpu
 max when testing for KVM via QMP resolves: RHEL-121076 Test the direct
 backend in %check Require passt resolves: RHEL-122315

(cherry picked from Fedora commit 737237a79ef195fd5cedd1157c1743aacba7289e)
(cherry picked from Fedora commit 1edc00676a6e26c1a062f302f966d0bef0cb4301)
---
 libguestfs.spec | 21 +++++++++++++++++----
 sources         |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index a34d48d..cbebd50 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -34,7 +34,7 @@ ExcludeArch: %{ix86}
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.57.4
+Version:       1.57.5
 Release:       1%{?dist}
 License:       LGPL-2.1-or-later
 
@@ -313,7 +313,7 @@ Recommends:    libvirt-daemon-config-network
 Requires:      libvirt-daemon-driver-qemu >= 7.1.0
 Requires:      libvirt-daemon-driver-secret
 Requires:      libvirt-daemon-driver-storage-core
-Recommends:    passt
+Requires:      passt
 Requires:      (selinux-policy >= 3.11.1-63 if selinux-policy)
 
 %ifarch aarch64
@@ -758,6 +758,15 @@ if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then
     cat $HOME/.cache/libvirt/qemu/log/*
     exit 1
 fi
+
+# As libvirt is the default backend, test that the direct backend
+# works too.  It's a good place to get test coverage across all the
+# architectures.
+if ! LIBGUESTFS_BACKEND=direct \
+     make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then
+    cat $HOME/.cache/libvirt/qemu/log/*
+    exit 1
+fi
 %endif
 
 
@@ -1078,13 +1087,17 @@ rm ocaml/html/.gitignore
 
 
 %changelog
-* Tue Sep 30 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.4-1
-- Rebase to libguestfs 1.57.4
+* Fri Oct 17 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.5-1
+- Rebase to libguestfs 1.57.5
   resolves: RHEL-111240
 - Add new libguestfs ntfs_chmod API
   resolves: RHEL-113833
 - Use setfiles -A option if available to reduce memory usage
   resolves: RHEL-114292
+- Add -cpu max when testing for KVM via QMP
+  resolves: RHEL-121076
+- Require passt
+  resolves: RHEL-122315
 
 * Thu Aug 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.56.1-3
 - Rebase to libguestfs 1.56.1
diff --git a/sources b/sources
index 98b9840..9ed7f34 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.57.4.tar.gz) = 8f856323536866a0c000299bdce7de89bb66773f948943654e39dce37aee9359c486c626b9a1190bb4b44a53d70f76a86130363c285c9a2bfa504da1e470613d
-SHA512 (libguestfs-1.57.4.tar.gz.sig) = bd83857dc81611e42edef8ec718a57399ecd9464479f4c5bc7b0dfe49a212a6428b098a835a49f54d47c3711bdbe0272c1ebc68c351733fdce608c82fe82a896
+SHA512 (libguestfs-1.57.5.tar.gz) = b8db1a16984db602dcee0b02386fbdbe7d06636da3934cccceca8b1907cff6c7cf38a87450acc856ff2b3eb1ee620cbb7d12144b6a51712d96bc136f5b8774a7
+SHA512 (libguestfs-1.57.5.tar.gz.sig) = c87208a79786cce2048abc79f2afbfd200b936ce142d50afccf777390735c74273bb5d19cc3dd700415d856a6b75998d11271157d681721772c612a217498bf9