diff --git a/0001-generator-daemon.ml-Avoid-not-available-macro-for-OC.patch b/0001-generator-daemon.ml-Avoid-not-available-macro-for-OC.patch new file mode 100644 index 0000000..4091d0b --- /dev/null +++ b/0001-generator-daemon.ml-Avoid-not-available-macro-for-OC.patch @@ -0,0 +1,42 @@ +From 07ea5915766d829b62255fb2a94239a28f433159 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 19 Jan 2026 21:36:08 +0000 +Subject: [PATCH] generator/daemon.ml: Avoid not available macro for OCaml + functions + +Reported-by: Toolybird +Fixes: https://github.com/libguestfs/libguestfs/issues/290 +(cherry picked from commit 1b79e22be443b48dc2bdb518cfea14342b3d8136) +--- + generator/daemon.ml | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/generator/daemon.ml b/generator/daemon.ml +index 65844309e..f1f954087 100644 +--- a/generator/daemon.ml ++++ b/generator/daemon.ml +@@ -1054,7 +1054,8 @@ let generate_daemon_optgroups_h () = + pr "#define OPTGROUP_%s_NOT_AVAILABLE \\\n" + (String.uppercase_ascii group); + List.iter ( +- fun { name; style = ret, args, optargs } -> ++ function ++ | { name; style = ret, args, optargs; impl = C } -> + let style = ret, args @ args_of_optargs optargs, [] in + pr " "; + generate_prototype +@@ -1065,6 +1066,11 @@ let generate_daemon_optgroups_h () = + ~semicolon:false + name style; + pr " { abort (); } \\\n" ++ | { impl = OCaml _ } -> ++ (* Don't need to generate anything for OCaml functions since ++ * the caml-stubs do_* function will still exist. ++ *) ++ () + ) fns; + pr " int optgroup_%s_available (void) { return 0; }\n" group; + pr "\n" +-- +2.47.3 + diff --git a/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch b/0002-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch similarity index 99% rename from 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch rename to 0002-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch index c4c24ca..5308aac 100644 --- a/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch +++ b/0002-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch @@ -1,4 +1,4 @@ -From 78c0b873d6d59cbb6a5cc0d40f642ce94fd99fb4 Mon Sep 17 00:00:00 2001 +From d9e9cc39c92288b713320b4d7f6f66d1b1e4ff42 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jul 2013 14:47:56 +0100 Subject: [PATCH] RHEL: Disable unsupported remote drive protocols diff --git a/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch b/0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch similarity index 97% rename from 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch rename to 0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch index 4142b9c..70a1b8f 100644 --- a/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +++ b/0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -1,4 +1,4 @@ -From 34ab9432562eb03dccaedf0f8ed98ff8cff40c1e Mon Sep 17 00:00:00 2001 +From 3319a68b51de8ded8a76dcd72f8fce804dd581a4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Jul 2015 09:28:03 -0400 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for diff --git a/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch b/0004-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch similarity index 90% rename from 0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch rename to 0004-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch index 58e2386..72dfae0 100644 --- a/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch +++ b/0004-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch @@ -1,4 +1,4 @@ -From 41ab721e6b8ea4841f86299a0537c403f61f42ba Mon Sep 17 00:00:00 2001 +From 4641910dc6aff98c3451041919dcca62b96e4cb7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 May 2025 17:28:25 +0100 Subject: [PATCH] RHEL: appliance/init: Run depmod -a to rebuild kernel module diff --git a/libguestfs.spec b/libguestfs.spec index 96b24e2..a32bc0e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -34,7 +34,7 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.58.0 +Version: 1.58.1 Release: 1%{?dist}.alma.1 License: LGPL-2.1-or-later @@ -75,9 +75,10 @@ Source8: copy-patches.sh # https://github.com/libguestfs/libguestfs/commits/rhel-10.2 # Patches. -Patch0001: 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch -Patch0002: 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch -Patch0003: 0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch +Patch0001: 0001-generator-daemon.ml-Avoid-not-available-macro-for-OC.patch +Patch0002: 0002-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch +Patch0003: 0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +Patch0004: 0004-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch BuildRequires: autoconf, automake, libtool, gettext-devel @@ -1089,11 +1090,11 @@ rm ocaml/html/.gitignore %changelog -* Thu Jan 08 2026 Eduard Abdullin - 1:1.58.0-1.alma.1 +* Wed Jan 21 2026 Eduard Abdullin - 1:1.58.1-1.alma.1 - Enable building for ppc64le -* Mon Jan 05 2026 Richard W.M. Jones - 1:1.58.0-1 -- Rebase to libguestfs 1.58.0 +* Tue Jan 20 2026 Richard W.M. Jones - 1:1.58.1-1 +- Rebase to libguestfs 1.58.1 resolves: RHEL-111240 - Synchronize spec file with Fedora - Add new libguestfs ntfs_chmod API diff --git a/sources b/sources index 23cf369..84556cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a -SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8 +SHA512 (libguestfs-1.58.1.tar.gz) = 56e8f21592b4c63a14cfaa3255180c3d83bea7d3cc1a404befb121513b7287dd09ae96477b80b3f8794b2cde49febb1909b9716c3b896a313e4445f7f2a5072a +SHA512 (libguestfs-1.58.1.tar.gz.sig) = 9d8bca8928bfa360d0d307373676ea587af9e5154ddfd954c70283f3125b397df9294c1504e188bea5a5cfbb4bae9f27cdbacf92bc9a3e8cb05b7c900c0bfac5