From 861a872c86487cd1eab93a675ef91757f97ca76b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 27 Nov 2023 14:37:05 +0000 Subject: [PATCH] Fix build for libxml2 2.12.1 --- 0001-common-Update-submodule.patch | 28 ++++++++++++++++++++++++++++ guestfs-tools.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-common-Update-submodule.patch diff --git a/0001-common-Update-submodule.patch b/0001-common-Update-submodule.patch new file mode 100644 index 0000000..4d3e5fd --- /dev/null +++ b/0001-common-Update-submodule.patch @@ -0,0 +1,28 @@ +From 706236b7f8087f0486596d70ac6973d02028eab1 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 27 Nov 2023 14:07:13 +0000 +Subject: [PATCH] common: Update submodule + +Pulls in this commit required for libxml2 2.12.1: + + mlxml: Include for xmlReadMemory +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common e711121607..6185aa8431: +diff --git a/common/mlxml/xml-c.c b/common/mlxml/xml-c.c +index 715c3bb..e024bd8 100644 +--- a/common/mlxml/xml-c.c ++++ b/common/mlxml/xml-c.c +@@ -34,6 +34,7 @@ + #include + #include + ++#include + #include + #include + #include +-- +2.42.0 + diff --git a/guestfs-tools.spec b/guestfs-tools.spec index 7c0b0c2..1fc3ea3 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.5 -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,8 @@ Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/ Source2: libguestfs.keyring %endif +Patch1: 0001-common-Update-submodule.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel %endif @@ -405,6 +407,9 @@ end %changelog +* Mon Nov 27 2023 Richard W.M. Jones - 1.51.5-2 +- Fix build for libxml2 2.12.1 + * Thu Nov 02 2023 Richard W.M. Jones - 1.51.5-1 - New development version 1.51.5