Accepting request 205656 from home:jengelh:branches:Base:System
- Update to new upstream release 1.37 * sg_compare_and_write: add --quiet option to suppress miscompare report * sg_persist: fix core dump on -Q option * sg_unmap: fix core dump on -g option * sg_ses: add --nickname and --nickid options - Remove sg3_utils-Fixup-T10-Vendor-designator-display.patch (merged upstream) OBS-URL: https://build.opensuse.org/request/show/205656 OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=31
This commit is contained in:
parent
4dbfe34245
commit
7c9ef8f1f7
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:505a46db655978d0f5b0a82be04188c43a6167b67962b343d6c258655e261403
|
||||
size 657560
|
3
sg3_utils-1.37.tar.xz
Normal file
3
sg3_utils-1.37.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6bbf198bc58b49e853cfd1a9aca0d405716173c1d083a690aa09b243afca5e5c
|
||||
size 673112
|
@ -1,77 +0,0 @@
|
||||
From 5a20c030863cc14647651586ab07554d73a062a8 Mon Sep 17 00:00:00 2001
|
||||
From: Hannes Reinecke <hare@suse.de>
|
||||
Date: Thu, 23 May 2013 09:26:40 +0200
|
||||
Subject: [PATCH] Fixup T10 Vendor designator display
|
||||
|
||||
The T10 Vendor designator might have a code set of 'binary', in
|
||||
which case the T10 Vendor ID is an 8 byte ASCII field, and the
|
||||
vendor specific identifier is in binary.
|
||||
|
||||
References: bnc#805059
|
||||
|
||||
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
||||
|
||||
diff --git a/src/sg_inq.c b/src/sg_inq.c
|
||||
index 4848574..408ecdd 100644
|
||||
--- a/src/sg_inq.c
|
||||
+++ b/src/sg_inq.c
|
||||
@@ -1115,8 +1115,16 @@ decode_dev_ids(const char * leadin, unsigned char * buff, int len, int do_hex)
|
||||
break;
|
||||
case 1: /* T10 vendor identification */
|
||||
printf(" vendor id: %.8s\n", ip);
|
||||
- if (i_len > 8)
|
||||
- printf(" vendor specific: %.*s\n", i_len - 8, ip + 8);
|
||||
+ if (i_len > 8) {
|
||||
+ if ((2 == c_set) || (3 == c_set)) { /* ASCII or UTF-8 */
|
||||
+ printf(" vendor specific: %.*s\n", i_len - 8, ip + 8);
|
||||
+ } else {
|
||||
+ printf(" vendor specific: 0x");
|
||||
+ for (m = 8; m < i_len; ++m)
|
||||
+ printf("%02x", (unsigned int)ip[m]);
|
||||
+ printf("\n");
|
||||
+ }
|
||||
+ }
|
||||
break;
|
||||
case 2: /* EUI-64 based */
|
||||
printf(" EUI-64 based %d byte identifier\n", i_len);
|
||||
@@ -1405,8 +1413,15 @@ export_dev_ids(unsigned char * buff, int len)
|
||||
printf("SCSI_IDENT_%s_VENDOR=%.*s\n", assoc_str, k, ip);
|
||||
break;
|
||||
case 1: /* T10 vendor identification */
|
||||
- k = encode_whitespaces(ip, i_len);
|
||||
- printf("SCSI_IDENT_%s_T10=%.*s\n", assoc_str, k, ip);
|
||||
+ printf("SCSI_IDENT_%s_T10=", assoc_str);
|
||||
+ if ((2 == c_set) || (3 == c_set)) {
|
||||
+ k = encode_whitespaces(ip, i_len);
|
||||
+ printf("%.*s\n", k, ip);
|
||||
+ } else {
|
||||
+ for (m = 0; m < i_len; ++m)
|
||||
+ printf("%02x", (unsigned int)ip[m]);
|
||||
+ printf("\n");
|
||||
+ }
|
||||
break;
|
||||
case 2: /* EUI-64 based */
|
||||
if (1 != c_set) {
|
||||
diff --git a/src/sg_vpd.c b/src/sg_vpd.c
|
||||
index f991623..f7345db 100644
|
||||
--- a/src/sg_vpd.c
|
||||
+++ b/src/sg_vpd.c
|
||||
@@ -796,8 +796,16 @@ decode_designation_descriptor(const unsigned char * ip, int i_len,
|
||||
break;
|
||||
case 1: /* T10 vendor identification */
|
||||
printf(" vendor id: %.8s\n", ip);
|
||||
- if (i_len > 8)
|
||||
- printf(" vendor specific: %.*s\n", i_len - 8, ip + 8);
|
||||
+ if (i_len > 8) {
|
||||
+ if ((2 == c_set) || (3 == c_set)) { /* ASCII or UTF-8 */
|
||||
+ printf(" vendor specific: %.*s\n", i_len - 8, ip + 8);
|
||||
+ } else {
|
||||
+ printf(" vendor specific: 0x");
|
||||
+ for (m = 8; m < i_len; ++m)
|
||||
+ printf("%02x", (unsigned int)ip[m]);
|
||||
+ printf("\n");
|
||||
+ }
|
||||
+ }
|
||||
break;
|
||||
case 2: /* EUI-64 based */
|
||||
if (! long_out) {
|
@ -1,3 +1,10 @@
|
||||
From: ohering@suse.de
|
||||
Date: 2013-08-25 18:45:14 +0200
|
||||
References: http://bugzilla.novell.com/780946
|
||||
|
||||
(was originally marked to fix an upstream issue, but no description
|
||||
was provided)
|
||||
|
||||
Index: sg3_utils-1.35/scripts/rescan-scsi-bus.sh
|
||||
===================================================================
|
||||
--- sg3_utils-1.35.orig/scripts/rescan-scsi-bus.sh
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 4 01:59:38 UTC 2013 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 1.37
|
||||
* sg_compare_and_write: add --quiet option to suppress miscompare
|
||||
report
|
||||
* sg_persist: fix core dump on -Q option
|
||||
* sg_unmap: fix core dump on -g option
|
||||
* sg_ses: add --nickname and --nickid options
|
||||
- Remove sg3_utils-Fixup-T10-Vendor-designator-display.patch
|
||||
(merged upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 25 18:45:14 CEST 2013 - ohering@suse.de
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
Name: sg3_utils
|
||||
%define lname libsgutils2-2
|
||||
Version: 1.36
|
||||
Version: 1.37
|
||||
Release: 0
|
||||
Summary: A collection of tools that send SCSI commands to devices
|
||||
License: GPL-2.0+ and BSD-3-Clause
|
||||
@ -26,10 +26,7 @@ Group: Hardware/Other
|
||||
Url: http://sg.danny.cz/sg/sg3_utils.html
|
||||
|
||||
Source: http://sg.danny.cz/sg/p/%name-%version.tar.xz
|
||||
# PATCH-FIX-UPSTREAM sg3_utils-check-if-hba-supports-issue-lip.patch bnc#780946
|
||||
Patch0: sg3_utils-check-if-hba-supports-issue-lip.patch
|
||||
# PATCH-FIX-UPSTREAM sg3_utils-Fixup-T10-Vendor-designator-display.patch bnc#805059
|
||||
Patch1: sg3_utils-Fixup-T10-Vendor-designator-display.patch
|
||||
Patch1: sg3_utils-check-if-hba-supports-issue-lip.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: xz
|
||||
Requires(pre): %insserv_prereq
|
||||
@ -83,12 +80,11 @@ applications that want to make use of libsgutils.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static --with-pic
|
||||
%{__make} %{?_smp_mflags}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR="%buildroot"
|
||||
|
Loading…
Reference in New Issue
Block a user