From 2ebc9cdab0ed667683ee1610f883d5e08de7a23f933b720d1d63ec107aae50c4 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 8 Jul 2015 11:00:19 +0000 Subject: [PATCH] Accepting request 315568 from home:morbidrsa:branches:Base:System - Update to new upstream release 1.41 * sg_zone: new utility for open, close and finish zone commands introduced in zbc-r02 * sg_rep_zones and sg_reset_wp: change opcodes as indicated in zbc-r02 * sg_read_buffer: add READ BUFFER(16) support (spc5r02) * sg_logs: add --enumerate and acronyms * allow decode from hex or binary in file * decode environmental reporting + limits lpages * sg_write_buffer: add --timeout=TO option * sg_lib interface: add sg_lib_pdt_decay(), TPROTO_PCIE plus support for zoning service actions * sg_lib: in Linux blocked devices yield ENXIO from ioctl(SG_IO), map to SG_LIB_CAT_NOT_READY * clean up sg_warnings_stream handling * sg_inq+sg_vpd: fix SCSI name string decoding in device identification VPD page (0x83) * increase sanity on Unit Serial number VPD page * improve rdac vpd page reporting (vendor) * sg_inq: improve NAA handling in dev_id VPD page * update version descriptor list to 20150126 OBS-URL: https://build.opensuse.org/request/show/315568 OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=51 --- sg3_utils-1.40.tar.xz | 3 --- sg3_utils-1.41.tar.xz | 3 +++ sg3_utils-sg_inq-blacklist.diff | 12 +++++++----- sg3_utils.changes | 25 +++++++++++++++++++++++++ sg3_utils.spec | 4 ++-- sgut-libversioning.diff | 12 +++++------- 6 files changed, 42 insertions(+), 17 deletions(-) delete mode 100644 sg3_utils-1.40.tar.xz create mode 100644 sg3_utils-1.41.tar.xz diff --git a/sg3_utils-1.40.tar.xz b/sg3_utils-1.40.tar.xz deleted file mode 100644 index 797095a..0000000 --- a/sg3_utils-1.40.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:901ece577d797a8a3870881fe765f6eac4bb381b99a1f7311551689e9f17130b -size 742448 diff --git a/sg3_utils-1.41.tar.xz b/sg3_utils-1.41.tar.xz new file mode 100644 index 0000000..51cfbbe --- /dev/null +++ b/sg3_utils-1.41.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d7c9ec193dccae0838bc5afe22a1cfb2d0e66b3ff5845bf201271c10540e7ac +size 752276 diff --git a/sg3_utils-sg_inq-blacklist.diff b/sg3_utils-sg_inq-blacklist.diff index 50f8836..735cbee 100644 --- a/sg3_utils-sg_inq-blacklist.diff +++ b/sg3_utils-sg_inq-blacklist.diff @@ -1,7 +1,9 @@ -Index: sg3_utils-1.39/scripts/55-scsi-sg3_id.rules -=================================================================== ---- sg3_utils-1.39.orig/scripts/55-scsi-sg3_id.rules -+++ sg3_utils-1.39/scripts/55-scsi-sg3_id.rules +--- + scripts/55-scsi-sg3_id.rules | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/scripts/55-scsi-sg3_id.rules ++++ b/scripts/55-scsi-sg3_id.rules @@ -15,10 +15,19 @@ ENV{SCSI_MODEL}=="?*", ENV{ID_MODEL}="$e ENV{SCSI_MODEL_ENC}=="?*", ENV{ID_MODEL_ENC}="$env{SCSI_MODEL_ENC}" ENV{SCSI_REVISION}=="?*", ENV{ID_REVISION}="$env{SCSI_REVISION}" @@ -21,4 +23,4 @@ Index: sg3_utils-1.39/scripts/55-scsi-sg3_id.rules +LABEL="sg3_utils_sg_inq_sn_di_end" # ID_WWN compat mapping - ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA}" + ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA_REGEXT}" diff --git a/sg3_utils.changes b/sg3_utils.changes index 368b44c..36e05d8 100644 --- a/sg3_utils.changes +++ b/sg3_utils.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Jul 8 07:35:53 UTC 2015 - jthumshirn@suse.com + +- Update to new upstream release 1.41 + * sg_zone: new utility for open, close and finish + zone commands introduced in zbc-r02 + * sg_rep_zones and sg_reset_wp: change opcodes as + indicated in zbc-r02 + * sg_read_buffer: add READ BUFFER(16) support (spc5r02) + * sg_logs: add --enumerate and acronyms + * allow decode from hex or binary in file + * decode environmental reporting + limits lpages + * sg_write_buffer: add --timeout=TO option + * sg_lib interface: add sg_lib_pdt_decay(), TPROTO_PCIE + plus support for zoning service actions + * sg_lib: in Linux blocked devices yield ENXIO from + ioctl(SG_IO), map to SG_LIB_CAT_NOT_READY + * clean up sg_warnings_stream handling + * sg_inq+sg_vpd: fix SCSI name string decoding in + device identification VPD page (0x83) + * increase sanity on Unit Serial number VPD page + * improve rdac vpd page reporting (vendor) + * sg_inq: improve NAA handling in dev_id VPD page + * update version descriptor list to 20150126 + ------------------------------------------------------------------- Fri Feb 13 14:22:36 UTC 2015 - jengelh@inai.de diff --git a/sg3_utils.spec b/sg3_utils.spec index 763e6e0..5b3214e 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -17,8 +17,8 @@ Name: sg3_utils -%define lname libsgutils2-1_40-2 -Version: 1.40 +%define lname libsgutils2-1_41-2 +Version: 1.41 Release: 0 Summary: A collection of tools that send SCSI commands to devices License: GPL-2.0+ and BSD-3-Clause diff --git a/sgut-libversioning.diff b/sgut-libversioning.diff index 8af4773..2746705 100644 --- a/sgut-libversioning.diff +++ b/sgut-libversioning.diff @@ -10,16 +10,14 @@ or using ELF symbol versions). lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: sg3_utils-1.40/lib/Makefile.am -=================================================================== ---- sg3_utils-1.40.orig/lib/Makefile.am -+++ sg3_utils-1.40/lib/Makefile.am -@@ -47,7 +47,7 @@ AM_CFLAGS = -iquote ../include -D_LARGEF +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -48,7 +48,7 @@ AM_CFLAGS = -Wall -W lib_LTLIBRARIES = libsgutils2.la --libsgutils2_la_LDFLAGS = -version-info 2:0:0 -+libsgutils2_la_LDFLAGS = -version-info 2:0:0 -release ${PACKAGE_VERSION} +-libsgutils2_la_LDFLAGS = -version-info 2:0:0 -no-undefined ++libsgutils2_la_LDFLAGS = -version-info 2:0:0 -no-undefined -release ${PACKAGE_VERSION} libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@ libsgutils2_la_DEPENDENCIES = @GETOPT_O_FILES@