[rpms/sg3_utils] f43: * Wed Jun 24 2026 Paul Evans <pevans@redhat.com> - 1.48-10

[rpms/sg3_utils] f43: * Wed Jun 24 2026 Paul Evans <pevans@redhat.com> - 1.48-10

[Paul Evans]

            A new commit has been pushed.

            Repo   : rpms/sg3_utils
            Branch : f43
            Commit : 8a48beca488e5e6ddd5f4529001b094c291dcb1e
            Author : Paul Evans <pevans@redhat.com>
            Date   : 2026-06-25T11:41:30+01:00
            Stats  : +70/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/sg3_utils/c/8a48beca488e5e6ddd5f4529001b094c291dcb1e?branch=f43

            Log:
            * Wed Jun 24 2026 Paul Evans <pevans@redhat.com> - 1.48-10

- sg_inq: export output conformance for SCSI name string (RHEL-188083)

---
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
new file mode 100644
index 0000000..825d208
--- /dev/null
+++ b/0010-sg_inq-export-output-conformance-for-SCSI-name-string-and-ATA-fields.patch
@@ -0,0 +1,63 @@
+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/sg3_utils.spec b/sg3_utils.spec
index be9c045..5ac1287 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: 9%{?dist}
+Release: 10%{?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
@@ -38,6 +38,9 @@ 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
@@ -154,6 +157,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir}
 
 
 %changelog
+* Wed Jun 24 2026 Paul Evans <pevans@redhat.com> - 1.48-10
+- sg_inq: export output conformance for SCSI name string (RHEL-188083)
+
 * 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]