From 1808f8096fe4879665e6e6888a5102a31cdb57a17974f17d277b47b4e6a12578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 15:26:42 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main guestfs-tools revision 4f5bcf2a282af5b5ca91d9168d5fcec2 --- Initialise-bar-fp-as-NULL.patch | 20 +++++++++++++++++++ Update-virt-customize-generated-files.patch | 22 +++++++++++++++++++++ guestfs-tools.changes | 14 +++++++++++++ guestfs-tools.spec | 4 ++++ 4 files changed, 60 insertions(+) create mode 100644 Initialise-bar-fp-as-NULL.patch create mode 100644 Update-virt-customize-generated-files.patch diff --git a/Initialise-bar-fp-as-NULL.patch b/Initialise-bar-fp-as-NULL.patch new file mode 100644 index 0000000..a1470cb --- /dev/null +++ b/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 +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; + diff --git a/Update-virt-customize-generated-files.patch b/Update-virt-customize-generated-files.patch new file mode 100644 index 0000000..603cc2f --- /dev/null +++ b/Update-virt-customize-generated-files.patch @@ -0,0 +1,22 @@ +Subject: mlcustomize: Update virt-customize generated files +From: Richard W.M. Jones rjones@redhat.com Fri Jan 19 13:23:43 2024 +0000 +Date: Fri Jan 19 13:24:24 2024 +0000: +Git: 54869c9875318db5e7b7c07be1b17931fbc17895 + +Modified by this patch to libguestfs: + + generator/customize.ml: Split --chown parameter on ':' character + +diff --git a/common/mlcustomize/customize_cmdline.ml b/common/mlcustomize/customize_cmdline.ml +index 245d996..48ee334 100644 +--- a/common/mlcustomize/customize_cmdline.ml ++++ b/common/mlcustomize/customize_cmdline.ml +@@ -157,7 +157,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") diff --git a/guestfs-tools.changes b/guestfs-tools.changes index 1684727..b6e19ef 100644 --- a/guestfs-tools.changes +++ b/guestfs-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue May 7 14:50:42 MDT 2024 - carnold@suse.com + +- Add Requires on libguestfs which will pull in + libguestfs-appliance and all its dependencies. (bsc#1223444) + guestfs-tools.spec + +------------------------------------------------------------------- +Fri Mar 29 13:02:14 MDT 2024 - carnold@suse.com + +- Upstream bug fixes + Update-virt-customize-generated-files.patch + Initialise-bar-fp-as-NULL.patch + ------------------------------------------------------------------- Thu Jan 4 13:27:31 MST 2024 - carnold@suse.com diff --git a/guestfs-tools.spec b/guestfs-tools.spec index 7bec50c..9611889 100644 --- a/guestfs-tools.spec +++ b/guestfs-tools.spec @@ -42,6 +42,9 @@ URL: http://libguestfs.org/ Source0: http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz.sig +Patch1: Update-virt-customize-generated-files.patch +Patch2: Initialise-bar-fp-as-NULL.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf BuildRequires: automake @@ -90,6 +93,7 @@ BuildRequires: pkgconfig(bash-completion) # For virt-builder: Requires: curl Requires: gpg2 +Requires: libguestfs >= 1.49 ###Requires: /usr/bin/qemu-img Requires: xz