From 2f47c1494f2939cfe4e99f1607deb35bc34e591e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 29 Oct 2022 19:36:29 +0200 Subject: New debian/patches/0105-sensor_reading.patch --- debian/changelog | 2 ++ debian/patches/0105-sensor_reading.patch | 35 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 38 insertions(+) create mode 100644 debian/patches/0105-sensor_reading.patch diff --git a/debian/changelog b/debian/changelog index f293347..3293358 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ 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. -- Jörg Frings-Fürst Sat, 10 Sep 2022 15:35:32 +0200 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 -- cgit v1.2.3 From 3388ab4b54145d52fd872adce83742ee2f6094d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 29 Oct 2022 21:36:55 +0200 Subject: New debian/README.Debian --- debian/README.Debian | 12 ++++++++++++ debian/changelog | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 debian/README.Debian 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 Sat, 10 Sep 2022 15:35:32 +0200 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 3293358..7e8fbc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ ipmitool (1.8.19-1) UNRELEASED; urgency=medium - 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 Sat, 10 Sep 2022 15:35:32 +0200 -- cgit v1.2.3 From 8b758ee941f4c1ffea0532caa74b1fcd8101d1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 29 Oct 2022 21:39:56 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e8fbc6..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. @@ -12,7 +12,7 @@ ipmitool (1.8.19-1) UNRELEASED; urgency=medium * New debian/README.Debian with the explanation how to change the start parameters (Closes: #1002013). - -- Jörg Frings-Fürst Sat, 10 Sep 2022 15:35:32 +0200 + -- Jörg Frings-Fürst Sat, 29 Oct 2022 21:38:16 +0200 ipmitool (1.8.18-11) unstable; urgency=medium -- cgit v1.2.3