From 768d2e7c5e2a88d3a4ff8c956f516e84dd52097538bf21801afe00f0a8f0e544 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 28 Mar 2024 19:18:42 +0000 Subject: [PATCH] - Fix command line argument parsing with upstream commit Split-chown-parameter-on-character.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=570 --- Split-chown-parameter-on-character.patch | 24 ++++++++++++++++++++++++ libguestfs.changes | 6 ++++++ libguestfs.spec | 1 + 3 files changed, 31 insertions(+) create mode 100644 Split-chown-parameter-on-character.patch diff --git a/Split-chown-parameter-on-character.patch b/Split-chown-parameter-on-character.patch new file mode 100644 index 0000000..fb94131 --- /dev/null +++ b/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\") diff --git a/libguestfs.changes b/libguestfs.changes index 69d71d3..61c9c44 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 28 13:15:07 MDT 2024 - carnold@suse.com + +- Fix command line argument parsing with upstream commit + Split-chown-parameter-on-character.patch + ------------------------------------------------------------------- Mon Feb 5 14:24:08 MST 2024 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 098d29c..852ccb5 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -33,6 +33,7 @@ Source101: README # Patches Patch1: use-rtc-driftfix-slew-for-x86-only.patch +Patch2: Split-chown-parameter-on-character.patch BuildRequires: bison BuildRequires: file-devel