public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Paul Evans <pevans@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/sg3_utils] rawhide: * Wed Jul 22 2026 Paul Evans <pevans@redhat.com> - 1.49-1
Date: Thu, 20 Aug 2026 07:44:07 GMT [thread overview]
Message-ID: <178721184749.1.6176932420498375605.rpms-sg3_utils-8eb736f1f1d9@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/sg3_utils
Branch : rawhide
Commit : 8eb736f1f1d94965be7b507fc854d1a9b54c918d
Author : Paul Evans <pevans@redhat.com>
Date : 2026-08-20T09:40:42+02:00
Stats : +11/-565 in 15 file(s)
URL : https://src.fedoraproject.org/rpms/sg3_utils/c/8eb736f1f1d94965be7b507fc854d1a9b54c918d?branch=rawhide
Log:
* Wed Jul 22 2026 Paul Evans <pevans@redhat.com> - 1.49-1
- update to version 1.49 (rhbz#2502183)
---
diff --git a/.gitignore b/.gitignore
index a23f508..f68906c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ rescan-scsi-bus.sh-1.35
/sg3_utils-1.45.tar.xz
/sg3_utils-1.46.tar.xz
/sg3_utils-1.48.tar.xz
+/sg3_utils-1.49.tar.xz
diff --git a/0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch b/0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch
deleted file mode 100644
index ab0c83b..0000000
--- a/0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 89427a6328a737b6a64104a6988e4ab319f239c7 Mon Sep 17 00:00:00 2001
-From: Douglas Gilbert <dgilbert@interlog.com>
-Date: Mon, 16 Oct 2023 14:59:21 +0000
-Subject: [PATCH 1/3] rescan-scsi-bus.sh: fix multipath resize without update,
- https://github.com/doug-gilbert/sg3_utils/pull/43.diff
-X-Patchwork-Bot: notify
-
-git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1055 6180dd3e-e324-4e3e-922d-17de1ae2f315
----
- scripts/rescan-scsi-bus.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 0c25dbb1..7d74d90f 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -1088,6 +1088,7 @@ findresized()
- local mpathsize=
- declare -a mpathsizes
-
-+ [ -e "$TMPLUNINFOFILE" ] || getallmultipathinfo
- if [ -z "$lunsearch" ] ; then
- devs=$(ls /sys/class/scsi_device/)
- else
---
-2.44.0
-
diff --git a/0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch b/0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch
deleted file mode 100644
index a17317a..0000000
--- a/0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 593cb078d4e91591aa3be823715f11888b21f8e4 Mon Sep 17 00:00:00 2001
-From: Douglas Gilbert <dgilbert@interlog.com>
-Date: Tue, 17 Oct 2023 20:41:37 +0000
-Subject: [PATCH 2/3] rescan-scsi-bus.sh: remove
- /tmp/rescan-scsi-mpath-info.txt;
- https://github.com/doug-gilbert/sg3_utils/pull/44.diff
-X-Patchwork-Bot: notify
-
-git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1056 6180dd3e-e324-4e3e-922d-17de1ae2f315
----
- scripts/rescan-scsi-bus.sh | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 7d74d90f..188d071c 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -7,7 +7,16 @@
- VERSION="20230413"
- SCAN_WILD_CARD=4294967295
-
--TMPLUNINFOFILE="/tmp/rescan-scsi-mpath-info.txt"
-+CLEANUP=:
-+trap 'eval "$CLEANUP"' 0
-+TMPD=$(mktemp -d /tmp/rsb.XXXXXXXX)
-+[ "$TMPD" ] || {
-+ echo failed to create temporary directory >&2
-+ exit 1
-+}
-+CLEANUP='rm -rf "$TMPD";'"$CLEANUP"
-+
-+TMPLUNINFOFILE="$TMPD/rescan-scsi-mpath-info.txt"
-
- setcolor ()
- {
-@@ -818,9 +827,9 @@ findremapped()
- mpaths=""
- local tmpfile=
-
-- tmpfile=$(mktemp /tmp/rescan-scsi-bus.XXXXXXXX 2> /dev/null)
-+ tmpfile=$(mktemp "$TMPD/rescan-scsi-bus.XXXXXXXX" 2> /dev/null)
- if [ -z "$tmpfile" ] ; then
-- tmpfile="/tmp/rescan-scsi-bus.$$"
-+ tmpfile="$TMPD/rescan-scsi-bus.$$"
- rm -f $tmpfile
- fi
-
-@@ -874,7 +883,6 @@ findremapped()
- echo "$SCSISTR"
- incrchgd "$hctl"
- done < $tmpfile
-- rm -f $tmpfile
-
- if [ -n "$mp_enable" ] && [ -n "$mpaths" ] ; then
- echo "Updating multipath device mappings"
---
-2.44.0
-
diff --git a/0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch b/0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch
deleted file mode 100644
index 3f8caa9..0000000
--- a/0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bc99b8db2cf8afd04b1f9d68e9bd4f9d847b3c6f Mon Sep 17 00:00:00 2001
-From: Douglas Gilbert <dgilbert@interlog.com>
-Date: Thu, 21 Dec 2023 04:35:26 +0000
-Subject: [PATCH 3/3] rescan-scsi-bus.sh: fix for
- github.com/doug-gilbert/sg3_utils/issues/46
-X-Patchwork-Bot: notify
-
-git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1076 6180dd3e-e324-4e3e-922d-17de1ae2f315
----
- scripts/rescan-scsi-bus.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 188d071c..52991e1e 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -1240,7 +1240,9 @@ if [ -x /usr/bin/sg_inq ] ; then
- if [ "$sg_turs_version" -gt 353 ] ; then
- sg_turs_opt="--ascq=0x3a"
- else
-- sg_turs_opt=""
-+ # Not really interested in timing a TUR but an empty string such as
-+ # "" gets interpreted on the command line as a positional parameter.
-+ sg_turs_opt="-t"
- fi
- else
- echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils"
---
-2.44.0
-
diff --git a/0004-rescan-scsi-bus.sh-Correctly-read-RMB-bit-on-enquiry.patch b/0004-rescan-scsi-bus.sh-Correctly-read-RMB-bit-on-enquiry.patch
deleted file mode 100644
index e83c799..0000000
--- a/0004-rescan-scsi-bus.sh-Correctly-read-RMB-bit-on-enquiry.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From fe9739425a5ef5220bd5efa3a45b531d3e9ee29c Mon Sep 17 00:00:00 2001
-From: Paul Evans <pevans@redhat.com>
-Date: Wed, 28 Jan 2026 14:42:02 +0000
-Subject: [PATCH] rescan-scsi-bus.sh Correctly read RMB bit on enquiry
-
-Make changes to is_removable() in rescan-scsi-bus.sh to correctly
-read the RMB byte on its hexedit enquiry response.
-
-As things stand the script incorrectly reads the first byte of the
-repsonse the "Peripheral Qualifier" and will always return a device
-as non-removable.
-
-Signed-off-by: Paul Evans <pevans@redhat.com>
----
- scripts/rescan-scsi-bus.sh | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 52991e1e..23a90bb4 100755
---- a/scripts/rescan-scsi-bus.sh
-+++ b/scripts/rescan-scsi-bus.sh
-@@ -4,7 +4,7 @@
- # (c) 2006--2022 Hannes Reinecke, GNU GPL v2 or later
- # $Id: rescan-scsi-bus.sh,v 1.57 2012/03/31 14:08:48 garloff Exp $
-
--VERSION="20230413"
-+VERSION="20260126"
- SCAN_WILD_CARD=4294967295
-
- CLEANUP=:
-@@ -256,9 +256,10 @@ is_removable ()
-
- p=/sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/inquiry
- # Extract the second byte of the INQUIRY response and check bit 7 (mask 0x80).
-- b=$(hexdump -n1 -e '/1 "%02X"' "$p" 2>/dev/null)
-+ b=$(od -j1 -N1 -An -t x1 "$p" 2>/dev/null)
- if [ -n "$b" ]; then
-- echo $(((0x$b & 0x80) != 0))
-+ # Handle od leading space with parameter substitution.
-+ echo $(((0x${b// /} & 0x80) != 0))
- else
- sg_inq "$sg_len_arg" /dev/$SGDEV 2>/dev/null | sed -n 's/^.*RMB=\([0-9]*\).*$/\1/p'
- fi
---
-2.53.0
-
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
deleted file mode 100644
index 01f749f..0000000
--- a/0005-PATCH-v2-rescan-scsi-bus.sh-Replace-which-with-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/0006-Update-sg_safte.c-to-update-short-option-of-version.patch b/0006-Update-sg_safte.c-to-update-short-option-of-version.patch
deleted file mode 100644
index 0724515..0000000
--- a/0006-Update-sg_safte.c-to-update-short-option-of-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From da138e7b28a7c5e8ea2bb1ae099245d65e23ec5e Mon Sep 17 00:00:00 2001
-From: Fan <ffan@redhat.com>
-Date: Mon, 3 Nov 2025 19:54:03 +0800
-Subject: [PATCH] Update sg_safte.c to update short option of version
-
-Update sg_safte.c to update short oprtion of version from -v to -V.
-
-Signed-off-by: Fan Fan <ffan@redhat.com>
----
- src/sg_safte.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sg_safte.c b/src/sg_safte.c
-index 26d34169..2319ee83 100644
---- a/src/sg_safte.c
-+++ b/src/sg_safte.c
-@@ -492,7 +492,7 @@ usage()
- "to stdout\n"
- " --usage|-u output usage statistics\n"
- " --verbose|-v increase verbosity\n"
-- " --version|-v output version then exit\n\n"
-+ " --version|-V output version then exit\n\n"
- "Queries a SAF-TE processor device\n");
- }
-
diff --git a/0007-Update-sg_rdac.c-to-accept--help-or--h-without-erro.patch b/0007-Update-sg_rdac.c-to-accept--help-or--h-without-erro.patch
deleted file mode 100644
index 272e78e..0000000
--- a/0007-Update-sg_rdac.c-to-accept--help-or--h-without-erro.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6450fb311edc28df015c977197bea5da7702ab80 Mon Sep 17 00:00:00 2001
-From: Fan Fan <ffan@redhat.com>
-Date: Thu, 28 Nov 2024 21:35:14 +0800
-Subject: [PATCH] Update sg_rdac.c to accept --help or -h without error ,
- update the version number.
-
----
- src/sg_rdac.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/sg_rdac.c b/src/sg_rdac.c
-index a5476daa..50b4207c 100644
---- a/src/sg_rdac.c
-+++ b/src/sg_rdac.c
-@@ -32,7 +32,7 @@
- #include "sg_pr2serr.h"
-
-
--static const char * version_str = "1.18 20230622";
-+static const char * version_str = "1.19 20241128";
-
- static const uint8_t mode6_hdr[] = {
- 0x75, /* Length */
-@@ -405,8 +405,13 @@ int main(int argc, char * argv[])
-
- for (k = 1; k < argc; ++k) {
- argptr = argv + k;
-- if (!strcmp (*argptr, "-v"))
-+ if (strcmp(argv[k], "--help") == 0 || strcmp(argv[k], "-h") == 0) {
-+ usage ();
-+ return 0;
-+ }
-+ else if (!strcmp (*argptr, "-v")) {
- ++do_verbose;
-+ }
- else if (!strncmp(*argptr, "-f=",3)) {
- fail_path = true;
- lun = strtoul(*argptr + 3, NULL, 0);
diff --git a/0008-sg_inq-fix-missing-output-fields-in--export-format.patch b/0008-sg_inq-fix-missing-output-fields-in--export-format.patch
deleted file mode 100644
index fa23391..0000000
--- a/0008-sg_inq-fix-missing-output-fields-in--export-format.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 16c97d4df31a5dee7197e09b89c80d5b978a53bd Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 13 Feb 2024 18:09:34 +0100
-Subject: [PATCH 1/2] sg_inq: fix missing output fields in --export format
-
-The SCSI_MODEL, SCSI_MODEL_ENC, SCSI_REVISION, and other fields are
-missing in the output of sg_inq with --export:
-
-$ sg_inq /dev/sda
-standard INQUIRY:
- PQual=0 PDT=0 RMB=0 LU_CONG=0 hot_pluggable=0 version=0x05 [SPC-3]
- [AERC=0] [TrmTsk=0] NormACA=0 HiSUP=0 Resp_data_format=2
- SCCS=0 ACC=0 TPGS=0 3PC=0 Protect=0 [BQue=0]
- EncServ=0 MultiP=0 [MChngr=0] [ACKREQQ=0] Addr16=0
- [RelAdr=0] WBus16=0 Sync=0 [Linked=0] [TranDis=0] CmdQue=1
- [SPI: Clocking=0x0 QAS=0 IUS=0]
- length=96 (0x60) Peripheral device type: disk
- Vendor identification: ATA
- Product identification: SK hynix SC300 M
- Product revision level: 0P00
-
-$ sg_inq --export /dev/sda
-SCSI_TPGS=0
-SCSI_TYPE=disk
-SCSI_VENDOR=ATA
-SCSI_VENDOR_ENC=ATA\x20\x20\x20\x20\x20
-
-The reason is that the parameter "len" is overwritten in std_inq_decode().
-Fix it by using block-local variables for calculating field lengths.
-
-Output after applying this patch:
-
-$ sg_inq --export /dev/sda
-SCSI_TPGS=0
-SCSI_TYPE=disk
-SCSI_VENDOR=ATA
-SCSI_VENDOR_ENC=ATA\x20\x20\x20\x20\x20
-SCSI_MODEL=SK_hynix_SC300_M
-SCSI_MODEL_ENC=SK\x20hynix\x20SC300\x20M
-SCSI_REVISION=0P00
-
-Fixes: 0f1230a ("sg_readcap+sg_luns: add --inhex= and json")
-Signed-off-by: Martin Wilck <mwilck@suse.com>
----
- src/sg_inq.c | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/sg_inq.c b/src/sg_inq.c
-index b3b8127f..8e6b269d 100644
---- a/src/sg_inq.c
-+++ b/src/sg_inq.c
-@@ -2349,8 +2349,8 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
- if (xtra_buff[i] == 0x09)
- xtra_buff[i] = ' ';
- if (op->do_export) {
-- len = encode_whitespaces((uint8_t *)xtra_buff, 8);
-- if (len > 0) {
-+ int vlen = encode_whitespaces((uint8_t *)xtra_buff, 8);
-+ if (vlen > 0) {
- printf("SCSI_VENDOR=%s\n", xtra_buff);
- encode_string(xtra_buff, &rp[8], 8);
- printf("SCSI_VENDOR_ENC=%s\n", xtra_buff);
-@@ -2364,8 +2364,8 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
- memcpy(xtra_buff, &rp[16], 16);
- xtra_buff[16] = '\0';
- if (op->do_export) {
-- len = encode_whitespaces((uint8_t *)xtra_buff, 16);
-- if (len > 0) {
-+ int mlen = encode_whitespaces((uint8_t *)xtra_buff, 16);
-+ if (mlen > 0) {
- printf("SCSI_MODEL=%s\n", xtra_buff);
- encode_string(xtra_buff, &rp[16], 16);
- printf("SCSI_MODEL_ENC=%s\n", xtra_buff);
-@@ -2380,8 +2380,8 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
- memcpy(xtra_buff, &rp[32], 4);
- xtra_buff[4] = '\0';
- if (op->do_export) {
-- len = encode_whitespaces((uint8_t *)xtra_buff, 4);
-- if (len > 0)
-+ int rlen = encode_whitespaces((uint8_t *)xtra_buff, 4);
-+ if (rlen > 0)
- printf("SCSI_REVISION=%s\n", xtra_buff);
- } else
- sgj_pr_hr(jsp, " Product revision level: %s\n", xtra_buff);
-@@ -2390,8 +2390,8 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
- (' ' != rp[36])) {
- memcpy(xtra_buff, &rp[36], len < 56 ? len - 36 : 20);
- if (op->do_export) {
-- len = encode_whitespaces((uint8_t *)xtra_buff, 20);
-- if (len > 0)
-+ int vlen = encode_whitespaces((uint8_t *)xtra_buff, 20);
-+ if (vlen > 0)
- printf("VENDOR_SPECIFIC=%s\n", xtra_buff);
- } else
- sgj_pr_hr(jsp, " Vendor specific: %s\n", xtra_buff);
-@@ -2404,9 +2404,9 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
- if ((op->do_vendor > 1) && (len > 96)) {
- memcpy(xtra_buff, &rp[96], len - 96);
- if (op->do_export) {
-- len = encode_whitespaces((uint8_t *)xtra_buff,
-+ int vlen = encode_whitespaces((uint8_t *)xtra_buff,
- len - 96);
-- if (len > 0)
-+ if (vlen > 0)
- printf("VENDOR_SPECIFIC=%s\n", xtra_buff);
- } else
- sgj_pr_hr(jsp, " Vendor specific: %s\n", xtra_buff);
-@@ -2415,8 +2415,8 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
- (0 == strncmp("OPEN-V", (const char *)&rp[16], 6))) {
- memcpy(xtra_buff, &rp[212], 32);
- if (op->do_export) {
-- len = encode_whitespaces((uint8_t *)xtra_buff, 32);
-- if (len > 0)
-+ int vlen = encode_whitespaces((uint8_t *)xtra_buff, 32);
-+ if (vlen > 0)
- printf("VENDOR_SPECIFIC_OPEN-V_LDEV_NAME=%s\n", xtra_buff);
- } else
- sgj_pr_hr(jsp, " Vendor specific OPEN-V LDEV Name: %s\n",
---
-2.53.0
-
diff --git a/0009-sg_inq-re-add-Unit-serial-number-field.patch b/0009-sg_inq-re-add-Unit-serial-number-field.patch
deleted file mode 100644
index acdebd3..0000000
--- a/0009-sg_inq-re-add-Unit-serial-number-field.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c86af25adb675bd508c82aa686d0e1b5952b12fc Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Fri, 19 Apr 2024 23:03:14 +0200
-Subject: [PATCH 2/2] sg_inq: re-add Unit serial number field
-
-After 0f1230a ("sg_readcap+sg_luns: add --inhex= and json"), the
-"Unit serial number" output field is missing from sg_inq output:
-
-> ./sg_inq /dev/sda
-standard INQUIRY:
- PQual=0 PDT=0 RMB=0 LU_CONG=0 hot_pluggable=0 version=0x05 [SPC-3]
- [AERC=0] [TrmTsk=0] NormACA=0 HiSUP=0 Resp_data_format=2
- SCCS=0 ACC=0 TPGS=0 3PC=0 Protect=0 [BQue=0]
- EncServ=0 MultiP=0 [MChngr=0] [ACKREQQ=0] Addr16=0
- [RelAdr=0] WBus16=0 Sync=0 [Linked=0] [TranDis=0] CmdQue=1
- [SPI: Clocking=0x0 QAS=0 IUS=0]
- length=96 (0x60) Peripheral device type: disk
- Vendor identification: ATA
- Product identification: SK hynix SC300 M
- Product revision level: 0P00
-
-Previously, the command would also print
-
- Unit serial number: FJ63N456110303C1E
-
-The problem is caused by checking "len" rather than op->maxlen
-in the condition that's evaluated for printing the unit serial numnber.
-
-Fixes: 0f1230a ("sg_readcap+sg_luns: add --inhex= and json")
-Signed-off-by: Martin Wilck <mwilck@suse.com>
----
- src/sg_inq.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/sg_inq.c b/src/sg_inq.c
-index 8e6b269d..5d77d908 100644
---- a/src/sg_inq.c
-+++ b/src/sg_inq.c
-@@ -2428,8 +2428,8 @@ std_inq_decode(const uint8_t * rp, int len, struct opts_t * op,
-
- if (as_json)
- jo2p = std_inq_decode_js(rp, len, op, jop);
-- if ((0 == len) && usn_buff[0])
-- sgj_pr_hr(jsp, " Unit serial number: %s\n", usn_buff);
-+ if ((0 == op->maxlen) && usn_buff[0])
-+ sgj_pr_hr(jsp, " Unit serial number: %s\n", usn_buff);
- if (op->do_descriptors) {
- sgj_opaque_p jap = sgj_named_subarray_r(jsp, jo2p,
- "version_descriptor_list");
---
-2.53.0
-
diff --git a/0010-sg_inq-export-output-conformance-for-SCSI-name-string-and-ATA-fields.patch b/0010-sg_inq-export-output-conformance-for-SCSI-name-string-and-ATA-fields.patch
deleted file mode 100644
index 825d208..0000000
--- a/0010-sg_inq-export-output-conformance-for-SCSI-name-string-and-ATA-fields.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 91981b9f091cf81b43fe5e8bbdb82fd0f90ebb8d Mon Sep 17 00:00:00 2001
-From: Paul Evans <pevans@redhat.com>
-Date: Tue, 2 Jun 2026 15:03:41 +0100
-Subject: [PATCH] sg_inq: --export output conformance for SCSI name string and
- ATA fields
-
-Apply udev-conforming character encoding to VPD 0x83 designator type 8
-(SCSI name string) and the T10 vendor ID ATA subfield, matching the
-encoding already used by designator types 0 and 1 since commit
-4d770f10.
-
-Signed-off-by: Paul Evans <pevans@redhat.com>
----
- src/sg_inq.c | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/src/sg_inq.c b/src/sg_inq.c
-index b3b8127f..a3b78965 100644
---- a/src/sg_inq.c
-+++ b/src/sg_inq.c
-@@ -1919,8 +1919,17 @@ export_dev_ids(uint8_t * buff, int len, int verbose)
- }
- printf("\n");
- if (!memcmp(ip, "ATA_", 4)) {
-- printf("SCSI_IDENT_%s_ATA=%.*s\n", assoc_str,
-- k - 4, ip + 4);
-+ printf("SCSI_IDENT_%s_ATA=", assoc_str);
-+ for (m = 4; m < k; ++m) {
-+ if ((ip[m] >= '0' && ip[m] <= '9') ||
-+ (ip[m] >= 'A' && ip[m] <= 'Z') ||
-+ (ip[m] >= 'a' && ip[m] <= 'z') ||
-+ strchr("#+-.:=@_", ip[m]) != NULL)
-+ printf("%c", ip[m]);
-+ else
-+ printf("\\x%02x", ip[m]);
-+ }
-+ printf("\n");
- }
- } else {
- for (m = 0; m < i_len; ++m)
-@@ -2043,8 +2052,17 @@ export_dev_ids(uint8_t * buff, int len, int verbose)
- break;
- }
-
-- printf("SCSI_IDENT_%s_NAME=%.*s\n", assoc_str, i_len,
-- (const char *)ip);
-+ printf("SCSI_IDENT_%s_NAME=", assoc_str);
-+ for (m = 0; m < i_len; ++m) {
-+ if ((ip[m] >= '0' && ip[m] <= '9') ||
-+ (ip[m] >= 'A' && ip[m] <= 'Z') ||
-+ (ip[m] >= 'a' && ip[m] <= 'z') ||
-+ strchr("#+-.:=@_", ip[m]) != NULL)
-+ printf("%c", ip[m]);
-+ else
-+ printf("\\x%02x", ip[m]);
-+ }
-+ printf("\n");
- break;
- case 9: /* Protocol specific port identifier */
- if (TPROTO_UAS == p_id) {
---
-2.54.0
-
diff --git a/scsi-rescan.8 b/scsi-rescan.8
deleted file mode 100644
index 7252653..0000000
--- a/scsi-rescan.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rescan-scsi-bus.sh.8
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 2c21142..7fea483 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -3,48 +3,18 @@
Summary: Utilities for devices that use SCSI command sets
Name: sg3_utils
-Version: 1.48
-Release: 11%{?dist}
+Version: 1.49
+Release: 1%{?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
-Source1: scsi-rescan.8
-# https://github.com/doug-gilbert/sg3_utils/pull/43
-# scripts/rescan-scsi-bus.sh: fix multipath resize without update
-Patch0: 0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch
-# https://github.com/doug-gilbert/sg3_utils/pull/44
-# scripts/rescan-scsi-bus.sh: remove /tmp/rescan-scsi-mpath-info.txt
-Patch1: 0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch
-# https://github.com/doug-gilbert/sg3_utils/issues/46
-# scripts/rescan-scsi-bus.sh: -r flag unmounts active root disk
-Patch2: 0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch
-# https://github.com/doug-gilbert/sg3_utils/pull/47
-Patch3: udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch
-# https://github.com/doug-gilbert/sg3_utils/pull/68
-# rescan-scsi-bus.sh Correctly read RMB bit on enquiry
-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-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
-# Update sg_rdac.c to accept --help or -h without error
-Patch7: 0007-Update-sg_rdac.c-to-accept--help-or--h-without-erro.patch
-# https://github.com/doug-gilbert/sg3_utils/pull/49
-# sg_inq: fix missing output fields in --export format
-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
-# https://github.com/doug-gilbert/sg3_utils/pull/83
-# sg_inq-export-output-conformance-for-SCSI-name-string-and-ATA-fields
-Patch10: 0010-sg_inq-export-output-conformance-for-SCSI-name-string-and-ATA-fields.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: make
BuildRequires: gcc
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
BuildRequires: systemd
@@ -82,6 +52,7 @@ developing applications.
%build
+autoreconf -vfi
%configure --disable-static
# Don't use rpath!
@@ -104,8 +75,6 @@ rm -rf %{buildroot}%{_libdir}/*.la
install -p -m 755 scripts/%{rescan_script} %{buildroot}%{_bindir}
( cd %{buildroot}%{_bindir}; ln -sf %{rescan_script} scsi-rescan )
-install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man8
-
# install all extra udev rules
mkdir -p %{buildroot}%{_udevrulesdir}
mkdir -p %{buildroot}%{_udevlibdir}
@@ -157,6 +126,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir}
%changelog
+* Wed Jul 22 2026 Paul Evans <pevans@redhat.com> - 1.49-1
+- update to version 1.49 (rhbz#2502183)
+
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 77279e3..38df503 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sg3_utils-1.48.tar.xz) = d4f586ac8a4ba9b5de5885657785e25251c8a42913332d6eca38f92b546c06e8e8aa0553c4b5c04f553cf2d0a9e4f34827f65ba596ef65e43dec36b4345f444a
+SHA512 (sg3_utils-1.49.tar.xz) = 00c76d367e076feff460b619d05a043ab6404642043c000f7a5f93ba503e0bbcc53ebe408d405d252b155197bf456fcc3a8eb8519153825a9c616b2ed8ba9b10
diff --git a/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch b/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch
deleted file mode 100644
index bd65db1..0000000
--- a/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4957a561867b4f363b0711bb5e0a3292f3067ce7 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 9 Jan 2024 22:10:09 +0100
-Subject: [PATCH] udev rules: avoid spurious warning for non-SCSI devices
-
-The udev rules spit out lots of warnings like this:
-
-55-scsi-sg3_id.rules[15445]: WARNING: SCSI device loop0 has no device ID, consider changing .SCSI_ID_SERIAL_SRC in 00-scsi-sg3_config.rules
-
-Because the warning code had erroneously been inserted in the
-"sg3_utils_id_end" clause. Fix it.
-
-Fixes: d7b8da0 ("udev rules: restrict use of ambiguous device IDs patchset")
----
- scripts/55-scsi-sg3_id.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules
-index 5e9732d6..f3ddb065 100644
---- a/scripts/55-scsi-sg3_id.rules
-+++ b/scripts/55-scsi-sg3_id.rules
-@@ -147,6 +147,6 @@ ENV{SCSI_IDENT_SERIAL}=="?*", ENV{.SCSI_ID_SERIAL_SRC}=="*S*", \
- ENV{ID_SERIAL}="S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}", \
- ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_SERIAL}"
-
--LABEL="sg3_utils_id_end"
- ENV{ID_SERIAL}!="?*", ENV{DEVTYPE}=="disk", \
- PROGRAM="/bin/logger -t 55-scsi-sg3_id.rules -p daemon.warning \"WARNING: SCSI device %k has no device ID, consider changing .SCSI_ID_SERIAL_SRC in 00-scsi-sg3_config.rules\""
-+LABEL="sg3_utils_id_end"
reply other threads:[~2026-08-20 7:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178721184749.1.6176932420498375605.rpms-sg3_utils-8eb736f1f1d9@fedoraproject.org \
--to=pevans@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox