Merge ~ahasenack/ubuntu/+source/ipmitool:plucky-ipmitool-missing-hour-in-timestamp into ubuntu/+source/ipmitool:ubuntu/plucky-devel

[Andreas Hasenack]

This is the SRU version of the questing PR[1].

Same change as for questing, same testing procedure. SRU bug template filled in.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/ipmitool-2107550
DEP8: green

I didn't build all architectures in the PPA, but the questing upload is the same version and it built for all arches, and dep8 also passed for all arches, so I don't expect it to be different for the SRU.

1. https://code.launchpad.net/~ahasenack/ubuntu/+source/ipmitool/+git/ipmitool/+ref/questing-ipmitool-missing-hour-in-timestamp

[Lena Voytek (lvoytek)]

LGTM - patch, changelog, and tests all look good. This should be fine to upload

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, lvoytek
Uploaders: ahasenack, lvoytek
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded to plucky unapproved:

Uploading ipmitool_1.8.19-7.1ubuntu0.2.dsc
Uploading ipmitool_1.8.19-7.1ubuntu0.2.debian.tar.xz
Uploading ipmitool_1.8.19-7.1ubuntu0.2_source.buildinfo
Uploading ipmitool_1.8.19-7.1ubuntu0.2_source.changes

diff --git a/debian/changelog b/debian/changelog
index 638e592..62af916 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ipmitool (1.8.19-7.1ubuntu0.2) plucky; urgency=medium
+
+  * d/p/fix-date-time-output-of-timestamps.patch: fix showing date twice,
+    intead of date and hour (LP: #2107550)
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 13 May 2025 10:45:44 +0200
+
 ipmitool (1.8.19-7.1ubuntu0.1) plucky; urgency=medium
 
   * d/patches: Apply sauce patch not addressed by upstream
diff --git a/debian/patches/fix-date-time-output-of-timestamps.patch b/debian/patches/fix-date-time-output-of-timestamps.patch
new file mode 100644
index 0000000..e75a6a6
--- /dev/null
+++ b/debian/patches/fix-date-time-output-of-timestamps.patch
@@ -0,0 +1,59 @@
+From 01c572b911035726526b9bfe685031f2bf925130 Mon Sep 17 00:00:00 2001
+From: Dalton Durst <[e-mail]>
+Date: Thu, 10 Oct 2024 14:53:39 -0500
+Subject: [PATCH] sel: Fix date/time output of timestamps for 'sel get'
+
+Both ipmi_timestamp_date and ipmi_timestamp_time call ipmi_timestamp_fmt
+which overwrites the static buffer datebuf. Therefore %s simply output
+the same thing twice.
+
+Before:
+ Timestamp             : 10/08/2024 10/08/2024
+After:
+ Timestamp             : 10/08/2024 10:46:55 AM PDT
+
+Signed-off-by: Dalton Durst <[e-mail]>
+---
+ lib/ipmi_sel.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+Origin: upstream, https://codeberg.org/IPMITool/ipmitool/commit/01c572b911035726526b9bfe685031f2bf925130
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/2107550
+Last-Update: 2025-05-09
+
+diff --git a/lib/ipmi_sel.c b/lib/ipmi_sel.c
+index 9a97af3..482d460 100644
+--- a/lib/ipmi_sel.c
++++ b/lib/ipmi_sel.c
+@@ -2042,13 +2042,13 @@ ipmi_sel_print_std_entry_verbose(struct ipmi_intf * intf, struct sel_event_recor
+ 	if (evt->record_type < 0xe0)
+ 	{
+ 		printf(" Timestamp             : ");
+-		if (evt->record_type < 0xc0)
+-			printf("%s %s", ipmi_timestamp_date(evt->sel_type.standard_type.timestamp),
+-				ipmi_timestamp_time(evt->sel_type.standard_type.timestamp));
+-		else
+-			printf("%s %s", ipmi_timestamp_date(evt->sel_type.oem_ts_type.timestamp),
+-				ipmi_timestamp_time(evt->sel_type.oem_ts_type.timestamp));
+-		printf("\n");
++		if (evt->record_type < 0xc0) {
++			printf("%s ", ipmi_timestamp_date(evt->sel_type.standard_type.timestamp));
++			printf("%s\n", ipmi_timestamp_time(evt->sel_type.standard_type.timestamp));
++		} else {
++			printf("%s ", ipmi_timestamp_date(evt->sel_type.oem_ts_type.timestamp));
++			printf("%s\n", ipmi_timestamp_time(evt->sel_type.oem_ts_type.timestamp));
++		}
+ 	}
+ 
+ 	if (evt->record_type >= 0xc0)
+@@ -2133,8 +2133,8 @@ ipmi_sel_print_extended_entry_verbose(struct ipmi_intf * intf, struct sel_event_
+ 	if (evt->record_type < 0xe0)
+ 	{
+ 		printf(" Timestamp             : ");
+-		printf("%s %s\n", ipmi_timestamp_date(evt->sel_type.standard_type.timestamp),
+-		ipmi_timestamp_time(evt->sel_type.standard_type.timestamp));
++		printf("%s ", ipmi_timestamp_date(evt->sel_type.standard_type.timestamp));
++		printf("%s\n", ipmi_timestamp_time(evt->sel_type.standard_type.timestamp));
+ 	}
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 80cb79e..e8faacc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 0802-fix-temp-read-parameters.patch
 0803-fix-sdr-hex-value.patch
 selsdr-fix-SEL-cannot-display-sensor-name-when-owner-lun1.patch
+fix-date-time-output-of-timestamps.patch