Accepting request 1130818 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/1130818
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=96

Omit-file--S-option-on-older-distros-that-lack-support.patch

@@ -1,125 +0,0 @@
-Subject: daemon: Omit 'file -S' option on older distros that lack support
-From: Richard W.M. Jones rjones@redhat.com Thu Sep 21 12:32:50 2023 +0100
-Date: Thu Sep 21 15:09:14 2023 +0100:
-Git: c95d8c4cf64142bb707b42c32cf3e1ba3c4a5eb1
-
-OpenSUSE LEAP 15 lacks support for this option, so test for it before
-using it.
-
-See also:
-https://listman.redhat.com/archives/libguestfs/2023-September/032613.html
-
-Reported-by: Olaf Hering
-Fixes: commit 23986d3c4f4d1f9cbac44cc743d3e6af721e4237
-Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -280,6 +280,7 @@ SOURCES_MLI = \
- 	devsparts.mli \
- 	file.mli \
- 	filearch.mli \
-+	file_helper.mli \
- 	findfs.mli \
- 	inspect.mli \
- 	inspect_fs.mli \
-@@ -321,6 +322,7 @@ SOURCES_ML = \
- 	btrfs.ml \
- 	cryptsetup.ml \
- 	devsparts.ml \
-+	file_helper.ml \
- 	file.ml \
- 	filearch.ml \
- 	isoinfo.ml \
---- a/daemon/file.ml
-+++ b/daemon/file.ml
-@@ -43,7 +43,10 @@ let file path =
-     | S_SOCK -> "socket"
-     | S_REG ->
-        (* Regular file, so now run [file] on it. *)
--       let out = command "file" ["-zSb"; Sysroot.sysroot_path path] in
-+       let file_options =
-+         sprintf "-z%sb"
-+           (if File_helper.file_has_S_option () then "S" else "") in
-+       let out = command "file" [file_options; Sysroot.sysroot_path path] in
- 
-        (*  We need to remove the trailing \n from output of file(1).
-         *
-@@ -54,6 +57,9 @@ let file path =
-        String.trimr out
-   )
-   else (* it's a device *) (
--    let out = command "file" ["-zSbsL"; path] in
-+    let file_options =
-+      sprintf "-z%sbsL"
-+        (if File_helper.file_has_S_option () then "S" else "") in
-+    let out = command "file" [file_options; path] in
-     String.trimr out
-   )
---- /dev/null
-+++ b/daemon/file_helper.ml
-@@ -0,0 +1,28 @@
-+(* libguestfs daemon
-+ * Copyright (C) 2009-2023 Red Hat Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *)
-+
-+open Std_utils
-+
-+(* Does [file] support the [-S] / [--no-sandbox] option
-+ * (not on OpenSUSE LEAP 15).
-+ *)
-+let test_option = lazy (
-+  let out = Utils.command "file" ["--help"] in
-+  String.find out "--no-sandbox" >= 0
-+)
-+let file_has_S_option () = Lazy.force test_option
---- /dev/null
-+++ b/daemon/file_helper.mli
-@@ -0,0 +1,19 @@
-+(* libguestfs daemon
-+ * Copyright (C) 2009-2023 Red Hat Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *)
-+
-+val file_has_S_option : unit -> bool
---- a/daemon/filearch.ml
-+++ b/daemon/filearch.ml
-@@ -128,7 +128,10 @@ and cpio_arch magic orig_path path =
-         | bin :: bins ->
-            let bin_path = tmpdir // bin in
-            if is_regular_file bin_path then (
--             let out = command "file" ["-zSb"; bin_path] in
-+             let file_options =
-+               sprintf "-z%sb"
-+                 (if File_helper.file_has_S_option () then "S" else "") in
-+             let out = command "file" [file_options; bin_path] in
-              file_architecture_of_magic out orig_path bin_path
-            )
-            else

libguestfs-1.50.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e6871e88f82e521e31d442de6a10b64970237cb7956e99d117b123b58565a6f
-size 19208743

libguestfs-1.50.1.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmP1QzoRHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKCAEBAAimQxT37HMWTHOqvj4s6ipOhDCNPlqo4L
-z+syvIkgbp024IOPUbrlmSCtrCFiLXsRmmenynFv66N8GXoWmJruyJMyvBxsupZT
-lTo7WdCEix/xPh/LAb8Q9RWA2SQYfkOKHRs/gr4b/LbtXBklMlcOdhegx3Mml4SW
-gwK5n799YebUVgzYch5hWjHcRAphPaUdMyaJ6MUnFrfUPyGK2QO1yXdnGxkseAPz
-srjlhFqu5kNojWzcaNcdHBdKvJVEZo7L6laADRS31sRH0BGVc6/DFJgOPdxROGJe
-oeq3Oo1EF88P15NSTNZSXLa65n9kts2OnqRgX/c3njV9+1/JPHJWVM+VezuCcN8D
-hHktHVOBjM209N5RmLtR92eROvo1aTrgjsLqOTvwbKBu7NrPc4ZICnX7dMjD6irj
-vQz0P5MUmELMvdEN3FMGf45v77z+249e1z+5EGi2HUPKLfxd+I3+2mxUm2xjWOy/
-zNzkG2rCgYRB8Tioj6Mw80RYKioRyu8p5lUZvvLk85CJbT4BFH8rXgJbrEBOSunE
-lWEcv690GzyszAN8zKZaIqhNzIKdlkQZAd1DMXfNBEfAy23YHRApB1O2EFhNAjAf
-yEsUjpiYc0pq64QiCPGzUp4iLfMt9hg4ey5Pquud/j6cfvJ3ak5gZECbFnbUjysZ
-YYpwSgy/FVI=
-=OPC/
------END PGP SIGNATURE-----

libguestfs-1.51.8.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:609a635ebe440445d9550cfb6380dd114d98c2bf9d2f9db05744e820a7668ef1
+size 19048989

libguestfs-1.51.8.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmVWAYERHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKD+shAAh/1ZjWW+xje3Q69U6F75WBq6C/EFQgwG
+O6KRMPSppF0uAzj6fvAZsb3sSmkdbDvOp94NnQbSrIVTWkEZt2FXoawL8macjSC1
+5G2lcjrmCNPYHZRIPvdhm+gHoesKVdswO5hLYXJsi6otlPUyIZYCNHyCycaDBPy9
+ERQIlRQehLN5xgE4Ial57dq1y0zG+oDddVX+M9vGS2wJ2soxMye3luEvl4HoOCa9
+ub6xTs0Q6GCotLJZVedmWDg8VvA2lpdh8vWNXYFfj6QmKi0+NjXkplXqk5/YdT8X
+eYgKgBDNAa6jY0b9CQPFAzMLtwz9TcWN2Or38uu8h02j9h/s0WzbwO4+yRn0lwTb
+5JSduyG2gN3PBBTni/DkQ33bn8WOxlxCXAzzazzfCOto2R2HOHEEyO23n5c3QgJx
+5MLi3A2G8sadvyWr6IM0OmffLrl/bdyCDjUvcTRvFP7TqrhvxN2phbNDwku2jniv
+r7GWtafwZ32spk8zo61dzD1EBYJGdfIAiBj2wmP/7BdxeW9o/EdoYtDej7EhGM/8
+T8TAhbuTdtx77MUIcAVc/y0mZF3Sya9zhjDOB4ztNXWRM95guZRsaFJEYwqN11+I
+qvkvBwUeB0t4c9RgpJSBEyHAmGtJ9I9D1YAgqotwrG04c7lHEPCq3rgeZ8t+nVNr
+yRxlR9yIQp0=
+=bwu6
+-----END PGP SIGNATURE-----

libguestfs.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Nov 30 22:22:22 UTC 2023 - olaf@aepfle.de
+
+- Require OCaml 4.07+
+
+-------------------------------------------------------------------
+Tue Nov 28 11:13:44 MST 2023 - carnold@suse.com
+
+- Update to version 1.51.8
+  * There are no upstream release notes for verion 1.51.x
+  * Dropped the virt-dib tool
+  * Add support for lzma and zstd compression methods.
+  * Add --chown option for virt-customize
+  * Add new virt-customize --tar-in operation
+  * Various bug fixes and language translations
+- Drop patch contained in new tarball
+  Omit-file--S-option-on-older-distros-that-lack-support.patch
+
 -------------------------------------------------------------------
 Mon Sep 25 14:51:13 MDT 2023 - carnold@suse.com
 

libguestfs.spec

@@ -18,7 +18,7 @@
 
 Name:           libguestfs
 ExclusiveArch:  x86_64 ppc64 ppc64le s390x aarch64 riscv64
-Version:        1.50.1
+Version:        1.51.8
 Release:        0
 Summary:        Access and modify virtual machine disk images
 License:        GPL-2.0-or-later
@@ -32,7 +32,6 @@ Source100:      mount-rootfs-and-chroot.sh
 Source101:      README
 
 # Patches
-Patch0:         Omit-file--S-option-on-older-distros-that-lack-support.patch
 
 BuildRequires:  bison
 BuildRequires:  file-devel
@@ -42,7 +41,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gperf
 BuildRequires:  libtool
-BuildRequires:  ocaml >= 4.04
+BuildRequires:  ocaml(ocaml_base_version) >= 4.07
 BuildRequires:  ocaml-augeas-devel
 BuildRequires:  ocaml-hivex-devel
 BuildRequires:  po4a