Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package s390-tools for openSUSE:Factory checked in at 2026-04-10 17:51:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s390-tools (Old) and /work/SRC/openSUSE:Factory/.s390-tools.new.21863 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools" Fri Apr 10 17:51:41 2026 rev:111 rq:1345571 version:2.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2026-03-03 15:33:22.707112457 +0100 +++ /work/SRC/openSUSE:Factory/.s390-tools.new.21863/s390-tools.changes 2026-04-10 17:58:50.700289000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 9 09:42:24 UTC 2026 - Nikolay Gueorguiev <[email protected]> + +- Applied patches (bsc#1261772) + * s390-tools-hyptop-opts-Replace-sort_field-option-with-sort.patch + * s390-tools-hyptop-opts-Fix-long-command-line-option-abbreviations.patch +- Re-vendor-ed vendor.tar.zst + +------------------------------------------------------------------- New: ---- s390-tools-hyptop-opts-Fix-long-command-line-option-abbreviations.patch s390-tools-hyptop-opts-Replace-sort_field-option-with-sort.patch ----------(New B)---------- New: * s390-tools-hyptop-opts-Replace-sort_field-option-with-sort.patch * s390-tools-hyptop-opts-Fix-long-command-line-option-abbreviations.patch - Re-vendor-ed vendor.tar.zst New:- Applied patches (bsc#1261772) * s390-tools-hyptop-opts-Replace-sort_field-option-with-sort.patch * s390-tools-hyptop-opts-Fix-long-command-line-option-abbreviations.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.MAoP4s/_old 2026-04-10 17:58:54.156431862 +0200 +++ /var/tmp/diff_new_pack.MAoP4s/_new 2026-04-10 17:58:54.160432027 +0200 @@ -92,6 +92,8 @@ ### # IBM patches +Patch100: s390-tools-hyptop-opts-Replace-sort_field-option-with-sort.patch +Patch101: s390-tools-hyptop-opts-Fix-long-command-line-option-abbreviations.patch ### # SUSE patches Patch900: s390-tools-combined.patch @@ -100,7 +102,6 @@ Patch910: s390-tools-ALP-zdev-live.patch ### -BuildRequires: cryptsetup-devel >= 2.8.2 BuildRequires: curl-devel BuildRequires: dracut BuildRequires: fuse3-devel ++++++ s390-tools-hyptop-opts-Fix-long-command-line-option-abbreviations.patch ++++++ >From 7c75df9e9634548a2513aa1e6dc7f6c100a4f37a Mon Sep 17 00:00:00 2001 From: Mete Durlu <[email protected]> Date: Tue, 17 Feb 2026 09:54:08 +0100 Subject: [PATCH] hyptop/opts: Fix long command line option abbreviations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hyptop should be able to accept abbreviations of the long command line options as getopt() is able to match them. Ex; $ hyptop --batch-mode $ hyptop --batch $ hyptop --bat >From getopt(3) man page: """ Long option names may be abbreviated if the abbreviation is unique or is an exact match for some defined option. """ After the introduction of commit c5695e43c4cd ("hyptop/opts: Replace long option formats for consistency") long command line options for hyptop received additional definitions to support dash separated option formats. Unfortunately these definitions were defined as new and unique options and caused an ambiguity for getopt() when abbreviations matched both definitions. Ex; $ hyptop --batch hyptop: option '--batch' is ambiguous; possibilities: '--batch-mode' '--batch_mode' Map both long option formats to the same short option to fix the issue and restore the functionality. Fixes: c5695e43c4cd ("hyptop/opts: Replace long option formats for consistency") Reported-by: Gorkem Kilinc <[email protected]> Reviewed-by: Jan Höppner <[email protected]> Signed-off-by: Mete Durlu <[email protected]> Signed-off-by: Jan Höppner <[email protected]> --- hyptop/opts.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/hyptop/opts.c b/hyptop/opts.c index a8829683..1a98cd99 100644 --- a/hyptop/opts.c +++ b/hyptop/opts.c @@ -54,13 +54,6 @@ static char HELP_TEXT[] = #define OPT_FORMAT 256 /* --format */ #define OPT_FORMAT_ALL 261 /* --all*/ -/* - * Options with underscore to keep compatibility - */ -#define OPT_BATCH_MODE 257 /* --batch_mode */ -#define OPT_CPU_TYPES 258 /* --cpu_types */ -#define OPT_SMT_FACTOR 259 /* --smt_factor */ - /* * Initialize default settings */ @@ -361,18 +354,18 @@ void opts_parse(int argc, char *argv[]) { "version", no_argument, NULL, 'v'}, { "help", no_argument, NULL, 'h'}, { "batch-mode", no_argument, NULL, 'b'}, - { "batch_mode", no_argument, NULL, OPT_BATCH_MODE}, + { "batch_mode", no_argument, NULL, 'b'}, { "all", no_argument, NULL, OPT_FORMAT_ALL }, { "delay", required_argument, NULL, 'd'}, { "smt-factor", required_argument, NULL, 'm'}, - { "smt_factor", required_argument, NULL, OPT_SMT_FACTOR}, + { "smt_factor", required_argument, NULL, 'm'}, { "window", required_argument, NULL, 'w'}, { "sys", required_argument, NULL, 's'}, { "iterations", required_argument, NULL, 'n'}, { "fields", required_argument, NULL, 'f'}, { "sort", required_argument, NULL, 'S'}, { "cpu-types", required_argument, NULL, 't'}, - { "cpu_types", required_argument, NULL, OPT_CPU_TYPES}, + { "cpu_types", required_argument, NULL, 't'}, { "format", required_argument, NULL, OPT_FORMAT }, { NULL, 0, NULL, 0 } }; @@ -391,14 +384,12 @@ void opts_parse(int argc, char *argv[]) case 'h': l_usage(); hyptop_exit(0); - case OPT_BATCH_MODE: case 'b': l_batch_mode_set(); break; case 'd': l_delay_set(optarg); break; - case OPT_SMT_FACTOR: case 'm': l_factor_set(optarg); break; @@ -411,7 +402,6 @@ void opts_parse(int argc, char *argv[]) case 'n': l_iterations_set(optarg); break; - case OPT_CPU_TYPES: case 't': l_cpu_types_set(optarg); break; ++++++ s390-tools-hyptop-opts-Replace-sort_field-option-with-sort.patch ++++++ >From 376ddfbd22f3ca6bed4fb80f2a5eb1ee9c89e3d9 Mon Sep 17 00:00:00 2001 From: Mete Durlu <[email protected]> Date: Tue, 17 Feb 2026 09:02:34 +0100 Subject: [PATCH] hyptop/opts: Replace sort_field option with sort MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hyptop's "--sort_field" command line option has always been documented as "--sort", while the code _only_ explicitly has "--sort_field". Specifying the shorter "--sort" happened to work due to an unnoticed getopt() behavior. >From getopt(3) man page: """ Long option names may be abbreviated if the abbreviation is unique or is an exact match for some defined option. """ With the addition of "--sort-field" as another unique identifier via commit c5695e43c4cd ("hyptop/opts: Replace long option formats for consistency") "--sort" is no longer unique. getopt() won't be able to use that as an abbreviation, since there is ambiguity between "--sort_field" and new "--sort-field" as they are defined as separate options. Replace "--sort-field" and "--sort_field" with plain "--sort" to adhere to the documented hyptop command line argument specification and resolve the broken behavior. Fixes: c5695e43c4cd ("hyptop/opts: Replace long option formats for consistency") Reported-by: Gorkem Kilinc <[email protected]> Reviewed-by: Jan Höppner <[email protected]> Signed-off-by: Mete Durlu <[email protected]> Signed-off-by: Jan Höppner <[email protected]> --- hyptop/opts.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hyptop/opts.c b/hyptop/opts.c index ca182069..a8829683 100644 --- a/hyptop/opts.c +++ b/hyptop/opts.c @@ -58,9 +58,8 @@ static char HELP_TEXT[] = * Options with underscore to keep compatibility */ #define OPT_BATCH_MODE 257 /* --batch_mode */ -#define OPT_SORT_FIELD 258 /* --sort | --sort_field */ -#define OPT_CPU_TYPES 259 /* --cpu_types */ -#define OPT_SMT_FACTOR 260 /* --smt_factor */ +#define OPT_CPU_TYPES 258 /* --cpu_types */ +#define OPT_SMT_FACTOR 259 /* --smt_factor */ /* * Initialize default settings @@ -224,7 +223,7 @@ static void l_fields_set(char *str) } /* - * Set the "--sort_field" option + * Set the "--sort" option */ static void l_sort_field_set(char *str) { @@ -371,8 +370,7 @@ void opts_parse(int argc, char *argv[]) { "sys", required_argument, NULL, 's'}, { "iterations", required_argument, NULL, 'n'}, { "fields", required_argument, NULL, 'f'}, - { "sort-field", required_argument, NULL, 'S'}, - { "sort_field", required_argument, NULL, OPT_SORT_FIELD}, + { "sort", required_argument, NULL, 'S'}, { "cpu-types", required_argument, NULL, 't'}, { "cpu_types", required_argument, NULL, OPT_CPU_TYPES}, { "format", required_argument, NULL, OPT_FORMAT }, @@ -420,7 +418,6 @@ void opts_parse(int argc, char *argv[]) case 'f': l_fields_set(optarg); break; - case OPT_SORT_FIELD: case 'S': l_sort_field_set(optarg); break; ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/s390-tools/vendor.tar.zst /work/SRC/openSUSE:Factory/.s390-tools.new.21863/vendor.tar.zst differ: char 7, line 1
