diff --git a/SOURCES/sg_raw-version.patch b/SOURCES/sg_raw-version.patch new file mode 100644 index 0000000..ab5cb6a --- /dev/null +++ b/SOURCES/sg_raw-version.patch @@ -0,0 +1,28 @@ +From c683e6e2bc62b43c140934b919323d107b0a48cb Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Tue, 28 May 2019 16:06:06 +0200 +Subject: [PATCH] sg_raw: do not print error about device not specified on + version request + +--- + src/sg_raw.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/sg_raw.c b/src/sg_raw.c +index 33a85f7c..453ff42a 100644 +--- a/src/sg_raw.c ++++ b/src/sg_raw.c +@@ -440,6 +440,13 @@ parse_cmd_line(struct opts_t * op, int argc, char *argv[]) + } + } + ++ if (op->version_given ++#ifdef DEBUG ++ && ! op->verbose_given ++#endif ++ ) ++ return 0; ++ + if (optind >= argc) { + pr2serr("No device specified\n\n"); + return SG_LIB_SYNTAX_ERROR; diff --git a/SOURCES/sg_turs-help.patch b/SOURCES/sg_turs-help.patch new file mode 100644 index 0000000..da7de09 --- /dev/null +++ b/SOURCES/sg_turs-help.patch @@ -0,0 +1,24 @@ +From 116e665ddb7b38bb8f7065ddb08192bd3551897d Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Tue, 26 Feb 2019 16:45:59 +0100 +Subject: [PATCH] sg_turs: fix help invocation in the old mode + +In the old mode the usage was printed out twice when called +by `sg_turs -O -?`. +--- + src/sg_turs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sg_turs.c b/src/sg_turs.c +index 8c6e3792..a318d22c 100644 +--- a/src/sg_turs.c ++++ b/src/sg_turs.c +@@ -252,7 +252,7 @@ old_parse_cmd_line(struct opts_t * op, int argc, char * argv[]) + op->version_given = true; + break; + case '?': +- usage_old(); ++ ++op->do_help; + return 0; + default: + jmp_out = true; diff --git a/SPECS/sg3_utils.spec b/SPECS/sg3_utils.spec index ba72eb4..f58a7c5 100644 --- a/SPECS/sg3_utils.spec +++ b/SPECS/sg3_utils.spec @@ -3,12 +3,18 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.44 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and BSD Group: Applications/System Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz Source2: scsi-rescan.8 Patch0: BZ_1633235-sg3_utils-1.44-covscan-fix.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1683343 +# sg_turs: improper usage show +Patch1: sg_turs-help.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1627657 +# sg_raw -V fail +Patch2: sg_raw-version.patch URL: http://sg.danny.cz/sg/sg3_utils.html Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -86,6 +92,10 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8 %changelog +* Tue May 28 2019 Tomas Bzatek - 1.44-3 +- Fix sg_turs help invocation in an old mode (#1683343) +- Fix sg_raw printing error about device not specified on version request (#1627657) + * Fri Sep 28 2018 Gris Ge - 1.44-2 - Fix coverity scan warninings (RHBZ#1633235)