Merge ~mitchellaugustin/ubuntu/+source/ipmitool:ubuntu/plucky-devel into ubuntu/+source/ipmitool:ubuntu/plucky-devel

[Mitchell Augustin]

UBUNTU: SAUCE: sel/sdr : Fix SEL cannot display Sensor name when sensor owner lun1

IPMI specification only allows for a 1 byte sensor number field, in
AMI SP-X firmware owner lun bits(1:0) in the SDR may be used to
extend sensor count beyond 255 sensors

The change will add checking of SEL Generator ID byte 2 LUN bits [1:0]
in the compare with the SDR LUN field to display the correct SDR string
in the SEL event

Signed-off-by: dwise0315 <email address hidden>
Signed-off-by: Mitchell Augustin <email address hidden>

IPMI specification only allows for a 1 byte sensor number field, in
AMI SP-X firmware owner lun bits(1:0) in the SDR may be used to
extend sensor count beyond 255 sensors

The change will add checking of SEL Generator ID byte 2 LUN bits [1:0]
in the compare with the SDR LUN field to display the correct SDR string
in the SEL event

Signed-off-by: dwise0315 <email address hidden>
Signed-off-by: Mitchell Augustin <email address hidden>

[Lena Voytek (lvoytek)]

Change matches questing and SRU report in bug looks good. The version number needs to be updated though then it will be good to go :)

review: Needs Fixing

[Mitchell Augustin (mitchellaugustin)]

> Change matches questing and SRU report in bug looks good. The version number
> needs to be updated though then it will be good to go :)

Thanks Lena,
I updated the commit with the new version number. Let me know if any other changes are needed.

[Lena Voytek (lvoytek)]

LGTM, uploaded

dput ubuntu ../ipmitool_1.8.19-7.1ubuntu0.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../ipmitool_1.8.19-7.1ubuntu0.1_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../ipmitool_1.8.19-7.1ubuntu0.1.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ipmitool_1.8.19-7.1ubuntu0.1.dsc: done.
  Uploading ipmitool_1.8.19-7.1ubuntu0.1.debian.tar.xz: done.
  Uploading ipmitool_1.8.19-7.1ubuntu0.1_source.buildinfo: done.
  Uploading ipmitool_1.8.19-7.1ubuntu0.1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index e3b4b01..638e592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ipmitool (1.8.19-7.1ubuntu0.1) plucky; urgency=medium
+
+  * d/patches: Apply sauce patch not addressed by upstream
+    + sel/sdr : Fix SEL cannot display Sensor name (lp: #2076173)
+
+ -- Mitchell Augustin <[e-mail]>  Thu, 1 May 2025 12:04:00 -0500
+
 ipmitool (1.8.19-7.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 182eba5..61135f1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ipmitool
 Section: utils
 Priority: optional
-Maintainer: Jörg Frings-Fürst <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jörg Frings-Fürst <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
  init-system-helpers (>= 1.58),
diff --git a/debian/patches/selsdr-fix-SEL-cannot-display-sensor-name-when-owner-lun1.patch b/debian/patches/selsdr-fix-SEL-cannot-display-sensor-name-when-owner-lun1.patch
new file mode 100644
index 0000000..9733926
--- /dev/null
+++ b/debian/patches/selsdr-fix-SEL-cannot-display-sensor-name-when-owner-lun1.patch
@@ -0,0 +1,49 @@
+Description: UBUNTU: SAUCE: sel/sdr : Fix SEL cannot display Sensor name when sensor owner lun1
+ IPMI specification only allows for a 1 byte sensor number field, in
+ AMI SP-X firmware owner lun bits(1:0) in the SDR may be used to
+ extend sensor count beyond 255 sensors
+
+ The change will add checking of SEL Generator ID byte 2 LUN bits [1:0]
+ in the compare with the SDR LUN field to display the correct SDR string
+ in the SEL event
+ .
+Origin: other, https://codeberg.org/IPMITool/ipmitool/pulls/39
+Bug: https://codeberg.org/IPMITool/ipmitool/issues/8
+Bug-Ubuntu: https://launchpad.net/bugs/2076173
+Forwarded: https://codeberg.org/IPMITool/ipmitool/pulls/39
+Last-Update: 2025-04-10
+---
+
+--- ipmitool-1.8.19.orig/lib/ipmi_sdr.c
++++ ipmitool-1.8.19/lib/ipmi_sdr.c
+@@ -3362,12 +3362,14 @@ ipmi_sdr_find_sdr_bynumtype(struct ipmi_
+ 		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+ 			if (e->record.common->keys.sensor_num == num &&
+ 			    e->record.common->keys.owner_id == (gen_id & 0x00ff) &&
++			    e->record.common->keys.lun == ((gen_id & 0x0300) >> 8) &&
+ 			    e->record.common->sensor.type == type)
+ 				return e;
+ 			break;
+ 		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+ 			if (e->record.eventonly->keys.sensor_num == num &&
+ 			    e->record.eventonly->keys.owner_id == (gen_id & 0x00ff) &&
++			    e->record.eventonly->keys.lun == ((gen_id & 0x0300) >> 0x8) &&
+ 			    e->record.eventonly->sensor_type == type)
+ 				return e;
+ 			break;
+@@ -3404,6 +3406,7 @@ ipmi_sdr_find_sdr_bynumtype(struct ipmi_
+ 			    (struct sdr_record_common_sensor *) rec;
+ 			if (sdrr->record.common->keys.sensor_num == num
+ 			    && sdrr->record.common->keys.owner_id == (gen_id & 0x00ff)
++			    && sdrr->record.common->keys.lun == ((gen_id & 0x0300) >> 8)
+ 			    && sdrr->record.common->sensor.type == type)
+ 				found = 1;
+ 			break;
+@@ -3412,6 +3415,7 @@ ipmi_sdr_find_sdr_bynumtype(struct ipmi_
+ 			    (struct sdr_record_eventonly_sensor *) rec;
+ 			if (sdrr->record.eventonly->keys.sensor_num == num
+ 			    && sdrr->record.eventonly->keys.owner_id == (gen_id & 0x00ff)
++			    && sdrr->record.eventonly->keys.lun == ((gen_id & 0x0300) >> 8)
+ 			    && sdrr->record.eventonly->sensor_type == type)
+ 				found = 1;
+ 			break;
diff --git a/debian/patches/series b/debian/patches/series
index 98065ad..80cb79e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0801-fix-lan-print-fails-on-unsupported-parameters.patch
 0802-fix-temp-read-parameters.patch
 0803-fix-sdr-hex-value.patch
+selsdr-fix-SEL-cannot-display-sensor-name-when-owner-lun1.patch