diff --git a/6f8dc568e6ab072bb8205b732f04e685bf9237c0.diff b/6f8dc568e6ab072bb8205b732f04e685bf9237c0.diff deleted file mode 100644 index 5de2de65798ca2c4256736c451eb6ed67a6b39da..0000000000000000000000000000000000000000 --- a/6f8dc568e6ab072bb8205b732f04e685bf9237c0.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/common.c b/common.c -index 48493b5f..0efe7ee3 100644 ---- a/common.c -+++ b/common.c -@@ -431,15 +431,17 @@ int check_dir(char *dirname) - void check_overflow(unsigned int val1, unsigned int val2, - unsigned int val3) - { -- if ((unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3 > UINT_MAX) { -+ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && -+ (((unsigned long long) UINT_MAX / (unsigned long long) val1 < -+ (unsigned long long) val2) || -+ ((unsigned long long) UINT_MAX / ((unsigned long long) val1 * (unsigned long long) val2) < -+ (unsigned long long) val3))) { - #ifdef DEBUG -- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", -- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3); -+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", -+ __FUNCTION__, val1, val2, val3); - #endif -- exit(4); -- } -+ exit(4); -+ } - } - - #ifndef SOURCE_SADC diff --git a/sysstat.spec b/sysstat.spec index 4b64b74026497cf1ebb71bb8adc76a135f0fe053..1e3afa1c59ab75cb1f156a900f185a801e6c9fc4 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,12 +1,11 @@ -%define anolis_release 2 +%define anolis_release 1 Summary: Collection of performance monitoring tools for Linux Name: sysstat -Version: 12.7.2 +Version: 12.7.6 Release: %{anolis_release}%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: http://sebastien.godard.pagesperso-orange.fr/ Source: https://github.com/sysstat/sysstat/archive/v%{version}.tar.gz -Patch0: https://github.com/sysstat/sysstat/commit/6f8dc568e6ab072bb8205b732f04e685bf9237c0.diff # Use colors in sysstat output Source1: colorsysstat.csh @@ -55,6 +54,8 @@ Doc files for sysstat --disable-file-attr \ --disable-stripping \ --docdir=%{_pkgdocdir} \ + --with-systemdsystemunitdir='%{_unitdir}' \ + --with-systemdsleepdir='%{_unitdir}-sleep' \ sadc_options='-S DISK' \ history=28 \ compressafter=31 @@ -105,9 +106,12 @@ fi %{abidir}/* %files doc -%doc CHANGES FAQ.md README.md %{name}-%{version}.lsm CREDITS +%doc CHANGES FAQ.md README.md CREDITS %changelog +* Wed Feb 26 2025 Weisson - 12.7.6-1 +- Refer to CentOS Stream sysstat-12.7.6-2(tdawson@redhat.com). + * Fri May 26 2023 Funda Wang - 12.7.3-2 - Fix CVE-2023-33204 diff --git a/v12.7.2.tar.gz b/v12.7.2.tar.gz deleted file mode 100644 index 3a8e2505f55f566bc73bb3c8ace5c27bcf4f0330..0000000000000000000000000000000000000000 Binary files a/v12.7.2.tar.gz and /dev/null differ diff --git a/v12.7.6.tar.gz b/v12.7.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8a0e1b749e35a4d0026ed02085cb1a282dae28f9 Binary files /dev/null and b/v12.7.6.tar.gz differ