diff --git a/Fix-w-s-field-display-result-overflow.patch b/Fix-w-s-field-display-result-overflow.patch new file mode 100644 index 0000000000000000000000000000000000000000..576da553dd0931478204a5a62b2d1b4728f4a8d2 --- /dev/null +++ b/Fix-w-s-field-display-result-overflow.patch @@ -0,0 +1,41 @@ +From 26f0d77fd9c3cf2da88f604b4a910cb9eb7272a8 Mon Sep 17 00:00:00 2001 +From: zhouwenpei +Date: Mon, 13 Mar 2023 19:40:11 +0800 +Subject: [PATCH] Fix w/s field display result overflow + +--- + iostat.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/iostat.c b/iostat.c +index 330f8c1..8174a93 100644 +--- a/iostat.c ++++ b/iostat.c +@@ -1834,6 +1834,25 @@ void write_stats(int curr, struct tm *rectime, int skip) + ioj = &iozero; + } + ++ if ((ioi->rd_merges < ioj->rd_merges )|| ++ (ioi->rd_ios < ioj->rd_ios)|| ++ (ioi->rd_ticks < ioj->rd_ticks)|| ++ (ioi->rd_sectors < ioj->rd_sectors)|| ++ (ioi->wr_merges < ioj->wr_merges) || ++ (ioi->wr_ios < ioj->wr_ios) || ++ (ioi->wr_ticks < ioj->wr_ticks)|| ++ (ioi->wr_sectors < ioj->wr_sectors)|| ++ (ioi->dc_merges < ioj->dc_merges)|| ++ (ioi->dc_ios < ioj->dc_ios)|| ++ (ioi->dc_ticks < ioj->dc_ticks)|| ++ (ioi->dc_sectors < ioj->dc_sectors)|| ++ (ioi->fl_ios < ioj->fl_ios)|| ++ (ioi->fl_ticks < ioj->fl_ticks)|| ++ (ioi->tot_ticks < ioj->tot_ticks)|| ++ (ioi->rq_ticks < ioj->rq_ticks)) ++ ioj = &iozero; ++ ++ + dev_name = get_device_name(d->major, d->minor, NULL, 0, + DISPLAY_DEVMAP_NAME(flags), + DISPLAY_PERSIST_NAME_I(flags), +-- +2.27.0 diff --git a/sysstat.spec b/sysstat.spec index 8fa383a406ee560b106db5d32cce52279ca2d8de..8b4ea3dd8f92544780b4faeb59a365723dc9270b 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,6 +1,6 @@ Name: sysstat Version: 12.6.2 -Release: 2 +Release: 3 Summary: System performance tools for the Linux operating system License: GPLv2+ URL: http://sebastien.godard.pagesperso-orange.fr/ @@ -14,6 +14,7 @@ Requires(preun): systemd Requires(postun): systemd Patch9000: bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch +Patch9001: Fix-w-s-field-display-result-overflow.patch %description The sysstat package contains various utilities, common to many commercial @@ -86,6 +87,9 @@ export compressafter="31" %{_mandir}/man*/* %changelog +* Sun Apr 23 2023 zhouwenpei - 12.6.2-3 +- Fix w/s field display result overflow + * Fri Apr 14 2023 wangjiang - 12.6.2-2 - service auto start after install