Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: [email protected], Thomas Lamprecht 
<[email protected]>, Ritesh Raj Sarraf <[email protected]>, Jonathan 
McDowell <[email protected]>, Chris Hofstaedtler <[email protected]>, 
[email protected]
Control: affects -1 + src:sg3-utils
User: [email protected]
Usertags: pu

Hi

[ Reason ]
While I was reading once again the trixie release notes I realized
item "5.1.28. udev properties from sg3-utils missing",
https://www.debian.org/releases/stable/release-notes/issues.en.html#udev-properties-from-sg3-utils-missing
which was referring to #1109923. That but was in meanwhile fixed with
cherry-picking a change.

[ Impact ]
The issue mentioned in #1109923 remains still affecting trixie.

[ Tests ]
None specifically, apart running autopkgtests as per
https://debusine.debian.net/debian/developers/work-request/902290/

[ Risks ]
The change was since August 2025 in unstable and testing, and afaics
no issues were reprted about this applied change.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
Done a rebuild of the version in testing, which only had the
cherry-picked change on top.

[ Other info ]
I have not uploaded this, to give Thomas, Ritesh and Jonathan to
weight in. The window for the next point release would close next
weekend, but if the maintaienrs feel confident I can upload it in time
or defer it to Ritesh and Jonathan as needed.

Regards,
Salvatore
diff -Nru sg3-utils-1.48/debian/changelog sg3-utils-1.48/debian/changelog
--- sg3-utils-1.48/debian/changelog     2025-01-05 10:43:59.000000000 +0100
+++ sg3-utils-1.48/debian/changelog     2026-06-30 13:28:52.000000000 +0200
@@ -1,3 +1,15 @@
+sg3-utils (1.48-3~deb13u1) trixie; urgency=medium
+
+  * Rebuild for trixie.
+
+ -- Salvatore Bonaccorso <[email protected]>  Tue, 30 Jun 2026 13:28:52 +0200
+
+sg3-utils (1.48-3) unstable; urgency=medium
+
+  * Add fix for missing output fields in sg_inq (Closes: #1109923)
+
+ -- Jonathan McDowell <[email protected]>  Sun, 17 Aug 2025 12:28:23 +0100
+
 sg3-utils (1.48-2) unstable; urgency=medium
 
   [ Bryce Harrington / Christian Ehrhardt ]
diff -Nru sg3-utils-1.48/debian/patches/0002-Fix-missing-sg-inq-fiels.patch 
sg3-utils-1.48/debian/patches/0002-Fix-missing-sg-inq-fiels.patch
--- sg3-utils-1.48/debian/patches/0002-Fix-missing-sg-inq-fiels.patch   
1970-01-01 01:00:00.000000000 +0100
+++ sg3-utils-1.48/debian/patches/0002-Fix-missing-sg-inq-fiels.patch   
2026-06-30 13:26:15.000000000 +0200
@@ -0,0 +1,81 @@
+Description: sg_inq: fix missing output fields
+ The SCSI_MODEL, SCSI_MODEL_ENC, SCSI_REVISION, and other fields are
+ missing in the output of sg_inq with --export due to a clobbering
+ of the length field.
+Forwarded: yes
+Origin: 
https://github.com/doug-gilbert/sg3_utils/pull/49/commits/c263d14510d310541606eacc3a5285f2eadc23aa
+Bug-Debian: http://bugs.debian.org/1109923
+Author: Martin Wilck <[email protected]>
+
+
+diff --git a/src/sg_inq.c b/src/sg_inq.c
+index b3b8127..8e6b269 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",
diff -Nru sg3-utils-1.48/debian/patches/series 
sg3-utils-1.48/debian/patches/series
--- sg3-utils-1.48/debian/patches/series        2024-12-24 13:39:21.000000000 
+0100
+++ sg3-utils-1.48/debian/patches/series        2026-06-30 13:26:15.000000000 
+0200
@@ -1 +1,2 @@
 0001-Fix-path-for-udevadm.patch
+0002-Fix-missing-sg-inq-fiels.patch

Reply via email to