[rpms/sg3_utils] f43: * Mon May 11 2026 Paul Evans <pevans@redhat.com> - 1.48-9

[Paul Evans <pevans@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/sg3_utils
            Branch : f43
            Commit : bbe69eadae15eced3a2cee32091cddf12db8ac8d
            Author : Paul Evans <pevans@redhat.com>
            Date   : 2026-05-11T12:46:39+01:00
            Stats  : +44/-38 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/sg3_utils/c/bbe69eadae15eced3a2cee32091cddf12db8ac8d?branch=f43

            Log:
            * Mon May 11 2026 Paul Evans <pevans@redhat.com> - 1.48-9

- rescan-scsi-bus.sh: Replace 'which' with built in 'command -v' [Patch v2]

---
diff --git a/0005-PATCH-v2-rescan-scsi-bus.sh-Replace-which-with-build.patch b/0005-PATCH-v2-rescan-scsi-bus.sh-Replace-which-with-build.patch
new file mode 100644
index 0000000..01f749f
--- /dev/null
+++ b/0005-PATCH-v2-rescan-scsi-bus.sh-Replace-which-with-build.patch
@@ -0,0 +1,37 @@
+From a50dfbd3fd06460bf8ed1bbaa3ea397e4c6fed00 Mon Sep 17 00:00:00 2001
+From: Paul Evans <pevans@redhat.com>
+Date: Mon, 11 May 2026 12:26:21 +0100
+Subject: [PATCH] [PATCH v2] rescan-scsi-bus.sh Replace 'which' with build in
+ 'command -v'
+
+Replace use of 'which' command to determine the existence of an
+executable and replace with the built in 'command -v' to achieve
+the same result. And to also remove the package dependency for
+minimal environments where 'which' might not be available.
+
+Signed-off-by: Paul Evans <pevans@redhat.com>
+---
+v2: Fix implementation error
+---
+ scripts/rescan-scsi-bus.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
+index 23a90bb4..e55e405d 100755
+--- a/scripts/rescan-scsi-bus.sh
++++ b/scripts/rescan-scsi-bus.sh
+@@ -1351,9 +1351,9 @@ if [ -w /sys/module/scsi_mod/parameters/default_dev_flags ] && [ $scan_flags !=
+     unset OLD_SCANFLAGS
+   fi
+ fi
+-DMSETUP=$(which dmsetup)
++DMSETUP=$(command -v dmsetup)
+ [ -z "$DMSETUP" ] && flush= && mp_enable=
+-MULTIPATH=$(which multipath)
++MULTIPATH=$(command -v multipath)
+ [ -z "$MULTIPATH" ] && flush= && mp_enable=
+ 
+ echo -n "Scanning SCSI subsystem for new devices"
+-- 
+2.54.0
+

diff --git a/0005-rescan-scsi-bus.sh-Replace-which-with-build-in-comma.patch b/0005-rescan-scsi-bus.sh-Replace-which-with-build-in-comma.patch
deleted file mode 100644
index 119e0cd..0000000
--- a/0005-rescan-scsi-bus.sh-Replace-which-with-build-in-comma.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 236875888f1c427fcc890842a9df0de8b768951d Mon Sep 17 00:00:00 2001
-From: Paul Evans <pevans@redhat.com>
-Date: Mon, 9 Feb 2026 15:21:53 +0000
-Subject: [PATCH] rescan-scsi-bus.sh Replace 'which' with build in 'command -v'
-
-Replace use of 'which' command to determine the existence of an
-executable and replace with the built in 'command -v' to achieve
-the same result. And to also remove the package dependency for
-minimal environments where 'which' might not be available.
-
-Signed-off-by: Paul Evans <pevans@redhat.com>
----
- scripts/rescan-scsi-bus.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 52991e1e..2c8560ad 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -1350,9 +1350,9 @@ if [ -w /sys/module/scsi_mod/parameters/default_dev_flags ] && [ $scan_flags !=
-     unset OLD_SCANFLAGS
-   fi
- fi
--DMSETUP=$(which dmsetup)
-+DMSETUP=$(version -s dmsetup)
- [ -z "$DMSETUP" ] && flush= && mp_enable=
--MULTIPATH=$(which multipath)
-+MULTIPATH=$(version -s multipath)
- [ -z "$MULTIPATH" ] && flush= && mp_enable=
- 
- echo -n "Scanning SCSI subsystem for new devices"
--- 
-2.53.0
-

diff --git a/sg3_utils.spec b/sg3_utils.spec
index 0b108d3..be9c045 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -4,7 +4,7 @@
 Summary: Utilities for devices that use SCSI command sets
 Name:    sg3_utils
 Version: 1.48
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL-2.0-or-later AND BSD-2-Clause
 URL:     https://sg.danny.cz/sg/sg3_utils.html
 Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz
@@ -25,8 +25,8 @@ Patch3: udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch
 Patch4: 0004-rescan-scsi-bus.sh-Correctly-read-RMB-bit-on-enquiry.patch
 # https://github.com/doug-gilbert/sg3_utils/pull/68
 # rescan-scsi-bus.sh Replace 'which' with build in 'command -v'
-Patch5: 0005-rescan-scsi-bus.sh-Replace-which-with-build-in-comma.patch
-# https://github.com/doug-gilbert/sg3_utils/pull/69
+Patch5: 0005-PATCH-v2-rescan-scsi-bus.sh-Replace-which-with-build.patch
+# https://github.com/doug-gilbert/sg3_utils/pull/75
 # Update sg_safte.c to update short option of version
 Patch6: 0006-Update-sg_safte.c-to-update-short-option-of-version.patch
 # https://github.com/doug-gilbert/sg3_utils/pull/56
@@ -37,7 +37,7 @@ Patch7: 0007-Update-sg_rdac.c-to-accept--help-or--h-without-erro.patch
 Patch8: 0008-sg_inq-fix-missing-output-fields-in--export-format.patch
 # https://github.com/doug-gilbert/sg3_utils/pull/49
 # sg_inq: re-add Unit serial number field
-#Patch9: 0009-sg_inq-re-add-Unit-serial-number-field.patch
+Patch9: 0009-sg_inq-re-add-Unit-serial-number-field.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires: make
@@ -154,6 +154,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir}
 
 
 %changelog
+* Mon May 11 2026 Paul Evans <pevans@redhat.com> - 1.48-9
+- rescan-scsi-bus.sh: Replace 'which' with built in 'command -v' [Patch v2]
+
 * Mon Feb 09 2026 Paul Evans <pevans@redhat.com> - 1.48-8
 - rescan-scsi-bus.sh: Correctly read RMB bit on enquiry (RHEL-122982)
 - rescan-scsi-bus.sh: Replace 'which' with built in 'command -v' (RHEL-70693)