From 35792e839568a127d1495054fc1b70b7e1b73b2a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 9 Dec 2023 13:11:53 +0000
Subject: [PATCH] Fixes a crash in virt-v2v and virt-customize

---
 0001-Update-common-submodule.patch | 29 +++++++++++++++++++++++++++++
 guestfs-tools.spec                 |  7 +++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 0001-Update-common-submodule.patch

diff --git a/0001-Update-common-submodule.patch b/0001-Update-common-submodule.patch
new file mode 100644
index 0000000..4915cc8
--- /dev/null
+++ b/0001-Update-common-submodule.patch
@@ -0,0 +1,29 @@
+From 056401c8c6db33536c477078008649054f347a9c Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 9 Dec 2023 12:59:13 +0000
+Subject: [PATCH] Update common submodule
+
+Pick up this bug fix:
+
+    mltools/libosinfo-c.c: Fix off-by-one error
+---
+ common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Submodule common cd29aee912..0dba002c20:
+diff --git a/common/mltools/libosinfo-c.c b/common/mltools/libosinfo-c.c
+index 93357fd..a48c898 100644
+--- a/common/mltools/libosinfo-c.c
++++ b/common/mltools/libosinfo-c.c
+@@ -296,7 +296,7 @@ v2v_osinfo_os_get_device_drivers (value osv)
+ 
+     driver = OSINFO_DEVICE_DRIVER(osinfo_list_get_nth (OSINFO_LIST(list), i));
+ 
+-    vi = caml_alloc (6, 0);
++    vi = caml_alloc (7, 0);
+     str = osinfo_device_driver_get_architecture (driver);
+     copyv = caml_copy_string (str);
+     Store_field (vi, 0, copyv);
+-- 
+2.43.0
+
diff --git a/guestfs-tools.spec b/guestfs-tools.spec
index 66fde73..1e27a40 100644
--- a/guestfs-tools.spec
+++ b/guestfs-tools.spec
@@ -26,7 +26,7 @@
 Summary:       Tools to access and modify virtual machine disk images
 Name:          guestfs-tools
 Version:       1.51.6
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
 
 # Build only for architectures that have a kernel
@@ -48,6 +48,9 @@ Source1:       http://download.libguestfs.org/guestfs-tools/%{source_directory}/
 Source2:       libguestfs.keyring
 %endif
 
+# Fixes a crash in virt-v2v and virt-customize
+Patch:         0001-Update-common-submodule.patch
+
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
@@ -405,7 +408,7 @@ end
 
 
 %changelog
-* Sat Dec  9 2023 Richard W.M. Jones <rjones@redhat.com> - 1.51.6-1
+* Sat Dec  9 2023 Richard W.M. Jones <rjones@redhat.com> - 1.51.6-2
 - New development version 1.51.6
 
 * Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.51.5-2