import libguestfs-1.50.1-6.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/libguestfs-1.48.4.tar.gz
+SOURCES/libguestfs-1.50.1.tar.gz
 SOURCES/libguestfs.keyring

.libguestfs.metadata

@@ -1,2 +1,2 @@
-a8754a62256ac488eec3e18bed20f570f785d069 SOURCES/libguestfs-1.48.4.tar.gz
+b2ccc62a61d43917d982bb380709cd283fda465a SOURCES/libguestfs-1.50.1.tar.gz
 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring

SOURCES/0001-New-API-guestfs_device_name-returning-the-drive-name.patch

@@ -1,96 +0,0 @@
-From e3ebd50abde3b05db86c8965868c866152cd3287 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 28 Apr 2022 13:16:54 +0100
-Subject: [PATCH] New API: guestfs_device_name returning the drive name
-
-For each drive added, return the name.  For example calling this with
-index 0 will return the string "/dev/sda".  I called it
-guestfs_device_name (not drive_name) for consistency with the existing
-guestfs_device_index function.
-
-You don't really need to call this function.  You can follow the
-advice here:
-https://libguestfs.org/guestfs.3.html#block-device-naming
-and assume that drives are added with predictable names like
-"/dev/sda", "/dev/sdb", etc.
-
-However it's useful to expose the internal guestfs_int_drive_name
-function since especially handling names beyond index 26 is tricky
-(https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-drive-26-devsdz/)
-
-Fixes: https://github.com/libguestfs/libguestfs/issues/80
-Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-(cherry picked from commit ac00e603f83802634f1d53b1629aee4670eaf31c)
----
- generator/actions_core.ml | 24 +++++++++++++++++++++++-
- lib/drives.c              | 15 +++++++++++++++
- 2 files changed, 38 insertions(+), 1 deletion(-)
-
-diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index ce9ee39cc..dc12fdc33 100644
---- a/generator/actions_core.ml
-+++ b/generator/actions_core.ml
-@@ -737,7 +737,29 @@ returns the index of the device in the list of devices.
- Index numbers start from 0.  The named device must exist,
- for example as a string returned from C<guestfs_list_devices>.
- 
--See also C<guestfs_list_devices>, C<guestfs_part_to_dev>." };
-+See also C<guestfs_list_devices>, C<guestfs_part_to_dev>,
-+C<guestfs_device_name>." };
-+
-+  { defaults with
-+    name = "device_name"; added = (1, 49, 1);
-+    style = RString (RPlainString, "name"), [Int "index"], [];
-+    tests = [
-+      InitEmpty, Always, TestResult (
-+        [["device_name"; "0"]], "STREQ (ret, \"/dev/sda\")"), [];
-+      InitEmpty, Always, TestResult (
-+        [["device_name"; "1"]], "STREQ (ret, \"/dev/sdb\")"), [];
-+      InitEmpty, Always, TestLastFail (
-+        [["device_name"; "99"]]), []
-+    ];
-+    shortdesc = "convert device index to name";
-+    longdesc = "\
-+This function takes a device index and returns the device
-+name.  For example index C<0> will return the string C</dev/sda>.
-+
-+The drive index must have been added to the handle.
-+
-+See also C<guestfs_list_devices>, C<guestfs_part_to_dev>,
-+C<guestfs_device_index>." };
- 
-   { defaults with
-     name = "shutdown"; added = (1, 19, 16);
-diff --git a/lib/drives.c b/lib/drives.c
-index fd95308d2..a6179fc36 100644
---- a/lib/drives.c
-+++ b/lib/drives.c
-@@ -31,6 +31,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <assert.h>
-+#include <errno.h>
- #include <libintl.h>
- 
- #include "c-ctype.h"
-@@ -1084,3 +1085,17 @@ guestfs_impl_device_index (guestfs_h *g, const char *device)
-     error (g, _("%s: device not found"), device);
-   return r;
- }
-+
-+char *
-+guestfs_impl_device_name (guestfs_h *g, int index)
-+{
-+  char drive_name[64];
-+
-+  if (index < 0 || index >= g->nr_drives) {
-+    guestfs_int_error_errno (g, EINVAL, _("drive index out of range"));
-+    return NULL;
-+  }
-+
-+  guestfs_int_drive_name (index, drive_name);
-+  return safe_asprintf (g, "/dev/sd%s", drive_name);
-+}
--- 
-2.31.1
-

SOURCES/0002-guestfs_readdir-rewrite-with-FileOut-transfer-to-lif.patch

@@ -1,565 +0,0 @@
-From b97b90779d5ea261d5e737f073bb4ec5dc546511 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Mon, 2 May 2022 10:56:00 +0200
-Subject: [PATCH] guestfs_readdir(): rewrite with FileOut transfer, to lift
- protocol limit
-
-Currently the guestfs_readdir() API can not list long directories, due to
-it sending back the whole directory listing in a single guestfs protocol
-response, which is limited to GUESTFS_MESSAGE_MAX (approx. 4MB) in size.
-
-Introduce the "internal_readdir" action, for transferring the directory
-listing from the daemon to the library through a FileOut parameter.
-Rewrite guestfs_readdir() on top of this new internal function:
-
-- The new "internal_readdir" action is a daemon action. Do not repurpose
-  the "readdir" proc_nr (138) for "internal_readdir", as some distros ship
-  the binary appliance to their users, and reusing the proc_nr could
-  create a mismatch between library & appliance with obscure symptoms.
-  Replace the old proc_nr (138) with a new proc_nr (511) instead; a
-  mismatch would then produce a clear error message. Assume the new action
-  will first be released in libguestfs-1.48.2.
-
-- Turn "readdir" from a daemon action into a non-daemon one. Call the
-  daemon action guestfs_internal_readdir() manually, receive the FileOut
-  parameter into a temp file, then deserialize the dirents array from the
-  temp file.
-
-This patch sneakily fixes an independent bug, too. In the pre-patch
-do_readdir() function [daemon/readdir.c], when readdir() returns NULL, we
-don't distinguish "end of directory stream" from "readdir() failed". This
-rewrite fixes this problem -- I didn't see much value separating out the
-fix for the original do_readdir().
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1674392
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220502085601.15012-2-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit 45b7f1736b64e9f0741e21e5a9d83a837bd863bf)
----
- TODO                      |   8 ---
- daemon/readdir.c          | 132 +++++++++++++++++++-------------------
- generator/actions_core.ml | 127 +++++++++++++++++++-----------------
- generator/proc_nr.ml      |   2 +-
- lib/MAX_PROC_NR           |   2 +-
- lib/Makefile.am           |   1 +
- lib/readdir.c             | 131 +++++++++++++++++++++++++++++++++++++
- 7 files changed, 267 insertions(+), 136 deletions(-)
- create mode 100644 lib/readdir.c
-
-diff --git a/TODO b/TODO
-index a50f7d73c..513e55f92 100644
---- a/TODO
-+++ b/TODO
-@@ -484,14 +484,6 @@ this approach works, it doesn't solve the MBR problem, so likely we'd
- have to write a library for that (or perhaps go back to sfdisk but
- using a very abstracted interface over sfdisk).
- 
--Reimplement some APIs to avoid protocol limits
------------------------------------------------
--
--Mostly this item was done (eg. commits a69f44f56f and before).  The
--most notable API with a protocol limit remaining is:
--
-- - guestfs_readdir
--
- hivex
- -----
- 
-diff --git a/daemon/readdir.c b/daemon/readdir.c
-index e488f93e7..9ab0b0aec 100644
---- a/daemon/readdir.c
-+++ b/daemon/readdir.c
-@@ -16,77 +16,67 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#include <config.h>
-+#include <config.h> /* HAVE_STRUCT_DIRENT_D_TYPE */
- 
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <unistd.h>
--#include <dirent.h>
-+#include <dirent.h>    /* readdir() */
-+#include <errno.h>     /* errno */
-+#include <rpc/xdr.h>   /* xdrmem_create() */
-+#include <stdio.h>     /* perror() */
-+#include <stdlib.h>    /* malloc() */
-+#include <sys/types.h> /* opendir() */
- 
--#include "daemon.h"
--#include "actions.h"
-+#include "daemon.h" /* reply_with_perror() */
- 
--static void
--free_int_dirent_list (guestfs_int_dirent *p, size_t len)
-+/* Has one FileOut parameter. */
-+int
-+do_internal_readdir (const char *dir)
- {
--  size_t i;
-+  int ret;
-+  DIR *dirstream;
-+  void *xdr_buf;
-+  XDR xdr;
- 
--  for (i = 0; i < len; ++i) {
--    free (p[i].name);
--  }
--  free (p);
--}
--
--guestfs_int_dirent_list *
--do_readdir (const char *path)
--{
--  guestfs_int_dirent_list *ret;
--  guestfs_int_dirent v;
--  DIR *dir;
--  struct dirent *d;
--  size_t i;
--
--  ret = malloc (sizeof *ret);
--  if (ret == NULL) {
--    reply_with_perror ("malloc");
--    return NULL;
--  }
--
--  ret->guestfs_int_dirent_list_len = 0;
--  ret->guestfs_int_dirent_list_val = NULL;
-+  /* Prepare to fail. */
-+  ret = -1;
- 
-   CHROOT_IN;
--  dir = opendir (path);
-+  dirstream = opendir (dir);
-   CHROOT_OUT;
- 
--  if (dir == NULL) {
--    reply_with_perror ("opendir: %s", path);
--    free (ret);
--    return NULL;
-+  if (dirstream == NULL) {
-+    reply_with_perror ("opendir: %s", dir);
-+    return ret;
-   }
- 
--  i = 0;
--  while ((d = readdir (dir)) != NULL) {
--    guestfs_int_dirent *p;
-+  xdr_buf = malloc (GUESTFS_MAX_CHUNK_SIZE);
-+  if (xdr_buf == NULL) {
-+    reply_with_perror ("malloc");
-+    goto close_dir;
-+  }
-+  xdrmem_create (&xdr, xdr_buf, GUESTFS_MAX_CHUNK_SIZE, XDR_ENCODE);
-+
-+  /* Send an "OK" reply, before starting the file transfer. */
-+  reply (NULL, NULL);
-+
-+  /* From this point on, we can only report errors by canceling the file
-+   * transfer.
-+   */
-+  for (;;) {
-+    struct dirent *d;
-+    guestfs_int_dirent v;
-+
-+    errno = 0;
-+    d = readdir (dirstream);
-+    if (d == NULL) {
-+      if (errno == 0)
-+        ret = 0;
-+      else
-+        perror ("readdir");
- 
--    p = realloc (ret->guestfs_int_dirent_list_val,
--                 sizeof (guestfs_int_dirent) * (i+1));
--    v.name = strdup (d->d_name);
--    if (!p || !v.name) {
--      reply_with_perror ("allocate");
--      if (p) {
--        free_int_dirent_list (p, i);
--      } else {
--        free_int_dirent_list (ret->guestfs_int_dirent_list_val, i);
--      }
--      free (v.name);
--      free (ret);
--      closedir (dir);
--      return NULL;
-+      break;
-     }
--    ret->guestfs_int_dirent_list_val = p;
- 
-+    v.name = d->d_name;
-     v.ino = d->d_ino;
- #ifdef HAVE_STRUCT_DIRENT_D_TYPE
-     switch (d->d_type) {
-@@ -104,19 +94,29 @@ do_readdir (const char *path)
-     v.ftyp = 'u';
- #endif
- 
--    ret->guestfs_int_dirent_list_val[i] = v;
-+    if (!xdr_guestfs_int_dirent (&xdr, &v)) {
-+      fprintf (stderr, "xdr_guestfs_int_dirent failed\n");
-+      break;
-+    }
- 
--    i++;
-+    if (send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
-+      break;
-+
-+    xdr_setpos (&xdr, 0);
-   }
- 
--  ret->guestfs_int_dirent_list_len = i;
-+  /* Finish or cancel the transfer. Note that if (ret == -1) because the library
-+   * canceled, we still need to cancel back!
-+   */
-+  send_file_end (ret == -1);
- 
--  if (closedir (dir) == -1) {
--    reply_with_perror ("closedir");
--    free (ret->guestfs_int_dirent_list_val);
--    free (ret);
--    return NULL;
--  }
-+  xdr_destroy (&xdr);
-+  free (xdr_buf);
-+
-+close_dir:
-+  if (closedir (dirstream) == -1)
-+    /* Best we can do here is log an error. */
-+    perror ("closedir");
- 
-   return ret;
- }
-diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index dc12fdc33..807150615 100644
---- a/generator/actions_core.ml
-+++ b/generator/actions_core.ml
-@@ -141,6 +141,66 @@ only useful for printing debug and internal error messages.
- 
- For more information on states, see L<guestfs(3)>." };
- 
-+  { defaults with
-+    name = "readdir"; added = (1, 0, 55);
-+    style = RStructList ("entries", "dirent"), [String (Pathname, "dir")], [];
-+    progress = true; cancellable = true;
-+    shortdesc = "read directories entries";
-+    longdesc = "\
-+This returns the list of directory entries in directory C<dir>.
-+
-+All entries in the directory are returned, including C<.> and
-+C<..>.  The entries are I<not> sorted, but returned in the same
-+order as the underlying filesystem.
-+
-+Also this call returns basic file type information about each
-+file.  The C<ftyp> field will contain one of the following characters:
-+
-+=over 4
-+
-+=item 'b'
-+
-+Block special
-+
-+=item 'c'
-+
-+Char special
-+
-+=item 'd'
-+
-+Directory
-+
-+=item 'f'
-+
-+FIFO (named pipe)
-+
-+=item 'l'
-+
-+Symbolic link
-+
-+=item 'r'
-+
-+Regular file
-+
-+=item 's'
-+
-+Socket
-+
-+=item 'u'
-+
-+Unknown file type
-+
-+=item '?'
-+
-+The L<readdir(3)> call returned a C<d_type> field with an
-+unexpected value
-+
-+=back
-+
-+This function is primarily intended for use by programs.  To
-+get a simple list of names, use C<guestfs_ls>.  To get a printable
-+directory for human consumption, use C<guestfs_ll>." };
-+
-   { defaults with
-     name = "version"; added = (1, 0, 58);
-     style = RStruct ("version", "version"), [], [];
-@@ -3939,66 +3999,6 @@ L<umask(2)>, C<guestfs_mknod>, C<guestfs_mkdir>.
- 
- This call returns the previous umask." };
- 
--  { defaults with
--    name = "readdir"; added = (1, 0, 55);
--    style = RStructList ("entries", "dirent"), [String (Pathname, "dir")], [];
--    protocol_limit_warning = true;
--    shortdesc = "read directories entries";
--    longdesc = "\
--This returns the list of directory entries in directory C<dir>.
--
--All entries in the directory are returned, including C<.> and
--C<..>.  The entries are I<not> sorted, but returned in the same
--order as the underlying filesystem.
--
--Also this call returns basic file type information about each
--file.  The C<ftyp> field will contain one of the following characters:
--
--=over 4
--
--=item 'b'
--
--Block special
--
--=item 'c'
--
--Char special
--
--=item 'd'
--
--Directory
--
--=item 'f'
--
--FIFO (named pipe)
--
--=item 'l'
--
--Symbolic link
--
--=item 'r'
--
--Regular file
--
--=item 's'
--
--Socket
--
--=item 'u'
--
--Unknown file type
--
--=item '?'
--
--The L<readdir(3)> call returned a C<d_type> field with an
--unexpected value
--
--=back
--
--This function is primarily intended for use by programs.  To
--get a simple list of names, use C<guestfs_ls>.  To get a printable
--directory for human consumption, use C<guestfs_ll>." };
--
-   { defaults with
-     name = "getxattrs"; added = (1, 0, 59);
-     style = RStructList ("xattrs", "xattr"), [String (Pathname, "path")], [];
-@@ -9713,4 +9713,11 @@ C<guestfs_cryptsetup_open>.  The C<device> parameter must be
- the name of the mapping device (ie. F</dev/mapper/mapname>)
- and I<not> the name of the underlying block device." };
- 
-+  { defaults with
-+    name = "internal_readdir"; added = (1, 48, 2);
-+    style = RErr, [String (Pathname, "dir"); String (FileOut, "filename")], [];
-+    visibility = VInternal;
-+    shortdesc = "read directories entries";
-+    longdesc = "Internal function for readdir." };
-+
- ]
-diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
-index b20672ff0..bdced51c9 100644
---- a/generator/proc_nr.ml
-+++ b/generator/proc_nr.ml
-@@ -152,7 +152,6 @@ let proc_nr = [
- 135, "mknod_b";
- 136, "mknod_c";
- 137, "umask";
--138, "readdir";
- 139, "sfdiskM";
- 140, "zfile";
- 141, "getxattrs";
-@@ -514,6 +513,7 @@ let proc_nr = [
- 508, "cryptsetup_open";
- 509, "cryptsetup_close";
- 510, "internal_list_rpm_applications";
-+511, "internal_readdir";
- ]
- 
- (* End of list.  If adding a new entry, add it at the end of the list
-diff --git a/lib/MAX_PROC_NR b/lib/MAX_PROC_NR
-index 2bc4cd64b..c0556fb20 100644
---- a/lib/MAX_PROC_NR
-+++ b/lib/MAX_PROC_NR
-@@ -1 +1 @@
--510
-+511
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 144c45588..212bcb94a 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -105,6 +105,7 @@ libguestfs_la_SOURCES = \
- 	private-data.c \
- 	proto.c \
- 	qemu.c \
-+	readdir.c \
- 	rescue.c \
- 	stringsbuf.c \
- 	structs-compare.c \
-diff --git a/lib/readdir.c b/lib/readdir.c
-new file mode 100644
-index 000000000..9cb0d7cf6
---- /dev/null
-+++ b/lib/readdir.c
-@@ -0,0 +1,131 @@
-+/* libguestfs
-+ * Copyright (C) 2016-2022 Red Hat Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include <config.h> /* UNIX_PATH_MAX, needed by "guestfs-internal.h" */
-+
-+#include <rpc/xdr.h> /* xdrstdio_create() */
-+#include <stdint.h>  /* UINT32_MAX */
-+#include <stdio.h>   /* fopen() */
-+#include <string.h>  /* memset() */
-+
-+#include "guestfs.h"                  /* guestfs_internal_readdir() */
-+#include "guestfs_protocol.h"         /* guestfs_int_dirent */
-+#include "guestfs-internal.h"         /* guestfs_int_make_temp_path() */
-+#include "guestfs-internal-actions.h" /* guestfs_impl_readdir */
-+
-+struct guestfs_dirent_list *
-+guestfs_impl_readdir (guestfs_h *g, const char *dir)
-+{
-+  struct guestfs_dirent_list *ret;
-+  char *tmpfn;
-+  FILE *f;
-+  off_t fsize;
-+  XDR xdr;
-+  struct guestfs_dirent_list *dirents;
-+  uint32_t alloc_entries;
-+  size_t alloc_bytes;
-+
-+  /* Prepare to fail. */
-+  ret = NULL;
-+
-+  tmpfn = guestfs_int_make_temp_path (g, "readdir", NULL);
-+  if (tmpfn == NULL)
-+    return ret;
-+
-+  if (guestfs_internal_readdir (g, dir, tmpfn) == -1)
-+    goto drop_tmpfile;
-+
-+  f = fopen (tmpfn, "r");
-+  if (f == NULL) {
-+    perrorf (g, "fopen: %s", tmpfn);
-+    goto drop_tmpfile;
-+  }
-+
-+  if (fseeko (f, 0, SEEK_END) == -1) {
-+    perrorf (g, "fseeko");
-+    goto close_tmpfile;
-+  }
-+  fsize = ftello (f);
-+  if (fsize == -1) {
-+    perrorf (g, "ftello");
-+    goto close_tmpfile;
-+  }
-+  if (fseeko (f, 0, SEEK_SET) == -1) {
-+    perrorf (g, "fseeko");
-+    goto close_tmpfile;
-+  }
-+
-+  xdrstdio_create (&xdr, f, XDR_DECODE);
-+
-+  dirents = safe_malloc (g, sizeof *dirents);
-+  dirents->len = 0;
-+  alloc_entries = 8;
-+  alloc_bytes = alloc_entries * sizeof *dirents->val;
-+  dirents->val = safe_malloc (g, alloc_bytes);
-+
-+  while (xdr_getpos (&xdr) < fsize) {
-+    guestfs_int_dirent v;
-+    struct guestfs_dirent *d;
-+
-+    if (dirents->len == alloc_entries) {
-+      if (alloc_entries > UINT32_MAX / 2 || alloc_bytes > (size_t)-1 / 2) {
-+        error (g, "integer overflow");
-+        goto free_dirents;
-+      }
-+      alloc_entries *= 2u;
-+      alloc_bytes *= 2u;
-+      dirents->val = safe_realloc (g, dirents->val, alloc_bytes);
-+    }
-+
-+    /* Decoding does not work unless the target buffer is zero-initialized. */
-+    memset (&v, 0, sizeof v);
-+    if (!xdr_guestfs_int_dirent (&xdr, &v)) {
-+      error (g, "xdr_guestfs_int_dirent failed");
-+      goto free_dirents;
-+    }
-+
-+    d = &dirents->val[dirents->len];
-+    d->ino = v.ino;
-+    d->ftyp = v.ftyp;
-+    d->name = v.name; /* transfer malloc'd string to "d" */
-+
-+    dirents->len++;
-+  }
-+
-+  /* Success; transfer "dirents" to "ret". */
-+  ret = dirents;
-+  dirents = NULL;
-+
-+  /* Clean up. */
-+  xdr_destroy (&xdr);
-+
-+free_dirents:
-+  guestfs_free_dirent_list (dirents);
-+
-+close_tmpfile:
-+  fclose (f);
-+
-+drop_tmpfile:
-+  /* In case guestfs_internal_readdir() failed, it may or may not have created
-+   * the temporary file.
-+   */
-+  unlink (tmpfn);
-+  free (tmpfn);
-+
-+  return ret;
-+}
--- 
-2.31.1
-

SOURCES/0002-update-common-submodule.patch

@@ -0,0 +1,37 @@
+From 89b6c8b458dcb00de83b543c47a6acb049f63f18 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Tue, 21 Mar 2023 16:55:15 +0100
+Subject: [PATCH] update common submodule
+
+HATAYAMA Daisuke (1):
+      progress: fix segmentation fault when TERM variable is "dumb"
+
+Laszlo Ersek (2):
+      detect_kernels: tighten "try" scope
+      detect_kernels: deal with RHEL's kernel-core / kernel-modules-core split
+
+rwmjones (1):
+      Merge pull request #5 from d-hatayama/fix_segfault_progress_bar
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2175703
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+(cherry picked from commit be11d25b3e2770d86699e94c5087e6625477d5ec)
+---
+ common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Submodule common 360e037d..70c10a07:
+diff --git a/common/progress/progress.c b/common/progress/progress.c
+index 4d52b97e..e4b30663 100644
+--- a/common/progress/progress.c
++++ b/common/progress/progress.c
+@@ -318,7 +318,8 @@ progress_bar_set (struct progress_bar *bar,
+        * (b) it's just not possible to use tputs in a sane way here.
+        */
+       /*tputs (UP, 2, putchar);*/
+-      fprintf (fp, "%s", UP);
++      if (UP)
++        fprintf (fp, "%s", UP);
+     }
+     bar->count++;
+ 

SOURCES/0003-daemon-selinux-relabel-don-t-exclude-selinux-if-it-s.patch

@@ -0,0 +1,63 @@
+From e58cd8df467e342463d08e3d761c2e322287b13e Mon Sep 17 00:00:00 2001
+From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
+Date: Wed, 26 Apr 2023 15:59:44 +0300
+Subject: [PATCH] daemon/selinux-relabel: don't exclude "/selinux" if it's
+ non-existent
+
+Since RHBZ#726528, filesystem.rpm doesn't include /selinux.  setfiles
+then gives us the warning: "Can't stat exclude path "/sysroot/selinux",
+No such file or directory - ignoring."
+
+Though the warning is harmless, let's get rid of it by checking the
+existence of /selinux directory.
+
+Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
+Reviewed-by: Laszlo Ersek <lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 9ced5fac8c1f0f8ff7ed2b5671c1c7f5f0bfa875)
+---
+ daemon/selinux-relabel.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/selinux-relabel.c b/daemon/selinux-relabel.c
+index 976cffe3..454486c1 100644
+--- a/daemon/selinux-relabel.c
++++ b/daemon/selinux-relabel.c
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/stat.h>
+ 
+ #include "guestfs_protocol.h"
+ #include "daemon.h"
+@@ -37,6 +38,17 @@ optgroup_selinuxrelabel_available (void)
+   return prog_exists ("setfiles");
+ }
+ 
++static int
++dir_exists (const char *dir)
++{
++  struct stat statbuf;
++
++  if (stat (dir, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))
++    return 1;
++  else
++    return 0;
++}
++
+ static int
+ setfiles_has_option (int *flag, char opt_char)
+ {
+@@ -99,8 +111,10 @@ do_selinux_relabel (const char *specfile, const char *path,
+    */
+   ADD_ARG (argv, i, "-e"); ADD_ARG (argv, i, s_dev);
+   ADD_ARG (argv, i, "-e"); ADD_ARG (argv, i, s_proc);
+-  ADD_ARG (argv, i, "-e"); ADD_ARG (argv, i, s_selinux);
+   ADD_ARG (argv, i, "-e"); ADD_ARG (argv, i, s_sys);
++  if (dir_exists (s_selinux)) {
++    ADD_ARG (argv, i, "-e"); ADD_ARG (argv, i, s_selinux);
++  }
+ 
+   /* You have to use the -m option (where available) otherwise
+    * setfiles puts all the mountpoints on the excludes list for no

SOURCES/0003-guestfs_readdir-minimize-the-number-of-send_file_wri.patch

@@ -1,108 +0,0 @@
-From 62cd6c9d2dd62dd24cc04b16437bfb816a6f4357 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Mon, 2 May 2022 10:56:01 +0200
-Subject: [PATCH] guestfs_readdir(): minimize the number of send_file_write()
- calls
-
-In guestfs_readdir(), the daemon currently sends each XDR-encoded
-"guestfs_int_dirent" to the library with a separate send_file_write()
-call.
-
-Determine the largest encoded size (from the longest filename that a
-"guestfs_int_dirent" could carry, from readdir()'s "struct dirent"), and
-batch up the XDR encodings until the next encoding might not fit in
-GUESTFS_MAX_CHUNK_SIZE. Call send_file_write() only then.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1674392
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220502085601.15012-3-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit 4864d21cb8eb991f0fc98d03a068173837cba50e)
----
- daemon/readdir.c | 38 ++++++++++++++++++++++++++++++++------
- 1 file changed, 32 insertions(+), 6 deletions(-)
-
-diff --git a/daemon/readdir.c b/daemon/readdir.c
-index 9ab0b0aec..3084ba939 100644
---- a/daemon/readdir.c
-+++ b/daemon/readdir.c
-@@ -35,6 +35,9 @@ do_internal_readdir (const char *dir)
-   DIR *dirstream;
-   void *xdr_buf;
-   XDR xdr;
-+  struct dirent fill;
-+  guestfs_int_dirent v;
-+  unsigned max_encoded;
- 
-   /* Prepare to fail. */
-   ret = -1;
-@@ -55,6 +58,20 @@ do_internal_readdir (const char *dir)
-   }
-   xdrmem_create (&xdr, xdr_buf, GUESTFS_MAX_CHUNK_SIZE, XDR_ENCODE);
- 
-+  /* Calculate the max number of bytes a "guestfs_int_dirent" can be encoded to.
-+   */
-+  memset (fill.d_name, 'a', sizeof fill.d_name - 1);
-+  fill.d_name[sizeof fill.d_name - 1] = '\0';
-+  v.ino = INT64_MAX;
-+  v.ftyp = '?';
-+  v.name = fill.d_name;
-+  if (!xdr_guestfs_int_dirent (&xdr, &v)) {
-+    fprintf (stderr, "xdr_guestfs_int_dirent failed\n");
-+    goto release_xdr;
-+  }
-+  max_encoded = xdr_getpos (&xdr);
-+  xdr_setpos (&xdr, 0);
-+
-   /* Send an "OK" reply, before starting the file transfer. */
-   reply (NULL, NULL);
- 
-@@ -63,7 +80,6 @@ do_internal_readdir (const char *dir)
-    */
-   for (;;) {
-     struct dirent *d;
--    guestfs_int_dirent v;
- 
-     errno = 0;
-     d = readdir (dirstream);
-@@ -94,22 +110,32 @@ do_internal_readdir (const char *dir)
-     v.ftyp = 'u';
- #endif
- 
-+    /* Flush "xdr_buf" if we may not have enough room for encoding "v". */
-+    if (GUESTFS_MAX_CHUNK_SIZE - xdr_getpos (&xdr) < max_encoded) {
-+      if (send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
-+        break;
-+
-+      xdr_setpos (&xdr, 0);
-+    }
-+
-     if (!xdr_guestfs_int_dirent (&xdr, &v)) {
-       fprintf (stderr, "xdr_guestfs_int_dirent failed\n");
-       break;
-     }
--
--    if (send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
--      break;
--
--    xdr_setpos (&xdr, 0);
-   }
- 
-+  /* Flush "xdr_buf" if the loop completed successfully and "xdr_buf" is not
-+   * empty. */
-+  if (ret == 0 && xdr_getpos (&xdr) > 0 &&
-+      send_file_write (xdr_buf, xdr_getpos (&xdr)) != 0)
-+    ret = -1;
-+
-   /* Finish or cancel the transfer. Note that if (ret == -1) because the library
-    * canceled, we still need to cancel back!
-    */
-   send_file_end (ret == -1);
- 
-+release_xdr:
-   xdr_destroy (&xdr);
-   free (xdr_buf);
- 
--- 
-2.31.1
-

SOURCES/0004-daemon-selinux-relabel-search-for-invalid-option-in-.patch

@@ -0,0 +1,33 @@
+From c1829048c598e11950c9d355fdd5c177a99e046f Mon Sep 17 00:00:00 2001
+From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
+Date: Wed, 26 Apr 2023 15:59:45 +0300
+Subject: [PATCH] daemon/selinux-relabel: search for "invalid option" in
+ setfiles output
+
+'X' in the setiles' stderr doesn't necessarily mean that option 'X'
+doesn't exist.  For instance, when passing '-T' we get: "setfiles:
+option requires an argument -- 'T'".
+
+Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
+Reviewed-by: Laszlo Ersek <lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 152d6e4bdf2dac88856a4ff83cf73451f897d4d4)
+---
+ daemon/selinux-relabel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/selinux-relabel.c b/daemon/selinux-relabel.c
+index 454486c1..60a6f48a 100644
+--- a/daemon/selinux-relabel.c
++++ b/daemon/selinux-relabel.c
+@@ -56,8 +56,9 @@ setfiles_has_option (int *flag, char opt_char)
+ 
+   if (*flag == -1) {
+     char option[] = { '-', opt_char, '\0' };       /* "-X" */
+-    char err_opt[] = { '\'', opt_char, '\'', '\0'}; /* "'X'" */
++    char err_opt[32];     /* "invalid option -- 'X'" */
+ 
++    snprintf(err_opt, sizeof(err_opt), "invalid option -- '%c'", opt_char);
+     ignore_value (command (NULL, &err, "setfiles", option, NULL));
+     *flag = err && strstr (err, /* "invalid option -- " */ err_opt) == NULL;
+   }

SOURCES/0004-lib-launch-direct-ignore-drive-iface-parameter.patch

@@ -1,123 +0,0 @@
-From e4901a4e83f0ab59a525095d2fe1c7f1a38c0aac Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Wed, 4 May 2022 15:41:52 +0200
-Subject: [PATCH] lib: launch-direct: ignore drive "iface" parameter
-
-Rich said in <https://bugzilla.redhat.com/show_bug.cgi?id=1844341#c1>:
-
-> The libvirt backend has never allowed the iface parameter.  We should
-> probably ignore it in the direct backend since it's never been possible
-> to use this parameter correctly.
-
-Remove the handling of "iface" in the direct (QEMU) backend. Refresh the
-documentation regarding both backends.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220504134155.11832-2-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit 3eb830dbaee12c8dc4566cab226ed2af0e0f2d8c)
----
- generator/actions_core_deprecated.ml |  8 +++-
- lib/launch-direct.c                  | 59 ++++++----------------------
- 2 files changed, 19 insertions(+), 48 deletions(-)
-
-diff --git a/generator/actions_core_deprecated.ml b/generator/actions_core_deprecated.ml
-index 00dde3d2a..f1040a0e9 100644
---- a/generator/actions_core_deprecated.ml
-+++ b/generator/actions_core_deprecated.ml
-@@ -73,7 +73,9 @@ of C<guestfs_add_drive_ro>." };
-     shortdesc = "add a drive specifying the QEMU block emulation to use";
-     longdesc = "\
- This is the same as C<guestfs_add_drive> but it allows you
--to specify the QEMU interface emulation to use at run time." };
-+to specify the QEMU interface emulation to use at run time.
-+The libvirt backend rejects a non-empty C<iface> argument.
-+The direct backend ignores C<iface>." };
- 
-   { defaults with
-     name = "add_drive_ro_with_if"; added = (1, 0, 84);
-@@ -83,7 +85,9 @@ to specify the QEMU interface emulation to use at run time." };
-     shortdesc = "add a drive read-only specifying the QEMU block emulation to use";
-     longdesc = "\
- This is the same as C<guestfs_add_drive_ro> but it allows you
--to specify the QEMU interface emulation to use at run time." };
-+to specify the QEMU interface emulation to use at run time.
-+The libvirt backend rejects a non-empty C<iface> argument.
-+The direct backend ignores C<iface>." };
- 
-   { defaults with
-     name = "lstatlist"; added = (1, 0, 77);
-diff --git a/lib/launch-direct.c b/lib/launch-direct.c
-index b292b9c26..ff0eaeb62 100644
---- a/lib/launch-direct.c
-+++ b/lib/launch-direct.c
-@@ -296,52 +296,19 @@ static int
- add_drive (guestfs_h *g, struct backend_direct_data *data,
-            struct qemuopts *qopts, size_t i, struct drive *drv)
- {
--  /* If there's an explicit 'iface', use it.  Otherwise default to
--   * virtio-scsi.
--   */
--  if (drv->iface && STREQ (drv->iface, "virtio")) { /* virtio-blk */
--    start_list ("-drive") {
--      if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
--        return -1;
--      append_list ("if=none");
--    } end_list ();
--    start_list ("-device") {
--      append_list (VIRTIO_DEVICE_NAME ("virtio-blk"));
--      append_list_format ("drive=hd%zu", i);
--      if (drv->disk_label)
--        append_list_format ("serial=%s", drv->disk_label);
--      if (add_device_blocksize_params (g, qopts, drv) == -1)
--        return -1;
--    } end_list ();
--  }
--#if defined(__arm__) || defined(__aarch64__) || defined(__powerpc__)
--  else if (drv->iface && STREQ (drv->iface, "ide")) {
--    error (g, "'ide' interface does not work on ARM or PowerPC");
--    return -1;
--  }
--#endif
--  else if (drv->iface) {
--    start_list ("-drive") {
--      if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
--        return -1;
--      append_list_format ("if=%s", drv->iface);
--    } end_list ();
--  }
--  else /* default case: virtio-scsi */ {
--    start_list ("-drive") {
--      if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
--        return -1;
--      append_list ("if=none");
--    } end_list ();
--    start_list ("-device") {
--      append_list ("scsi-hd");
--      append_list_format ("drive=hd%zu", i);
--      if (drv->disk_label)
--        append_list_format ("serial=%s", drv->disk_label);
--      if (add_device_blocksize_params (g, qopts, drv) == -1)
--        return -1;
--    } end_list ();
--  }
-+  start_list ("-drive") {
-+    if (add_drive_standard_params (g, data, qopts, i, drv) == -1)
-+      return -1;
-+    append_list ("if=none");
-+  } end_list ();
-+  start_list ("-device") {
-+    append_list ("scsi-hd");
-+    append_list_format ("drive=hd%zu", i);
-+    if (drv->disk_label)
-+      append_list_format ("serial=%s", drv->disk_label);
-+    if (add_device_blocksize_params (g, qopts, drv) == -1)
-+      return -1;
-+  } end_list ();
- 
-   return 0;
- 
--- 
-2.31.1
-

SOURCES/0005-daemon-selinux-relabel-run-setfiles-with-T-0-if-supp.patch

@@ -0,0 +1,78 @@
+From 3046af080baad9935627ebb671950448cfd0fa7b Mon Sep 17 00:00:00 2001
+From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
+Date: Wed, 26 Apr 2023 15:59:46 +0300
+Subject: [PATCH] daemon/selinux-relabel: run setfiles with "-T 0", if
+ supported
+
+Since SELinux userspace v3.4 [1], setfiles command supports "-T nthreads"
+option, which allows parallel execution.  "-T 0" allows using as many
+threads as there're available CPU cores.  This might speed up the process
+of filesystem relabeling in case the appliance is being run with multiple
+vCPUs.  The latter is true for at least v2v starting from d2b64ecc67
+("v2v: Set the number of vCPUs to same as host number of pCPUs.").
+
+For instance, when running virt-v2v-in-place on my 12-core Xeon host
+with SSD, with appliance being run with 8 vCPUs (the upper limit specified
+in d2b64ecc67), and on the ~150GiB disk VM (physical size on the host),
+I get the following results:
+
+./in-place/virt-v2v-in-place -i libvirt fedora37-vm -v -x
+
+Without this patch:
+...
+commandrvf: setfiles -F -e /sysroot/dev -e /sysroot/proc -e /sysroot/sys -m -C -r /sysroot -v /sysroot/etc/selinux/targeted/contexts/files/file_contexts /sysroot/^M
+libguestfs: trace: v2v: selinux_relabel = 0
+libguestfs: trace: v2v: rm_f "/.autorelabel"
+guestfsd: => selinux_relabel (0x1d3) took 17.94 secs
+...
+
+With this patch:
+...
+commandrvf: setfiles -F -e /sysroot/dev -e /sysroot/proc -e /sysroot/sys -m -C -T 0 -r /sysroot -v /sysroot/etc/selinux/targeted/contexts/files/file_contexts /sysroot/^M
+libguestfs: trace: v2v: selinux_relabel = 0
+libguestfs: trace: v2v: rm_f "/.autorelabel"
+guestfsd: => selinux_relabel (0x1d3) took 5.88 secs
+...
+
+So in my scenario it's getting 3 times faster.
+
+[1] https://github.com/SELinuxProject/selinux/releases/tag/3.4
+
+Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
+Reviewed-by: Laszlo Ersek <lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit d0d8e6738477148a7b752348f9364a3b8faed67f)
+---
+ daemon/selinux-relabel.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/daemon/selinux-relabel.c b/daemon/selinux-relabel.c
+index 60a6f48a..cfc5a31d 100644
+--- a/daemon/selinux-relabel.c
++++ b/daemon/selinux-relabel.c
+@@ -73,6 +73,7 @@ do_selinux_relabel (const char *specfile, const char *path,
+ {
+   static int flag_m = -1;
+   static int flag_C = -1;
++  static int flag_T = -1;
+   const char *argv[MAX_ARGS];
+   CLEANUP_FREE char *s_dev = NULL, *s_proc = NULL, *s_selinux = NULL,
+     *s_sys = NULL, *s_specfile = NULL, *s_path = NULL;
+@@ -131,6 +132,17 @@ do_selinux_relabel (const char *specfile, const char *path,
+   if (setfiles_has_option (&flag_C, 'C'))
+     ADD_ARG (argv, i, "-C");
+ 
++  /* If the appliance is being run with multiple vCPUs, running setfiles
++   * in multithreading mode might speeds up the process.  Option "-T" was
++   * introduced in SELinux userspace v3.4, and we need to check whether it's
++   * supported.  Passing "-T 0" creates as many threads as there're available
++   * vCPU cores.
++   * https://github.com/SELinuxProject/selinux/releases/tag/3.4
++   */
++  if (setfiles_has_option (&flag_T, 'T')) {
++    ADD_ARG (argv, i, "-T"); ADD_ARG (argv, i, "0");
++  }
++
+   /* Relabelling in a chroot. */
+   if (STRNEQ (sysroot, "/")) {
+     ADD_ARG (argv, i, "-r");

SOURCES/0005-lib-drive_create_data-drive-remove-field-iface.patch

@@ -1,245 +0,0 @@
-From f13297315495144775f6249e9e24dc5f18f6f902 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Wed, 4 May 2022 15:41:53 +0200
-Subject: [PATCH] lib: drive_create_data, drive: remove field "iface"
-
-Representing "iface" in the "drive_create_data" and "drive" structures is
-now useless; the direct backend ignores "iface", while the libvirt one
-rejects it unless it is empty. Unify both backends -- make them both
-ignore "iface". (Which only relaxes the libvirt backend, so it cannot
-cause compatibility problems.) This lets us remove the fields. Update the
-documentation as well.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220504134155.11832-3-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit f68eaee1d6c41f91e7dfd2aa9e7d238cca7b8a4c)
----
- generator/actions_core_deprecated.ml |  6 ++----
- lib/drives.c                         | 31 +++++-----------------------
- lib/guestfs-internal.h               |  1 -
- lib/launch-libvirt.c                 |  6 ------
- lib/libvirt-domain.c                 | 15 --------------
- 5 files changed, 7 insertions(+), 52 deletions(-)
-
-diff --git a/generator/actions_core_deprecated.ml b/generator/actions_core_deprecated.ml
-index f1040a0e9..c23f4a330 100644
---- a/generator/actions_core_deprecated.ml
-+++ b/generator/actions_core_deprecated.ml
-@@ -74,8 +74,7 @@ of C<guestfs_add_drive_ro>." };
-     longdesc = "\
- This is the same as C<guestfs_add_drive> but it allows you
- to specify the QEMU interface emulation to use at run time.
--The libvirt backend rejects a non-empty C<iface> argument.
--The direct backend ignores C<iface>." };
-+Both the direct and the libvirt backends ignore C<iface>." };
- 
-   { defaults with
-     name = "add_drive_ro_with_if"; added = (1, 0, 84);
-@@ -86,8 +85,7 @@ The direct backend ignores C<iface>." };
-     longdesc = "\
- This is the same as C<guestfs_add_drive_ro> but it allows you
- to specify the QEMU interface emulation to use at run time.
--The libvirt backend rejects a non-empty C<iface> argument.
--The direct backend ignores C<iface>." };
-+Both the direct and the libvirt backends ignore C<iface>." };
- 
-   { defaults with
-     name = "lstatlist"; added = (1, 0, 77);
-diff --git a/lib/drives.c b/lib/drives.c
-index a6179fc36..8fe46a41c 100644
---- a/lib/drives.c
-+++ b/lib/drives.c
-@@ -53,7 +53,6 @@ struct drive_create_data {
-   const char *secret;
-   bool readonly;
-   const char *format;
--  const char *iface;
-   const char *name;
-   const char *disk_label;
-   const char *cachemode;
-@@ -110,7 +109,6 @@ create_drive_file (guestfs_h *g,
-   drv->src.format = data->format ? safe_strdup (g, data->format) : NULL;
- 
-   drv->readonly = data->readonly;
--  drv->iface = data->iface ? safe_strdup (g, data->iface) : NULL;
-   drv->name = data->name ? safe_strdup (g, data->name) : NULL;
-   drv->disk_label = data->disk_label ? safe_strdup (g, data->disk_label) : NULL;
-   drv->cachemode = data->cachemode ? safe_strdup (g, data->cachemode) : NULL;
-@@ -147,7 +145,6 @@ create_drive_non_file (guestfs_h *g,
-   drv->src.format = data->format ? safe_strdup (g, data->format) : NULL;
- 
-   drv->readonly = data->readonly;
--  drv->iface = data->iface ? safe_strdup (g, data->iface) : NULL;
-   drv->name = data->name ? safe_strdup (g, data->name) : NULL;
-   drv->disk_label = data->disk_label ? safe_strdup (g, data->disk_label) : NULL;
-   drv->cachemode = data->cachemode ? safe_strdup (g, data->cachemode) : NULL;
-@@ -470,7 +467,6 @@ free_drive_struct (struct drive *drv)
- {
-   free_drive_source (&drv->src);
-   free (drv->overlay);
--  free (drv->iface);
-   free (drv->name);
-   free (drv->disk_label);
-   free (drv->cachemode);
-@@ -511,14 +507,12 @@ drive_to_string (guestfs_h *g, const struct drive *drv)
-     s_blocksize = safe_asprintf (g, "%d", drv->blocksize);
- 
-   return safe_asprintf
--    (g, "%s%s%s%s protocol=%s%s%s%s%s%s%s%s%s%s%s%s%s",
-+    (g, "%s%s%s%s protocol=%s%s%s%s%s%s%s%s%s%s%s",
-      drv->src.u.path,
-      drv->readonly ? " readonly" : "",
-      drv->src.format ? " format=" : "",
-      drv->src.format ? : "",
-      guestfs_int_drive_protocol_to_string (drv->src.protocol),
--     drv->iface ? " iface=" : "",
--     drv->iface ? : "",
-      drv->name ? " name=" : "",
-      drv->name ? : "",
-      drv->disk_label ? " label=" : "",
-@@ -747,8 +741,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
-     ? optargs->readonly : false;
-   data.format = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_FORMAT_BITMASK
-     ? optargs->format : NULL;
--  data.iface = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_IFACE_BITMASK
--    ? optargs->iface : NULL;
-   data.name = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_NAME_BITMASK
-     ? optargs->name : NULL;
-   data.disk_label = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_LABEL_BITMASK
-@@ -804,12 +796,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
-     free_drive_servers (data.servers, data.nr_servers);
-     return -1;
-   }
--  if (data.iface && !VALID_FORMAT_IFACE (data.iface)) {
--    error (g, _("%s parameter is empty or contains disallowed characters"),
--           "iface");
--    free_drive_servers (data.servers, data.nr_servers);
--    return -1;
--  }
-   if (data.disk_label && !VALID_DISK_LABEL (data.disk_label)) {
-     error (g, _("label parameter is empty, too long, or contains disallowed characters"));
-     free_drive_servers (data.servers, data.nr_servers);
-@@ -935,24 +921,17 @@ guestfs_impl_add_drive_ro (guestfs_h *g, const char *filename)
- 
- int
- guestfs_impl_add_drive_with_if (guestfs_h *g, const char *filename,
--				const char *iface)
-+				const char *iface ATTRIBUTE_UNUSED)
- {
--  const struct guestfs_add_drive_opts_argv optargs = {
--    .bitmask = GUESTFS_ADD_DRIVE_OPTS_IFACE_BITMASK,
--    .iface = iface,
--  };
--
--  return guestfs_add_drive_opts_argv (g, filename, &optargs);
-+  return guestfs_add_drive_opts_argv (g, filename, NULL);
- }
- 
- int
- guestfs_impl_add_drive_ro_with_if (guestfs_h *g, const char *filename,
--                               const char *iface)
-+                               const char *iface ATTRIBUTE_UNUSED)
- {
-   const struct guestfs_add_drive_opts_argv optargs = {
--    .bitmask = GUESTFS_ADD_DRIVE_OPTS_IFACE_BITMASK
--             | GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK,
--    .iface = iface,
-+    .bitmask = GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK,
-     .readonly = true,
-   };
- 
-diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
-index 5bb00bc10..16755cfb3 100644
---- a/lib/guestfs-internal.h
-+++ b/lib/guestfs-internal.h
-@@ -298,7 +298,6 @@ struct drive {
- 
-   /* Various per-drive flags. */
-   bool readonly;
--  char *iface;
-   char *name;
-   char *disk_label;
-   char *cachemode;
-diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
-index de342b425..03d69e027 100644
---- a/lib/launch-libvirt.c
-+++ b/lib/launch-libvirt.c
-@@ -1472,12 +1472,6 @@ construct_libvirt_xml_disk (guestfs_h *g,
-   const char *type, *uuid;
-   int r;
- 
--  /* XXX We probably could support this if we thought about it some more. */
--  if (drv->iface) {
--    error (g, _("‘iface’ parameter is not supported by the libvirt backend"));
--    return -1;
--  }
--
-   start_element ("disk") {
-     attribute ("device", "disk");
- 
-diff --git a/lib/libvirt-domain.c b/lib/libvirt-domain.c
-index 3050680fa..fafbf50ea 100644
---- a/lib/libvirt-domain.c
-+++ b/lib/libvirt-domain.c
-@@ -68,7 +68,6 @@ guestfs_impl_add_domain (guestfs_h *g, const char *domain_name,
-   int live;
-   int allowuuid;
-   const char *readonlydisk;
--  const char *iface;
-   const char *cachemode;
-   const char *discard;
-   bool copyonread;
-@@ -78,8 +77,6 @@ guestfs_impl_add_domain (guestfs_h *g, const char *domain_name,
-     ? optargs->libvirturi : NULL;
-   readonly = optargs->bitmask & GUESTFS_ADD_DOMAIN_READONLY_BITMASK
-     ? optargs->readonly : 0;
--  iface = optargs->bitmask & GUESTFS_ADD_DOMAIN_IFACE_BITMASK
--    ? optargs->iface : NULL;
-   live = optargs->bitmask & GUESTFS_ADD_DOMAIN_LIVE_BITMASK
-     ? optargs->live : 0;
-   allowuuid = optargs->bitmask & GUESTFS_ADD_DOMAIN_ALLOWUUID_BITMASK
-@@ -136,10 +133,6 @@ guestfs_impl_add_domain (guestfs_h *g, const char *domain_name,
-     optargs2.bitmask |= GUESTFS_ADD_LIBVIRT_DOM_READONLY_BITMASK;
-     optargs2.readonly = readonly;
-   }
--  if (iface) {
--    optargs2.bitmask |= GUESTFS_ADD_LIBVIRT_DOM_IFACE_BITMASK;
--    optargs2.iface = iface;
--  }
-   if (live) {
-     error (g, _("libguestfs live support was removed in libguestfs 1.48"));
-     goto cleanup;
-@@ -193,7 +186,6 @@ guestfs_impl_add_libvirt_dom (guestfs_h *g, void *domvp,
-   virDomainPtr dom = domvp;
-   ssize_t r;
-   int readonly;
--  const char *iface;
-   const char *cachemode;
-   const char *discard;
-   bool copyonread;
-@@ -208,9 +200,6 @@ guestfs_impl_add_libvirt_dom (guestfs_h *g, void *domvp,
-   readonly =
-     optargs->bitmask & GUESTFS_ADD_LIBVIRT_DOM_READONLY_BITMASK
-     ? optargs->readonly : 0;
--  iface =
--    optargs->bitmask & GUESTFS_ADD_LIBVIRT_DOM_IFACE_BITMASK
--    ? optargs->iface : NULL;
-   live =
-     optargs->bitmask & GUESTFS_ADD_LIBVIRT_DOM_LIVE_BITMASK
-     ? optargs->live : 0;
-@@ -289,10 +278,6 @@ guestfs_impl_add_libvirt_dom (guestfs_h *g, void *domvp,
-   data.optargs.bitmask = 0;
-   data.readonly = readonly;
-   data.readonlydisk = readonlydisk;
--  if (iface) {
--    data.optargs.bitmask |= GUESTFS_ADD_DRIVE_OPTS_IFACE_BITMASK;
--    data.optargs.iface = iface;
--  }
-   if (cachemode) {
-     data.optargs.bitmask |= GUESTFS_ADD_DRIVE_OPTS_CACHEMODE_BITMASK;
-     data.optargs.cachemode = cachemode;
--- 
-2.31.1
-

SOURCES/0006-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch

@@ -1,4 +1,4 @@
-From 010cd5ff441166c01125fc588398a1fb8367a852 Mon Sep 17 00:00:00 2001
+From ab7e68dbeefe464734bd63a862a36f612f76d396 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
@@ -31,7 +31,7 @@ We hope to gradually add some of these back over the lifetime of RHEL.
  8 files changed, 16 insertions(+), 348 deletions(-)
 
 diff --git a/docs/guestfs-testing.pod b/docs/guestfs-testing.pod
-index f558964bf..8f264ed17 100644
+index 47f381a7..c7b44928 100644
 --- a/docs/guestfs-testing.pod
 +++ b/docs/guestfs-testing.pod
 @@ -109,26 +109,6 @@ image.  To exit, type C<exit>.
@@ -62,7 +62,7 @@ index f558964bf..8f264ed17 100644
  
  Run L<virt-alignment-scan(1)> on guests or disk images:
 diff --git a/fish/guestfish.pod b/fish/guestfish.pod
-index ae2445571..46cba64ff 100644
+index ccc0825b..d36cac9d 100644
 --- a/fish/guestfish.pod
 +++ b/fish/guestfish.pod
 @@ -131,9 +131,9 @@ To list what is available do:
@@ -171,7 +171,7 @@ index ae2445571..46cba64ff 100644
  In this case, the password is C<pass@word>.
  
 diff --git a/fish/test-add-uri.sh b/fish/test-add-uri.sh
-index 21d424984..ddabeb639 100755
+index 21d42498..ddabeb63 100755
 --- a/fish/test-add-uri.sh
 +++ b/fish/test-add-uri.sh
 @@ -40,14 +40,6 @@ function fail ()
@@ -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 807150615..6cd42a290 100644
+index c8d9949b..26c576c7 100644
 --- a/generator/actions_core.ml
 +++ b/generator/actions_core.ml
 @@ -350,29 +350,6 @@ F<filename> is interpreted as a local file or device.
@@ -305,7 +305,7 @@ index 807150615..6cd42a290 100644
  example if using the libvirt backend and if the libvirt backend is configured to
  start the qemu appliance as a special user such as C<qemu.qemu>.  If in doubt,
 diff --git a/lib/drives.c b/lib/drives.c
-index c5a208468..efb289254 100644
+index c5a20846..efb28925 100644
 --- a/lib/drives.c
 +++ b/lib/drives.c
 @@ -166,6 +166,7 @@ create_drive_non_file (guestfs_h *g,
@@ -373,10 +373,10 @@ index c5a208468..efb289254 100644
      error (g, _("unknown protocol ‘%s’"), protocol);
      drv = NULL; /*FALLTHROUGH*/
 diff --git a/lib/guestfs.pod b/lib/guestfs.pod
-index 1ad44e7c2..946ce2d36 100644
+index c6c8cb16..866a4638 100644
 --- a/lib/guestfs.pod
 +++ b/lib/guestfs.pod
-@@ -712,70 +712,6 @@ a qcow2 backing file specification, libvirt does not construct an
+@@ -723,70 +723,6 @@ a qcow2 backing file specification, libvirt does not construct an
  ephemeral secret object from those, for Ceph authentication.  Refer to
  L<https://bugzilla.redhat.com/2033247>.
  
@@ -447,7 +447,7 @@ index 1ad44e7c2..946ce2d36 100644
  =head3 NETWORK BLOCK DEVICE
  
  Libguestfs can access Network Block Device (NBD) disks remotely.
-@@ -838,42 +774,6 @@ L<https://bugs.launchpad.net/qemu/+bug/1155677>
+@@ -849,42 +785,6 @@ L<https://bugs.launchpad.net/qemu/+bug/1155677>
  
  =back
  
@@ -491,7 +491,7 @@ index 1ad44e7c2..946ce2d36 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 d86a1ecd..cf7d2a0c 100755
 --- a/tests/disks/test-qemu-drive-libvirt.sh
 +++ b/tests/disks/test-qemu-drive-libvirt.sh
 @@ -65,34 +65,6 @@ check_output
@@ -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 12937fb3..b3e4f990 100755
 --- a/tests/disks/test-qemu-drive.sh
 +++ b/tests/disks/test-qemu-drive.sh
 @@ -62,45 +62,6 @@ check_output
@@ -604,6 +604,3 @@ index 12937fb30..b3e4f9903 100755
 -check_output
 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
 -rm "$DEBUG_QEMU_FILE"
--- 
-2.31.1
-

SOURCES/0006-lib-rename-VALID_FORMAT_IFACE-to-VALID_FORMAT.patch

@@ -1,82 +0,0 @@
-From f408b24d8d8f5b5f4e1a25c1046c3a18107c8d80 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Wed, 4 May 2022 15:41:54 +0200
-Subject: [PATCH] lib: rename VALID_FORMAT_IFACE to VALID_FORMAT
-
-We no longer use VALID_FORMAT_IFACE for validating "iface"; rename the
-macro to reflect that we only check "format" with it.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220504134155.11832-4-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit c8e3caf9e6000ea2f5cfbe30ffe1240317bb4578)
----
- lib/drives.c     |  4 ++--
- lib/unit-tests.c | 16 ++++++++--------
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/lib/drives.c b/lib/drives.c
-index 8fe46a41c..c5a208468 100644
---- a/lib/drives.c
-+++ b/lib/drives.c
-@@ -593,7 +593,7 @@ guestfs_int_free_drives (guestfs_h *g)
-  * Check string parameter matches regular expression
-  * C<^[-_[:alnum:]]+$> (in C locale).
-  */
--#define VALID_FORMAT_IFACE(str) \
-+#define VALID_FORMAT(str) \
-   guestfs_int_string_is_valid ((str), 1, 0, \
-                                VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
- 
-@@ -790,7 +790,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
-     return -1;
-   }
- 
--  if (data.format && !VALID_FORMAT_IFACE (data.format)) {
-+  if (data.format && !VALID_FORMAT (data.format)) {
-     error (g, _("%s parameter is empty or contains disallowed characters"),
-            "format");
-     free_drive_servers (data.servers, data.nr_servers);
-diff --git a/lib/unit-tests.c b/lib/unit-tests.c
-index 62457ccba..0e550cb98 100644
---- a/lib/unit-tests.c
-+++ b/lib/unit-tests.c
-@@ -434,7 +434,7 @@ test_stringsbuf (void)
- }
- 
- /* Use the same macros as in lib/drives.c */
--#define VALID_FORMAT_IFACE(str) \
-+#define VALID_FORMAT(str) \
-   guestfs_int_string_is_valid ((str), 1, 0, \
-                                VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
- #define VALID_DISK_LABEL(str) \
-@@ -446,18 +446,18 @@ test_stringsbuf (void)
- static void
- test_valid (void)
- {
--  assert (!VALID_FORMAT_IFACE (""));
-+  assert (!VALID_FORMAT (""));
-   assert (!VALID_DISK_LABEL (""));
-   assert (!VALID_HOSTNAME (""));
- 
-   assert (!VALID_DISK_LABEL ("012345678901234567890"));
- 
--  assert (VALID_FORMAT_IFACE ("abc"));
--  assert (VALID_FORMAT_IFACE ("ABC"));
--  assert (VALID_FORMAT_IFACE ("abc123"));
--  assert (VALID_FORMAT_IFACE ("abc123-"));
--  assert (VALID_FORMAT_IFACE ("abc123_"));
--  assert (!VALID_FORMAT_IFACE ("abc123."));
-+  assert (VALID_FORMAT ("abc"));
-+  assert (VALID_FORMAT ("ABC"));
-+  assert (VALID_FORMAT ("abc123"));
-+  assert (VALID_FORMAT ("abc123-"));
-+  assert (VALID_FORMAT ("abc123_"));
-+  assert (!VALID_FORMAT ("abc123."));
- 
-   assert (VALID_DISK_LABEL ("abc"));
-   assert (VALID_DISK_LABEL ("ABC"));
--- 
-2.31.1
-

SOURCES/0007-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch

@@ -1,4 +1,4 @@
-From d59942a7a3d1ca2248a94099d28f7555378d7993 Mon Sep 17 00:00:00 2001
+From b74c6c8520773c2ef4a4d69b08b70e5ceeb06964 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
@@ -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 447059b8..0391dd3d 100644
 --- a/generator/c.ml
 +++ b/generator/c.ml
 @@ -1846,6 +1846,22 @@ and generate_client_actions actions () =
@@ -40,7 +40,7 @@ index ea69abf76..56ee38aa4 100644
       * as a progress bar hint.
       *)
 diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
-index 30908a918..73cf5144e 100755
+index 16debd12..1c13ddac 100755
 --- a/test-data/phony-guests/make-windows-img.sh
 +++ b/test-data/phony-guests/make-windows-img.sh
 @@ -37,6 +37,7 @@ fi
@@ -52,7 +52,7 @@ 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 105291dc..5ca4f3b6 100644
 --- a/tests/charsets/test-charset-fidelity.c
 +++ b/tests/charsets/test-charset-fidelity.c
 @@ -96,6 +96,8 @@ main (int argc, char *argv[])
@@ -64,6 +64,3 @@ index 105291dc3..5ca4f3b6d 100644
    if (guestfs_add_drive_scratch (g, 1024*1024*1024, -1) == -1)
      exit (EXIT_FAILURE);
  
--- 
-2.31.1
-

SOURCES/0007-tests-regressions-remove-iface-based-restrictions.patch

@@ -1,74 +0,0 @@
-From 431ca828e9f7d7a6c7e315b410f381304986ba44 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Wed, 4 May 2022 15:41:55 +0200
-Subject: [PATCH] tests/regressions: remove "iface"-based restrictions
-
-Now that "iface" is ignored by both backends, the regression tests for
-RHBZ 690819 and 975797 can be enabled on all arches (regardless of
-backend).
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220504134155.11832-5-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit ddf276884c04418a32902689cf8fc3506be3ca4b)
----
- tests/regressions/rhbz690819.sh | 10 +++-------
- tests/regressions/rhbz975797.sh | 10 +++-------
- 2 files changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/tests/regressions/rhbz690819.sh b/tests/regressions/rhbz690819.sh
-index e6f61d00d..9e1bcda84 100755
---- a/tests/regressions/rhbz690819.sh
-+++ b/tests/regressions/rhbz690819.sh
-@@ -19,18 +19,14 @@
- # https://bugzilla.redhat.com/show_bug.cgi?id=690819
- # mkfs fails creating a filesytem on a disk device when using a disk
- # with 'ide' interface
-+#
-+# The 'iface' parameter is now ignored:
-+# https://bugzilla.redhat.com/show_bug.cgi?id=1844341
- 
- set -e
- 
- $TEST_FUNCTIONS
- skip_if_skipped
--# These architectures don't support the 'ide' interface.
--skip_if_arch arm
--skip_if_arch aarch64
--skip_if_arch ppc64
--skip_if_arch ppc64le
--skip_if_arch s390x
--skip_if_backend libvirt
- 
- rm -f rhbz690819.img
- 
-diff --git a/tests/regressions/rhbz975797.sh b/tests/regressions/rhbz975797.sh
-index c676abfa3..feecf1f2b 100755
---- a/tests/regressions/rhbz975797.sh
-+++ b/tests/regressions/rhbz975797.sh
-@@ -19,18 +19,14 @@
- # Regression test for:
- # https://bugzilla.redhat.com/show_bug.cgi?id=975797
- # Ensure the appliance doesn't hang when using the 'iface' parameter.
-+#
-+# The 'iface' parameter is now ignored:
-+# https://bugzilla.redhat.com/show_bug.cgi?id=1844341
- 
- set -e
- 
- $TEST_FUNCTIONS
- skip_if_skipped
--# These architectures don't support the 'ide' interface.
--skip_if_arch arm
--skip_if_arch aarch64
--skip_if_arch ppc64
--skip_if_arch ppc64le
--skip_if_arch s390x
--skip_if_backend libvirt
- 
- rm -f rhbz975797-*.img
- 
--- 
-2.31.1
-

SOURCES/0008-Remove-virt-dib.patch

@@ -0,0 +1,63 @@
+From e916ad54c31a725cbf08fb186756d9e968ff20b2 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 7 Feb 2023 13:20:36 +0000
+Subject: [PATCH] Remove virt-dib
+
+The tool only supports an older version of the diskimage-builder
+metadata, and we do not have the time or inclination to update it to a
+newer version.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1910039
+(cherry picked from commit 7503eeebede688409b2adf616d71a94e04b7f0d2)
+---
+ appliance/packagelist.in | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/appliance/packagelist.in b/appliance/packagelist.in
+index 585d52ad..20b08c47 100644
+--- a/appliance/packagelist.in
++++ b/appliance/packagelist.in
+@@ -110,7 +110,6 @@ ifelse(ARCHLINUX,1,
+   dnl syslinux has mtools as optional dependency, but in reality it's
+   dnl a hard one:
+   mtools
+-  multipath-tools  dnl for kpartx
+   nilfs-utils
+   ntfs-3g
+   ntfs-3g-system-compression
+@@ -266,35 +265,6 @@ util-linux-ng
+ xfsprogs
+ zerofree
+ 
+-dnl tools needed by virt-dib
+-ifelse(REDHAT,1,
+-  qemu-img
+-  which
+-)
+-ifelse(DEBIAN,1,
+-  qemu-utils
+-)
+-ifelse(ARCHLINUX,1,
+-  qemu
+-  which
+-)
+-ifelse(SUSE,1,
+-  qemu-tools
+-  which
+-)
+-ifelse(FRUGALWARE,1,
+-  qemu
+-  which
+-)
+-ifelse(MAGEIA,1,
+-  qemu-img
+-  which
+-)
+-curl
+-kpartx
+-dnl (virt-dib) tools optionally used for elements
+-debootstrap
+-
+ dnl exFAT is not usually available in free software repos
+ exfat-fuse
+ exfat-utils

SOURCES/0008-generator-customize-invert-SELinux-relabeling-defaul.patch

@@ -1,56 +0,0 @@
-From 8f800b369ada05ea690cebb0bb5e0fed0ba1c548 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Tue, 10 May 2022 12:27:57 +0200
-Subject: [PATCH] generator/customize: invert SELinux relabeling default
-
-Replace the "--selinux-relabel" option with "--no-selinux-relabel",
-inverting the default behavior (for guests with SELinux support, that is
--- relabeling is always skipped for guests that don't support SELinux.)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1554735
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2075718
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220510102757.14466-3-lersek@redhat.com>
-Acked-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit 2f6a27f1077d32d1ab526427052fc88e188356f7)
----
- generator/customize.ml | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/generator/customize.ml b/generator/customize.ml
-index 3b3eec6d2..9634dad85 100644
---- a/generator/customize.ml
-+++ b/generator/customize.ml
-@@ -564,18 +564,21 @@ to modify C</etc/sysconfig/authconfig> (Fedora, RHEL) or
- C</etc/pam.d/common-password> (Debian, Ubuntu).";
-   };
- 
--  { flag_name = "selinux-relabel";
-+  { flag_name = "no-selinux-relabel";
-     flag_type = FlagBool false (* XXX - the default in virt-builder *);
--    flag_ml_var = "selinux_relabel";
--    flag_shortdesc = "Relabel files with correct SELinux labels";
-+    flag_ml_var = "no_selinux_relabel";
-+    flag_shortdesc = "Do not relabel files with correct SELinux labels";
-     flag_pod_longdesc = "\
--Relabel files in the guest so that they have the correct SELinux label.
-+Do not attempt to correct the SELinux labels of files in the guest.
- 
--This will attempt to relabel files immediately, but if the operation fails
--this will instead touch F</.autorelabel> on the image to schedule a
--relabel operation for the next time the image boots.
-+In such guests that support SELinux, customization automatically
-+relabels files so that they have the correct SELinux label.  (The
-+relabeling is performed immediately, but if the operation fails,
-+customization will instead touch F</.autorelabel> on the image to
-+schedule a relabel operation for the next time the image boots.)  This
-+option disables the automatic relabeling.
- 
--This option is a no-op for guests that do not support SELinux.";
-+The option is a no-op for guests that do not support SELinux.";
-   };
- 
-   { flag_name = "sm-credentials";
--- 
-2.31.1
-

SOURCES/0009-generator-customize-reintroduce-selinux-relabel-as-a.patch

@@ -1,42 +0,0 @@
-From 4cfba19fa2b087c4b2c5a1b67aa70eb16e9d5a59 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Wed, 25 May 2022 09:19:58 +0200
-Subject: [PATCH] generator/customize: reintroduce "--selinux-relabel" as a
- compat option
-
-Removing "--selinux-relabel" in commit 2f6a27f1077d ("generator/customize:
-invert SELinux relabeling default", 2022-05-11) breaks existing scripts
-that invoke virt-customize and/or virt-sysprep with that option. Restore
-the option, with no functionality tied to it.
-
-Fixes: 2f6a27f1077d32d1ab526427052fc88e188356f7
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2089748
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220525071958.9612-1-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit 4b9ee1052a4396621485fdd56d6826714e7481b1)
----
- generator/customize.ml | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/generator/customize.ml b/generator/customize.ml
-index 9634dad85..5abaf206f 100644
---- a/generator/customize.ml
-+++ b/generator/customize.ml
-@@ -581,6 +581,13 @@ option disables the automatic relabeling.
- The option is a no-op for guests that do not support SELinux.";
-   };
- 
-+  { flag_name = "selinux-relabel";
-+    flag_type = FlagBool false;
-+    flag_ml_var = "selinux_relabel_ignored";
-+    flag_shortdesc = "Compatibility option doing nothing";
-+    flag_pod_longdesc = "This is a compatibility option that does nothing.";
-+  };
-+
-   { flag_name = "sm-credentials";
-     flag_type = FlagSMCredentials "SELECTOR";
-     flag_ml_var = "sm_credentials";
--- 
-2.31.1
-

SOURCES/0009-lib-Choose-q35-machine-type-for-x86-64.patch

@@ -0,0 +1,32 @@
+From e712c4b81cbd2cf0e990d01cb4d1f54734e62de6 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 9 Feb 2023 13:38:50 +0000
+Subject: [PATCH] lib: Choose q35 machine type for x86-64
+
+This machine type is more modern than the older 'pc' type and as most
+qemu development is now focused there we expect it will perform and
+behave better.  In almost all respects this change should make no
+difference.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2168578
+Acked-by: Laszlo Ersek <lersek@redhat.com>
+See-also: https://listman.redhat.com/archives/libguestfs/2023-February/030645.html
+(cherry picked from commit f0f8e6c5fe0c3f6d5d90534d263bded3a4dc7e8d)
+---
+ lib/guestfs-internal.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
+index 306f2a2e..fb55e026 100644
+--- a/lib/guestfs-internal.h
++++ b/lib/guestfs-internal.h
+@@ -113,6 +113,9 @@ cleanup_mutex_unlock (pthread_mutex_t **ptr)
+ #define MAX_WINDOWS_EXPLORER_SIZE (4 * 1000 * 1000)
+ 
+ /* Machine types. */
++#if defined(__x86_64__)
++#define MACHINE_TYPE "q35"
++#endif
+ #ifdef __arm__
+ #define MACHINE_TYPE "virt"
+ #endif

SOURCES/0011-update-common-submodule.patch

@@ -0,0 +1,160 @@
+From 194a48aef32367c45c555a4d93fb1a3375b0dead Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Fri, 19 May 2023 16:08:47 +0200
+Subject: [PATCH] update common submodule
+
+Laszlo Ersek (2):
+      options/keys: key_store_import_key(): un-constify "key" parameter
+      options/keys: introduce unescape_device_mapper_lvm()
+
+Richard W.M. Jones (1):
+      mlcustomize/SELinux_relabel.ml: Use Array.mem
+
+Roman Kagan (1):
+      mlcustomize: skip SELinux relabeling if it's disabled
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168506
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20230519140849.310774-2-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 83afd6d3d2c82ee3a8f22079ba12ef7eac38ac34)
+---
+ common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Submodule common 70c10a07..b636c3f2:
+diff --git a/common/options/options.h b/common/options/options.h
+index 94573ee0..94e8b9ee 100644
+--- a/common/options/options.h
++++ b/common/options/options.h
+@@ -169,7 +169,8 @@ extern struct matching_key *get_keys (struct key_store *ks, const char *device,
+                                       const char *uuid, size_t *nr_matches);
+ extern void free_keys (struct matching_key *keys, size_t nr_matches);
+ extern struct key_store *key_store_add_from_selector (struct key_store *ks, const char *selector);
+-extern struct key_store *key_store_import_key (struct key_store *ks, const struct key_store_key *key);
++extern struct key_store *key_store_import_key (struct key_store *ks,
++                                               struct key_store_key *key);
+ extern bool key_store_requires_network (const struct key_store *ks);
+ extern void free_key_store (struct key_store *ks);
+ 
+diff --git a/common/options/keys.c b/common/options/keys.c
+index 48f1bc7c..52b27369 100644
+--- a/common/options/keys.c
++++ b/common/options/keys.c
+@@ -260,8 +260,107 @@ key_store_add_from_selector (struct key_store *ks, const char *selector)
+   return key_store_import_key (ks, &key);
+ }
+ 
++/* Turn /dev/mapper/VG-LV into /dev/VG/LV, in-place. */
++static void
++unescape_device_mapper_lvm (char *id)
++{
++  static const char dev[] = "/dev/", dev_mapper[] = "/dev/mapper/";
++  const char *input_start;
++  char *output;
++  enum { M_SCAN, M_FILL, M_DONE } mode;
++
++  if (!STRPREFIX (id, dev_mapper))
++    return;
++
++  /* Start parsing "VG-LV" from "id" after "/dev/mapper/". */
++  input_start = id + (sizeof dev_mapper - 1);
++
++  /* Start writing the unescaped "VG/LV" output after "/dev/". */
++  output = id + (sizeof dev - 1);
++
++  for (mode = M_SCAN; mode < M_DONE; ++mode) {
++    char c;
++    const char *input = input_start;
++    const char *hyphen_buffered = NULL;
++    bool single_hyphen_seen = false;
++
++    do {
++      c = *input;
++
++      switch (c) {
++      case '-':
++        if (hyphen_buffered == NULL)
++          /* This hyphen may start an escaped hyphen, or it could be the
++           * separator in VG-LV.
++           */
++          hyphen_buffered = input;
++        else {
++          /* This hyphen completes an escaped hyphen; unescape it. */
++          if (mode == M_FILL)
++            *output++ = '-';
++          hyphen_buffered = NULL;
++        }
++        break;
++
++      case '/':
++        /* Slash characters are forbidden in VG-LV anywhere. If there's any,
++         * we'll find it in the first (i.e., scanning) phase, before we output
++         * anything back to "id".
++         */
++        assert (mode == M_SCAN);
++        return;
++
++      default:
++        /* Encountered a non-slash, non-hyphen character -- which also may be
++         * the terminating NUL.
++         */
++        if (hyphen_buffered != NULL) {
++          /* The non-hyphen character comes after a buffered hyphen, so the
++           * buffered hyphen is supposed to be the single hyphen that separates
++           * VG from LV in VG-LV. There are three requirements for this
++           * separator: (a) it must be unique (we must not have seen another
++           * such separator earlier), (b) it must not be at the start of VG-LV
++           * (because VG would be empty that way), (c) it must not be at the end
++           * of VG-LV (because LV would be empty that way). Should any of these
++           * be violated, we'll catch that during the first (i.e., scanning)
++           * phase, before modifying "id".
++           */
++          if (single_hyphen_seen || hyphen_buffered == input_start ||
++              c == '\0') {
++            assert (mode == M_SCAN);
++            return;
++          }
++
++          /* Translate the separator hyphen to a slash character. */
++          if (mode == M_FILL)
++            *output++ = '/';
++          hyphen_buffered = NULL;
++          single_hyphen_seen = true;
++        }
++
++        /* Output the non-hyphen character (including the terminating NUL)
++         * regardless of whether there was a buffered hyphen separator (which,
++         * by now, we'll have attempted to translate and flush).
++         */
++        if (mode == M_FILL)
++          *output++ = c;
++      }
++
++      ++input;
++    } while (c != '\0');
++
++    /* We must have seen the VG-LV separator. If that's not the case, we'll
++     * catch it before modifying "id".
++     */
++    if (!single_hyphen_seen) {
++      assert (mode == M_SCAN);
++      return;
++    }
++  }
++}
++
+ struct key_store *
+-key_store_import_key (struct key_store *ks, const struct key_store_key *key)
++key_store_import_key (struct key_store *ks, struct key_store_key *key)
+ {
+   struct key_store_key *new_keys;
+ 
+@@ -278,6 +377,7 @@ key_store_import_key (struct key_store *ks, const struct key_store_key *key)
+     error (EXIT_FAILURE, errno, "realloc");
+ 
+   ks->keys = new_keys;
++  unescape_device_mapper_lvm (key->id);
+   ks->keys[ks->nr_keys] = *key;
+   ++ks->nr_keys;
+ 

SOURCES/0012-LUKS-on-LVM-inspection-test-rename-VGs-and-LVs.patch

@@ -0,0 +1,97 @@
+From c95b3086bdbdf840de8d3b24c3ae5e9b847bf588 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Fri, 19 May 2023 16:08:48 +0200
+Subject: [PATCH] LUKS-on-LVM inspection test: rename VGs and LVs
+
+In preparation for a subsequent patch, rename "VG" to "Volume-Group", and
+"LV<n>" to "Logical-Volume-<n>", in the LUKS-on-LVM inspection test.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168506
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20230519140849.310774-3-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 58e26402334a4696fa08730eecc9098fc270ed1c)
+---
+ test-data/phony-guests/make-fedora-img.pl     | 30 +++++++++++--------
+ .../test-key-option-inspect-luks-on-lvm.sh    | 16 +++++-----
+ 2 files changed, 25 insertions(+), 21 deletions(-)
+
+diff --git a/test-data/phony-guests/make-fedora-img.pl b/test-data/phony-guests/make-fedora-img.pl
+index c0cb5d0b..6362e225 100755
+--- a/test-data/phony-guests/make-fedora-img.pl
++++ b/test-data/phony-guests/make-fedora-img.pl
+@@ -224,23 +224,27 @@ EOF
+ 
+     # Create the Volume Group on /dev/sda2.
+     $g->pvcreate ('/dev/sda2');
+-    $g->vgcreate ('VG', ['/dev/sda2']);
+-    $g->lvcreate ('Root', 'VG', 32);
+-    $g->lvcreate ('LV1',  'VG', 32);
+-    $g->lvcreate ('LV2',  'VG', 32);
+-    $g->lvcreate ('LV3',  'VG', 64);
++    $g->vgcreate ('Volume-Group', ['/dev/sda2']);
++    $g->lvcreate ('Root',              'Volume-Group', 32);
++    $g->lvcreate ('Logical-Volume-1',  'Volume-Group', 32);
++    $g->lvcreate ('Logical-Volume-2',  'Volume-Group', 32);
++    $g->lvcreate ('Logical-Volume-3',  'Volume-Group', 64);
+ 
+     # Format each Logical Group as a LUKS device, with a different password.
+-    $g->luks_format ('/dev/VG/Root', 'FEDORA-Root', 0);
+-    $g->luks_format ('/dev/VG/LV1',  'FEDORA-LV1',  0);
+-    $g->luks_format ('/dev/VG/LV2',  'FEDORA-LV2',  0);
+-    $g->luks_format ('/dev/VG/LV3',  'FEDORA-LV3',  0);
++    $g->luks_format ('/dev/Volume-Group/Root',              'FEDORA-Root', 0);
++    $g->luks_format ('/dev/Volume-Group/Logical-Volume-1',  'FEDORA-LV1',  0);
++    $g->luks_format ('/dev/Volume-Group/Logical-Volume-2',  'FEDORA-LV2',  0);
++    $g->luks_format ('/dev/Volume-Group/Logical-Volume-3',  'FEDORA-LV3',  0);
+ 
+     # Open the LUKS devices. This creates nodes like /dev/mapper/*-luks.
+-    $g->cryptsetup_open ('/dev/VG/Root', 'FEDORA-Root', 'Root-luks');
+-    $g->cryptsetup_open ('/dev/VG/LV1',  'FEDORA-LV1',  'LV1-luks');
+-    $g->cryptsetup_open ('/dev/VG/LV2',  'FEDORA-LV2',  'LV2-luks');
+-    $g->cryptsetup_open ('/dev/VG/LV3',  'FEDORA-LV3',  'LV3-luks');
++    $g->cryptsetup_open ('/dev/Volume-Group/Root',
++                         'FEDORA-Root', 'Root-luks');
++    $g->cryptsetup_open ('/dev/Volume-Group/Logical-Volume-1',
++                         'FEDORA-LV1',  'LV1-luks');
++    $g->cryptsetup_open ('/dev/Volume-Group/Logical-Volume-2',
++                         'FEDORA-LV2',  'LV2-luks');
++    $g->cryptsetup_open ('/dev/Volume-Group/Logical-Volume-3',
++                         'FEDORA-LV3',  'LV3-luks');
+ 
+     # Phony root filesystem.
+     $g->mkfs ('ext2', '/dev/mapper/Root-luks', blocksize => 4096, label => 'ROOT');
+diff --git a/tests/luks/test-key-option-inspect-luks-on-lvm.sh b/tests/luks/test-key-option-inspect-luks-on-lvm.sh
+index 52cd7e98..a8d72b9f 100755
+--- a/tests/luks/test-key-option-inspect-luks-on-lvm.sh
++++ b/tests/luks/test-key-option-inspect-luks-on-lvm.sh
+@@ -30,10 +30,10 @@ skip_unless_phony_guest fedora-luks-on-lvm.img
+ # Volume names.
+ guestfish=(guestfish --listen --ro --inspector
+            --add ../test-data/phony-guests/fedora-luks-on-lvm.img)
+-keys_by_lvname=(--key /dev/VG/Root:key:FEDORA-Root
+-                --key /dev/VG/LV1:key:FEDORA-LV1
+-                --key /dev/VG/LV2:key:FEDORA-LV2
+-                --key /dev/VG/LV3:key:FEDORA-LV3)
++keys_by_lvname=(--key /dev/Volume-Group/Root:key:FEDORA-Root
++                --key /dev/Volume-Group/Logical-Volume-1:key:FEDORA-LV1
++                --key /dev/Volume-Group/Logical-Volume-2:key:FEDORA-LV2
++                --key /dev/Volume-Group/Logical-Volume-3:key:FEDORA-LV3)
+ 
+ # The variable assignment below will fail, and abort the script, if guestfish
+ # refuses to start up.
+@@ -56,10 +56,10 @@ function cleanup_guestfish
+ trap cleanup_guestfish EXIT
+ 
+ # Get the UUIDs of the LUKS devices.
+-uuid_root=$(guestfish --remote -- luks-uuid /dev/VG/Root)
+-uuid_lv1=$( guestfish --remote -- luks-uuid /dev/VG/LV1)
+-uuid_lv2=$( guestfish --remote -- luks-uuid /dev/VG/LV2)
+-uuid_lv3=$( guestfish --remote -- luks-uuid /dev/VG/LV3)
++uuid_root=$(guestfish --remote -- luks-uuid /dev/Volume-Group/Root)
++uuid_lv1=$( guestfish --remote -- luks-uuid /dev/Volume-Group/Logical-Volume-1)
++uuid_lv2=$( guestfish --remote -- luks-uuid /dev/Volume-Group/Logical-Volume-2)
++uuid_lv3=$( guestfish --remote -- luks-uuid /dev/Volume-Group/Logical-Volume-3)
+ 
+ # The actual test.
+ function check_filesystems

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

@@ -1,32 +0,0 @@
-From c1ff450bcee1465f0eaca00a4d6c8c731f175488 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 19aa151b7..e67d88280 100755
---- a/appliance/init
-+++ b/appliance/init
-@@ -76,6 +76,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
-+
- # Static nodes must happen before udev is started.
- 
- # Set up kmod static-nodes (RHBZ#1011907).
--- 
-2.31.1
-

SOURCES/0013-LUKS-on-LVM-inspection-test-test-dev-mapper-VG-LV-tr.patch

@@ -0,0 +1,46 @@
+From 15cc20d1f5e0413c1af26c683437995886146eb6 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Fri, 19 May 2023 16:08:49 +0200
+Subject: [PATCH] LUKS-on-LVM inspection test: test /dev/mapper/VG-LV
+ translation
+
+In the LUKS-on-LVM inspection test, call the "check_filesystems" function
+yet another time, now with such "--key" options that exercise the recent
+"/dev/mapper/VG-LV" -> "/dev/VG/LV" translation (unescaping) from
+libguestfs-common.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168506
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20230519140849.310774-4-lersek@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 32408a9c36165af376f9f42e7d3e158d3da2c76e)
+---
+ .../test-key-option-inspect-luks-on-lvm.sh     | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/tests/luks/test-key-option-inspect-luks-on-lvm.sh b/tests/luks/test-key-option-inspect-luks-on-lvm.sh
+index a8d72b9f..932862b1 100755
+--- a/tests/luks/test-key-option-inspect-luks-on-lvm.sh
++++ b/tests/luks/test-key-option-inspect-luks-on-lvm.sh
+@@ -101,3 +101,21 @@ eval "$fish_ref"
+ 
+ # Repeat the test.
+ check_filesystems
++
++# Exit the current guestfish background process.
++guestfish --remote -- exit
++GUESTFISH_PID=
++
++# Start up another guestfish background process, and specify the keys in
++# /dev/mapper/VG-LV format this time.
++keys_by_mapper_lvname=(
++  --key /dev/mapper/Volume--Group-Root:key:FEDORA-Root
++  --key /dev/mapper/Volume--Group-Logical--Volume--1:key:FEDORA-LV1
++  --key /dev/mapper/Volume--Group-Logical--Volume--2:key:FEDORA-LV2
++  --key /dev/mapper/Volume--Group-Logical--Volume--3:key:FEDORA-LV3
++)
++fish_ref=$("${guestfish[@]}" "${keys_by_mapper_lvname[@]}")
++eval "$fish_ref"
++
++# Repeat the test.
++check_filesystems

SOURCES/0013-php-add-arginfo-to-php-bindings.patch

@@ -1,90 +0,0 @@
-From d451e0e42c75429279426e9eb5a7701cd4681d07 Mon Sep 17 00:00:00 2001
-From: Geoff Amey <gamey@datto.com>
-Date: Wed, 15 Jun 2022 17:06:56 -0400
-Subject: [PATCH] php: add arginfo to php bindings
-
-Starting with PHP8, arginfo is mandatory for PHP extensions. This patch
-updates the generator for the PHP bindings to generate the arginfo
-structures, using the Zend API macros. Only basic arginfo is added,
-without full documentation of argument and return types, in order to
-ensure compatibility with as many versions of PHP as possible.
-
-(cherry picked from commit ec27979398b0871c1a3e0e244849f8435c9c9a8d)
----
- .gitignore       |  1 +
- generator/php.ml | 37 ++++++++++++++++++++++++++++++++++---
- 2 files changed, 35 insertions(+), 3 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index a36ccc86a..356c01fbd 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -325,6 +325,7 @@ Makefile.in
- /php/extension/configure.in
- /php/extension/env
- /php/extension/guestfs_php.c
-+/php/extension/guestfs_php.dep
- /php/extension/install-sh
- /php/extension/libtool
- /php/extension/ltmain.sh
-diff --git a/generator/php.ml b/generator/php.ml
-index 5c7ef48e8..acdc7b877 100644
---- a/generator/php.ml
-+++ b/generator/php.ml
-@@ -130,6 +130,37 @@ typedef size_t guestfs_string_length;
- typedef int guestfs_string_length;
- #endif
- 
-+/* Declare argument info structures */
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_create, 0, 0, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_last_error, 0, 0, 1)
-+  ZEND_ARG_INFO(0, g)
-+ZEND_END_ARG_INFO()
-+
-+";
-+  List.iter (
-+    fun { name = shortname; style = ret, args, optargs; } ->
-+      let len = List.length args in
-+      pr "ZEND_BEGIN_ARG_INFO_EX(arginfo_%s, 0, 0, %d)\n" shortname (len + 1);
-+      pr "  ZEND_ARG_INFO(0, g)\n";
-+      List.iter (
-+        function
-+        | BufferIn n | Bool n | Int n | Int64 n | OptString n
-+        | Pointer(_, n) | String (_, n) | StringList (_, n) ->
-+          pr "  ZEND_ARG_INFO(0, %s)\n" n
-+        ) args;
-+
-+      List.iter (
-+        function
-+        | OBool n | OInt n | OInt64 n | OString n | OStringList n ->
-+          pr "  ZEND_ARG_INFO(0, %s)\n" n
-+      ) optargs;
-+      pr "ZEND_END_ARG_INFO()\n\n";
-+  ) (actions |> external_functions |> sort);
-+
-+  pr "
-+
- /* Convert array to list of strings.
-  * http://marc.info/?l=pecl-dev&m=112205192100631&w=2
-  */
-@@ -204,12 +235,12 @@ PHP_MINIT_FUNCTION (guestfs_php)
- }
- 
- static zend_function_entry guestfs_php_functions[] = {
--  PHP_FE (guestfs_create, NULL)
--  PHP_FE (guestfs_last_error, NULL)
-+  PHP_FE (guestfs_create, arginfo_create)
-+  PHP_FE (guestfs_last_error, arginfo_last_error)
- ";
- 
-   List.iter (
--    fun { name } -> pr "  PHP_FE (guestfs_%s, NULL)\n" name
-+    fun { name } -> pr "  PHP_FE (guestfs_%s, arginfo_%s)\n" name name
-   ) (actions |> external_functions |> sort);
- 
-   pr "  { NULL, NULL, NULL }
--- 
-2.31.1
-

SOURCES/0014-introduce-the-clevis_luks_unlock-API.patch

@@ -1,252 +0,0 @@
-From 51ea2e3af9caa434e847ca74a86f5de5ade6058f Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Thu, 30 Jun 2022 14:20:47 +0200
-Subject: [PATCH] introduce the "clevis_luks_unlock" API
-
-Introduce a new guestfs API called "clevis_luks_unlock". At the libguestfs
-level, it is quite simple; it wraps the "clevis luks unlock" guest command
-(implemented by the "clevis-luks-unlock" executable, which is in fact a
-shell script).
-
-The complexity is instead in the network-based disk encryption
-(Clevis/Tang) scheme. Useful documentation:
-
-- https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/security_hardening/index#configuring-automated-unlocking-of-encrypted-volumes-using-policy-based-decryption_security-hardening
-- https://github.com/latchset/clevis#clevis
-- https://github.com/latchset/tang#tang
-
-The package providing "clevis-luks-unlock" is usually called
-"clevis-luks", occasionally "clevis". Some distros don't package clevis at
-all. Add the new API under a new option group (which may not be available)
-called "clevisluks".
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1809453
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Message-Id: <20220630122048.19335-3-lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-(cherry picked from commit 9a3e9a6c03eaffe60196bc4c7ae4699beae01dc3)
----
- appliance/packagelist.in  |  4 +++
- daemon/Makefile.am        |  1 +
- daemon/clevis-luks.c      | 58 +++++++++++++++++++++++++++++++++++++++
- generator/actions_core.ml | 40 +++++++++++++++++++++++++++
- generator/proc_nr.ml      |  1 +
- lib/MAX_PROC_NR           |  2 +-
- lib/guestfs.pod           | 19 ++++++++++---
- 7 files changed, 120 insertions(+), 5 deletions(-)
- create mode 100644 daemon/clevis-luks.c
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 77a07acc6..0b79edcdd 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -23,6 +23,7 @@ dnl Basically the same with a few minor tweaks.
- ifelse(UBUNTU,1,`define(`DEBIAN',1)')
- 
- ifelse(REDHAT,1,
-+  clevis-luks
-   cryptsetup
-   cryptsetup-luks      dnl old name used before Fedora 17
-   dhclient
-@@ -53,6 +54,7 @@ ifelse(DEBIAN,1,
-   bsdmainutils
- dnl old name used in Jessie and earlier
-   btrfs-tools
-+  clevis-luks
-   cryptsetup
-   dash
-   extlinux
-@@ -92,6 +94,7 @@ dnl iproute has been renamed to iproute2
- ifelse(ARCHLINUX,1,
-   cdrkit
-   cdrtools
-+  clevis
-   cryptsetup
-   dhclient
-   dhcpcd
-@@ -119,6 +122,7 @@ ifelse(SUSE,1,
-   augeas-lenses
-   btrfsprogs
-   cdrkit-cdrtools-compat
-+  clevis
-   cryptsetup
-   dhcpcd
-   dhcp-client
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index bbd49f9ea..f50faecd6 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -98,6 +98,7 @@ guestfsd_SOURCES = \
- 	cap.c \
- 	checksum.c \
- 	cleanups.c \
-+	clevis-luks.c \
- 	cmp.c \
- 	command.c \
- 	command.h \
-diff --git a/daemon/clevis-luks.c b/daemon/clevis-luks.c
-new file mode 100644
-index 000000000..d3d970d78
---- /dev/null
-+++ b/daemon/clevis-luks.c
-@@ -0,0 +1,58 @@
-+/* libguestfs - the guestfsd daemon
-+ * Copyright (C) 2009-2022 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.
-+ */
-+
-+#include <config.h>
-+
-+#include "daemon.h"
-+#include "actions.h"
-+#include "optgroups.h"
-+
-+#define MAX_ARGS 8
-+
-+int
-+optgroup_clevisluks_available (void)
-+{
-+  return prog_exists ("clevis-luks-unlock");
-+}
-+
-+int
-+do_clevis_luks_unlock (const char *device, const char *mapname)
-+{
-+  const char *argv[MAX_ARGS];
-+  size_t i = 0;
-+  int r;
-+  CLEANUP_FREE char *err = NULL;
-+
-+  ADD_ARG (argv, i, "clevis");
-+  ADD_ARG (argv, i, "luks");
-+  ADD_ARG (argv, i, "unlock");
-+  ADD_ARG (argv, i, "-d");
-+  ADD_ARG (argv, i, device);
-+  ADD_ARG (argv, i, "-n");
-+  ADD_ARG (argv, i, mapname);
-+  ADD_ARG (argv, i, NULL);
-+
-+  r = commandv (NULL, &err, argv);
-+  if (r == -1) {
-+    reply_with_error ("%s: %s: %s", device, mapname, err);
-+    return -1;
-+  }
-+
-+  udev_settle ();
-+  return 0;
-+}
-diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index 6cd42a290..3c9b0a9b2 100644
---- a/generator/actions_core.ml
-+++ b/generator/actions_core.ml
-@@ -9676,4 +9676,44 @@ and I<not> the name of the underlying block device." };
-     shortdesc = "read directories entries";
-     longdesc = "Internal function for readdir." };
- 
-+  { defaults with
-+    name = "clevis_luks_unlock"; added = (1, 49, 3);
-+    style = RErr,
-+            [String (Device, "device"); String (PlainString, "mapname")],
-+            [];
-+    optional = Some "clevisluks";
-+    test_excuse = "needs networking and a configured Tang server";
-+    shortdesc = "open an encrypted LUKS block device with Clevis and Tang";
-+    longdesc = "\
-+This command opens a block device that has been encrypted according to
-+the Linux Unified Key Setup (LUKS) standard, using network-bound disk
-+encryption (NBDE).
-+
-+C<device> is the encrypted block device.
-+
-+The appliance will connect to the Tang servers noted in the tree of
-+Clevis pins that is bound to a keyslot of the LUKS header.  The Clevis
-+pin tree may comprise C<sss> (redudancy) pins as internal nodes
-+(optionally), and C<tang> pins as leaves.  C<tpm2> pins are not
-+supported.  The appliance unlocks the encrypted block device by
-+combining responses from the Tang servers with metadata from the LUKS
-+header; there is no C<key> parameter.
-+
-+This command will fail if networking has not been enabled for the
-+appliance. Refer to C<guestfs_set_network>.
-+
-+The command creates a new block device called F</dev/mapper/mapname>.
-+Reads and writes to this block device are decrypted from and encrypted
-+to the underlying C<device> respectively.  Close the decrypted block
-+device with C<guestfs_cryptsetup_close>.
-+
-+C<mapname> cannot be C<\"control\"> because that name is reserved by
-+device-mapper.
-+
-+If this block device contains LVM volume groups, then calling
-+C<guestfs_lvm_scan> with the C<activate> parameter C<true> will make
-+them visible.
-+
-+Use C<guestfs_list_dm_devices> to list all device mapper devices." };
-+
- ]
-diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
-index bdced51c9..edd9bd99d 100644
---- a/generator/proc_nr.ml
-+++ b/generator/proc_nr.ml
-@@ -514,6 +514,7 @@ let proc_nr = [
- 509, "cryptsetup_close";
- 510, "internal_list_rpm_applications";
- 511, "internal_readdir";
-+512, "clevis_luks_unlock"
- ]
- 
- (* End of list.  If adding a new entry, add it at the end of the list
-diff --git a/lib/MAX_PROC_NR b/lib/MAX_PROC_NR
-index c0556fb20..4d0e90cbc 100644
---- a/lib/MAX_PROC_NR
-+++ b/lib/MAX_PROC_NR
-@@ -1 +1 @@
--511
-+512
-diff --git a/lib/guestfs.pod b/lib/guestfs.pod
-index 946ce2d36..0fbe114a5 100644
---- a/lib/guestfs.pod
-+++ b/lib/guestfs.pod
-@@ -591,11 +591,22 @@ For Windows BitLocker it returns C<BitLocker>.
- Then open these devices by calling L</guestfs_cryptsetup_open>.
- Obviously you will require the passphrase!
- 
-+Passphrase-less unlocking is supported for LUKS (not BitLocker)
-+block devices that have been encrypted with network-bound disk
-+encryption (NBDE), using Clevis on the Linux guest side, and
-+Tang on a separate Linux server.  Open such devices with
-+L</guestfs_clevis_luks_unlock>.  The appliance will need
-+networking enabled (refer to L</guestfs_set_network>) and actual
-+connectivity to the Tang servers noted in the C<tang> Clevis
-+pins that are bound to the LUKS header.  (This includes the
-+ability to resolve the names of the Tang servers.)
-+
- Opening an encrypted device creates a new device mapper device
--called F</dev/mapper/mapname> (where C<mapname> is the
--string you supply to L</guestfs_cryptsetup_open>).
--Reads and writes to this mapper device are decrypted from and
--encrypted to the underlying block device respectively.
-+called F</dev/mapper/mapname> (where C<mapname> is the string
-+you supply to L</guestfs_cryptsetup_open> or
-+L</guestfs_clevis_luks_unlock>). Reads and writes to this mapper
-+device are decrypted from and encrypted to the underlying block
-+device respectively.
- 
- LVM volume groups on the device can be made visible by calling
- L</guestfs_vgscan> followed by L</guestfs_vg_activate_all>.
--- 
-2.31.1
-

SOURCES/0015-guestfish-guestmount-enable-networking-for-key-ID-cl.patch

@@ -1,69 +0,0 @@
-From 5ae97d7d83d8cdb6e8428774282167dd774aaf70 Mon Sep 17 00:00:00 2001
-From: Laszlo Ersek <lersek@redhat.com>
-Date: Thu, 30 Jun 2022 14:20:48 +0200
-Subject: [PATCH] guestfish, guestmount: enable networking for "--key
- ID:clevis"
-
-Call the C-language helper key_store_requires_network() in guestfish and
-guestmount.
-
-(Short log for the "common" submodule, commit range
-35467027f657..af6cb55bc58a:
-
-Laszlo Ersek (12):
-      options: fix UUID comparison logic bug in get_keys()
-      mltools/tools_utils: remove unused function "key_store_to_cli"
-      mltools/tools_utils: allow multiple "--key" options for OCaml tools too
-      options: replace NULL-termination with number-of-elements in get_keys()
-      options: wrap each passphrase from get_keys() into a struct
-      options: add back-end for LUKS decryption with Clevis+Tang
-      options: introduce selector type "key_clevis"
-      options: generalize "--key" selector parsing for C-language utilities
-      mltools/tools_utils-c: handle internal type error with abort()
-      mltools/tools_utils: generalize "--key" selector parsing for OCaml utils
-      options, mltools/tools_utils: parse "--key ID:clevis" options
-      options, mltools/tools_utils: add helper for network dependency
-).
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1809453
-Signed-off-by: Laszlo Ersek <lersek@redhat.com>
-Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
-Message-Id: <20220630122048.19335-4-lersek@redhat.com>
-(cherry picked from commit 6a5b44f538065a9f661510234a4235bf38348213)
----
- fish/fish.c       | 3 +++
- fuse/guestmount.c | 4 ++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/fish/fish.c b/fish/fish.c
-index 23d9bb94f..19e3d2799 100644
---- a/fish/fish.c
-+++ b/fish/fish.c
-@@ -476,6 +476,9 @@ main (int argc, char *argv[])
-   /* If we've got drives to add, add them now. */
-   add_drives (drvs);
- 
-+  if (key_store_requires_network (ks) && guestfs_set_network (g, 1) == -1)
-+    exit (EXIT_FAILURE);
-+
-   /* If we've got mountpoints or prepared drives or -i option, we must
-    * launch the guest and mount them.
-    */
-diff --git a/fuse/guestmount.c b/fuse/guestmount.c
-index 77c534828..3c6d57bde 100644
---- a/fuse/guestmount.c
-+++ b/fuse/guestmount.c
-@@ -348,6 +348,10 @@ main (int argc, char *argv[])
- 
-   /* Do the guest drives and mountpoints. */
-   add_drives (drvs);
-+
-+  if (key_store_requires_network (ks) && guestfs_set_network (g, 1) == -1)
-+    exit (EXIT_FAILURE);
-+
-   if (guestfs_launch (g) == -1)
-     exit (EXIT_FAILURE);
-   if (inspector)
--- 
-2.31.1
-

SOURCES/0016-daemon-Add-zstd-support-to-guestfs_file_architecture.patch

@@ -1,182 +0,0 @@
-From 4807dacb577167b89cb5ffb1fa1a68ddf30b9319 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 9 Aug 2022 18:39:30 +0100
-Subject: [PATCH] daemon: Add zstd support to guestfs_file_architecture
-
-This is required so we can determine the file architecture of
-zstd-compressed Linux kernel modules as used by OpenSUSE and maybe
-other distros in future.
-
-Note that zstd becomes a required package, but it is widely available
-in current Linux distros.
-
-The package names come from https://pkgs.org/download/zstd and my own
-research.
-
-(cherry picked from commit 0e784824e82a88e522873fec5db1a11943d637ed)
----
- .gitignore                  | 1 +
- appliance/packagelist.in    | 6 ++++++
- daemon/filearch.ml          | 1 +
- docs/guestfs-building.pod   | 4 ++++
- generator/actions_core.ml   | 2 ++
- m4/guestfs-progs.m4         | 4 ++++
- test-data/Makefile.am       | 1 +
- test-data/files/Makefile.am | 6 ++++++
- 8 files changed, 25 insertions(+)
-
-diff --git a/.gitignore b/.gitignore
-index 356c01fbd..ee5ea74dd 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -448,6 +448,7 @@ Makefile.in
- /test-data/files/initrd-x86_64.img
- /test-data/files/initrd-x86_64.img.gz
- /test-data/files/lib-i586.so.xz
-+/test-data/files/lib-i586.so.zst
- /test-data/files/test-grep.txt.gz
- /test-data/phony-guests/archlinux.img
- /test-data/phony-guests/blank-*.img
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 0b79edcdd..0fc11f6ae 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -48,6 +48,7 @@ ifelse(REDHAT,1,
-   vim-minimal
-   xz
-   zfs-fuse
-+  zstd
- )
- 
- ifelse(DEBIAN,1,
-@@ -88,6 +89,7 @@ dnl iproute has been renamed to iproute2
-   vim-tiny
-   xz-utils
-   zfs-fuse
-+  zstd
-   uuid-runtime
- )
- 
-@@ -115,6 +117,7 @@ ifelse(ARCHLINUX,1,
-   systemd
-   vim
-   xz
-+  zstd
- )
- 
- ifelse(SUSE,1,
-@@ -140,6 +143,7 @@ ifelse(SUSE,1,
-   systemd-sysvinit
-   vim
-   xz
-+  zstd
- )
- 
- ifelse(FRUGALWARE,1,
-@@ -185,6 +189,7 @@ ifelse(MAGEIA,1,
-   systemd /* for /sbin/reboot and udevd */
-   vim-minimal
-   xz
-+  zstd
- )
- 
- ifelse(OPENMANDRIVA,1,
-@@ -203,6 +208,7 @@ ifelse(OPENMANDRIVA,1,
-   systemd /* for /sbin/reboot and udevd */
-   vim-minimal
-   xz
-+  zstd
- )
- 
- include(guestfsd.deps)
-diff --git a/daemon/filearch.ml b/daemon/filearch.ml
-index 67a7339e0..4d7e912c0 100644
---- a/daemon/filearch.ml
-+++ b/daemon/filearch.ml
-@@ -106,6 +106,7 @@ and cpio_arch magic orig_path path =
-     if String.find magic "gzip" >= 0 then "zcat"
-     else if String.find magic "bzip2" >= 0 then "bzcat"
-     else if String.find magic "XZ compressed" >= 0 then "xzcat"
-+    else if String.find magic "Zstandard compressed" >= 0 then "zstdcat"
-     else "cat" in
- 
-   let tmpdir = Mkdtemp.temp_dir "filearch" in
-diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
-index b93a611a6..7a7240f78 100644
---- a/docs/guestfs-building.pod
-+++ b/docs/guestfs-building.pod
-@@ -172,6 +172,10 @@ I<Required>.
- 
- I<Required>.
- 
-+=item zstd
-+
-+I<Required>.
-+
- =item Jansson E<ge> 2.7
- 
- I<Required>.
-diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index 3c9b0a9b2..553e4ec3b 100644
---- a/generator/actions_core.ml
-+++ b/generator/actions_core.ml
-@@ -9373,6 +9373,8 @@ with large files, such as the resulting squashfs will be over 3GB big." };
-         [["file_architecture"; "/bin-x86_64-dynamic.gz"]], "x86_64"), [];
-       InitISOFS, Always, TestResultString (
-         [["file_architecture"; "/lib-i586.so.xz"]], "i386"), [];
-+      InitISOFS, Always, TestResultString (
-+        [["file_architecture"; "/lib-i586.so.zst"]], "i386"), [];
-     ];
-     shortdesc = "detect the architecture of a binary file";
-     longdesc = "\
-diff --git a/m4/guestfs-progs.m4 b/m4/guestfs-progs.m4
-index cd8662e86..22fc61367 100644
---- a/m4/guestfs-progs.m4
-+++ b/m4/guestfs-progs.m4
-@@ -95,6 +95,10 @@ AC_PATH_PROGS([XZCAT],[xzcat],[no])
- test "x$XZCAT" = "xno" && AC_MSG_ERROR([xzcat must be installed])
- AC_DEFINE_UNQUOTED([XZCAT],["$XZCAT"],[Name of xzcat program.])
- 
-+dnl Check for zstdcat (required).
-+AC_PATH_PROGS([ZSTDCAT],[zstdcat],[no])
-+test "x$ZSTDCAT" = "xno" && AC_MSG_ERROR([zstdcat must be installed])
-+
- dnl (f)lex and bison for virt-builder (required).
- dnl XXX Could be optional with some work.
- AC_PROG_LEX
-diff --git a/test-data/Makefile.am b/test-data/Makefile.am
-index b603311a1..dbecd74b9 100644
---- a/test-data/Makefile.am
-+++ b/test-data/Makefile.am
-@@ -85,6 +85,7 @@ image_files = \
- 	files/initrd-x86_64.img \
- 	files/initrd-x86_64.img.gz \
- 	files/lib-i586.so.xz \
-+	files/lib-i586.so.zst \
- 	files/test-grep.txt.gz
- 
- noinst_DATA = test.iso
-diff --git a/test-data/files/Makefile.am b/test-data/files/Makefile.am
-index a3d7288f9..06b0c6585 100644
---- a/test-data/files/Makefile.am
-+++ b/test-data/files/Makefile.am
-@@ -40,6 +40,7 @@ noinst_DATA = \
- 	initrd-x86_64.img \
- 	initrd-x86_64.img.gz \
- 	lib-i586.so.xz \
-+	lib-i586.so.zst \
- 	test-grep.txt.gz
- 
- CLEANFILES += $(noinst_DATA)
-@@ -116,3 +117,8 @@ lib-i586.so.xz: $(top_srcdir)/test-data/binaries/lib-i586.so
- 	rm -f $@ $@-t
- 	xz -c $< > $@-t
- 	mv $@-t $@
-+
-+lib-i586.so.zst: $(top_srcdir)/test-data/binaries/lib-i586.so
-+	rm -f $@ $@-t
-+	zstd -c $< > $@-t
-+	mv $@-t $@
--- 
-2.31.1
-

SOURCES/0017-New-API-inspect_get_build_id.patch

@@ -1,184 +0,0 @@
-From 7dbcddd5bd5939493db74843593316f7101f8fde Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 1 Dec 2022 10:00:46 +0000
-Subject: [PATCH] New API: inspect_get_build_id
-
-Add an API to return the build ID of the guest.  This to allow a
-future change to be able to distinguish between Windows 10 and Windows 11
-which can only be done using the build ID.
-
-For Windows we can read the CurrentBuildNumber key from the registry.
-For Linux there happens to be a BUILD_ID field in /etc/os-release.
-I've never seen a Linux distro that actually uses this.
-
-Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-(cherry picked from commit f3dd67affe3c657af64ee9f6d70a16e965309556)
----
- daemon/inspect.ml               |  6 ++++++
- daemon/inspect_fs_unix.ml       |  2 ++
- daemon/inspect_fs_windows.ml    | 14 ++++++++++++++
- daemon/inspect_types.ml         |  5 +++++
- daemon/inspect_types.mli        |  1 +
- generator/actions_inspection.ml | 19 +++++++++++++++++++
- generator/proc_nr.ml            |  3 ++-
- lib/MAX_PROC_NR                 |  2 +-
- 8 files changed, 50 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/inspect.ml b/daemon/inspect.ml
-index fb75b4a6c..20217c025 100644
---- a/daemon/inspect.ml
-+++ b/daemon/inspect.ml
-@@ -335,6 +335,12 @@ and inspect_get_hostname root =
-   | Some v -> v
-   | None -> "unknown"
- 
-+and inspect_get_build_id root =
-+  let root = search_for_root root in
-+  match root.inspection_data.build_id with
-+  | Some v -> v
-+  | None -> "unknown"
-+
- and inspect_get_windows_systemroot root =
-   let root = search_for_root root in
-   match root.inspection_data.windows_systemroot with
-diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml
-index 63cb279d0..009195f80 100644
---- a/daemon/inspect_fs_unix.ml
-+++ b/daemon/inspect_fs_unix.ml
-@@ -96,6 +96,8 @@ let rec parse_os_release release_file data =
-            data.product_name <- Some value
-          else if key = "VERSION_ID" then
-            parse_os_release_version_id value data
-+         else if key = "BUILD_ID" then
-+           data.build_id <- Some value
-        ) values;
- 
-      (* If we haven't got all the fields, exit right away. *)
-diff --git a/daemon/inspect_fs_windows.ml b/daemon/inspect_fs_windows.ml
-index c4a05bc38..7bc5de7f7 100644
---- a/daemon/inspect_fs_windows.ml
-+++ b/daemon/inspect_fs_windows.ml
-@@ -263,6 +263,20 @@ and check_windows_software_registry software_hive data =
-          with
-            Not_found -> ()
-         );
-+
-+        (* CurrentBuildNumber (build_id).
-+         *
-+         * In modern Windows, the "CurrentBuild" and "CurrentBuildNumber"
-+         * keys are the same.  But in Windows XP, "CurrentBuild"
-+         * contained something quite different.  So always use
-+         * "CurrentBuildNumber".
-+         *)
-+        (try
-+           let v = List.assoc "CurrentBuildNumber" values in
-+           data.build_id <- Some (Hivex.value_string h v)
-+         with
-+           Not_found -> ()
-+        );
-       with
-       | Not_found ->
-          if verbose () then
-diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml
-index 9395c51f9..328a2146b 100644
---- a/daemon/inspect_types.ml
-+++ b/daemon/inspect_types.ml
-@@ -48,6 +48,7 @@ and inspection_data = {
-   mutable version : version option;
-   mutable arch : string option;
-   mutable hostname : string option;
-+  mutable build_id : string option;
-   mutable fstab : fstab_entry list;
-   mutable windows_systemroot : string option;
-   mutable windows_software_hive : string option;
-@@ -167,6 +168,8 @@ and string_of_inspection_data data =
-              data.arch;
-   Option.may (fun v -> bpf "    hostname: %s\n" v)
-              data.hostname;
-+  Option.may (fun v -> bpf "    build ID: %s\n" v)
-+             data.build_id;
-   if data.fstab <> [] then (
-     let v = List.map (
-       fun (a, b) -> sprintf "(%s, %s)" (Mountable.to_string a) b
-@@ -272,6 +275,7 @@ let null_inspection_data = {
-   version = None;
-   arch = None;
-   hostname = None;
-+  build_id = None;
-   fstab = [];
-   windows_systemroot = None;
-   windows_software_hive = None;
-@@ -294,6 +298,7 @@ let merge_inspection_data child parent =
-   parent.version <-         merge child.version parent.version;
-   parent.arch <-            merge child.arch parent.arch;
-   parent.hostname <-        merge child.hostname parent.hostname;
-+  parent.build_id <-        merge child.build_id parent.build_id;
-   parent.fstab <-           child.fstab @ parent.fstab;
-   parent.windows_systemroot <-
-     merge child.windows_systemroot parent.windows_systemroot;
-diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli
-index 29c76e8ab..05a3ffd4e 100644
---- a/daemon/inspect_types.mli
-+++ b/daemon/inspect_types.mli
-@@ -51,6 +51,7 @@ and inspection_data = {
-   mutable version : version option;
-   mutable arch : string option;
-   mutable hostname : string option;
-+  mutable build_id : string option;
-   mutable fstab : fstab_entry list;
-   mutable windows_systemroot : string option;
-   mutable windows_software_hive : string option;
-diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml
-index f8b744993..70de22ec0 100644
---- a/generator/actions_inspection.ml
-+++ b/generator/actions_inspection.ml
-@@ -529,6 +529,25 @@ hive is a valid Windows Registry hive.
- 
- You can use C<guestfs_hivex_open> to read or write to the hive.
- 
-+Please read L<guestfs(3)/INSPECTION> for more details." };
-+
-+  { defaults with
-+    name = "inspect_get_build_id"; added = (1, 49, 8);
-+    style = RString (RPlainString, "buildid"), [String (Mountable, "root")], [];
-+    impl = OCaml "Inspect.inspect_get_build_id";
-+    shortdesc = "get the system build ID";
-+    longdesc = "\
-+This returns the build ID of the system, or the string
-+C<\"unknown\"> if the system does not have a build ID.
-+
-+For Windows, this gets the build number.  Although it is
-+returned as a string, it is (so far) always a number.  See
-+L<https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions>
-+for some possible values.
-+
-+For Linux, this returns the C<BUILD_ID> string from
-+F</etc/os-release>, although this is not often used.
-+
- Please read L<guestfs(3)/INSPECTION> for more details." };
- 
-   { defaults with
-diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
-index edd9bd99d..0f17b1c06 100644
---- a/generator/proc_nr.ml
-+++ b/generator/proc_nr.ml
-@@ -514,7 +514,8 @@ let proc_nr = [
- 509, "cryptsetup_close";
- 510, "internal_list_rpm_applications";
- 511, "internal_readdir";
--512, "clevis_luks_unlock"
-+512, "clevis_luks_unlock";
-+513, "inspect_get_build_id";
- ]
- 
- (* End of list.  If adding a new entry, add it at the end of the list
-diff --git a/lib/MAX_PROC_NR b/lib/MAX_PROC_NR
-index 4d0e90cbc..31cf34b8d 100644
---- a/lib/MAX_PROC_NR
-+++ b/lib/MAX_PROC_NR
-@@ -1 +1 @@
--512
-+513
--- 
-2.31.1
-

SOURCES/0018-lib-Return-correct-osinfo-field-for-Windows-11.patch

@@ -1,82 +0,0 @@
-From 363bbb7e9bd39fc1683fb600c76266f67ad2063c Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 1 Dec 2022 10:14:43 +0000
-Subject: [PATCH] lib: Return correct osinfo field for Windows 11
-
-For Windows Client, we can only distinguish between Windows 10 and
-Windows 11 using the build ID.  The product name in both cases is
-"Windows 10 <something>", apparently intentionally.
-
-References:
-https://learn.microsoft.com/en-us/answers/questions/586619/windows-11-build-ver-is-still-10022000194.html
-https://github.com/cygwin/cygwin/blob/a263fe0b268580273c1adc4b1bad256147990222/winsup/cygwin/wincap.cc#L429
-https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions
-
-After this fix, the output of virt-inspector changes to this, which is
-a bit odd, but correct:
-
-    <name>windows</name>
-    <arch>x86_64</arch>
-    <distro>windows</distro>
-    <product_name>Windows 10 Pro</product_name>
-    <product_variant>Client</product_variant>
-    <major_version>10</major_version>
-    <minor_version>0</minor_version>
-    <windows_systemroot>/Windows</windows_systemroot>
-    <windows_current_control_set>ControlSet001</windows_current_control_set>
-    <osinfo>win11</osinfo>
-
-Thanks: Yaakov Selkowitz
-Reported-by: Yongkui Guo
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2012658
-Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-(cherry picked from commit 824c7457489366494f0f10fd3369dc30f3a3c360)
----
- lib/inspect-osinfo.c | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c
-index 90e57e6df..1c10ff469 100644
---- a/lib/inspect-osinfo.c
-+++ b/lib/inspect-osinfo.c
-@@ -86,6 +86,8 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root)
-   else if (STREQ (type, "windows")) {
-     CLEANUP_FREE char *product_name = NULL;
-     CLEANUP_FREE char *product_variant = NULL;
-+    CLEANUP_FREE char *build_id_str = NULL;
-+    int build_id;
- 
-     product_name = guestfs_inspect_get_product_name (g, root);
-     if (!product_name)
-@@ -142,8 +144,26 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root)
-             return safe_strdup (g, "win2k19");
-           else
-             return safe_strdup (g, "win2k16");
--        } else
--          return safe_strdup (g, "win10");
-+        }
-+        else {
-+          /* For Windows >= 10 Client we can only distinguish between
-+           * versions by looking at the build ID.  See:
-+           * https://learn.microsoft.com/en-us/answers/questions/586619/windows-11-build-ver-is-still-10022000194.html
-+           * https://github.com/cygwin/cygwin/blob/a263fe0b268580273c1adc4b1bad256147990222/winsup/cygwin/wincap.cc#L429
-+           */
-+          build_id_str = guestfs_inspect_get_build_id (g, root);
-+          if (!build_id_str)
-+            return NULL;
-+
-+          build_id = guestfs_int_parse_unsigned_int (g, build_id_str);
-+          if (build_id == -1)
-+            return NULL;
-+
-+          if (build_id >= 22000)
-+            return safe_strdup (g, "win11");
-+          else
-+            return safe_strdup (g, "win10");
-+        }
-       }
-       break;
-     }
--- 
-2.31.1
-

SOURCES/copy-patches.sh

@@ -3,12 +3,11 @@
 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
 
 project=libguestfs
-rhel_version=9.2
+rhel_version=9.3
 
 # Check we're in the right directory.
 if [ ! -f $project.spec ]; then
@@ -37,7 +36,12 @@ git rm -f [0-9]*.patch ||:
 rm -f [0-9]*.patch
 
 # Get the patches.
-(cd $git_checkout; rm -f [0-9]*.patch; git -c core.abbrev=9 format-patch -O/dev/null -N --submodule=diff $tag)
+(
+  cd $git_checkout
+  rm -f [0-9]*.patch
+  git -c core.abbrev=8 format-patch -O/dev/null --subject-prefix=PATCH -N \
+      --submodule=diff --no-signature --patience $tag
+)
 mv $git_checkout/[0-9]*.patch .
 
 # Remove any not to be applied.

SOURCES/libguestfs-1.48.4.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmLFql8RHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKAV2hAAzOcZseFTUFFoj4M5riqXqtBN3W+fr/O7
-v0wzJ9sY31Ftk8KFKKgpwOn4UFXYMPXY7Hm94GRAYjYBAtx9Viyyt7B6PbV7mVZ0
-WHLlZcg3ZsliF23s3EoHfgTGFfKLkjDwfPlmChC260Ffhq4KKvnwu/DobY/CDLHG
-0cvrjb0OOYibBGbq58AHYR6QlVH/ScAuLSA1aRAd06bbpixufRR1oh1MtFA1iSvC
-yjNH0joLFiu0uuD7KFH66YX2nFNrO24r0LxJkwT5G7GHlZJStJUpvs/QHa8Tw5Zt
-Z1JMk9yB9EMPYimdVDm7m6eDBxTx8YbF7u6G8JdHRXgAPBt4O09XX7WGxxmh9Dc4
-M+QkpiubEOG6qwBythJJ6sTSRLKIAPeVfHEOauXg8n45Tbk5jYwthMKbnD9ETb3t
-QKdMr5g+DZUO0LfbOvP0GtD+b1jK4iu4BcWDquQBXpDTbx7LUfSuTDrWItehEnBp
-/K6FRbakNZEroLR5VA9WAa6sE+2B3gg1OG+KHypHuw4hfpmutvVA8wnPgyw3j+WK
-xdcRp65NUMUkKRE/FTwp1MkY1Y2S9M9iAPX+CopdHPVoq9O2YE+K6Rv1EdJjmKZK
-EwLzX08Xcj9T/U9GEfV+QdIzitCuxf7x9ULEDcFozFnuHXww+JLdR0EmIDkUwl7C
-Z0KKsy18Eq8=
-=WB1H
------END PGP SIGNATURE-----

SOURCES/libguestfs-1.50.1.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmP1QzoRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKCAEBAAimQxT37HMWTHOqvj4s6ipOhDCNPlqo4L
+z+syvIkgbp024IOPUbrlmSCtrCFiLXsRmmenynFv66N8GXoWmJruyJMyvBxsupZT
+lTo7WdCEix/xPh/LAb8Q9RWA2SQYfkOKHRs/gr4b/LbtXBklMlcOdhegx3Mml4SW
+gwK5n799YebUVgzYch5hWjHcRAphPaUdMyaJ6MUnFrfUPyGK2QO1yXdnGxkseAPz
+srjlhFqu5kNojWzcaNcdHBdKvJVEZo7L6laADRS31sRH0BGVc6/DFJgOPdxROGJe
+oeq3Oo1EF88P15NSTNZSXLa65n9kts2OnqRgX/c3njV9+1/JPHJWVM+VezuCcN8D
+hHktHVOBjM209N5RmLtR92eROvo1aTrgjsLqOTvwbKBu7NrPc4ZICnX7dMjD6irj
+vQz0P5MUmELMvdEN3FMGf45v77z+249e1z+5EGi2HUPKLfxd+I3+2mxUm2xjWOy/
+zNzkG2rCgYRB8Tioj6Mw80RYKioRyu8p5lUZvvLk85CJbT4BFH8rXgJbrEBOSunE
+lWEcv690GzyszAN8zKZaIqhNzIKdlkQZAd1DMXfNBEfAy23YHRApB1O2EFhNAjAf
+yEsUjpiYc0pq64QiCPGzUp4iLfMt9hg4ey5Pquud/j6cfvJ3ak5gZECbFnbUjysZ
+YYpwSgy/FVI=
+=OPC/
+-----END PGP SIGNATURE-----

SPECS/libguestfs.spec

@@ -14,10 +14,7 @@
 %if !0%{?rhel}
 %global test_arches aarch64 %{power64} s390x x86_64
 %else
-# RHEL 9 only:
-# x86-64:  "/lib64/libc.so.6: CPU ISA level is lower than required"
-#          (RHBZ#1919389)
-%global test_arches NONE
+%global test_arches x86_64
 %endif
 
 # Trim older changelog entries.
@@ -36,7 +33,7 @@
 %endif
 
 # The source directory.
-%global source_directory 1.48-stable
+%global source_directory 1.50-stable
 
 # Filter perl provides.
 %{?perl_default_filter}
@@ -47,8 +44,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.48.4
-Release:       4%{?dist}
+Version:       1.50.1
+Release:       6%{?dist}
 License:       LGPLv2+
 
 # Build only for architectures that have a kernel
@@ -83,27 +80,22 @@ Source7:       libguestfs.keyring
 Source8:       copy-patches.sh
 
 # Patches are maintained in the following repository:
-# https://github.com/libguestfs/libguestfs/commits/rhel-9.2
+# https://github.com/libguestfs/libguestfs/commits/rhel-9.3
 
 # Patches.
-Patch0001:     0001-New-API-guestfs_device_name-returning-the-drive-name.patch
-Patch0002:     0002-guestfs_readdir-rewrite-with-FileOut-transfer-to-lif.patch
-Patch0003:     0003-guestfs_readdir-minimize-the-number-of-send_file_wri.patch
-Patch0004:     0004-lib-launch-direct-ignore-drive-iface-parameter.patch
-Patch0005:     0005-lib-drive_create_data-drive-remove-field-iface.patch
-Patch0006:     0006-lib-rename-VALID_FORMAT_IFACE-to-VALID_FORMAT.patch
-Patch0007:     0007-tests-regressions-remove-iface-based-restrictions.patch
-Patch0008:     0008-generator-customize-invert-SELinux-relabeling-defaul.patch
-Patch0009:     0009-generator-customize-reintroduce-selinux-relabel-as-a.patch
-Patch0010:     0010-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
-Patch0011:     0011-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
-Patch0012:     0012-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch
-Patch0013:     0013-php-add-arginfo-to-php-bindings.patch
-Patch0014:     0014-introduce-the-clevis_luks_unlock-API.patch
-Patch0015:     0015-guestfish-guestmount-enable-networking-for-key-ID-cl.patch
-Patch0016:     0016-daemon-Add-zstd-support-to-guestfs_file_architecture.patch
-Patch0017:     0017-New-API-inspect_get_build_id.patch
-Patch0018:     0018-lib-Return-correct-osinfo-field-for-Windows-11.patch
+#Patch0001:     0001-update-common-submodule.patch
+Patch0002:     0002-update-common-submodule.patch
+Patch0003:     0003-daemon-selinux-relabel-don-t-exclude-selinux-if-it-s.patch
+Patch0004:     0004-daemon-selinux-relabel-search-for-invalid-option-in-.patch
+Patch0005:     0005-daemon-selinux-relabel-run-setfiles-with-T-0-if-supp.patch
+Patch0006:     0006-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
+Patch0007:     0007-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
+Patch0008:     0008-Remove-virt-dib.patch
+Patch0009:     0009-lib-Choose-q35-machine-type-for-x86-64.patch
+Patch0010:     0010-RHEL-Revert-build-Remove-bundled-copy-of-ocaml-augea.patch
+Patch0011:     0011-update-common-submodule.patch
+Patch0012:     0012-LUKS-on-LVM-inspection-test-rename-VGs-and-LVs.patch
+Patch0013:     0013-LUKS-on-LVM-inspection-test-test-dev-mapper-VG-LV-tr.patch
 
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
@@ -122,6 +114,8 @@ BuildRequires: perl(Pod::Man)
 BuildRequires: /usr/bin/pod2text
 BuildRequires: po4a
 BuildRequires: augeas-devel >= 1.7.0
+# Waiting for https://bugzilla.redhat.com/show_bug.cgi?id=2168634
+#BuildRequires: ocaml-augeas-devel >= 0.6
 BuildRequires: readline-devel
 BuildRequires: xorriso
 BuildRequires: libxml2-devel
@@ -173,7 +167,6 @@ BuildRequires: gnupg2
 BuildRequires: ocaml
 BuildRequires: ocaml-ocamldoc
 BuildRequires: ocaml-findlib-devel
-BuildRequires: ocaml-gettext-devel
 %if !0%{?rhel}
 BuildRequires: ocaml-ounit-devel
 %endif
@@ -227,10 +220,6 @@ BuildRequires: clevis-luks
 BuildRequires: coreutils
 BuildRequires: cpio
 BuildRequires: cryptsetup
-%if !0%{?rhel}
-BuildRequires: curl
-BuildRequires: debootstrap
-%endif
 BuildRequires: dhclient
 BuildRequires: diffutils
 BuildRequires: dosfstools
@@ -254,9 +243,6 @@ BuildRequires: iproute
 BuildRequires: iputils
 BuildRequires: kernel
 BuildRequires: kmod
-%if !0%{?rhel}
-BuildRequires: kpartx
-%endif
 BuildRequires: less
 BuildRequires: libcap
 %if !0%{?rhel}
@@ -279,7 +265,6 @@ BuildRequires: pcre2
 BuildRequires: policycoreutils
 BuildRequires: procps
 BuildRequires: psmisc
-BuildRequires: qemu-img
 BuildRequires: rpm-libs
 BuildRequires: rsync
 BuildRequires: scrub
@@ -297,9 +282,6 @@ BuildRequires: tar
 BuildRequires: udev
 BuildRequires: util-linux
 BuildRequires: vim-minimal
-%if !0%{?rhel}
-BuildRequires: which
-%endif
 BuildRequires: xfsprogs
 BuildRequires: xz
 BuildRequires: yajl
@@ -451,17 +433,6 @@ Requires:      pkgconfig
 for %{name}.
 
 
-%if !0%{?rhel}
-%package dib
-Summary:       Additional tools for virt-dib
-License:       LGPLv2+
-
-%description dib
-This adds extra packages needed by virt-dib to %{name}.  You should
-normally install the virt-dib package which depends on this one.
-%endif
-
-
 %if !0%{?rhel}
 %package forensics
 Summary:       Filesystem forensics support for %{name}
@@ -798,8 +769,14 @@ make V=1 INSTALLDIRS=vendor %{?_smp_mflags}
 
 
 %check
-
 %ifarch %{test_arches}
+# Only run the tests with non-debug (ie. non-Rawhide) kernels.
+# XXX This tests for any debug kernel installed.
+if grep CONFIG_DEBUG_MUTEXES=y /lib/modules/*/config ; then
+    echo "Skipping tests because debug kernel is installed"
+    exit 0
+fi
+
 export LIBGUESTFS_DEBUG=1
 export LIBGUESTFS_TRACE=1
 export LIBVIRT_DEBUG=1
@@ -828,6 +805,13 @@ find $RPM_BUILD_ROOT -name .packlist -delete
 find $RPM_BUILD_ROOT -name '*.bs' -delete
 find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete
 
+# Perl's ExtUtils::Install installs "Guestfs.so" read-only; that
+# prevents objcopy from adding the ".gdb_index" section for the sake of
+# the debuginfo file. See
+# <https://rt.cpan.org/Public/Bug/Display.html?id=40976>. Restore write
+# permission for the file owner.
+find $RPM_BUILD_ROOT -name Guestfs.so -exec chmod u+w '{}' +
+
 # golang: Ignore what libguestfs upstream installs, and just copy the
 # source files to %%{_datadir}/gocode/src.
 %ifarch %{golang_arches}
@@ -856,19 +840,6 @@ function move_to
     echo "$1" >> "$2"
 }
 
-%if !0%{?rhel}
-move_to curl            zz-packages-dib
-move_to debootstrap     zz-packages-dib
-move_to kpartx          zz-packages-dib
-move_to qemu-img        zz-packages-dib
-move_to which           zz-packages-dib
-%else
-remove curl
-remove debootstrap
-remove kpartx
-remove qemu-img
-remove which
-%endif
 %if !0%{?rhel}
 move_to sleuthkit       zz-packages-forensics
 move_to gfs2-utils      zz-packages-gfs2
@@ -977,11 +948,6 @@ rm ocaml/html/.gitignore
 %{_libdir}/pkgconfig/libguestfs.pc
 
 
-%if !0%{?rhel}
-%files dib
-%{_libdir}/guestfs/supermin.d/zz-packages-dib
-%endif
-
 %if !0%{?rhel}
 %files forensics
 %{_libdir}/guestfs/supermin.d/zz-packages-forensics
@@ -1140,7 +1106,24 @@ rm ocaml/html/.gitignore
 
 
 %changelog
-* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.48.4-4
+* Wed Jun 07 2023 Laszlo Ersek <lersek@redhat.com> - 1:1.50.1-6
+- enable the ".gdb_index" section in the Perl bindings debug info
+  resolves: rhbz#2209279
+
+* Tue May 23 2023 Laszlo Ersek <lersek@redhat.com> - 1:1.50.1-5
+- let "guestfish -i" recognize "--key /dev/mapper/VG-LV:key:password"
+- reenable quickcheck; we now use "-cpu max" (upstream 30f74f38bd6e)
+  resolves: rhbz#2209279
+
+* Thu May 04 2023 Richard W.M. Jones <rjones@redhat.com> - 1:1.50.1-4
+- Rebase libguestfs to 1.50.1
+  resolves: rhbz#2168625
+- Use q35 machine type for libguestfs appliance
+  resolves: rhbz#2168578
+- Run SELinux relabelling in parallel [for virt-v2v]
+  resolves: rhbz#2190276
+
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1:1.48.4-4
 - Rebuilt for MSVSphere 9.2 beta
 
 * Fri Dec 02 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.48.4-4