Accepting request 516130 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/516130
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sg3_utils?expand=0&rev=47

40-usb-blacklist.rules

@@ -1,10 +0,0 @@
-#
-# Blacklist specific USB devices
-#
-# don't inquire sn and di on broken devices (https://bugzilla.suse.com/show_bug.cgi?id=840054)
-
-# unkown device
-ATTRS{idVendor}=="0aec", ATTRS{idProduct}=="3260", ENV{ID_SCSI_DI}="1"
-# Sony/JMicron port replicator
-ATTRS{idVendor}=="054c", ATTRS{idProduct}=="06a0", ENV{ID_SCSI_DI}="1"
-

_service

@@ -5,7 +5,7 @@
     <param name="subdir"></param>
     <param name="filename">sg3_utils</param>
     <param name="version">1.43</param>
-    <param name="revision">master</param>
+    <param name="revision">factory</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*sg3_utils*.tar</param>

add-lunsearch-filter-to-searchexisting.patch

@@ -1,44 +0,0 @@
-From: Sebastian Parschauer <sparschauer@suse.de>
-Date: Wed, 31 Aug 2016 15:34:23 +0200
-Subject: [PATCH] rescan-scsi-bus.sh: Add lunsearch filter to searchexisting()
-References: bnc#981452
-Patch-Mainline: not yet, sent but waiting for upstream response
-
-A user has reported that `rescan-scsi-bus.sh --luns=<lun #>` prints
-all existing LUNs and scans all new LUNs instead of only the ones
-specified. The problem is that searchexisting() always calls
-doreportlun() and is missing the lunsearch filter e.g. used in
-dosearch().
-So add the required lunsearch filter from dosearch() to
-searchexisting().
-
-Signed-off-by: Sebastian Parschauer <sparschauer@suse.de>
----
- scripts/rescan-scsi-bus.sh | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index fad4868..5bc4a95 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -711,7 +711,16 @@ searchexisting()
-     else
-       match=1
-     fi
--    test $match -eq 1 && doreportlun
-+
-+    test $match -eq 0 && continue
-+
-+    if [ -z "$lunsearch" ] ; then
-+      doreportlun
-+    else
-+      for lun in $lunsearch ; do
-+        dolunscan
-+      done
-+    fi
-   done
- }
- 
--- 
-2.6.6
-

sg3_utils-1.43.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f45e8775989b2249294c5fcfbddb763adec8c9da431e0a657fcd8c0e483c85e7
-size 788776
+oid sha256:f5f70f293e98a45353c8e5d4237bf505937fbbb6f2a856059b69450a5ae35662
+size 791784

sg3_utils.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Aug 11 14:45:56 CEST 2017 - hare@suse.de
+
+- Drop patch merged with git repository
+  * drop add-lunsearch-filter-to-searchexisting.patch
+- Drop rules included in git repository
+  * drop 40-usb-blacklist.rules
+- Update to latest svn snapshot:
+  * sg_rdac: add sanity checks for -f=lun value
+  * sg_vpd improvements
+  * sg_ses: fix uninitialized struct
+  * sg_luns: resync with SAM and SPC drafts
+  * sg_vpd: fix struct misalignment introduced by --force
+  * sg_logs: add --vendor and fixup enumeration
+- Port patches from SLES:
+  * Add systemd service files for LUN masking (bsc#954600)
+  * 55-scsi-sg3_id.rules: handle VPD page 0x80 correctly (bsc#1006469)
+  * scripts: added udev rules for legacy CCISS (bsc#1006175)
+  * rescan-scsi-bus.sh: Add lunsearch filter to findresized()
+  (bsc#1027176)
+  * Add fc_wwpn_id to generate by-path links for fibrechannel
+  (bsc#1005063)
+  * 55-scsi-sg3_id.rules: allow to override sysfs inquiry
+  (bsc#1012523)
+  * sg_inq: export all NAA values (bsc#1050767)
+  * Silence gcc warnings
+
 -------------------------------------------------------------------
 Mon Feb 20 11:05:45 CET 2017 - kukuk@suse.de
 

sg3_utils.spec

@@ -26,9 +26,7 @@ Group:          Hardware/Other
 Url:            http://sg.danny.cz/sg/sg3_utils.html
 
 Source:         sg3_utils-%{version}.tar.xz
-Source1:        40-usb-blacklist.rules
 Patch1:         sgut-libversioning.diff
-Patch2:         add-lunsearch-filter-to-searchexisting.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libtool
 BuildRequires:  udev
@@ -84,7 +82,6 @@ applications that want to make use of libsgutils.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fi
@@ -99,7 +96,7 @@ install -m 644 doc/rescan-scsi-bus.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m 644 scripts/58-scsi-sg3_symlink.rules $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevrulesdir}
+install -m 644 scripts/40-usb-blacklist.rules $RPM_BUILD_ROOT%{_udevrulesdir}
 rm -f %{buildroot}%{_libdir}/*.la
 
 %post   -p /sbin/ldconfig -n %lname