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..4e23f20ddf8531673036741ca92fa5c8a1e59666 --- /dev/null +++ b/Fix-w-s-field-display-result-overflow.patch @@ -0,0 +1,39 @@ +From d907a09b62852154640aab1efbf1af1938e5d47e 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 | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/iostat.c b/iostat.c +index 41a1dbd..bbdd333 100644 +--- a/iostat.c ++++ b/iostat.c +@@ -1626,6 +1626,22 @@ 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->tot_ticks < ioj->tot_ticks)|| ++ (ioi->rq_ticks < ioj->rq_ticks)) ++ ioj = &iozero; ++ + /* Get device name to print */ + dev_name = NULL; + +-- +2.33.0 + diff --git a/sysstat.spec b/sysstat.spec index 995481d059e17ae2f4f0dfd62a49837b19afbc7f..15482aa916e8bb708d0870cdf070e2953775add5 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,6 +1,6 @@ Name: sysstat Version: 12.2.1 -Release: 4 +Release: 5 Summary: System performance tools for the Linux operating system License: GPLv2+ URL: http://sebastien.godard.pagesperso-orange.fr/ @@ -16,6 +16,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 @@ -88,6 +89,9 @@ export compressafter="31" %{_mandir}/man*/* %changelog +* Sun Apr 23 2023 zhouwenpei - 12.2.1-5 +- Fix w/s field display result overflow + * Fri Apr 14 2023 wangjiang - 12.2.1-4 - service auto start after install