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

---
 0001-Update-common-submodule.patch | 29 +++++++++++++++++++++++++++++
 virt-v2v.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/virt-v2v.spec b/virt-v2v.spec
index 0971e40..4f9b7ef 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -15,7 +15,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.3.7
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -31,6 +31,9 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:       copy-patches.sh
 
+# Fixes a crash in virt-v2v and virt-customize
+Patch:         0001-Update-common-submodule.patch
+
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
 # kernel built for this architecture any longer and libguestfs rather
@@ -308,7 +311,7 @@ done
 
 
 %changelog
-* Sat Dec 09 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.7-1
+* Sat Dec 09 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.7-2
 - New development branch version 2.3.7
 
 * Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.6-2