From 08b3cd87630ff1deffb836c050f2641d38d81efc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 8 Dec 2021 05:28:10 +0000 Subject: [PATCH] import sysstat-11.7.3-7.el8 --- ...df-Fix-seg-fault-on-empty-data-files.patch | 40 +++++++++++++++++++ .../0001-sar-Fix-typo-in-manual-page.patch | 26 ++++++++++++ SPECS/sysstat.spec | 14 +++++-- 3 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-sadf-Fix-seg-fault-on-empty-data-files.patch create mode 100644 SOURCES/0001-sar-Fix-typo-in-manual-page.patch diff --git a/SOURCES/0001-sadf-Fix-seg-fault-on-empty-data-files.patch b/SOURCES/0001-sadf-Fix-seg-fault-on-empty-data-files.patch new file mode 100644 index 0000000..64a900a --- /dev/null +++ b/SOURCES/0001-sadf-Fix-seg-fault-on-empty-data-files.patch @@ -0,0 +1,40 @@ +From ce90f916fee2a39eb914f8b6b349adb76d100f75 Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD +Date: Sat, 13 Apr 2019 18:44:29 +0200 +Subject: [PATCH] sadf: Fix seg fault on empty data files + +Trying to display XML or JSON data (with sadf -x/-j) from a data file +containing only RESTART records created a core dump. +This patch fixes that. + +Signed-off-by: Sebastien GODARD +--- + sadf.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sadf.c b/sadf.c +index 2d2c39c..5d558d3 100644 +--- a/sadf.c ++++ b/sadf.c +@@ -963,14 +963,15 @@ void logic1_display_loop(int ifd, struct file_activity *file_actlst, char *file, + (tm_start.use && (datecmp(loctime, &tm_start) < 0)) || + (tm_end.use && (datecmp(loctime, &tm_end) >= 0)))); + +- /* Save the first stats collected. Used for example in next_slice() function */ +- copy_structures(act, id_seq, record_hdr, 2, 0); +- + curr = 1; + cnt = count; + reset = TRUE; + + if (!eosaf) { ++ ++ /* Save the first stats collected. Used for example in next_slice() function */ ++ copy_structures(act, id_seq, record_hdr, 2, 0); ++ + do { + eosaf = read_next_sample(ifd, IGNORE_COMMENT | IGNORE_RESTART, curr, + file, &rtype, tab, file_magic, file_actlst, +-- +2.31.1 + diff --git a/SOURCES/0001-sar-Fix-typo-in-manual-page.patch b/SOURCES/0001-sar-Fix-typo-in-manual-page.patch new file mode 100644 index 0000000..a8d6346 --- /dev/null +++ b/SOURCES/0001-sar-Fix-typo-in-manual-page.patch @@ -0,0 +1,26 @@ +From 83dac62520afe3fa92b53393f438c9fb9c492525 Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD +Date: Sat, 6 Oct 2018 18:12:54 +0200 +Subject: [PATCH] sar: Fix typo in manual page + +Signed-off-by: Sebastien GODARD +--- + man/sar.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/sar.in b/man/sar.in +index c45ee54..925c5f5 100644 +--- a/man/sar.in ++++ b/man/sar.in +@@ -373,7 +373,7 @@ The following values are displayed: + .B MBfsfree + .RS + .RS +-Total amount a free space in megabytes (including space available only to privileged user). ++Total amount of free space in megabytes (including space available only to privileged user). + .RE + + .B MBfsused +-- +2.31.1 + diff --git a/SPECS/sysstat.spec b/SPECS/sysstat.spec index fe5b5b0..58d1f57 100644 --- a/SPECS/sysstat.spec +++ b/SPECS/sysstat.spec @@ -1,7 +1,7 @@ Summary: Collection of performance monitoring tools for Linux Name: sysstat Version: 11.7.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System URL: http://sebastien.godard.pagesperso-orange.fr/ @@ -15,6 +15,8 @@ Source11: colorsysstat.sh Patch01: CVE-2019-16167_memory-corruption-due-to-an-integer-overflow.patch Patch02: 0001-ignoring-autofs-as-real-filesystem-by-counting-numbe.patch Patch03: 0001-sar-Add-missing-gnice-CPU-value-for-tickless-CPU.patch +Patch04: 0001-sadf-Fix-seg-fault-on-empty-data-files.patch +Patch05: 0001-sar-Fix-typo-in-manual-page.patch BuildRequires: gettext, lm_sensors-devel, systemd @@ -46,6 +48,8 @@ The cifsiostat command reports I/O statistics for CIFS file systems. %patch01 -p0 %patch02 -p1 %patch03 -p1 +%patch04 -p1 +%patch05 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld" @@ -94,9 +98,11 @@ fi %{_localstatedir}/log/sa %changelog -* Wed Jul 21 2021 - 11.7.3-6 -- Don't trigger autofs mounts when running sadc (#1954793) -- sar: Add missing %gnice CPU value for tickless CPU (#1908996) +* Mon Nov 29 2021 - 11.7.3-7 +- Don't trigger autofs mounts when running sadc (#2000910) +- sar: Add missing %gnice CPU value for tickless CPU (#2000916) +- sadf: Fix seg fault on empty data files (#1910841) +- sar: Fix typo in manual page (#1877836) * Fri Jul 10 2020 Jan Macku - 11.7.3-5 - Rebuild