From b6a17ea4645e5b9c00bc632c0e64e94c674fa5bb Mon Sep 17 00:00:00 2001
From: Pavel Cahyna <pcahyna@redhat.com>
Date: Mon, 12 Feb 2024 19:41:31 +0100
Subject: [PATCH] Add Debian patch to fix non-analog sensor readings

Originally reported upstream by mareedu srinivasa rao:
https://sourceforge.net/p/ipmitool/bugs/490/
but never applied.
---
 0105-sensor_reading.patch | 35 +++++++++++++++++++++++++++++++++++
 ipmitool.spec             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 0105-sensor_reading.patch

diff --git a/0105-sensor_reading.patch b/0105-sensor_reading.patch
new file mode 100644
index 0000000..edde4a0
--- /dev/null
+++ b/0105-sensor_reading.patch
@@ -0,0 +1,35 @@
+Description: Fix soensor reading
+Author: mareedu srinivasa rao
+Origin: upstream, https://sourceforge.net/p/ipmitool/bugs/490/
+Bug: https://sourceforge.net/p/ipmitool/bugs/490/
+Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983082
+Forwarded: not-needed
+Last-Update: 2022-10-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/lib/ipmi_sdr.c
+===================================================================
+--- trunk.orig/lib/ipmi_sdr.c
++++ trunk/lib/ipmi_sdr.c
+@@ -1799,7 +1799,7 @@ ipmi_sdr_print_sensor_fc(struct ipmi_int
+ 						      sr->s_a_units);
+ 			} else /* Discrete */
+ 				snprintf(sval, sizeof(sval),
+-					"0x%02x", sr->s_reading);
++					"0x%02x", sr->s_data2);
+ 		}
+ 		else if (sr->s_scanning_disabled)
+ 			snprintf(sval, sizeof (sval), sr->full ? "disabled"   : "Not Readable");
+Index: trunk/lib/ipmi_sensor.c
+===================================================================
+--- trunk.orig/lib/ipmi_sensor.c
++++ trunk/lib/ipmi_sensor.c
+@@ -201,7 +201,7 @@ ipmi_sensor_print_fc_discrete(struct ipm
+ 					       sr->s_a_str, sr->s_a_units, "ok");
+ 				} else {
+ 					printf("| 0x%-8x | %-10s | 0x%02x%02x",
+-					       sr->s_reading, "discrete",
++					       sr->s_data2, "discrete",
+ 					       sr->s_data2, sr->s_data3);
+ 				}
+ 			} else {
diff --git a/ipmitool.spec b/ipmitool.spec
index 4cacc23..b0a4ec2 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -30,6 +30,8 @@ Patch14:      0014-lanplus-cipher-retry.patch
 # https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/633054
 # https://sourceforge.net/p/ipmitool/mailman/message/24405281/
 Patch100:     0100-fix_buf_overflow.patch
+# https://sourceforge.net/p/ipmitool/bugs/490/
+Patch105:     0105-sensor_reading.patch
 
 BuildRequires: openssl-devel readline-devel ncurses-devel
 %{?systemd_requires}