- update to version 1.45 (#1809392)

sg3_utils-1.45_rescan-scsi-bus.sh_use_LUN_wildcard_in_idlist.patch

@@ -1,34 +0,0 @@
-From linux-scsi  Thu Oct 25 08:49:11 2018
-From: Martin Wilck <mwilck () suse ! com>
-Date: Thu, 25 Oct 2018 08:49:11 +0000
-To: linux-scsi
-Subject: [PATCH] rescan-scsi-bus.sh: use LUN wildcard in idlist
-Message-Id: <20181025084911.19958-1-mwilck () suse ! com>
-X-MARC-Message: https://marc.info/?l=linux-scsi&m=154045737232713
-
-By scanning for LUN 0 only, we may encounter a device that the
-kernel won't add (e.g. peripheral device type 31) and which may
-thus never appear in sysfs for us to use for REPORT LUNS. That
-causes LUN additions for such devices to be missed by
-"rescan-iscsi-bus.sh -a".
-
-Signed-off-by: Martin Wilck <mwilck@suse.com>
----
- scripts/rescan-scsi-bus.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 6989208..a2aa8d8 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -376,7 +376,7 @@ idlist ()
- 
-   oldlist=$(ls /sys/class/scsi_device/ | sed -n "s/${host}:${channel}:\([0-9]*:[0-9]*\)/\1/p" | uniq)
-   # Rescan LUN 0 to check if we found new targets
--  echo "${channel} - 0" > /sys/class/scsi_host/host${host}/scan
-+  echo "${channel} - -" > /sys/class/scsi_host/host${host}/scan
-   newlist=$(ls /sys/class/scsi_device/ | sed -n "s/${host}:${channel}:\([0-9]*:[0-9]*\)/\1/p" | uniq)
-   for newid in $newlist ; do
-     oldid=$newid
--- 
-2.19.1

sg3_utils.spec

@@ -2,14 +2,13 @@
 
 Summary: Utilities for devices that use SCSI command sets
 Name: sg3_utils
-Version: 1.44
+Version: 1.45
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and BSD
 Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz
 Source2: scsi-rescan.8
 Source10: 40-usb-blacklist.rules
 Source11: 59-fc-wwpn-id.rules
-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
@@ -19,8 +18,6 @@ Patch2: sg_raw-version.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1760847
 # FC_TARGET_LUN attribute assigned for non FC device
 Patch3: fc_wwpn_id-non_FC-devices.patch
-# backport from svn
-Patch4: sg3_utils-1.45_rescan-scsi-bus.sh_use_LUN_wildcard_in_idlist.patch
 
 URL: http://sg.danny.cz/sg/sg3_utils.html
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -99,7 +96,7 @@ install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT/usr/lib/udev
 %{_udevrulesdir}/63-fc-wwpn-id.rules
 %{_udevrulesdir}/65-scsi-cciss_id.rules
 %{_udevrulesdir}/40-usb-blacklist.rules
-/usr/lib/udev/*
+/usr/lib/udev/fc_wwpn_id
 
 %files libs
 %doc BSD_LICENSE COPYING
@@ -111,6 +108,9 @@ install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT/usr/lib/udev
 
 
 %changelog
+* Thu Mar 12 2020 Dan Horák <dan@danny.cz> - 1.45-1
+- update to version 1.45 (#1809392)
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.44-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild