diff -Nru freeipmi-1.6.4/debian/changelog freeipmi-1.6.4/debian/changelog --- freeipmi-1.6.4/debian/changelog 2020-09-07 01:02:06.000000000 -0600 +++ freeipmi-1.6.4/debian/changelog 2021-05-20 16:49:31.000000000 -0600 @@ -1,3 +1,11 @@ +freeipmi (1.6.4-3ubuntu1.2) focal; urgency=medium + + * d/p/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch + incorrect sensor reading reported (LP: #1926299) + * update Changelog + + -- Heather Lemon Thu, 20 May 2021 16:49:31 -0600 + freeipmi (1.6.4-3ubuntu1.1) focal; urgency=medium * d/p/lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch: fix diff -Nru freeipmi-1.6.4/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch freeipmi-1.6.4/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch --- freeipmi-1.6.4/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch 1969-12-31 17:00:00.000000000 -0700 +++ freeipmi-1.6.4/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch 2021-05-20 16:49:31.000000000 -0600 @@ -0,0 +1,48 @@ +From: Heather Lemon +Date: Wed, 19 May 2021 08:19:03 -0600 +Subject: [PATCH] libfreeipmi/ipmi-sensor-read.c: Incorrect sensor +reading reported. The ipmi-sensors command +reads the wrong temperature sensor on a Lenovo BMC. +When the LUN number is not the default (00b) the sensor is reporting +back an incorrect temperature reading. +You are allowed to change the default, but unless otherwise specified, +commands listed as mandatory must be accessed with LUN 00b. +Note ipmi-tools correctly reports the sensor temperature +because it knows how to use the alternative LUN number correctly. +Forwarded: no +Last-Updated: 2021-05-20 +Origin: upstream, https://github.com/chu11/freeipmi-mirror/commit/82db0fb1d834ff404444483304064486f1481610 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1926299 + +--- + ChangeLog | 8 ++++++++ + libfreeipmi/sensor-read/ipmi-sensor-read.c | 3 ++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,4 +1,4 @@ +-2021-05-29 Heather Lemon ++2021-05-20 Heather Lemon + + * libfreeipmi/sensor-read/ipmi-sensor-read.c: (LP#1926299) + Incorrect sensor reading reported. +--- a/libfreeipmi/sensor-read/ipmi-sensor-read.c ++++ b/libfreeipmi/sensor-read/ipmi-sensor-read.c +@@ -40,6 +40,7 @@ + #include "freeipmi/record-format/ipmi-sdr-record-format.h" + #include "freeipmi/spec/ipmi-channel-spec.h" + #include "freeipmi/spec/ipmi-comp-code-spec.h" ++#include "freeipmi/spec/ipmi-ipmb-lun-spec.h" + #include "freeipmi/spec/ipmi-slave-address-spec.h" + #include "freeipmi/spec/ipmi-sensor-units-spec.h" + #include "freeipmi/util/ipmi-sensor-and-event-code-tables-util.h" +@@ -563,7 +564,7 @@ + */ + if (!(ctx->flags & IPMI_SENSOR_READ_FLAGS_ASSUME_BMC_OWNER)) + { +- if (slave_address == IPMI_SLAVE_ADDRESS_BMC) ++ if (slave_address == IPMI_SLAVE_ADDRESS_BMC && sensor_owner_lun == IPMI_BMC_IPMB_LUN_BMC) + { + if (_get_sensor_reading (ctx, + sensor_number, diff -Nru freeipmi-1.6.4/debian/patches/lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch freeipmi-1.6.4/debian/patches/lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch --- freeipmi-1.6.4/debian/patches/lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch 2020-09-07 01:02:06.000000000 -0600 +++ freeipmi-1.6.4/debian/patches/lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch 2021-05-20 16:49:31.000000000 -0600 @@ -36,11 +36,9 @@ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 1 - 1 file changed, 1 deletion(-) -diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c -index 710674e53..11c688524 100644 --- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c +++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c -@@ -1384,7 +1384,6 @@ _ipmi_acpi_get_table_dev_mem (ipmi_locate_ctx_t ctx, +@@ -1384,7 +1384,6 @@ else acpi_table_count = rsdt_xsdt_table_data_length / 8; @@ -48,6 +46,17 @@ acpi_table_length = 0; for (i = 0, signature_table_count = 0; i < acpi_table_count; i++) { --- -2.28.0 - +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,11 @@ ++2021-05-29 Heather Lemon ++ ++ * libfreeipmi/sensor-read/ipmi-sensor-read.c: (LP#1926299) ++ Incorrect sensor reading reported. ++ BMC's that use a non-zero 'LUN' number (00b-10b) ++ will display an incorrect sensor temperature reading unless ++ otherwise specified via the ipmiV2.0 spec and must be accessed via LUN 00b. ++ + 2019-08-16 Albert Chu + + * libfreeipmi/sdr/ipmi-sdr-cache-create.c: Workaround Dell diff -Nru freeipmi-1.6.4/debian/patches/series freeipmi-1.6.4/debian/patches/series --- freeipmi-1.6.4/debian/patches/series 2020-09-07 01:02:06.000000000 -0600 +++ freeipmi-1.6.4/debian/patches/series 2021-05-20 16:49:31.000000000 -0600 @@ -1 +1,2 @@ lp-1875771-libfreeipmi-fix-segfault-in-SPMI-parsing.patch +libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch