.gitignore

@@ -1,2 +1,2 @@
-SOURCES/libguestfs-1.45.6.tar.gz
+SOURCES/libguestfs-1.44.0.tar.gz
 SOURCES/libguestfs.keyring

.libguestfs.metadata

@@ -1,2 +1,2 @@
-1351e7078f21ac7233141e2146d0bc3e85d72c6f SOURCES/libguestfs-1.45.6.tar.gz
+99d241dc4a5ba0dc6111954ed7a872e0b0bb6944 SOURCES/libguestfs-1.44.0.tar.gz
 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring

SOURCES/0001-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch

@@ -1,15 +1,15 @@
-From 69751394dccdf5ade209b42aa97b498b59f42010 Mon Sep 17 00:00:00 2001
+From 5b6d2b05fe0c4035b9791a751e3133d26c7baa2d 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: Remove libguestfs live (RHBZ#798980).
+Subject: [PATCH] RHEL 8: Remove libguestfs live (RHBZ#798980).
 
-This isn't supported in RHEL.
+This isn't supported in RHEL 8.
 
 Disable daemon tests that require the 'unix' backend.
 ---
- lib/launch-unix.c | 7 +++++++
- tests/Makefile.am | 3 ---
- 2 files changed, 7 insertions(+), 3 deletions(-)
+ lib/launch-unix.c        | 7 +++++++
+ tests/daemon/Makefile.am | 4 +---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/lib/launch-unix.c b/lib/launch-unix.c
 index 0d344f9df..74dd1bb4a 100644
@@ -36,20 +36,21 @@ index 0d344f9df..74dd1bb4a 100644
  }
  
  static int
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 690e09b5e..919e2f248 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -328,9 +328,6 @@ EXTRA_DIST += create/test-disk-create.sh
+diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am
+index 921e6d1df..8b2887247 100644
+--- a/tests/daemon/Makefile.am
++++ b/tests/daemon/Makefile.am
+@@ -23,9 +23,7 @@ include $(top_srcdir)/subdir-rules.mk
  
- check_DATA = daemon/captive-daemon.pm
+ check_DATA = captive-daemon.pm
+ 
+-TESTS = \
+-	test-daemon-start.pl \
+-	test-btrfs.pl
++TESTS =
+ 
+ TESTS_ENVIRONMENT = $(top_builddir)/run --test
  
--TESTS += \
--	daemon/test-daemon-start.pl \
--	daemon/test-btrfs.pl
- EXTRA_DIST += \
- 	daemon/test-daemon-start.pl \
- 	daemon/test-btrfs.pl
 -- 
 2.31.1
 

SOURCES/0001-build-Don-t-use-non-POSIX-tests.patch

@@ -1,38 +0,0 @@
-From e68a844eb406f0b32cc2c4e60ca66bc1a7f94bdc Mon Sep 17 00:00:00 2001
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Mon, 31 May 2021 21:16:29 +0200
-Subject: [PATCH] build: Don't use non-POSIX tests
-
-The `test` builtin/binary usually accepts `==` for string comparison, it is
-mostly accepted for typos and people being used to double equals, but is not
-documented and not always accepted either.  Since autoconf uses the default
-shell, it might just fail in some cases with:
-
-    ./configure: 29986: test: xrustc: unexpected operator
-    ./configure: 29990: test: xcargo: unexpected operator
-
-Just change it to single equals as it is done everywhere else.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- m4/guestfs-rust.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/guestfs-rust.m4 b/m4/guestfs-rust.m4
-index aa12a9ef5..1dffd8118 100644
---- a/m4/guestfs-rust.m4
-+++ b/m4/guestfs-rust.m4
-@@ -24,8 +24,8 @@ AS_IF([test "x$enable_rust" != "xno"],[
-     AC_CHECK_PROG([RUSTC],[rustc],[rustc],[no])
-     AC_CHECK_PROG([CARGO],[cargo],[cargo],[no])
- 
--    AS_IF([test "x$RUSTC" == "xno"], [AC_MSG_WARN([rustc not found])])
--    AS_IF([test "x$CARGO" == "xno"], [AC_MSG_WARN([cargo not found])])
-+    AS_IF([test "x$RUSTC" = "xno"], [AC_MSG_WARN([rustc not found])])
-+    AS_IF([test "x$CARGO" = "xno"], [AC_MSG_WARN([cargo not found])])
- ],[
-     RUSTC=no
-     CARGO=no
--- 
-2.31.1
-

SOURCES/0002-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch

@@ -1,9 +1,10 @@
-From 3b7d5e86beb84d0a0fefe34d442dc3becdbf1fd5 Mon Sep 17 00:00:00 2001
+From 91b2a6e50211c58ea31a36351ec63c358f708bf9 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: Remove 9p APIs from RHEL (RHBZ#921710).
+Subject: [PATCH] RHEL 8: Remove 9p APIs from RHEL (RHBZ#921710).
 
 ---
+ Makefile.am               |   2 +-
  daemon/9p.c               | 182 --------------------------------------
  daemon/Makefile.am        |   1 -
  docs/C_SOURCE_FILES       |   1 -
@@ -11,10 +12,22 @@ Subject: [PATCH] RHEL: Remove 9p APIs from RHEL (RHBZ#921710).
  generator/proc_nr.ml      |   2 -
  gobject/Makefile.inc      |   2 -
  po/POTFILES               |   2 -
- tests/Makefile.am         |   1 -
- 8 files changed, 212 deletions(-)
+ 8 files changed, 1 insertion(+), 212 deletions(-)
  delete mode 100644 daemon/9p.c
 
+diff --git a/Makefile.am b/Makefile.am
+index 3df1b6a7a..36e44dfd5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -78,7 +78,7 @@ SUBDIRS += tests/xfs
+ SUBDIRS += tests/charsets
+ SUBDIRS += tests/xml
+ SUBDIRS += tests/mount-local
+-SUBDIRS += tests/9p
++#SUBDIRS += tests/9p
+ SUBDIRS += tests/rsync
+ SUBDIRS += tests/bigdirs
+ SUBDIRS += tests/disk-labels
 diff --git a/daemon/9p.c b/daemon/9p.c
 deleted file mode 100644
 index 743a96abd..000000000
@@ -204,10 +217,10 @@ index 743a96abd..000000000
 -  return 0;
 -}
 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 6f13bd43c..cc4dbcd85 100644
+index 038be592c..df9dcc4ee 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
-@@ -84,7 +84,6 @@ guestfsd_SOURCES = \
+@@ -82,7 +82,6 @@ guestfsd_SOURCES = \
  	../common/protocol/guestfs_protocol.h \
  	../common/utils/cleanups.h \
  	../common/utils/guestfs-utils.h \
@@ -216,19 +229,19 @@ index 6f13bd43c..cc4dbcd85 100644
  	actions.h \
  	available.c \
 diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
-index 6a97d8b0e..896314e7e 100644
+index cd5bd2924..831b7e25a 100644
 --- a/docs/C_SOURCE_FILES
 +++ b/docs/C_SOURCE_FILES
-@@ -43,7 +43,6 @@ common/visit/visit.c
- common/visit/visit.h
- common/windows/windows.c
+@@ -63,7 +63,6 @@ common/windows/windows.c
  common/windows/windows.h
+ customize/crypt-c.c
+ customize/perl_edit-c.c
 -daemon/9p.c
  daemon/acl.c
  daemon/actions.h
  daemon/augeas.c
 diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index bb602ee02..db8156c51 100644
+index 806565b19..37476c93e 100644
 --- a/generator/actions_core.ml
 +++ b/generator/actions_core.ml
 @@ -6157,27 +6157,6 @@ This returns true iff the device exists and contains all zero bytes.
@@ -260,7 +273,7 @@ index bb602ee02..db8156c51 100644
      name = "list_dm_devices"; added = (1, 11, 15);
      style = RStringList (RDevice, "devices"), [], [];
 diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
-index 74b95baf7..6b6cb7353 100644
+index 30e42864f..57976be36 100644
 --- a/generator/proc_nr.ml
 +++ b/generator/proc_nr.ml
 @@ -295,8 +295,6 @@ let proc_nr = [
@@ -293,18 +306,18 @@ index 650f8ddac..c4e735967 100644
    src/optargs-ntfsclone_out.c \
    src/optargs-ntfsfix.c \
 diff --git a/po/POTFILES b/po/POTFILES
-index 29205b6a6..23afe619c 100644
+index 69ea7134a..0782e8ceb 100644
 --- a/po/POTFILES
 +++ b/po/POTFILES
-@@ -26,7 +26,6 @@ common/utils/stringlists-utils.c
- common/utils/utils.c
- common/visit/visit.c
+@@ -47,7 +47,6 @@ common/visit/visit.c
  common/windows/windows.c
+ customize/crypt-c.c
+ customize/perl_edit-c.c
 -daemon/9p.c
  daemon/acl.c
  daemon/augeas.c
  daemon/available.c
-@@ -264,7 +263,6 @@ gobject/src/optargs-mkfs_btrfs.c
+@@ -277,7 +276,6 @@ gobject/src/optargs-mkfs_btrfs.c
  gobject/src/optargs-mksquashfs.c
  gobject/src/optargs-mkswap.c
  gobject/src/optargs-mktemp.c
@@ -312,18 +325,6 @@ index 29205b6a6..23afe619c 100644
  gobject/src/optargs-mount_local.c
  gobject/src/optargs-ntfsclone_out.c
  gobject/src/optargs-ntfsfix.c
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 919e2f248..e3613fec4 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -43,7 +43,6 @@ check-slow:
- check-valgrind:
- 	$(MAKE) VG="@VG@" check
- 
--TESTS += 9p/test-9p.sh
- EXTRA_DIST += 9p/test-9p.sh
- 
- SLOW_TESTS += bigdirs/test-big-dirs.pl
 -- 
 2.31.1
 

SOURCES/0002-python-Don-t-leak-fields-when-creating-Python-struct.patch

@@ -1,86 +0,0 @@
-From e84c63a2ca4bf2366af96eb1a1222cf494e228c9 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 27 Jul 2021 08:55:27 +0100
-Subject: [PATCH] python: Don't leak fields when creating Python structs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When creating and returning a Python struct we were adding fields from
-the C struct, but did not reduce the ref count on the temporary value
-after it had been moved to the struct, resulting in a memory leak.
-
-Reported-by: 朱丹 <zhudan24@huawei.com>
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1985912
----
- generator/python.ml | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/generator/python.ml b/generator/python.ml
-index b3d3a5579..1afd05dd6 100644
---- a/generator/python.ml
-+++ b/generator/python.ml
-@@ -173,44 +173,52 @@ and generate_python_structs () =
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, FBuffer ->
-             pr "  value = PyBytes_FromStringAndSize (%s->%s, %s->%s_len);\n"
-               typ name typ name;
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, FUUID ->
-             pr "  value = guestfs_int_py_fromstringsize (%s->%s, 32);\n"
-               typ name;
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, (FBytes|FUInt64) ->
-             pr "  value = PyLong_FromUnsignedLongLong (%s->%s);\n" typ name;
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, FInt64 ->
-             pr "  value = PyLong_FromLongLong (%s->%s);\n" typ name;
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, FUInt32 ->
-             pr "  value = PyLong_FromUnsignedLong (%s->%s);\n" typ name;
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, FInt32 ->
-             pr "  value = PyLong_FromLong (%s->%s);\n" typ name;
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-         | name, FOptPercent ->
-             pr "  if (%s->%s >= 0) {\n" typ name;
-             pr "    value = PyFloat_FromDouble ((double) %s->%s);\n" typ name;
-             pr "    if (value == NULL)\n";
-             pr "      goto err;\n";
-             pr "    PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "    Py_DECREF (value);\n";
-             pr "  }\n";
-             pr "  else {\n";
-             pr "    Py_INCREF (Py_None);\n";
-@@ -222,6 +230,7 @@ and generate_python_structs () =
-             pr "  if (value == NULL)\n";
-             pr "    goto err;\n";
-             pr "  PyDict_SetItemString (dict, \"%s\", value);\n" name;
-+            pr "  Py_DECREF (value);\n"
-       ) cols;
-       pr "  return dict;\n";
-       pr " err:\n";
--- 
-2.31.1
-

SOURCES/0003-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch

@@ -1,7 +1,7 @@
-From 3ee38c13db6bf6bcea375f66a38fb848d0251d83 Mon Sep 17 00:00:00 2001
+From 4dd2f3f56a39411a255ad0a8f38081d46620dbd8 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: Disable unsupported remote drive protocols
+Subject: [PATCH] RHEL 8: Disable unsupported remote drive protocols
  (RHBZ#962113).
 
 This disables support for unsupported remote drive protocols:
@@ -18,7 +18,7 @@ This disables support for unsupported remote drive protocols:
 
 Note 'nbd' is not disabled, and of course 'file' works.
 
-We hope to gradually add some of these back over the lifetime of RHEL.
+We hope to gradually add some of these back over the lifetime of RHEL 8.
 ---
  docs/guestfs-testing.pod               |  20 -----
  fish/guestfish.pod                     |  66 ++--------------
@@ -220,7 +220,7 @@ index 21d424984..ddabeb639 100755
  rm test-add-uri.out
  rm test-add-uri.img
 diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index db8156c51..b87071e3b 100644
+index 37476c93e..9f0402510 100644
 --- a/generator/actions_core.ml
 +++ b/generator/actions_core.ml
 @@ -297,29 +297,6 @@ F<filename> is interpreted as a local file or device.
@@ -373,7 +373,7 @@ index 46af66db4..c81ded5d7 100644
      error (g, _("unknown protocol ‘%s’"), protocol);
      drv = NULL; /*FALLTHROUGH*/
 diff --git a/lib/guestfs.pod b/lib/guestfs.pod
-index ff58aa0bb..1af00f1bb 100644
+index bce9eb79f..2bb13b875 100644
 --- a/lib/guestfs.pod
 +++ b/lib/guestfs.pod
 @@ -715,70 +715,6 @@ servers.  The server string is documented in
@@ -491,10 +491,10 @@ index ff58aa0bb..1af00f1bb 100644
  
  Libguestfs has APIs for inspecting an unknown disk image to find out
 diff --git a/tests/disks/test-qemu-drive-libvirt.sh b/tests/disks/test-qemu-drive-libvirt.sh
-index 595a95a5e..b49534c94 100755
+index 3c5aa592e..f73827bd6 100755
 --- a/tests/disks/test-qemu-drive-libvirt.sh
 +++ b/tests/disks/test-qemu-drive-libvirt.sh
-@@ -65,34 +65,6 @@ check_output
+@@ -64,34 +64,6 @@ check_output
  grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail ceph2
  rm "$DEBUG_QEMU_FILE"
  
@@ -530,7 +530,7 @@ index 595a95a5e..b49534c94 100755
  
  $guestfish -d pool1 run ||:
 diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh
-index 12937fb30..b3e4f9903 100755
+index 19dd60a2f..583e031bd 100755
 --- a/tests/disks/test-qemu-drive.sh
 +++ b/tests/disks/test-qemu-drive.sh
 @@ -62,45 +62,6 @@ check_output

SOURCES/0003-appliance-Add-IBM850-iconv-converter-for-syslinux.patch

@@ -1,34 +0,0 @@
-From 90a076fe19ead3c517ba2b45edfcc7fffec9860d Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 6 Aug 2021 08:26:51 +0100
-Subject: [PATCH] appliance: Add IBM850 iconv converter for syslinux
-
-$ guestfish -N fs:vfat:2G syslinux /dev/sda1
-libguestfs: error: syslinux: Error converting to codepage 850 Invalid argument
-...
-
-This happens because of the default codepage requested by syslinux
-(code page 850) combined with the appliance missing the iconv
-converter for this codepage.
-
-Reported-by: Yongkui Guo
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1990720
----
- appliance/packagelist.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index cede0ac0b..b5f9d9dc7 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -28,6 +28,7 @@ ifelse(REDHAT,1,
-   dhclient
-   gfs-utils
-   gfs2-utils
-+  glibc-gconv-extra    dnl syslinux requires IBM850 iconv converter
-   grub
-   hfsplus-tools
-   iproute
--- 
-2.31.1
-

SOURCES/0004-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch

@@ -1,9 +1,9 @@
-From a651907e06fb488ef91fdf8b624cf1d527cfb057 Mon Sep 17 00:00:00 2001
+From 34f8c6a5eb0eabfba4ab1831b45e2baa73a4b501 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: Remove User-Mode Linux (RHBZ#1144197).
+Subject: [PATCH] RHEL 8: Remove User-Mode Linux (RHBZ#1144197).
 
-This isn't supported in RHEL.
+This isn't supported in RHEL 8.
 ---
  lib/launch-uml.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)

SOURCES/0005-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch

@@ -1,8 +1,8 @@
-From 0315e1f00e229c990226203a3e04af1820f688c2 Mon Sep 17 00:00:00 2001
+From cb2ac63562447e2780bd7103ed060fd6013b9054 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: Reject use of libguestfs-winsupport features except for
- virt-* tools (RHBZ#1240276).
+Subject: [PATCH] RHEL 8: Reject use of libguestfs-winsupport features except
+ for virt-* tools (RHBZ#1240276).
 
 Fix the tests: it doesn't let us use guestfish for arbitrary Windows
 edits.
@@ -13,7 +13,7 @@ edits.
  3 files changed, 19 insertions(+)
 
 diff --git a/generator/c.ml b/generator/c.ml
-index ea69abf76..56ee38aa4 100644
+index 86d3b26f8..a625361a9 100644
 --- a/generator/c.ml
 +++ b/generator/c.ml
 @@ -1846,6 +1846,22 @@ and generate_client_actions actions () =
@@ -52,10 +52,10 @@ index 30908a918..73cf5144e 100755
  run
  
 diff --git a/tests/charsets/test-charset-fidelity.c b/tests/charsets/test-charset-fidelity.c
-index 105291dc3..5ca4f3b6d 100644
+index 39ccc2068..2b2e2d8a9 100644
 --- a/tests/charsets/test-charset-fidelity.c
 +++ b/tests/charsets/test-charset-fidelity.c
-@@ -96,6 +96,8 @@ main (int argc, char *argv[])
+@@ -94,6 +94,8 @@ main (int argc, char *argv[])
    if (g == NULL)
      error (EXIT_FAILURE, 0, "failed to create handle");
  

SOURCES/0006-build-Avoid-warnings-about-unknown-pragmas.patch

@@ -0,0 +1,37 @@
+From dbd1eaab6a478cf0c3ea093a56b3d04c29278615 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 12 Jan 2021 10:23:11 +0000
+Subject: [PATCH] build: Avoid warnings about unknown pragmas.
+
+In commit 4bbbf03b8bc266ed2b63c461cd0945250bb134fe we started to
+ignore bogus GCC 11 warnings.  Unfortunately earlier versions of GCC
+don't know about those pragmas so give warnings [hence errors in
+developer builds] like:
+
+tsk.c:75:32: error: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
+
+Turn off these warnings.
+
+Updates: commit 4bbbf03b8bc266ed2b63c461cd0945250bb134fe
+(cherry picked from commit 812f837c97f48ce0c26a0e02286fb9180c282923)
+---
+ m4/guestfs-c.m4 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
+index 25ffea0d9..bbb4db464 100644
+--- a/m4/guestfs-c.m4
++++ b/m4/guestfs-c.m4
+@@ -108,6 +108,9 @@ gl_WARN_ADD([-Wformat-truncation=1])
+ dnl GCC 9 at level 2 gives apparently bogus errors when %.*s is used.
+ gl_WARN_ADD([-Wformat-overflow=1])
+ 
++dnl GCC < 11 gives warnings when disabling GCC 11 warnings.
++gl_WARN_ADD([-Wno-pragmas])
++
+ AC_SUBST([WARN_CFLAGS])
+ 
+ NO_SNV_CFLAGS=
+-- 
+2.31.1
+

SOURCES/0007-daemon-lvm-Use-lvcreate-yes-to-avoid-interactive-pro.patch

@@ -0,0 +1,94 @@
+From 22416a2329ec531b9608c21b11ff3d53275fe7a0 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 22 Feb 2021 10:18:45 +0000
+Subject: [PATCH] daemon: lvm: Use lvcreate --yes to avoid interactive prompts.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1930996#c1
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1930996
+(cherry picked from commit 21cd97732c4973db835b8b6540c8ad582ebd2bda)
+---
+ daemon/lvm.c                     |  2 +-
+ tests/regressions/Makefile.am    |  2 ++
+ tests/regressions/rhbz1930996.sh | 36 ++++++++++++++++++++++++++++++++
+ 3 files changed, 39 insertions(+), 1 deletion(-)
+ create mode 100755 tests/regressions/rhbz1930996.sh
+
+diff --git a/daemon/lvm.c b/daemon/lvm.c
+index 841dc4b6b..72c59c3a1 100644
+--- a/daemon/lvm.c
++++ b/daemon/lvm.c
+@@ -219,7 +219,7 @@ do_lvcreate (const char *logvol, const char *volgroup, int mbytes)
+   snprintf (size, sizeof size, "%d", mbytes);
+ 
+   r = command (NULL, &err,
+-               "lvm", "lvcreate",
++               "lvm", "lvcreate", "--yes",
+                "-L", size, "-n", logvol, volgroup, NULL);
+   if (r == -1) {
+     reply_with_error ("%s", err);
+diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
+index ecb0d68a7..c1e0ee8a9 100644
+--- a/tests/regressions/Makefile.am
++++ b/tests/regressions/Makefile.am
+@@ -49,6 +49,7 @@ EXTRA_DIST = \
+ 	rhbz1370424.sh \
+ 	rhbz1370424.xml \
+ 	rhbz1477623.sh \
++	rhbz1930996.sh \
+ 	test-noexec-stack.pl
+ 
+ TESTS = \
+@@ -79,6 +80,7 @@ TESTS = \
+ 	rhbz1285847.sh \
+ 	rhbz1370424.sh \
+ 	rhbz1477623.sh \
++	rhbz1930996.sh \
+ 	test-big-heap \
+ 	test-noexec-stack.pl \
+ 	$(SLOW_TESTS)
+diff --git a/tests/regressions/rhbz1930996.sh b/tests/regressions/rhbz1930996.sh
+new file mode 100755
+index 000000000..27089beaa
+--- /dev/null
++++ b/tests/regressions/rhbz1930996.sh
+@@ -0,0 +1,36 @@
++#!/bin/bash -
++# libguestfs
++# Copyright (C) 2017-2021 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++
++# Regression test for:
++# https://bugzilla.redhat.com/show_bug.cgi?id=1930996#c1
++#
++# Actually a bug/change in LVM, previously we failed to create an LV
++# if the underlying disk contained a filesystem signature.
++
++set -e
++
++$TEST_FUNCTIONS
++skip_if_skipped
++skip_unless_phony_guest fedora.img
++
++f=rhbz1930996.img
++rm -f $f
++
++guestfish -N $f=lvfs vgremove VG : vgcreate VG /dev/sda1 : lvcreate LV2 VG 100
++
++rm $f
+-- 
+2.31.1
+

SOURCES/0008-inspection-More-reliable-detection-of-Linux-split-us.patch

@@ -0,0 +1,113 @@
+From e1b339688e5f8f2a14fe0c7e9d02ad68004e4655 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 15 Apr 2021 09:18:22 +0100
+Subject: [PATCH] inspection: More reliable detection of Linux split /usr
+ configurations
+
+In RHEL 8+, /usr/etc no longer exists.  Since we were looking for this
+directory in order to detect a separate /usr partition, those were no
+longer detected, so the merging of /usr data into the root was not
+being done.  The result was incomplete inspection data and failure of
+virt-v2v.
+
+All Linux systems since forever have had /usr/src but not /src, so
+detect this instead.
+
+Furthermore the merging code didn't work, because we expected that the
+root filesystem had a distro assigned, but in this configuration we
+may need to look for that information in /usr/lib/os-release (not on
+the root filesystem).  This change makes the merging work even if we
+have incomplete information about the root filesystem, so long as we
+have an /etc/fstab entry pointing to the /usr mountpoint.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1949683
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1930133
+Fixes: commit 394d11be49121884295e61964ed47f5a8488c252
+(cherry picked from commit 26427b9ecc64e7e5e53a1d577cef9dc080d08877)
+---
+ daemon/inspect.ml    | 33 +++++++++++++++------------------
+ daemon/inspect_fs.ml |  6 +++---
+ 2 files changed, 18 insertions(+), 21 deletions(-)
+
+diff --git a/daemon/inspect.ml b/daemon/inspect.ml
+index 945a476f6..fb75b4a6c 100644
+--- a/daemon/inspect.ml
++++ b/daemon/inspect.ml
+@@ -182,11 +182,9 @@ and check_for_duplicated_bsd_root fses =
+ and collect_linux_inspection_info fses =
+   List.map (
+     function
+-    | { role = RoleRoot { distro = Some d } } as root ->
+-       if d <> DISTRO_COREOS then
+-         collect_linux_inspection_info_for fses root
+-       else
+-         root
++    | { role = RoleRoot { distro = Some DISTRO_COREOS } } as root -> root
++    | { role = RoleRoot _ } as root ->
++       collect_linux_inspection_info_for fses root
+     | fs -> fs
+   ) fses
+ 
+@@ -196,29 +194,28 @@ and collect_linux_inspection_info fses =
+  * or other ways to identify the OS).
+  *)
+ and collect_linux_inspection_info_for fses root =
+-  let root_distro, root_fstab =
++  let root_fstab =
+     match root with
+-    | { role = RoleRoot { distro = Some d; fstab = f } } -> d, f
++    | { role = RoleRoot { fstab = f } } -> f
+     | _ -> assert false in
+ 
+   try
+     let usr =
+       List.find (
+         function
+-        | { role = RoleUsr { distro = d } }
+-             when d = Some root_distro || d = None -> true
++        | { role = RoleUsr _; fs_location = usr_mp } ->
++           (* This checks that this usr is found in the fstab of
++            * the root filesystem.
++            *)
++           List.exists (
++             fun (mountable, _) ->
++               usr_mp.mountable = mountable
++           ) root_fstab
+         | _ -> false
+       ) fses in
+ 
+-    let usr_mountable = usr.fs_location.mountable in
+-
+-    (* This checks that [usr] is found in the fstab of the root
+-     * filesystem.  If not, [Not_found] is thrown.
+-     *)
+-    ignore (
+-      List.find (fun (mountable, _) -> usr_mountable = mountable) root_fstab
+-    );
+-
++    eprintf "collect_linux_inspection_info_for: merging:\n%sinto:\n%s"
++      (string_of_fs usr) (string_of_fs root);
+     merge usr root;
+     root
+   with
+diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml
+index 6e00c7083..02b5a0470 100644
+--- a/daemon/inspect_fs.ml
++++ b/daemon/inspect_fs.ml
+@@ -164,10 +164,10 @@ and check_filesystem mountable =
+     ()
+   )
+   (* Linux /usr? *)
+-  else if Is.is_dir "/etc" &&
+-          Is.is_dir "/bin" &&
+-          Is.is_dir "/share" &&
++  else if Is.is_dir "/bin" &&
+           Is.is_dir "/local" &&
++          Is.is_dir "/share" &&
++          Is.is_dir "/src" &&
+           not (Is.is_file "/etc/fstab") then (
+     debug_matching "Linux /usr";
+     role := `Usr;
+-- 
+2.31.1
+

SOURCES/0009-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch

@@ -1,32 +0,0 @@
-From 75d88b5fd89655b8c3ac2a385a5ac2f8dea560e5 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 29 Jun 2021 15:29:11 +0100
-Subject: [PATCH] RHEL: Create /etc/crypto-policies/back-ends/opensslcnf.config
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1977214#c13
----
- appliance/init | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/appliance/init b/appliance/init
-index b1c4d09ea..be46f9648 100755
---- a/appliance/init
-+++ b/appliance/init
-@@ -70,6 +70,14 @@ if ! test -e /etc/mtab; then
-   ln -s /proc/mounts /etc/mtab
- fi
- 
-+# openssl 3 requires /etc/crypto-policies/back-ends/opensslcnf.config
-+# to exist, but it is created in a %post script in crypto-policies
-+# https://bugzilla.redhat.com/show_bug.cgi?id=1977214#c13
-+if ! test -r /etc/crypto-policies/back-ends/opensslcnf.config &&
-+     test -f /usr/share/crypto-policies/DEFAULT/opensslcnf.txt; then
-+  ln -s /usr/share/crypto-policies/DEFAULT/opensslcnf.txt /etc/crypto-policies/back-ends/opensslcnf.config
-+fi
-+
- # devtmpfs is required since udev 176
- mount -t devtmpfs /dev /dev
- mkdir -p /dev/pts
--- 
-2.31.1
-

SOURCES/0009-lib-Autodetect-backing-format-for-qemu-img-create-b.patch

@@ -0,0 +1,49 @@
+From 791a16b049ea1ce2c450acd367fce774d9aab5b1 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 31 Aug 2021 08:27:15 +0100
+Subject: [PATCH] lib: Autodetect backing format for qemu-img create -b
+
+qemu 6.1 has decided to change qemu-img create so that a backing
+format (-F) is required if a backing file (-b) is specified.  Since we
+don't want to change the libguestfs API to force callers to specify
+this because that would be an API break, autodetect it.
+
+This is similar to commit c8c181e8d9 ("launch: libvirt: Autodetect
+backing format for readonly drive overlays").
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1998820
+(cherry picked from commit 45de287447bb18d59749fbfc1ec5072413090109)
+---
+ lib/create.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/lib/create.c b/lib/create.c
+index 44a7df25f..75a4d3a28 100644
+--- a/lib/create.c
++++ b/lib/create.c
+@@ -255,6 +255,7 @@ disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,
+                    const struct guestfs_disk_create_argv *optargs)
+ {
+   const char *backingformat = NULL;
++  CLEANUP_FREE char *backingformat_free = NULL;
+   const char *preallocation = NULL;
+   const char *compat = NULL;
+   int clustersize = -1;
+@@ -270,6 +271,14 @@ disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,
+       return -1;
+     }
+   }
++  else if (backingfile) {
++    /* Since qemu 6.1, qemu-img create has requires a backing format (-F)
++     * parameter if backing file (-b) is used (RHBZ#1998820).
++     */
++    backingformat = backingformat_free = guestfs_disk_format (g, backingfile);
++    if (!backingformat)
++      return -1;
++  }
+   if (optargs->bitmask & GUESTFS_DISK_CREATE_PREALLOCATION_BITMASK) {
+     if (STREQ (optargs->preallocation, "off") ||
+         STREQ (optargs->preallocation, "sparse"))
+-- 
+2.31.1
+

SOURCES/0010-daemon-chroot-Fix-long-standing-possible-deadlock.patch

@@ -0,0 +1,44 @@
+From 3435938f43ca3737ec1d73da4d8cad756b5c9508 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 26 Mar 2021 16:04:43 +0000
+Subject: [PATCH] daemon: chroot: Fix long-standing possible deadlock.
+
+The child (chrooted) process wrote its answer on the pipe and then
+exited.  Meanwhile the parent waiting for the child to exit before
+reading from the pipe.  Thus if the output was larger than a Linux
+pipebuffer then the whole thing would deadlock.
+
+(cherry picked from commit 94e64b28bee3b8dc7ed354a366d6a8f7ba5f245c)
+---
+ daemon/chroot.ml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/chroot.ml b/daemon/chroot.ml
+index 5e856c91f..7da8ae29e 100644
+--- a/daemon/chroot.ml
++++ b/daemon/chroot.ml
+@@ -62,6 +62,10 @@ let f t func arg =
+   (* Parent. *)
+   close wfd;
+ 
++  let chan = in_channel_of_descr rfd in
++  let ret = input_value chan in
++  close_in chan;
++
+   let _, status = waitpid [] pid in
+   (match status with
+    | WEXITED 0 -> ()
+@@ -76,10 +80,6 @@ let f t func arg =
+       failwithf "chroot ‘%s’ stopped by signal %d" t.name i
+   );
+ 
+-  let chan = in_channel_of_descr rfd in
+-  let ret = input_value chan in
+-  close_in chan;
+-
+   match ret with
+   | Either ret -> ret
+   | Or exn -> raise exn
+-- 
+2.31.1
+

SOURCES/0012-inspection-Return-RPM-epoch.patch

@@ -0,0 +1,36 @@
+From 3ce392c9870a589cc50d2270fcf07b4d129c3dc3 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 27 Mar 2021 09:31:00 +0000
+Subject: [PATCH] inspection: Return RPM epoch.
+
+Fixes: commit c9ee831affed55abe0f928134cbbd2ed83b2f510
+(cherry picked from commit fef73bce7eec0ce0753a2e150e4e088020d38643)
+---
+ daemon/rpm-c.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/rpm-c.c b/daemon/rpm-c.c
+index 92a3abf58..be0e81e22 100644
+--- a/daemon/rpm-c.c
++++ b/daemon/rpm-c.c
+@@ -108,13 +108,16 @@ guestfs_int_daemon_rpm_next_application (value unitv)
+ 
+   h = headerLink (h);
+   app.app2_name = headerFormat (h, "%{NAME}", NULL);
+-  // XXXapp.app2_epoch = headerFormat (h, "%{NAME}", NULL);
+   app.app2_version = headerFormat (h, "%{VERSION}", NULL);
+   app.app2_release = headerFormat (h, "%{RELEASE}", NULL);
+   app.app2_arch = headerFormat (h, "%{ARCH}", NULL);
+   app.app2_url = headerFormat (h, "%{URL}", NULL);
+   app.app2_summary = headerFormat (h, "%{SUMMARY}", NULL);
+   app.app2_description = headerFormat (h, "%{DESCRIPTION}", NULL);
++
++  /* epoch is special as the only int field. */
++  app.app2_epoch = headerGetNumber (h, RPMTAG_EPOCH);
++
+   headerFree (h);
+ 
+   /* Convert this to an OCaml struct.  Any NULL fields must be turned
+-- 
+2.31.1
+

SOURCES/0014-po-POTFILES-Fix-list-of-files-for-translation.patch

@@ -0,0 +1,34 @@
+From 9664527c107d04aab416be87cc4fcd76dcbe5927 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 29 Mar 2021 18:25:13 +0100
+Subject: [PATCH] po/POTFILES: Fix list of files for translation.
+
+Fixes: commit c9ee831affed55abe0f928134cbbd2ed83b2f510
+(cherry picked from commit df983200d76bac37c811fbd2fb67e7ebe830e759)
+---
+ po/POTFILES | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/POTFILES b/po/POTFILES
+index 0782e8ceb..fdc6e8062 100644
+--- a/po/POTFILES
++++ b/po/POTFILES
+@@ -128,6 +128,7 @@ daemon/pingdaemon.c
+ daemon/proto.c
+ daemon/readdir.c
+ daemon/rename.c
++daemon/rpm-c.c
+ daemon/rsync.c
+ daemon/scrub.c
+ daemon/selinux-relabel.c
+@@ -353,7 +354,6 @@ lib/command.c
+ lib/conn-socket.c
+ lib/copy-in-out.c
+ lib/create.c
+-lib/dbdump.c
+ lib/drives.c
+ lib/errors.c
+ lib/event-string.c
+-- 
+2.31.1
+

SOURCES/0015-m4-guestfs-find-db-tool.m4-Remove-unused-file.patch

@@ -0,0 +1,64 @@
+From 083856d9f9c8fccc629bf0f3a5237d26434c8940 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 29 Mar 2021 18:35:48 +0100
+Subject: [PATCH] m4/guestfs-find-db-tool.m4: Remove unused file.
+
+Fixes: commit 42e5e7cfdbca01b2e9bd50c63a9fc65b6da9192f
+(cherry picked from commit 8317279c3539562ebad9de13c7ac515dded74e4d)
+---
+ m4/guestfs-find-db-tool.m4 | 43 --------------------------------------
+ 1 file changed, 43 deletions(-)
+ delete mode 100644 m4/guestfs-find-db-tool.m4
+
+diff --git a/m4/guestfs-find-db-tool.m4 b/m4/guestfs-find-db-tool.m4
+deleted file mode 100644
+index b404148c6..000000000
+--- a/m4/guestfs-find-db-tool.m4
++++ /dev/null
+@@ -1,43 +0,0 @@
+-# libguestfs
+-# Copyright (C) 2014 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-
+-AC_DEFUN([GUESTFS_FIND_DB_TOOL],[
+-    pushdef([VARIABLE],$1)
+-    TOOL=$2
+-
+-    db_tool_name="db_$TOOL"
+-    db_versions="53 5.3 5.2 5.1 4.8 4.7 4.6"
+-    db_tool_patterns="dbX_$TOOL dbX.Y_$TOOL"
+-    db_tool_patterns="dbX_$TOOL db_$TOOL-X dbX.Y_$TOOL db_$TOOL-X.Y"
+-
+-    AC_ARG_VAR(VARIABLE, [Absolute path to $db_tool_name executable])
+-
+-    AS_IF(test -z "$VARIABLE", [
+-        exe_list="db_$TOOL"
+-        for ver in $db_versions ; do
+-            ver_maj=`echo $ver | cut -d. -f1`
+-            ver_min=`echo $ver | cut -d. -f2`
+-            for pattern in $db_tool_patterns ; do
+-                exe=`echo "$pattern" | sed -e "s/X/$ver_maj/g;s/Y/$ver_min/g"`
+-                exe_list="$exe_list $exe"
+-            done
+-        done
+-        AC_PATH_PROGS([]VARIABLE[], [$exe_list], [no])
+-    ])
+-
+-    popdef([VARIABLE])
+-])
+-- 
+2.31.1
+

SOURCES/0016-test-data-phony-guests-Fix-phony-RPM-database-fix-vi.patch

@@ -0,0 +1,474 @@
+From f8ccce2c7a0c1323e0721f503322df525dd5b139 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 29 Mar 2021 12:22:12 +0100
+Subject: [PATCH] test-data/phony-guests: Fix phony RPM database, fix
+ virt-inspector test.
+
+libguestfs 1.45.3 now reads the RPM database using librpm, which means
+our old phony database created by db_dump can no longer work.  Instead
+provide a real (but very minimal) sqlite database.
+
+This commit also fixes the virt-inspector test since the RPM database
+contents are now different.
+
+(cherry picked from commit 46bf6fb473889ed28bd7220476120edcda47ae07)
+---
+ inspector/expected-fedora-luks.img.xml | 208 +++++++++++++++++++++++--
+ inspector/expected-fedora.img.xml      | 208 +++++++++++++++++++++++--
+ 2 files changed, 398 insertions(+), 18 deletions(-)
+
+diff --git a/inspector/expected-fedora-luks.img.xml b/inspector/expected-fedora-luks.img.xml
+index df6060a73..72cddaf88 100644
+--- a/inspector/expected-fedora-luks.img.xml
++++ b/inspector/expected-fedora-luks.img.xml
+@@ -30,22 +30,212 @@
+     </filesystems>
+     <applications>
+       <application>
+-        <name>test1</name>
+-        <version>1.0</version>
+-        <release>1.fc14</release>
++        <name>basesystem</name>
++        <version>11</version>
++        <release>10.fc33</release>
++        <arch>noarch</arch>
++        <url>(none)</url>
++        <summary>The skeleton package which defines a simple Fedora system</summary>
++        <description>Basesystem defines the components of a basic Fedora system
++(for example, the package installation order to use during bootstrapping).
++Basesystem should be in every installation of a system, and it
++should never be removed.</description>
++      </application>
++      <application>
++        <name>bash</name>
++        <version>5.0.17</version>
++        <release>2.fc33</release>
++        <arch>x86_64</arch>
++        <url>https://www.gnu.org/software/bash</url>
++        <summary>The GNU Bourne Again shell</summary>
++        <description>The GNU Bourne Again shell (Bash) is a shell or command language
++interpreter that is compatible with the Bourne shell (sh). Bash
++incorporates useful features from the Korn shell (ksh) and the C shell
++(csh). Most sh scripts can be run by bash without modification.</description>
++      </application>
++      <application>
++        <name>fedora-gpg-keys</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora RPM keys</summary>
++        <description>This package provides the RPM signature keys.</description>
++      </application>
++      <application>
++        <name>fedora-release</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora release files</summary>
++        <description>Fedora release files such as various /etc/ files that define the release
++and systemd preset files that determine which services are enabled by default.</description>
++      </application>
++      <application>
++        <name>fedora-release-common</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora release files</summary>
++        <description>Release files common to all Editions and Spins of Fedora</description>
++      </application>
++      <application>
++        <name>fedora-release-identity-basic</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Package providing the basic Fedora identity</summary>
++        <description>Provides the necessary files for a Fedora installation that is not identifying
++itself as a particular Edition or Spin.</description>
++      </application>
++      <application>
++        <name>fedora-repos</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora package repositories</summary>
++        <description>Fedora package repository files for yum and dnf along with gpg public keys.</description>
++      </application>
++      <application>
++        <name>filesystem</name>
++        <version>3.14</version>
++        <release>3.fc33</release>
++        <arch>x86_64</arch>
++        <url>https://pagure.io/filesystem</url>
++        <summary>The basic directory layout for a Linux system</summary>
++        <description>The filesystem package is one of the basic packages that is installed
++on a Linux system. Filesystem contains the basic directory layout
++for a Linux operating system, including the correct permissions for
++the directories.</description>
++      </application>
++      <application>
++        <name>glibc</name>
++        <version>2.32</version>
++        <release>4.fc33</release>
++        <arch>x86_64</arch>
++        <url>http://www.gnu.org/software/glibc/</url>
++        <summary>The GNU libc libraries</summary>
++        <description>The glibc package contains standard libraries which are used by
++multiple programs on the system. In order to save disk space and
++memory, as well as to make upgrading easier, common system code is
++kept in one place and shared between programs. This particular package
++contains the most important sets of shared libraries: the standard C
++library and the standard math library. Without these two libraries, a
++Linux system will not function.</description>
++      </application>
++      <application>
++        <name>glibc-all-langpacks</name>
++        <version>2.32</version>
++        <release>4.fc33</release>
++        <arch>x86_64</arch>
++        <url>http://www.gnu.org/software/glibc/</url>
++        <summary>All language packs for glibc.</summary>
++      </application>
++      <application>
++        <name>glibc-common</name>
++        <version>2.32</version>
++        <release>4.fc33</release>
+         <arch>x86_64</arch>
++        <url>http://www.gnu.org/software/glibc/</url>
++        <summary>Common binaries and locale data for glibc</summary>
++        <description>The glibc-common package includes common binaries for the GNU libc
++libraries, as well as national language (locale) support.</description>
+       </application>
+       <application>
+-        <name>test2</name>
+-        <version>2.0</version>
+-        <release>2.fc14</release>
++        <name>gpg-pubkey</name>
++        <version>9570ff31</version>
++        <release>5e3006fb</release>
++        <arch>(none)</arch>
++        <url>(none)</url>
++        <summary>Fedora (33) &lt;fedora-33-primary@fedoraproject.org&gt; public key</summary>
++        <description>-----BEGIN PGP PUBLIC KEY BLOCK-----
++Version: rpm-4.16.1.2 (NSS-3)
++
++mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
++bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
++kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
++Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
++QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
++2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
++UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
++oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
++rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
++6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
++EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
++tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
++cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
++CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
++P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
++7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
++AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
++2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
++GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
++EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
++fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
++66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
++Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
++Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
++=EPL3
++-----END PGP PUBLIC KEY BLOCK-----
++</description>
++      </application>
++      <application>
++        <name>libgcc</name>
++        <version>10.2.1</version>
++        <release>9.fc33</release>
+         <arch>x86_64</arch>
++        <url>http://gcc.gnu.org</url>
++        <summary>GCC version 10 shared support library</summary>
++        <description>This package contains GCC shared support library which is needed
++e.g. for exception handling support.</description>
++      </application>
++      <application>
++        <name>ncurses-base</name>
++        <version>6.2</version>
++        <release>3.20200222.fc33</release>
++        <arch>noarch</arch>
++        <url>https://invisible-island.net/ncurses/ncurses.html</url>
++        <summary>Descriptions of common terminals</summary>
++        <description>This package contains descriptions of common terminals. Other terminal
++descriptions are included in the ncurses-term package.</description>
+       </application>
+       <application>
+-        <name>test3</name>
+-        <version>3.0</version>
+-        <release>3.fc14</release>
++        <name>ncurses-libs</name>
++        <version>6.2</version>
++        <release>3.20200222.fc33</release>
+         <arch>x86_64</arch>
++        <url>https://invisible-island.net/ncurses/ncurses.html</url>
++        <summary>Ncurses libraries</summary>
++        <description>The curses library routines are a terminal-independent method of
++updating character screens with reasonable optimization.  The ncurses
++(new curses) library is a freely distributable replacement for the
++discontinued 4.4 BSD classic curses library.
++
++This package contains the ncurses libraries.</description>
++      </application>
++      <application>
++        <name>setup</name>
++        <version>2.13.7</version>
++        <release>2.fc33</release>
++        <arch>noarch</arch>
++        <url>https://pagure.io/setup/</url>
++        <summary>A set of system configuration and setup files</summary>
++        <description>The setup package contains a set of important system configuration and
++setup files, such as passwd, group, and profile.</description>
++      </application>
++      <application>
++        <name>tzdata</name>
++        <version>2021a</version>
++        <release>1.fc33</release>
++        <arch>noarch</arch>
++        <url>https://www.iana.org/time-zones</url>
++        <summary>Timezone data</summary>
++        <description>This package contains data files with rules for various timezones around
++the world.</description>
+       </application>
+     </applications>
+   </operatingsystem>
+diff --git a/inspector/expected-fedora.img.xml b/inspector/expected-fedora.img.xml
+index df6060a73..72cddaf88 100644
+--- a/inspector/expected-fedora.img.xml
++++ b/inspector/expected-fedora.img.xml
+@@ -30,22 +30,212 @@
+     </filesystems>
+     <applications>
+       <application>
+-        <name>test1</name>
+-        <version>1.0</version>
+-        <release>1.fc14</release>
++        <name>basesystem</name>
++        <version>11</version>
++        <release>10.fc33</release>
++        <arch>noarch</arch>
++        <url>(none)</url>
++        <summary>The skeleton package which defines a simple Fedora system</summary>
++        <description>Basesystem defines the components of a basic Fedora system
++(for example, the package installation order to use during bootstrapping).
++Basesystem should be in every installation of a system, and it
++should never be removed.</description>
++      </application>
++      <application>
++        <name>bash</name>
++        <version>5.0.17</version>
++        <release>2.fc33</release>
++        <arch>x86_64</arch>
++        <url>https://www.gnu.org/software/bash</url>
++        <summary>The GNU Bourne Again shell</summary>
++        <description>The GNU Bourne Again shell (Bash) is a shell or command language
++interpreter that is compatible with the Bourne shell (sh). Bash
++incorporates useful features from the Korn shell (ksh) and the C shell
++(csh). Most sh scripts can be run by bash without modification.</description>
++      </application>
++      <application>
++        <name>fedora-gpg-keys</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora RPM keys</summary>
++        <description>This package provides the RPM signature keys.</description>
++      </application>
++      <application>
++        <name>fedora-release</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora release files</summary>
++        <description>Fedora release files such as various /etc/ files that define the release
++and systemd preset files that determine which services are enabled by default.</description>
++      </application>
++      <application>
++        <name>fedora-release-common</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora release files</summary>
++        <description>Release files common to all Editions and Spins of Fedora</description>
++      </application>
++      <application>
++        <name>fedora-release-identity-basic</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Package providing the basic Fedora identity</summary>
++        <description>Provides the necessary files for a Fedora installation that is not identifying
++itself as a particular Edition or Spin.</description>
++      </application>
++      <application>
++        <name>fedora-repos</name>
++        <version>33</version>
++        <release>3</release>
++        <arch>noarch</arch>
++        <url>https://fedoraproject.org/</url>
++        <summary>Fedora package repositories</summary>
++        <description>Fedora package repository files for yum and dnf along with gpg public keys.</description>
++      </application>
++      <application>
++        <name>filesystem</name>
++        <version>3.14</version>
++        <release>3.fc33</release>
++        <arch>x86_64</arch>
++        <url>https://pagure.io/filesystem</url>
++        <summary>The basic directory layout for a Linux system</summary>
++        <description>The filesystem package is one of the basic packages that is installed
++on a Linux system. Filesystem contains the basic directory layout
++for a Linux operating system, including the correct permissions for
++the directories.</description>
++      </application>
++      <application>
++        <name>glibc</name>
++        <version>2.32</version>
++        <release>4.fc33</release>
++        <arch>x86_64</arch>
++        <url>http://www.gnu.org/software/glibc/</url>
++        <summary>The GNU libc libraries</summary>
++        <description>The glibc package contains standard libraries which are used by
++multiple programs on the system. In order to save disk space and
++memory, as well as to make upgrading easier, common system code is
++kept in one place and shared between programs. This particular package
++contains the most important sets of shared libraries: the standard C
++library and the standard math library. Without these two libraries, a
++Linux system will not function.</description>
++      </application>
++      <application>
++        <name>glibc-all-langpacks</name>
++        <version>2.32</version>
++        <release>4.fc33</release>
++        <arch>x86_64</arch>
++        <url>http://www.gnu.org/software/glibc/</url>
++        <summary>All language packs for glibc.</summary>
++      </application>
++      <application>
++        <name>glibc-common</name>
++        <version>2.32</version>
++        <release>4.fc33</release>
+         <arch>x86_64</arch>
++        <url>http://www.gnu.org/software/glibc/</url>
++        <summary>Common binaries and locale data for glibc</summary>
++        <description>The glibc-common package includes common binaries for the GNU libc
++libraries, as well as national language (locale) support.</description>
+       </application>
+       <application>
+-        <name>test2</name>
+-        <version>2.0</version>
+-        <release>2.fc14</release>
++        <name>gpg-pubkey</name>
++        <version>9570ff31</version>
++        <release>5e3006fb</release>
++        <arch>(none)</arch>
++        <url>(none)</url>
++        <summary>Fedora (33) &lt;fedora-33-primary@fedoraproject.org&gt; public key</summary>
++        <description>-----BEGIN PGP PUBLIC KEY BLOCK-----
++Version: rpm-4.16.1.2 (NSS-3)
++
++mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
++bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
++kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
++Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
++QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
++2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
++UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
++oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
++rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
++6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
++EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
++tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
++cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
++CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
++P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
++7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
++AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
++2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
++GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
++EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
++fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
++66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
++Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
++Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
++=EPL3
++-----END PGP PUBLIC KEY BLOCK-----
++</description>
++      </application>
++      <application>
++        <name>libgcc</name>
++        <version>10.2.1</version>
++        <release>9.fc33</release>
+         <arch>x86_64</arch>
++        <url>http://gcc.gnu.org</url>
++        <summary>GCC version 10 shared support library</summary>
++        <description>This package contains GCC shared support library which is needed
++e.g. for exception handling support.</description>
++      </application>
++      <application>
++        <name>ncurses-base</name>
++        <version>6.2</version>
++        <release>3.20200222.fc33</release>
++        <arch>noarch</arch>
++        <url>https://invisible-island.net/ncurses/ncurses.html</url>
++        <summary>Descriptions of common terminals</summary>
++        <description>This package contains descriptions of common terminals. Other terminal
++descriptions are included in the ncurses-term package.</description>
+       </application>
+       <application>
+-        <name>test3</name>
+-        <version>3.0</version>
+-        <release>3.fc14</release>
++        <name>ncurses-libs</name>
++        <version>6.2</version>
++        <release>3.20200222.fc33</release>
+         <arch>x86_64</arch>
++        <url>https://invisible-island.net/ncurses/ncurses.html</url>
++        <summary>Ncurses libraries</summary>
++        <description>The curses library routines are a terminal-independent method of
++updating character screens with reasonable optimization.  The ncurses
++(new curses) library is a freely distributable replacement for the
++discontinued 4.4 BSD classic curses library.
++
++This package contains the ncurses libraries.</description>
++      </application>
++      <application>
++        <name>setup</name>
++        <version>2.13.7</version>
++        <release>2.fc33</release>
++        <arch>noarch</arch>
++        <url>https://pagure.io/setup/</url>
++        <summary>A set of system configuration and setup files</summary>
++        <description>The setup package contains a set of important system configuration and
++setup files, such as passwd, group, and profile.</description>
++      </application>
++      <application>
++        <name>tzdata</name>
++        <version>2021a</version>
++        <release>1.fc33</release>
++        <arch>noarch</arch>
++        <url>https://www.iana.org/time-zones</url>
++        <summary>Timezone data</summary>
++        <description>This package contains data files with rules for various timezones around
++the world.</description>
+       </application>
+     </applications>
+   </operatingsystem>
+-- 
+2.31.1
+

SOURCES/0017-launch-libvirt-place-our-virtio-net-pci-device-in-sl.patch

@@ -0,0 +1,65 @@
+From 6657d0c1018ab44ae680376463ac3f0421548fb4 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Thu, 23 Dec 2021 11:36:59 +0100
+Subject: [PATCH] launch-libvirt: place our virtio-net-pci device in slot 0x1e
+
+The <qemu:commandline> trick we use for adding our virtio-net-pci device
+in the libvirt backend can conflict with libvirtd's and QEMU's PCI address
+assignment. Try to mitigate that by placing our device in slot 0x1e on the
+root bus. In practice this could only conflict with a "dmi-to-pci-bridge"
+device model, which libvirtd itself places in slot 0x1e. However, given
+the XMLs we generate, and modern QEMU versions, libvirtd has no reason to
+auto-add "dmi-to-pci-bridge". Refer to
+<https://libvirt.org/formatdomain.html#controllers>.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20211223103701.12702-2-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 5ce5ef6a97a58c5e906083ad4e944545712b3f3f)
+---
+ lib/guestfs-internal.h | 11 +++++++++++
+ lib/launch-libvirt.c   |  4 +++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
+index 4799ee0a1..0b46f0070 100644
+--- a/lib/guestfs-internal.h
++++ b/lib/guestfs-internal.h
+@@ -147,6 +147,17 @@
+ #define VIRTIO_DEVICE_NAME(type) type "-pci"
+ #endif
+ 
++/* Place the virtio-net controller in slot 0x1e on the root bus, on normal
++ * hardware with PCI. Refer to RHBZ#2034160.
++ */
++#ifdef HAVE_LIBVIRT_BACKEND
++#if defined(__arm__) || defined(__s390x__)
++#define VIRTIO_NET_PCI_ADDR ""
++#else
++#define VIRTIO_NET_PCI_ADDR ",addr=1e.0"
++#endif
++#endif
++
+ /* Guestfs handle and associated structures. */
+ 
+ /* State. */
+diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
+index 026dc6b26..5842319df 100644
+--- a/lib/launch-libvirt.c
++++ b/lib/launch-libvirt.c
+@@ -1834,7 +1834,9 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g,
+       } end_element ();
+ 
+       start_element ("qemu:arg") {
+-        attribute ("value", VIRTIO_DEVICE_NAME ("virtio-net") ",netdev=usernet");
++        attribute ("value", (VIRTIO_DEVICE_NAME ("virtio-net")
++                             ",netdev=usernet"
++                             VIRTIO_NET_PCI_ADDR));
+       } end_element ();
+     }
+ 
+-- 
+2.31.1
+

SOURCES/0018-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-ma.patch

@@ -0,0 +1,70 @@
+From 4b9eac11db3e2cc9ace397ed4c804356a7d9adbf Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Thu, 23 Dec 2021 11:37:00 +0100
+Subject: [PATCH] lib: extract NETWORK_ADDRESS and NETWORK_PREFIX as macros
+
+The 169.254.0.0/16 network specification (for the appliance) is currently
+duplicated between the direct backend and the libvirt backend. In a
+subsequent patch, we're going to need the network specification in yet
+another spot; extract it now to the NETWORK_ADDRESS and NETWORK_PREFIX
+macros (simply as strings).
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20211223103701.12702-3-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 216de164e091a5c36403f24901698044a43ae0d9)
+---
+ lib/guestfs-internal.h | 6 ++++++
+ lib/launch-direct.c    | 2 +-
+ lib/launch-libvirt.c   | 3 ++-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
+index 0b46f0070..97a13ff2c 100644
+--- a/lib/guestfs-internal.h
++++ b/lib/guestfs-internal.h
+@@ -158,6 +158,12 @@
+ #endif
+ #endif
+ 
++/* Network address and network mask (expressed as address prefix) that the
++ * appliance will see (if networking is enabled).
++ */
++#define NETWORK_ADDRESS "169.254.0.0"
++#define NETWORK_PREFIX  "16"
++
+ /* Guestfs handle and associated structures. */
+ 
+ /* State. */
+diff --git a/lib/launch-direct.c b/lib/launch-direct.c
+index b6ed9766f..de17d2167 100644
+--- a/lib/launch-direct.c
++++ b/lib/launch-direct.c
+@@ -681,7 +681,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
+     start_list ("-netdev") {
+       append_list ("user");
+       append_list ("id=usernet");
+-      append_list ("net=169.254.0.0/16");
++      append_list ("net=" NETWORK_ADDRESS "/" NETWORK_PREFIX);
+     } end_list ();
+     start_list ("-device") {
+       append_list (VIRTIO_DEVICE_NAME ("virtio-net"));
+diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
+index 5842319df..0f38f0aec 100644
+--- a/lib/launch-libvirt.c
++++ b/lib/launch-libvirt.c
+@@ -1826,7 +1826,8 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g,
+       } end_element ();
+ 
+       start_element ("qemu:arg") {
+-        attribute ("value", "user,id=usernet,net=169.254.0.0/16");
++        attribute ("value",
++                   "user,id=usernet,net=" NETWORK_ADDRESS "/" NETWORK_PREFIX);
+       } end_element ();
+ 
+       start_element ("qemu:arg") {
+-- 
+2.31.1
+

SOURCES/0019-launch-libvirt-add-virtio-net-via-the-standard-inter.patch

@@ -0,0 +1,91 @@
+From 8570de6e766297e4c9feab1c54ae05037f33edeb Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Thu, 23 Dec 2021 11:37:01 +0100
+Subject: [PATCH] launch-libvirt: add virtio-net via the standard <interface>
+ element
+
+Starting with version 3.8.0, libvirt allows us to specify the network
+address and network mask (as prefix) for SLIRP directly via the
+<interface> element in the domain XML:
+<https://libvirt.org/formatdomain.html#userspace-slirp-stack>. This means
+we don't need the <qemu:commandline> hack for virtio-net on such versions.
+
+Restrict the hack in construct_libvirt_xml_qemu_cmdline() to
+libvirt<3.8.0, and generate the proper <interface> element in
+construct_libvirt_xml_devices() on libvirt>=3.8.0.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160
+Suggested-by: Richard W.M. Jones <rjones@redhat.com>
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20211223103701.12702-4-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 5858c2cf6c24b3776e3867eafd9d86a1f4912d9c)
+---
+ lib/guestfs-internal.h |  3 ++-
+ lib/launch-libvirt.c   | 27 +++++++++++++++++++++++++--
+ 2 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
+index 97a13ff2c..b11c945e9 100644
+--- a/lib/guestfs-internal.h
++++ b/lib/guestfs-internal.h
+@@ -148,7 +148,8 @@
+ #endif
+ 
+ /* Place the virtio-net controller in slot 0x1e on the root bus, on normal
+- * hardware with PCI. Refer to RHBZ#2034160.
++ * hardware with PCI. Necessary only before libvirt 3.8.0. Refer to
++ * RHBZ#2034160.
+  */
+ #ifdef HAVE_LIBVIRT_BACKEND
+ #if defined(__arm__) || defined(__s390x__)
+diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
+index 0f38f0aec..f6bb39d99 100644
+--- a/lib/launch-libvirt.c
++++ b/lib/launch-libvirt.c
+@@ -1396,6 +1396,28 @@ construct_libvirt_xml_devices (guestfs_h *g,
+       } end_element ();
+     } end_element ();
+ 
++    /* Virtio-net NIC with SLIRP (= userspace) back-end, if networking is
++     * enabled. Starting with libvirt 3.8.0, we can specify the network address
++     * and prefix for SLIRP in the domain XML. Therefore, we can add the NIC
++     * via the standard <interface> element rather than <qemu:commandline>, and
++     * so libvirt can manage the PCI address of the virtio-net NIC like the PCI
++     * addresses of all other devices. Refer to RHBZ#2034160.
++     */
++    if (g->enable_network &&
++        guestfs_int_version_ge (&params->data->libvirt_version, 3, 8, 0)) {
++      start_element ("interface") {
++        attribute ("type", "user");
++        start_element ("model") {
++          attribute ("type", "virtio");
++        } end_element ();
++        start_element ("ip") {
++          attribute ("family", "ipv4");
++          attribute ("address", NETWORK_ADDRESS);
++          attribute ("prefix", NETWORK_PREFIX);
++        } end_element ();
++      } end_element ();
++    }
++
+     /* Libvirt adds some devices by default.  Indicate to libvirt
+      * that we don't want them.
+      */
+@@ -1818,9 +1840,10 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g,
+     } end_element ();
+ 
+     /* Workaround because libvirt user networking cannot specify "net="
+-     * parameter.
++     * parameter. Necessary only before libvirt 3.8.0; refer to RHBZ#2034160.
+      */
+-    if (g->enable_network) {
++    if (g->enable_network &&
++        !guestfs_int_version_ge (&params->data->libvirt_version, 3, 8, 0)) {
+       start_element ("qemu:arg") {
+         attribute ("value", "-netdev");
+       } end_element ();
+-- 
+2.31.1
+

SOURCES/0020-appliance-Use-cpu-max.patch

@@ -0,0 +1,86 @@
+From fbb053fc71c0c072acb3fbf6e5fbbfc3b0667fd2 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 28 Jan 2021 12:20:49 +0000
+Subject: [PATCH] appliance: Use -cpu max.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QEMU has a newish feature (from about 2017 / qemu 2.9) called -cpu max
+which is supposed to select the best CPU, ideal for libguestfs.
+
+After this change, on x86-64:
+
+               KVM                          TCG
+
+Direct         -cpu max                     -cpu max
+(non-libvirt)
+
+Libvirt   <cpu mode="host-passthrough">     <cpu mode="host-model">
+            <model fallback="allow"/>         <model fallback="allow"/>
+          </cpu>                            </cpu>
+
+Thanks: Daniel Berrangé
+(cherry picked from commit 30f74f38bd6e42e783ba80895f4d6826abddd417)
+---
+ lib/appliance-cpu.c  | 16 ++++++++--------
+ lib/launch-libvirt.c |  9 +++++++++
+ 2 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/lib/appliance-cpu.c b/lib/appliance-cpu.c
+index 5ef9f5c72..54ac6e2e3 100644
+--- a/lib/appliance-cpu.c
++++ b/lib/appliance-cpu.c
+@@ -38,6 +38,11 @@
+  *
+  * The literal string C<"host"> means use C<-cpu host>.
+  *
++ * =item C<"max">
++ *
++ * The literal string C<"max"> means use C<-cpu max> (the best
++ * possible).  This requires awkward translation for libvirt.
++ *
+  * =item some string
+  *
+  * Some string such as C<"cortex-a57"> means use C<-cpu cortex-a57>.
+@@ -80,14 +85,9 @@ guestfs_int_get_cpu_model (int kvm)
+   /* See discussion in https://bugzilla.redhat.com/show_bug.cgi?id=1605071 */
+   return NULL;
+ #else
+-  /* On most architectures, it is faster to pass the CPU host model to
+-   * the appliance, allowing maximum speed for things like checksums
+-   * and encryption.  Only do this with KVM.  It is broken in subtle
+-   * ways on TCG, and fairly pointless when you're emulating anyway.
++  /* On most architectures we can use "max" to get the best possible CPU.
++   * For recent qemu this should work even on TCG.
+    */
+-  if (kvm)
+-    return "host";
+-  else
+-    return NULL;
++  return "max";
+ #endif
+ }
+diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
+index f6bb39d99..e3ff1ffe0 100644
+--- a/lib/launch-libvirt.c
++++ b/lib/launch-libvirt.c
+@@ -1169,6 +1169,15 @@ construct_libvirt_xml_cpu (guestfs_h *g,
+           attribute ("fallback", "allow");
+         } end_element ();
+       }
++      else if (STREQ (cpu_model, "max")) {
++        if (params->data->is_kvm)
++          attribute ("mode", "host-passthrough");
++        else
++          attribute ("mode", "host-model");
++        start_element ("model") {
++          attribute ("fallback", "allow");
++        } end_element ();
++      }
+       else
+         single_element ("model", cpu_model);
+     } end_element ();
+-- 
+2.31.1
+

SOURCES/0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch

@@ -0,0 +1,48 @@
+From 7dde1007525ec235e769351be15ca5de34eeda4a Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 18 Mar 2021 12:32:26 +0000
+Subject: [PATCH] appliance: Use <cpu mode="maximum"/> for -cpu max on libvirt.
+
+Note this requires libvirt >= 7.1.0 which was only released in March 2021.
+
+With an older libvirt you will see this error:
+
+  Original error from libvirt: unsupported configuration: Invalid mode attribute 'maximum' [code=67 int1=-1]
+
+In theory we could check if this is supported by looking at the
+libvirt capabilities and fall back, but this commit does not do that,
+in the expectation that most people will be using the default backend
+(direct) and on Fedora/RHEL we will add an explicit minimum version
+dependency to the package.
+
+qemu support has been around quite a bit longer (at least since 2017).
+
+Fixes: commit 30f74f38bd6e42e783ba80895f4d6826abddd417
+(cherry picked from commit 13ceb6a87b2869909a6a0e3c8caa962b72e4cb0e)
+---
+ lib/launch-libvirt.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
+index e3ff1ffe0..db619910f 100644
+--- a/lib/launch-libvirt.c
++++ b/lib/launch-libvirt.c
+@@ -1170,13 +1170,8 @@ construct_libvirt_xml_cpu (guestfs_h *g,
+         } end_element ();
+       }
+       else if (STREQ (cpu_model, "max")) {
+-        if (params->data->is_kvm)
+-          attribute ("mode", "host-passthrough");
+-        else
+-          attribute ("mode", "host-model");
+-        start_element ("model") {
+-          attribute ("fallback", "allow");
+-        } end_element ();
++        /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
++        attribute ("mode", "maximum");
+       }
+       else
+         single_element ("model", cpu_model);
+-- 
+2.31.1
+

SOURCES/0022-lib-Disable-5-level-page-tables-when-using-cpu-max.patch

@@ -0,0 +1,92 @@
+From bb19cc0cdd43619ccf830e1e608f79e46f8ddf86 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 12 May 2022 08:36:37 +0100
+Subject: [PATCH] lib: Disable 5-level page tables when using -cpu max
+
+In https://bugzilla.redhat.com/show_bug.cgi?id=2082806 we've been
+tracking an insidious qemu bug which intermittently prevents the
+libguestfs appliance from starting.  The symptoms are that SeaBIOS
+starts and displays its messages, but the kernel isn't reached.  We
+found that the kernel does in fact start, but when it tries to set up
+page tables and jump to protected mode it gets a triple fault which
+causes the emulated CPU in qemu to reset (qemu exits).
+
+This seems to only affect TCG (not KVM).
+
+Yesterday I found that this is caused by using -cpu max which enables
+the "la57" feature (5-level page tables[0]), and that we can make the
+problem go away using -cpu max,la57=off.  Note that I still don't
+fully understand the qemu bug, so this is only a workaround.
+
+I chose to disable 5-level page tables for both TCG and KVM, partly to
+make the patch simpler, and partly because I guess it's not a feature
+(ie. 57 bit linear addresses) that is useful for the libguestfs
+appliance case, where we have limited physical memory and no need to
+run any programs with huge address spaces.
+
+I tested this by running both the direct & libvirt paths overnight.  I
+expect that this patch will fail with old qemu/libvirt which doesn't
+understand the "la57" feature, but this is only intended as a
+temporary workaround.
+
+[0] Article about 5-level page tables as background:
+https://lwn.net/Articles/717293/
+
+Thanks: Laszlo Ersek
+Fixes: https://answers.launchpad.net/ubuntu/+source/libguestfs/+question/701625
+
+[RHEL 8.7: Patch is not upstream.  This is the initial patch as posted
+to the mailing list here:
+https://listman.redhat.com/archives/libguestfs/2022-May/028853.html]
+---
+ lib/launch-direct.c  | 15 +++++++++++++--
+ lib/launch-libvirt.c |  7 +++++++
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/lib/launch-direct.c b/lib/launch-direct.c
+index de17d2167..6b28e4724 100644
+--- a/lib/launch-direct.c
++++ b/lib/launch-direct.c
+@@ -534,8 +534,19 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
+   } end_list ();
+ 
+   cpu_model = guestfs_int_get_cpu_model (has_kvm && !force_tcg);
+-  if (cpu_model)
+-    arg ("-cpu", cpu_model);
++  if (cpu_model) {
++#if defined(__x86_64__)
++    /* Temporary workaround for RHBZ#2082806 */
++    if (STREQ (cpu_model, "max")) {
++      start_list ("-cpu") {
++        append_list (cpu_model);
++        append_list ("la57=off");
++      } end_list ();
++    }
++    else
++#endif
++      arg ("-cpu", cpu_model);
++  }
+ 
+   if (g->smp > 1)
+     arg_format ("-smp", "%d", g->smp);
+diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
+index db619910f..bad4a54ea 100644
+--- a/lib/launch-libvirt.c
++++ b/lib/launch-libvirt.c
+@@ -1172,6 +1172,13 @@ construct_libvirt_xml_cpu (guestfs_h *g,
+       else if (STREQ (cpu_model, "max")) {
+         /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
+         attribute ("mode", "maximum");
++#if defined(__x86_64__)
++        /* Temporary workaround for RHBZ#2082806 */
++        start_element ("feature") {
++          attribute ("policy", "disable");
++          attribute ("name", "la57");
++        } end_element ();
++#endif
+       }
+       else
+         single_element ("model", cpu_model);
+-- 
+2.31.1
+

SOURCES/0023-docs-guestfs-security-document-CVE-2022-2211.patch

@@ -0,0 +1,103 @@
+From 22d779d5982dc82d629710d41973ed6545707bd9 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Tue, 28 Jun 2022 13:54:16 +0200
+Subject: [PATCH] docs/guestfs-security: document CVE-2022-2211
+
+Short log for the common submodule, commit range
+f8de5508fe75..35467027f657:
+
+Laszlo Ersek (2):
+      mlcustomize: factor out pkg install/update/uninstall from guestfs-tools
+      options: fix buffer overflow in get_keys() [CVE-2022-2211]
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1809453
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2100862
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20220628115418.5376-2-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+
+Cherry picked from commit 99844660b48ed809e37378262c65d63df6ce4a53.
+For the cherry pick I only added one submodule commit:
+
+options: fix buffer overflow in get_keys() [CVE-2022-2211]
+---
+ common                    |  2 +-
+ docs/guestfs-security.pod | 28 ++++++++++++++++++++++++++++
+ 2 files changed, 29 insertions(+), 1 deletion(-)
+
+Submodule common be09523d6..1174b443a:
+diff --git a/common/options/keys.c b/common/options/keys.c
+index 798315c..d27a712 100644
+--- a/common/options/keys.c
++++ b/common/options/keys.c
+@@ -128,17 +128,23 @@ read_first_line_from_file (const char *filename)
+ char **
+ get_keys (struct key_store *ks, const char *device, const char *uuid)
+ {
+-  size_t i, j, len;
++  size_t i, j, nmemb;
+   char **r;
+   char *s;
+ 
+   /* We know the returned list must have at least one element and not
+    * more than ks->nr_keys.
+    */
+-  len = 1;
+-  if (ks)
+-    len = MIN (1, ks->nr_keys);
+-  r = calloc (len+1, sizeof (char *));
++  nmemb = 1;
++  if (ks && ks->nr_keys > nmemb)
++    nmemb = ks->nr_keys;
++
++  /* make room for the terminating NULL */
++  if (nmemb == (size_t)-1)
++    error (EXIT_FAILURE, 0, _("size_t overflow"));
++  nmemb++;
++
++  r = calloc (nmemb, sizeof (char *));
+   if (r == NULL)
+     error (EXIT_FAILURE, errno, "calloc");
+ 
+diff --git a/docs/guestfs-security.pod b/docs/guestfs-security.pod
+index 9ceef5623..efa35b29d 100644
+--- a/docs/guestfs-security.pod
++++ b/docs/guestfs-security.pod
+@@ -406,6 +406,34 @@ The libvirt backend is not affected.
+ The solution is to update qemu to a version containing the fix (see
+ L<https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01012.html>).
+ 
++=head2 CVE-2022-2211
++
++L<https://bugzilla.redhat.com/CVE-2022-2211>
++
++The C<get_keys> function in F<libguestfs-common/options/keys.c> collects
++those I<--key> options from the command line into a new array that match
++a particular block device that's being decrypted for inspection. The
++function intends to size the result array such that potentially all
++I<--key> options, plus a terminating C<NULL> element, fit into it. The
++code mistakenly uses the C<MIN> macro instead of C<MAX>, and therefore
++only one element is allocated before the C<NULL> terminator.
++
++Passing precisely two I<--key ID:...> options on the command line for
++the encrypted block device C<ID> causes C<get_keys> to overwrite the
++terminating C<NULL>, leading to an out-of-bounds read in
++C<decrypt_mountables>, file F<libguestfs-common/options/decrypt.c>.
++
++Passing more than two I<--key ID:...> options on the command line for
++the encrypted block device C<ID> causes C<get_keys> itself to perform
++out-of-bounds writes. The most common symptom is a crash with C<SIGSEGV>
++later on.
++
++This issue affects -- broadly speaking -- all libguestfs-based utilities
++that accept I<--key>, namely: C<guestfish>, C<guestmount>, C<virt-cat>,
++C<virt-customize>, C<virt-diff>, C<virt-edit>, C<virt-get-kernel>,
++C<virt-inspector>, C<virt-log>, C<virt-ls>, C<virt-sparsify>,
++C<virt-sysprep>, C<virt-tail>, C<virt-v2v>.
++
+ =head1 SEE ALSO
+ 
+ L<guestfs(3)>,
+-- 
+2.31.1
+

SOURCES/README-replacement.in

@@ -8,7 +8,8 @@ list:
 
   http://www.redhat.com/mailman/listinfo/libguestfs
 
-This package comes with a lot of help and examples to get you started.
+This Red Hat Enterprise Linux package comes with a lot of help and
+examples to get you started.
 
 The first place to start are the manual pages.  Type:
 
@@ -19,19 +20,19 @@ The first place to start are the manual pages.  Type:
   man virt-cat   # and other virt-* tools
 
 If you install the libguestfs-devel package, then in the
-/usr/share/doc/libguestfs-devel/ directory you will find other
-documentation including:
+/usr/share/doc/libguestfs-devel/ directory you will also
+find:
 
  - BUGS: list of open bugs in this version
 
- - ChangeLog.gz: the detailed list of changes in this version
+ - ChangeLog: the detailed list of changes in this version
 
- - HACKING: how to extend libguestfs
+ - ROADMAP: the roadmap for future versions
 
  - TODO: ideas for extending libguestfs
 
  - *.c: example C programs using the API
 
- - *.xml.gz: example virt-inspector output (compressed)
+ - *.xml: example virt-inspector output
 
- - virt-inspector.rng: virt-inspector RelaxNG schema
+ - *.rng: virt-inspector RelaxNG schema

SOURCES/copy-patches.sh

@@ -3,11 +3,10 @@
 set -e
 
 # Maintainer script to copy patches from the git repo to the current
-# directory.  It's normally only used downstream (ie. in RHEL).  Use
-# it like this:
+# directory.  Use it like this:
 #   ./copy-patches.sh
 
-rhel_version=9.0.0
+rhel_version=8.7.0
 
 # Check we're in the right directory.
 if [ ! -f libguestfs.spec ]; then

SOURCES/libguestfs-1.44.0.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl/1jrcRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKCBcQ/+JwE8JTm3PdTPGoKxCqSgAOirbqE4ZvMY
+p/3y5mexagcWXx6X2Y+u6dlybS06jFR8TkbjdE3VAhhJo0C8l1vfvUTWKVDZoBhG
+3jZ6e+exff3VEUY4nFIVvYPNP+/J1BCiexMO0/2f1MDKwnJ73je9GlzwPEpdqPj/
+jSxaAy1G/rA5qV5rWQd4n5S9m8zRnf1lnM7YI7I0PunC2Wt/U6BZidL/FVVWVBxV
+DGKTIy7GgWnfGWdqJ+Wi9o9QCJH/9FGTP35xonyQEM/7GI+jLz+a9g2xgvv584Ni
+FF0Gqywrp5QFd13Nj3MPM7MXjGjUY5vB964k3mgE4fH91CnVvisRWfUCCo+c/9wG
+odS0YTrveWJpm0oYU2tL3AjahRclskAxXEIxx9kbnWMUTrpXG0r8G4+vE+estCjb
+mbyK5FQh2KASqNgmeopjK9DAEwD7SfPyHmPQ07Q76Pgl8X+FfBX2uyXBjaR5IJJJ
+qVVamdVtPilqwWqQ8hGkKE0qVKqZHGCOJ8+AkQjHjUtSVegT6zHmCG/bM4im1dGV
+r9fv6oQ7kWViz8mBluoETWr5sd2AfLOdLS8A42JaOnU7ASJUX/9eN0Y9u4BYC9P3
+l+QXikyq6T/4iC+tADOYGBr9uNitksLwSSUYScpnN+4AY+M+qjXTBq38MEHmwcgK
+5mwscgQefcY=
+=UrAA
+-----END PGP SIGNATURE-----

SOURCES/libguestfs-1.45.6.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmCvzBkRHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKAHgxAApu8ZwOLMKF88hHOKTUvOYBilEq7FiDtW
-9hVgm/aCIwNxTwgODfP7aZtkiyId5wjBrP8ADl3tN6sWkPqn2+B4XenOIEvXNfFV
-7I6920YWjO7oVrgjdi9ErjRXpkJ+HuKq98xqu6xtbeRZ35fO9bNMRnntU4BaXfi/
-lND+KfbSONJKl/MqLBK73A3ZDzRG3qvdl73270tx5l0IsEShpVEoqeXsR/vL+Y26
-5h8sB/7RnqpSCBjUWIhaj1faGfVl4Dle7QEVD8giu38V1bxsaf5glELShMWSS5xc
-lwvC7NJIvbzEkVV8d+bzW7uoRI7DQS+fxnJ8HcDzqUtLMoyGHDMQt4fU2iHQbvAd
-QNAuuXuS1tYykL0QKrA9sXTB0rrbMi5jZH+NhANN+AmuXETXoap54NX1dCIKKzk3
-HySm+AiG7+sYdWv607oM35VzkzJqzW08fABFgbevPQSoD+Qvn44428QlFHxXZ1ZQ
-Mn/pkZ5P5H8IhymM3oJ8hq0UaCIyu/M4qgvEgBwytmY3OqkZanimOZGDZxNgEH+Y
-4yq0Veo2oZO9AcGw3Ve9U/BjDzGLgIAKd2s/S9wPszBkKClQUSOmwlOyFNDEQLQk
-tCfekW91aSBsGDoBu+0FUKrw1slGPmUJl5QLaEyAEsA+ky7Ut8bfwNhbdedz0JbH
-Q7jbq65QmWg=
-=iC06
------END PGP SIGNATURE-----