diff --git a/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch index 6058852..c4c24ca 100644 --- a/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch +++ b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch @@ -1,4 +1,4 @@ -From 1138b3e24c68e89c743b422a769c9fd02265357f Mon Sep 17 00:00:00 2001 +From 78c0b873d6d59cbb6a5cc0d40f642ce94fd99fb4 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 @@ -249,7 +249,7 @@ index b4ec6db87..9c23da008 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. If in doubt, diff --git a/lib/drives.c b/lib/drives.c -index c068b8ecb..6e4453ce5 100644 +index 6a62623d5..8c334c6c7 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -166,34 +166,6 @@ create_drive_non_file (guestfs_h *g, @@ -355,7 +355,7 @@ index c068b8ecb..6e4453ce5 100644 /** * Create the special F drive. * -@@ -768,26 +679,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, +@@ -769,26 +680,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, drv = create_drive_file (g, &data); } } @@ -382,7 +382,7 @@ index c068b8ecb..6e4453ce5 100644 else if (STREQ (protocol, "nbd")) { data.protocol = drive_protocol_nbd; drv = create_drive_nbd (g, &data); -@@ -796,10 +687,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, +@@ -797,10 +688,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, data.protocol = drive_protocol_rbd; drv = create_drive_rbd (g, &data); } diff --git a/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch index 77c38af..4142b9c 100644 --- a/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +++ b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -1,4 +1,4 @@ -From 3c728eac0381734995ee8c67b34b7de22d12c84b Mon Sep 17 00:00:00 2001 +From 34ab9432562eb03dccaedf0f8ed98ff8cff40c1e 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/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch index 580b78f..58e2386 100644 --- a/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch +++ b/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch @@ -1,4 +1,4 @@ -From cff5ffbe185c8d516d70a0227c23cf1da3888106 Mon Sep 17 00:00:00 2001 +From 41ab721e6b8ea4841f86299a0537c403f61f42ba 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 b2ded67..64f00a2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -23,7 +23,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.57-development +%global source_directory 1.58-stable # Filter perl provides. %{?perl_default_filter} @@ -34,8 +34,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.57.6 -Release: 3%{?dist} +Version: 1.58.0 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -102,7 +102,7 @@ BuildRequires: libselinux-utils BuildRequires: libselinux-devel BuildRequires: fuse, fuse-devel BuildRequires: pcre2-devel -BuildRequires: libvirt-devel +BuildRequires: libvirt-devel >= 11.10.0 BuildRequires: gperf BuildRequires: rpm-devel BuildRequires: cpio @@ -114,7 +114,7 @@ BuildRequires: unzip BuildRequires: systemd-units BuildRequires: netpbm-progs BuildRequires: icoutils -BuildRequires: libvirt-daemon-kvm >= 7.1.0 +BuildRequires: libvirt-daemon-kvm %if !0%{?rhel} BuildRequires: perl(Expect) %endif @@ -134,7 +134,7 @@ BuildRequires: curl BuildRequires: xz BuildRequires: zstd BuildRequires: libzstd-devel -BuildRequires: /usr/bin/qemu-img +BuildRequires: qemu-img >= 7.2.0 %if 0%{verify_tarball_signature} BuildRequires: gnupg2 @@ -291,7 +291,7 @@ Requires: systemd-libs%{?_isa} Requires: fuse # For core APIs: -Requires: /usr/bin/qemu-img +Requires: qemu-img Requires: coreutils Requires: grep Requires: tar @@ -300,7 +300,7 @@ Requires: tar Requires: xz # For qemu direct and libvirt backends. -Requires: qemu-kvm-core +Requires: qemu-kvm-core >= 7.2.0 %if !0%{?rhel} Suggests: qemu-block-curl Suggests: qemu-block-iscsi @@ -310,7 +310,7 @@ Suggests: qemu-block-rbd Suggests: qemu-block-ssh %endif Recommends: libvirt-daemon-config-network -Requires: libvirt-daemon-driver-qemu >= 7.1.0 +Requires: libvirt-daemon-driver-qemu >= 11.10.0 Requires: libvirt-daemon-driver-secret Requires: libvirt-daemon-driver-storage-core Requires: passt @@ -1087,8 +1087,8 @@ rm ocaml/html/.gitignore %changelog -* Thu Nov 06 2025 Richard W.M. Jones - 1:1.57.6-3 -- Rebase to libguestfs 1.57.6 +* Mon Jan 05 2026 Richard W.M. Jones - 1:1.58.0-1 +- Rebase to libguestfs 1.58.0 resolves: RHEL-111240 - Synchronize spec file with Fedora - Add new libguestfs ntfs_chmod API diff --git a/sources b/sources index 3845e6b..23cf369 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.57.6.tar.gz) = 35bd4e446a1126ff4fbe0aa1b5c6292a3dd474a0c1e34a6fbc0cedfc6dfad29b0b5610ab60b1dc73e21065da932c202189b106648c8b5743f9a8a9365b731d14 -SHA512 (libguestfs-1.57.6.tar.gz.sig) = cc865542c9bc9c97d2ea98d66f2b11e57d46d5d04026e2770a385ac6ba8a77fe83a25cbd2d1b2a10688c153b1d832b78080d28711622c19ea546f6c50f5ab9fa +SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a +SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8