From feab4686ea2ab3e0f48beddcbad3b2bf91990e77 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 30 Mar 2026 11:07:54 -0400 Subject: [PATCH] import CS sysstat-12.5.4-11.el9 --- SOURCES/sysstat-12.5.4-RHEL-123483.patch | 65 ++++++++++++++++++++++++ SOURCES/sysstat-tmpfiles.conf | 1 + SPECS/sysstat.spec | 18 ++++++- 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 SOURCES/sysstat-12.5.4-RHEL-123483.patch create mode 100644 SOURCES/sysstat-tmpfiles.conf diff --git a/SOURCES/sysstat-12.5.4-RHEL-123483.patch b/SOURCES/sysstat-12.5.4-RHEL-123483.patch new file mode 100644 index 0000000..11d3f78 --- /dev/null +++ b/SOURCES/sysstat-12.5.4-RHEL-123483.patch @@ -0,0 +1,65 @@ +From 94477599ab42d54de172ea60d82fc483d16b025e Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD +Date: Mon, 10 Nov 2025 17:08:41 +0100 +Subject: [PATCH] Update sadf manual page (#416) + +Signed-off-by: Sebastien GODARD + +Cherry-picked-by: Lukáš Zaoral +Upstream-commit: 52b0a92767a8dfe40ab3b6ca5b912c45f9448fb0 +--- + man/sadf.in | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/man/sadf.in b/man/sadf.in +index f953559..873a60a 100644 +--- a/man/sadf.in ++++ b/man/sadf.in +@@ -242,11 +242,8 @@ Output can be controlled using option + .BR "-O " "(see above)." + .TP + .BI "-s [ " "hh" ":" "mm" "[:" "ss" "] ]" +-Set the starting time of the data, causing the +-.B sadf +-command to extract records time-tagged at, or following, the time +-specified. The default starting time is 08:00:00. +-Hours must be given in 24-hour format. ++Set the starting time of the report. The default starting ++time is 08:00:00. Hours must be given in 24-hour format. + .TP + .B -T + Display timestamp in local time instead of UTC (Coordinated Universal Time). +-- +2.52.0 + +From 6754280be3034f3b732fc73b989b1b77e16c7328 Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD +Date: Mon, 10 Nov 2025 17:12:19 +0100 +Subject: [PATCH] Update FAQ + +Signed-off-by: Sebastien GODARD + +Cherry-picked-by: Lukáš Zaoral +Upstream-commit: d5687be42acdac2ccc7388733ae7a9e75372bb38 +--- + FAQ.md | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/FAQ.md b/FAQ.md +index cda3e41..a07dba2 100644 +--- a/FAQ.md ++++ b/FAQ.md +@@ -280,7 +280,9 @@ options -s and -e didn't work properly. + So with sysstat version 12.1.5, the time specified with options -s and -e + is now consistent with the timestamps displayed by sadf (either in UTC by + default or in local time with option -T), even if the output doesn't match +-that of sar. ++that of sar. ++Also note that the intervals corresponding to the records displayed by sadf ++must fall entirely within the range specified with options -s and -e. + + --- + 2.9. I cannot see all my disks when I use the sar -d command... +-- +2.52.0 + diff --git a/SOURCES/sysstat-tmpfiles.conf b/SOURCES/sysstat-tmpfiles.conf new file mode 100644 index 0000000..ce93986 --- /dev/null +++ b/SOURCES/sysstat-tmpfiles.conf @@ -0,0 +1 @@ +d /var/log/sa 0755 root root - diff --git a/SPECS/sysstat.spec b/SPECS/sysstat.spec index f37ccf0..b9bc497 100644 --- a/SPECS/sysstat.spec +++ b/SPECS/sysstat.spec @@ -1,7 +1,7 @@ Summary: Collection of performance monitoring tools for Linux Name: sysstat Version: 12.5.4 -Release: 9%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://sebastien.godard.pagesperso-orange.fr/ Source: https://github.com/sysstat/sysstat/archive/v%{version}.tar.gz @@ -9,6 +9,7 @@ Source: https://github.com/sysstat/sysstat/archive/v%{version}.tar.gz # Use colors in sysstat output Source1: colorsysstat.csh Source2: colorsysstat.sh +Source3: sysstat-tmpfiles.conf # arithmetic overflow in allocate_structures() on 32 bit systems (CVE-2022-39377) Patch1: sysstat-12.5.4-CVE-2022-39377.patch @@ -26,6 +27,10 @@ Patch5: sysstat-12.5.4-bz2216805.patch # don't cap SVG graph output at 100% (RHEL-39002) # https://github.com/sysstat/sysstat/commit/808f2ef2fe7a92f8bb510ef872801e67cc600c36 Patch6: sysstat-12.5.4-RHEL-39002.patch +# make the sadf -s/-e documentation more accurate (RHEL-123483) +# https://github.com/sysstat/sysstat/commit/52b0a92767a8dfe40ab3b6ca5b912c45f9448fb0 +# https://github.com/sysstat/sysstat/commit/d5687be42acdac2ccc7388733ae7a9e75372bb38 +Patch7: sysstat-12.5.4-RHEL-123483.patch BuildRequires: make BuildRequires: gcc, gettext, lm_sensors-devel, pcp-libs-devel, systemd, git @@ -77,6 +82,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d +# tmpfiles config +mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir} +install -p -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}.conf + %post %systemd_post sysstat.service sysstat-collect.timer sysstat-summary.timer @@ -101,8 +110,15 @@ fi %{_systemd_util_dir}/system-sleep/sysstat* %{_mandir}/man*/* %{_localstatedir}/log/sa +%{_tmpfilesdir}/%{name}.conf %changelog +* Mon Dec 08 2025 Lukáš Zaoral - 12.5.4-11 +- make the sadf -s/-e documentation more accurate (RHEL-123483) + +* Mon Dec 01 2025 Lukáš Zaoral - 12.5.4-10 +- fix creation of /var/log/sa in image mode (RHEL-129980) + * Tue Jul 30 2024 Lukáš Zaoral - 12.5.4-9 - don't cap SVG graph output at 100% (RHEL-39002)