Sync from SUSE:SLFO:1.1 libguestfs revision 65b403f8647e49feb1ef0ddbd92251fe

Initialise-bar-fp-as-NULL.patch

@@ -0,0 +1,20 @@
+Subject: Initialise bar->fp as NULL
+From: Ben Brown ben.brown@softiron.com Thu Mar 28 12:35:28 2024 +0000
+Date: Thu Mar 28 12:53:52 2024 +0000:
+Git: 0330ebe40cb645df311bab25888c5ca6cc179efe
+
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2272045
+
+diff --git a/common/progress/progress.c b/common/progress/progress.c
+index e4b3066..5848abd 100644
+--- a/common/progress/progress.c
++++ b/common/progress/progress.c
+@@ -123,6 +123,7 @@ progress_bar_init (unsigned flags)
+     bar->machine_readable = 1;
+     bar->utf8_mode = 0;
+     bar->have_terminfo = 0;
++    bar->fp = NULL;
+   } else {
+     bar->machine_readable = 0;
+ 

Split-chown-parameter-on-character.patch

@@ -0,0 +1,24 @@
+Subject: generator/customize.ml: Split --chown parameter on ':' character
+From: Richard W.M. Jones rjones@redhat.com Fri Jan 19 13:18:00 2024 +0000
+Date: Fri Jan 19 13:24:37 2024 +0000:
+Git: e9a728bb22dfa1de5328fbbe7d6d7acad2dbed64
+
+The previous code split it on ',' which was completely wrong.
+(It reveals the lack of testing however).
+
+Fixes: commit c08032ebe2763f5e9ce5b14e003721475219d390
+Reported-by: Yongkui Guo
+
+diff --git a/generator/customize.ml b/generator/customize.ml
+index e64b45c0d..e2c4b6051 100644
+--- a/generator/customize.ml
++++ b/generator/customize.ml
+@@ -775,7 +775,7 @@ let rec argspec () =
+     let len = String.length arg in
+     String.sub arg 0 i, String.sub arg (i+1) (len-(i+1))
+   and split_string_triplet option_name arg =
+-    match String.nsplit ~max:3 \",\" arg with
++    match String.nsplit ~max:3 \":\" arg with
+     | [a; b; c] -> a, b, c
+     | _ ->
+         error (f_\"invalid format for '--%%s' parameter, see the man page\")

libguestfs-1.52.0.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmWW64MRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKDVHw//UIr27iA6WpJy0KyLOSmcdyrtYbnnySwP
+GH7ho8tpggDjXjSYyuUSjeqhCluMSy6XGYxYmZKNx8gyvydCfX7oflr6Lldti6tk
+9vARyrIg85knFH4VgxZfVpN7FUava3qbVSW5EH4T539+rKi7r8M6bgyPzeeOCd0w
+8jzeLy0VPz9XMCBMQ0HRbtX6EjttblNSgD7NnjhqQt274UJW6bdrzXvTHw/uyr0p
++Qbzas8qaUye5E1L6jqlH+5fHoF0R481PDq6XS8CvGWGD+/7MMTuRUDYa69ia9Du
+pbD5XjTWU1ELGiS/nah3HWcprKzpw7MJmqqOKCnQedxPyeNbJQ5XfRc0R6HRkxil
+yHq8hU2eidWz+/zLvV69vL1jXoUddYdv0YpIFqTtyAAFYvzfc6GgcJ/wcAr8DdOl
+/ULMxf+AH0Lm7Pygj6R/cdbd0OvmDCi3LoN2oyMVMvVAhsx0UMcGfPdHony7FUYS
+u23k6fJ7B3ksL6TtWJyjSbzW7v3I7LcfI8SShprR728VppYjyryEkxB+4H/DsWe7
+eTMqnOddoteuBAapUoXZnOdfbMLkZib+2Kel7DnezLCiAnWXXALRWUreyrasr0vT
+r1bZwJKjJH1atbKO+6taKkcATVoieRUxJkBDDdSOlpE3zuLL8btMgU6KerWLl1Yu
+YRiSNBCEfjM=
+=4eIl
+-----END PGP SIGNATURE-----

libguestfs-1.55.8.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCgAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmfu0rERHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKC18g//YFKSlhrBUv2ChlMteYj3ZeKpYCxKbZPO
-NHEs1Td1yIGeLo3PVwwiklMJYOFL7fSUONRzi9icRqALlVx3wzhYRkGmAutjFeMa
-QIWC9RI2ZHT+hm1eU1S4LKYrvJBSA2WpPJEvCpWYZg7YjT1S3KUnT/dcF540K0/i
-WrdOTc2Aq7Di+8qj5sNbUR+VBokzSpCCpbvmfl91mQOS7GDW6m0vYQciXOn076Pb
-WtK60gXb+XFEvHCx3/ZzmHPE8lhOXUpIz4rkv7+bmX29nY9HGQIrlD2v8Z8OxvbM
-rIYWrkKpKc7Aj6ri7JJCC/o5CxYuxbzcdz3C3zmizbVYMF+IOOqYTDJNMRrRxEuw
-QA2mwRVvx/oEAwj9q5gnXIDSiMCFgw7UoQvnRcII6Gaz04N28ZciH7LKLAfP6wg1
-VFc9rAlKmMpyq1b38x1Gvc/piAedim0LLDHp3DoBzsBxOCZrG5OOk5cTtcp3OykY
-TQOaGfqxbcc5+j6gcNmv3HDLJm1xN5Fd6f1HcuX3Tk7UTLcftIZqbwSgoIAD9QgB
-o6Z0+RNqvXvlSQfZXLDoxaah8/HcPCLQgrGnnvCRmvFnigTHu1IVlQ8q66Z5TJdy
-qy9zbbnFxd7INLTxwrWRfyxjTY9HihOTFyvtoybtFmKE9Uln6pk/IdetZUN8QUWw
-8jPvAV7qsmA=
-=N9eJ
------END PGP SIGNATURE-----

libguestfs.changes

@@ -1,185 +1,3 @@
--------------------------------------------------------------------
-Thu Apr  3 15:04:42 MDT 2025 - carnold@suse.com
-
-- Update to version 1.55.8 (jsc#PED-8910)
-  * Various build improvements
-  * Updated translations for several languages
-  * lib/launch-libvirt.c: Remove fallback <emulator> for Arm
-
--------------------------------------------------------------------
-Mon Mar 24 21:17:18 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
-
-- libguestfs-appliance: drop incorrect requireson libpcre1,
-  package was converted to pcre2 by 1.44.2
-
--------------------------------------------------------------------
-Wed Mar 12 13:37:32 MDT 2025 - carnold@suse.com
-
-- Update to version 1.55.7 (jsc#PED-8910)
-  * libguestfs: Rust binding build error and warning fixes
-  * support TencentOS
-  * lib: Print kernel utsname in debug output
-  * daemon: Fix loongarch64 detection on RHEL 9
-
--------------------------------------------------------------------
-Wed Feb 19 10:08:10 MST 2025 - carnold@suse.com
-
-- Update to version 1.55.6 (jsc#PED-8910)
-  * appliance: add dhcpcd support on Debian
-  * appliance: add support for sfdisk on Debian
-  * mlcustomize, mltools: Replace $TEST_FUNCTIONS
-  * ruby: Make sure all object files are cleaned up
-  * daemon: New command_out and sh_out APIs
-
--------------------------------------------------------------------
-Wed Feb 12 15:34:38 MST 2025 - carnold@suse.com
-
-- Update to version 1.55.4 (jsc#PED-8910)
-  * appliance/init: Fix /usr/sbin symlinks in Fedora 42+
-  * Various translation updates
-
--------------------------------------------------------------------
-Thu Jan 30 10:29:58 MST 2025 - carnold@suse.com
-
-- Update to version 1.55.3 (jsc#PED-8910)
-  * build: Move baseline OCaml to 4.08
-  * Various translation updates
-
--------------------------------------------------------------------
-Fri Jan  3 14:09:24 MST 2025 - carnold@suse.com
-
-- Update to version 1.55.2 (jsc#PED-8910)
-  * lib/inspect-osinfo.c: Add Windows Server 2025 osinfo
-  * appliance: Use stable owner, group and mtime in appliance
-    tarballs
-  * mltools: Replace jansson with json-c
-  * lib/info.c: Replace jansson with json-c
-  * lib/qemu.c: Replace jansson with json-c
-  * lib: direct: Remove test for qemu mandatory locking
-  * Various language translations
-  * Fix dhcpcd failing on systemd-resolved stub
-  * mlcustomize: Add heuristic support for Windows Server 2025
-  * mlcustomize/customize_run.ml: Move 'in' to new line
-  * mlstdutils/guestfs_config: Define host_os
-  * mlcustomize, mltools: Check guest OS is compatible before
-    allowing --run
-  * generator: Remove common/mlv2v/uefi.ml{,i} files
-  * qemuopts: Add ability to add raw, unquoted output to qemu
-    scripts
-  * qemuopts: Fix missing break statement
-  * mlstdutils: Remove Option module
-  * Remove test for caml_alloc_initialized_string
-  * build: Move baseline OCaml to 4.08
-
--------------------------------------------------------------------
-Thu Oct 10 07:06:04 MDT 2024 - carnold@suse.com
-
-- Update to version 1.54.0 (jsc#PED-8910)
-  * Add detection of Circle Linux (Bella Zhang).
-  * Add support for LoongArch (liuxiang).
-  * Add detection of Kylin (grass-lu).
-  * Add detection of openEuler (Wang Guoquan).
-  * PARTUUID and PARTLABEL are now resolved in guest /etc/fstab.
-  * New APIs findfs_partuuid and findfs_partlabel. These can be
-    used to efficiently look up a filesystem by its GPT partition
-    UUID or label.
-  * Support for the following inactive or infrequently used device
-    types has been removed: Gluster, Sheepdog, TFTP.
-  * Add GOST R34.11-94 message digest algorithm to checksum APIs
-    (Alexey Shabalin).
-  * Allow nbd+unix:// URIs (NBD over Unix domain socket) in
-    guestfish and other places.
-  * Various part_* (partition) APIs related to GPT have been
-    reimplemented to use util-linux sfdisk instead of sgdisk.
-    Util-linux is more widely available, so this reduces
-    dependencies in the common case. One optional API remains that
-    still uses sgdisk. (Thanks Yongkui Guo).
-  * Add cipher suboption to cryptsetup_open (Jonatan Pålsson).
-  * Because of a bug, the part_get_gpt_attributes API could
-    truncate the return value from 64 to 32 bits. This has been
-    fixed.
-  * Libguestfs will now no longer recommend using
-    LIBGUESTFS_BACKEND=direct. This was shown previously when
-    libvirt failed to start the appliance. However it is felt that
-    this now does more harm than good.
-  * Fix generation of virt-customize --chown parameter (Yongkui Guo)
-  * In the appliance, reduce boot time when dhcp isn't needed
-    (Olaf Hering).
-  * A deadlock in the appliance caused by a regression in Linux
-    6.11 has been worked around. The deadlock was also fixed in
-    Linux 6.12.
-- Bug fixes
-  * Fix rare hangs while starting the appliance, at 'echo noop'
-    into /sys/block/{h,s,ub,v}d*/queue/scheduler
-  * Drop dependency from libguestfs -> gdisk
-  * libguestfs inspection does not know about /etc/fstab
-    PARTLABEL=<label>
-  * btrfs related c_api/tests are failing (unable to create quota
-    group: Invalid argument)
-  * Python how-to incorrect exception name
-  * Rust test 410_close_event fails
-
--------------------------------------------------------------------
-Thu Aug 29 15:06:57 MDT 2024 - carnold@suse.com
-
-- Update to version 1.53.6 (jsc#PED-8910)
-  * Various MacOS fixes and enhancements
-  * ocaml: INSTALL_OCAMLLIB Makefile parameter
-  * appliance/init: Don't set impossible "noop" disk scheduler
-  * Pull in some fixes from the common submodule.
-    mlcustomize: Add Inject_virtio_win.inject_blnsvr implementation
-    mlcustomize: firstboot: Use Linux path for Powershell script path
-    mlcustomize: firstboot: Use powershell.exe instead of path
-    mlcustomize: firstboot: Use Powershell -NoProfile flag
-    mlcustomize: Revert delay installation of qemu-ga MSI
-    mldrivers/linux_kernels.ml: Prefix general information with ^info:
-    mlcustomize: Use Start-Process -Wait to run qemu-ga installer
-    mlcustomize: Add Firstboot.firstboot_dir function
-    mlcustomize: Place powershell scripts into <firstboot_dir>\Temp
-    mlcustomize: Inject qemu-ga & blnsvr into <firstboot_dir>/Temp
-    mlcustomize: Write qemu-ga log file name to log.txt
-    mlcustomize: Add some comments to firstboot batch file
-    mlcustomize: Reboot Windows between each firstboot script
-
--------------------------------------------------------------------
-Tue Jul 16 13:15:45 MDT 2024 - carnold@suse.com
-
-- Update to version 1.53.5 (jsc#PED-6305)
-  * generator/customize.ml: Split --chown parameter on ':' character
-  * daemon: Add gost checksum command support
-  * Add detection support for Circle Linux
-  * Add support for LoongArch.
-  * daemon: Fix file architecture translation for LoongArch
-  * options: Allow nbd+unix:// URIs
-  * daemon/parted: Assume sfdisk --part-type exists
-  * daemon: Reimplement partition GPT functions using sfdisk
-  * appliance: only wait for resolv.conf update if dhcpcd succeeded
-  * generator/customize.ml: Add virt-customize --inject-blnsvr operation
-  * lib: libvirt: Stop recommending LIBGUESTFS_BACKEND=direct
-  * daemon: cryptsetup_open: Add --cipher
-  * rust: Handle null pointer when creating slice
-  * Remove gluster support
-  * Remove sheepdog support
-  * Remove tftp drive support
-  * generator/daemon: Don't truncate 64 bit results from OCaml functions
-  * daemon: Fix parsing in part_get_gpt_attributes
-  * New APIs: findfs_partuuid and findfs_partlabel
-  * inspection: Resolve PARTUUID= and PARTLABEL= in /etc/fstab
-  * generator/actions_core.ml: Fix version field for new APIs
-  * Kylin is centos derivative
-
--------------------------------------------------------------------
-Thu May 16 13:02:34 MDT 2024 - carnold@suse.com
-
-- Update to version 1.52.1 bug fix release (jsc#PED-6305)
-  * There are no upstream release notes for verion 1.52.x
-  * Several python fixes
-  * Rework Std_utils.Option so it works like the OCaml stdlib module
-  * Update common submodule to latest
-- Drop patches contained in new tarball
-  Split-chown-parameter-on-character.patch
-  Initialise-bar-fp-as-NULL.patch
-
 -------------------------------------------------------------------
 Wed May  8 12:42:02 MDT 2024 - carnold@suse.com
 

libguestfs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libguestfs
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           libguestfs
 ExclusiveArch:  x86_64 ppc64 ppc64le s390x aarch64 riscv64
-Version:        1.55.8
+Version:        1.52.0
 Release:        0
 Summary:        Access and modify virtual machine disk images
 License:        GPL-2.0-or-later
@@ -33,6 +33,8 @@ Source101:      README
 
 # Patches
 Patch1:         use-rtc-driftfix-slew-for-x86-only.patch
+Patch2:         Split-chown-parameter-on-character.patch
+Patch3:         Initialise-bar-fp-as-NULL.patch
 
 BuildRequires:  bison
 BuildRequires:  file-devel
@@ -41,7 +43,6 @@ BuildRequires:  gawk
 BuildRequires:  gcc-c++
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gperf
-BuildRequires:  libjson-c-devel
 BuildRequires:  libtool
 BuildRequires:  ocaml-augeas-devel
 BuildRequires:  ocaml-hivex-devel
@@ -50,7 +51,7 @@ BuildRequires:  po4a
 BuildRequires:  readline-devel
 BuildRequires:  supermin >= 5.1.18
 BuildRequires:  zstd
-BuildRequires:  ocaml(ocaml_base_version) >= 4.08
+BuildRequires:  ocaml(ocaml_base_version) >= 4.07
 BuildRequires:  ocamlfind(findlib)
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  perl(Locale::TextDomain)
@@ -345,9 +346,7 @@ BuildRequires:  parted
 BuildRequires:  psmisc
 BuildRequires:  sg3_utils
 BuildRequires:  strace
-%if 0%{?suse_version} < 1600
 BuildRequires:  sysconfig-netconfig
-%endif
 %ifarch %ix86 x86_64
 BuildRequires:  syslinux
 %endif
@@ -375,7 +374,7 @@ Requires:       libaugeas0
 Requires:       libcap2
 Requires:       libguestfs0
 Requires:       libhivex0
-Requires:       libpcre2-8-0
+Requires:       libpcre1
 
 # For core disk features
 Requires:       qemu-tools

use-rtc-driftfix-slew-for-x86-only.patch

@@ -1,6 +1,6 @@
---- a/lib/launch-direct.c
+--- libguestfs-1.52.0/lib/launch-direct.c.orig	2024-02-05 14:17:10.208970293 -0700
-+++ b/lib/launch-direct.c
++++ libguestfs-1.52.0/lib/launch-direct.c	2024-02-05 14:21:37.548976664 -0700
-@@ -645,7 +645,10 @@ launch_direct (guestfs_h *g, void *datav
+@@ -650,7 +650,10 @@ launch_direct (guestfs_h *g, void *datav
    flag ("-no-reboot");
  
    /* These are recommended settings, see RHBZ#1053847. */