Merge tag 'debian/1.8.19-1' into develop

New upstream release

4 files changed, 54 insertions, 2 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..9db9445
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,12 @@
+ Since the config file /etc/default/ipmitool is removed you can
+ change the start parameter on systemd systems by running
+
+  systemctl edit ipmievd
+
+ as root.
+
+ On SysV system you may edit 
+
+  /etc/init.d/ipmievd
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 10 Sep 2022 15:35:32 +0200
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index f293347..4e1ef9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ipmitool (1.8.19-1) UNRELEASED; urgency=medium
+ipmitool (1.8.19-1) unstable; urgency=medium
 
   * New upstrem release.
     - New debian/patches/0700-build.patch.
@@ -7,8 +7,12 @@ ipmitool (1.8.19-1) UNRELEASED; urgency=medium
   * Declare compliance with Debian Policy 4.6.1.0 (No changes needed).
   * debian/copyright:
     - Add year 2022 to myself.
+  * New debian/patches/0105-sensor_reading.patch (Closes: #983082):
+    - Fix sensor reading for non-analog sensors.
+  * New debian/README.Debian with the explanation how to change the
+      start parameters (Closes: #1002013).
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sat, 10 Sep 2022 15:35:32 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 29 Oct 2022 21:38:16 +0200
 
 ipmitool (1.8.18-11) unstable; urgency=medium
 
diff --git a/debian/patches/0105-sensor_reading.patch b/debian/patches/0105-sensor_reading.patch
new file mode 100644
index 0000000..edde4a0
--- /dev/null
+++ b/debian/patches/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/debian/patches/series b/debian/patches/series
index 5200085..e7d92ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0105-sensor_reading.patch
 0620-manpage_typo.patch
 0700-build.patch
 0100-fix_buf_overflow.patch