Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2019-08-30 14:39:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysstat" Fri Aug 30 14:39:33 2019 rev:81 rq:726603 version:12.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2019-06-04 12:09:01.119887047 +0200 +++ /work/SRC/openSUSE:Factory/.sysstat.new.7948/sysstat.changes 2019-08-30 14:39:36.481438044 +0200 @@ -1,0 +2,16 @@ +Tue Aug 27 15:53:53 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonza...@suse.com> + +- Version update to 12.0.6 + * sadc: Check if InCsumErrors is present for EICMP as well. + * sadf: XML: Fix bad transmission words statistics for Fibre Channel hosts. + * iostat: Fix wrong CPU statistics displayed for the first sample when option -y is used. + * iostat: Make sure UUID given on the command line is not taken as interval value. + * Allow more space for persistent type directory names. + +------------------------------------------------------------------- +Tue Jul 23 16:33:27 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonza...@suse.com> + +- Remove deprecated Require gettext and require gettext-runtime only + during build [bsc#1142470] + +------------------------------------------------------------------- Old: ---- sysstat-12.0.5.tar.xz New: ---- sysstat-12.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.1fyJQc/_old 2019-08-30 14:39:37.505437859 +0200 +++ /var/tmp/diff_new_pack.1fyJQc/_new 2019-08-30 14:39:37.509437858 +0200 @@ -17,7 +17,7 @@ Name: sysstat -Version: 12.0.5 +Version: 12.0.6 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0-or-later @@ -34,12 +34,12 @@ # use getpagesize() instead of kb_shift for hugetable archs Patch2: sysstat-8.0.4-pagesize.diff BuildRequires: findutils +BuildRequires: gettext-runtime BuildRequires: pkgconfig BuildRequires: sed BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files BuildRequires: pkgconfig(systemd) -Requires: gettext Requires: procmail Requires: xz %{?systemd_requires} ++++++ sysstat-12.0.5.tar.xz -> sysstat-12.0.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/CHANGES new/sysstat-12.0.6/CHANGES --- old/sysstat-12.0.5/CHANGES 2019-05-31 08:42:11.000000000 +0200 +++ new/sysstat-12.0.6/CHANGES 2019-08-14 17:56:38.000000000 +0200 @@ -1,5 +1,16 @@ Changes: +2019/08/14: Version 12.0.6 - Sebastien Godard (sysstat <at> orange.fr) + * [Alexandros Kosiaris]: sadc: Check if InCsumErrors is present for + EICMP as well. + * sadf: XML: Fix bad transmission words statistics for Fibre Channel + hosts. + * iostat: Fix wrong CPU statistics displayed for the first sample + when option -y is used. + * iostat: Make sure UUID given on the command line is not taken as + interval value. + * Allow more space for persistent type directory names. + 2019/05/31: Version 12.0.5 - Sebastien Godard (sysstat <at> orange.fr) * sar: Add missing %gnice CPU value for tickless CPU. * sar: Better detect if a disk has been unregistered then registered diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/common.c new/sysstat-12.0.6/common.c --- old/sysstat-12.0.5/common.c 2019-05-31 08:28:49.000000000 +0200 +++ new/sysstat-12.0.6/common.c 2019-08-14 17:54:20.000000000 +0200 @@ -776,9 +776,9 @@ */ char *get_persistent_type_dir(char *type) { - static char dir[32]; + static char dir[PATH_MAX]; - snprintf(dir, 32, "%s-%s", DEV_DISK_BY, type); + snprintf(dir, sizeof(dir), "%s-%s", DEV_DISK_BY, type); if (access(dir, R_OK)) { return (NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/configure new/sysstat-12.0.6/configure --- old/sysstat-12.0.5/configure 2019-05-31 08:28:49.000000000 +0200 +++ new/sysstat-12.0.6/configure 2019-08-14 17:54:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sysstat 12.0.5. +# Generated by GNU Autoconf 2.69 for sysstat 12.0.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='sysstat' PACKAGE_TARNAME='sysstat' -PACKAGE_VERSION='12.0.5' -PACKAGE_STRING='sysstat 12.0.5' +PACKAGE_VERSION='12.0.6' +PACKAGE_STRING='sysstat 12.0.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1304,7 +1304,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysstat 12.0.5 to adapt to many kinds of systems. +\`configure' configures sysstat 12.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1365,7 +1365,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysstat 12.0.5:";; + short | recursive ) echo "Configuration of sysstat 12.0.6:";; esac cat <<\_ACEOF @@ -1482,7 +1482,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysstat configure 12.0.5 +sysstat configure 12.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1901,7 +1901,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysstat $as_me 12.0.5, which was +It was created by sysstat $as_me 12.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5961,7 +5961,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysstat $as_me 12.0.5, which was +This file was extended by sysstat $as_me 12.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6014,7 +6014,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysstat config.status 12.0.5 +sysstat config.status 12.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/configure.in new/sysstat-12.0.6/configure.in --- old/sysstat-12.0.5/configure.in 2019-05-31 08:28:49.000000000 +0200 +++ new/sysstat-12.0.6/configure.in 2019-08-14 17:54:20.000000000 +0200 @@ -4,7 +4,7 @@ # Modified by Sebastien Godard (sysstat <at> orange.fr) # Initialization of $PACKAGE_VERSION and $PACKAGE_NAME variables -AC_INIT(sysstat, 12.0.5) +AC_INIT(sysstat, 12.0.6) # Ensure that a recent enough version of Autoconf is being used AC_PREREQ(2.53) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/iostat.c new/sysstat-12.0.6/iostat.c --- old/sysstat-12.0.5/iostat.c 2019-05-31 08:28:49.000000000 +0200 +++ new/sysstat-12.0.6/iostat.c 2019-08-14 17:54:20.000000000 +0200 @@ -944,16 +944,6 @@ { unsigned long long deltot_jiffies; - /* - * Compute the total number of jiffies spent by all processors. - * NB: Don't add cpu_guest/cpu_guest_nice because cpu_user/cpu_nice - * already include them. - */ - tot_jiffies[curr] = st_cpu[curr]->cpu_user + st_cpu[curr]->cpu_nice + - st_cpu[curr]->cpu_sys + st_cpu[curr]->cpu_idle + - st_cpu[curr]->cpu_iowait + st_cpu[curr]->cpu_hardirq + - st_cpu[curr]->cpu_steal + st_cpu[curr]->cpu_softirq; - /* Total number of jiffies spent on the interval */ deltot_jiffies = get_interval(tot_jiffies[!curr], tot_jiffies[curr]); @@ -1673,6 +1663,16 @@ /* Read stats for CPU "all" */ read_stat_cpu(st_cpu[curr], 1); + /* + * Compute the total number of jiffies spent by all processors. + * NB: Don't add cpu_guest/cpu_guest_nice because cpu_user/cpu_nice + * already include them. + */ + tot_jiffies[curr] = st_cpu[curr]->cpu_user + st_cpu[curr]->cpu_nice + + st_cpu[curr]->cpu_sys + st_cpu[curr]->cpu_idle + + st_cpu[curr]->cpu_iowait + st_cpu[curr]->cpu_hardirq + + st_cpu[curr]->cpu_steal + st_cpu[curr]->cpu_softirq; + if (dlist_idx) { /* * A device or partition name was explicitly entered @@ -1977,7 +1977,7 @@ opt++; } - else if (!isdigit(argv[opt][0])) { + else if (strspn(argv[opt], DIGITS) != strlen(argv[opt])) { /* * By default iostat doesn't display unused devices. * If some devices are explicitly entered on the command line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/nls/sysstat.pot new/sysstat-12.0.6/nls/sysstat.pot --- old/sysstat-12.0.5/nls/sysstat.pot 2019-05-31 08:40:52.000000000 +0200 +++ new/sysstat-12.0.6/nls/sysstat.pot 2019-08-14 17:55:04.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n" -"POT-Creation-Date: 2019-05-31 08:40+0200\n" +"POT-Creation-Date: 2019-08-14 17:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/rd_stats.c new/sysstat-12.0.6/rd_stats.c --- old/sysstat-12.0.5/rd_stats.c 2019-05-31 08:28:49.000000000 +0200 +++ new/sysstat-12.0.6/rd_stats.c 2019-08-14 17:54:20.000000000 +0200 @@ -1521,6 +1521,7 @@ { FILE *fp; char line[1024]; + static char format[256] = ""; int sw = FALSE; if ((fp = fopen(NET_SNMP, "r")) == NULL) @@ -1530,8 +1531,7 @@ if (!strncmp(line, "Icmp:", 5)) { if (sw) { - sscanf(line + 5, "%*u %lu %lu %lu %lu %lu %lu %*u %*u " - "%*u %*u %*u %*u %*u %lu %lu %lu %lu %lu %lu", + sscanf(line + 5, format, &st_net_eicmp->InErrors, &st_net_eicmp->InDestUnreachs, &st_net_eicmp->InTimeExcds, @@ -1548,6 +1548,25 @@ break; } else { + if (!strlen(format)) { + if (strstr(line, "InCsumErrors")) { + /* + * New format: InCsumErrors field exists at position #3. + * Capture: 2,4,5,6,7,8,16,17,18,19,20,21 + */ + strcpy(format, "%*u %lu %*u %lu %lu %lu %lu %lu %*u %*u " + "%*u %*u %*u %*u %*u %lu %lu %lu %lu %lu %lu"); + } + else { + /* + * Old format: InCsumErrors field doesn't exist. + * Capture: 2,3,4,5,6,7,15,16,17,18,19,20 + */ + strcpy(format, "%*u %lu %lu %lu %lu %lu %lu %*u %*u " + "%*u %*u %*u %*u %*u %lu %lu %lu %lu %lu %lu"); + + } + } sw = TRUE; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/sysstat-12.0.5.lsm new/sysstat-12.0.6/sysstat-12.0.5.lsm --- old/sysstat-12.0.5/sysstat-12.0.5.lsm 2019-05-31 08:44:14.000000000 +0200 +++ new/sysstat-12.0.6/sysstat-12.0.5.lsm 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -Begin4 -Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux -Version: 12.0.5 -Entered-date: 2019-05-31 -Description: The sysstat package contains the sar, sadf, mpstat, iostat, tapestat, - pidstat, cifsiostat and sa tools for Linux. - The sar command collects and reports system activity - information. - The information collected by sar can be saved in a file - in a binary format for future inspection. - The statistics reported by sar concern I/O transfer rates, - paging activity, process-related activities, interrupts, - network activity, memory and swap space utilization, CPU - utilization, kernel activities and TTY statistics, among - others. Both UP and SMP machines are fully supported. - The sadf command is used to display data collected by sar in various - formats (XML, database-friendly, etc.) and to draw graphs (SVG). - The mpstat command reports global and per-processor statistics. - The iostat command reports CPU utilization and I/O statistics - for disks. - The tapestat command reports statistics for tape drives connected - to the system. - The pidstat command reports statistics for Linux tasks (processes). - The cifsiostat command reports I/O statistics for CIFS filesystems. - NB: Send bugs, patches, suggestions and/or questions to - (sysstat [at] orange.fr). - URL: http://pagesperso-orange.fr/sebastien.godard/ -Keywords: system administration, system monitoring, sar, sadf, iostat, mpstat, tapestat, pidstat, system accounting, performance, tuning -Author: syss...@nospam.orange.fr (Sebastien Godard) -Maintained-by: syss...@nospam.orange.fr (Sebastien Godard) -Primary-site: http://pagesperso-orange.fr/sebastien.godard/ - 536kiB sysstat-12.0.5.tar.xz -Alternate-site: -Copying-policy: GPL -End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/sysstat-12.0.5.spec new/sysstat-12.0.6/sysstat-12.0.5.spec --- old/sysstat-12.0.5/sysstat-12.0.5.spec 2019-05-31 08:42:48.000000000 +0200 +++ new/sysstat-12.0.6/sysstat-12.0.5.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux -Name: sysstat -Version: 12.0.5 -Release: 1 -License: GPL -Group: Applications/System -Source0: %{name}-%{version}.tar.gz -URL: http://pagesperso-orange.fr/sebastien.godard/ -Packager: Sebastien Godard <sysstat _at_ orange.fr> -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) -Requires: gettext - -%description -The sysstat package contains the sar, sadf, mpstat, iostat, tapestat, -pidstat, cifsiostat and sa tools for Linux. -The sar command collects and reports system activity information. -The information collected by sar can be saved in a file in a binary -format for future inspection. The statistics reported by sar concern -I/O transfer rates, paging activity, process-related activities, -interrupts, network activity, memory and swap space utilization, CPU -utilization, kernel activities and TTY statistics, among others. Both -UP and SMP machines are fully supported. -The sadf command may be used to display data collected by sar in -various formats (CSV, XML, etc.) and to draw graphs (SVG). -The iostat command reports CPU utilization and I/O statistics for disks. -The tapestat command reports statistics for tapes connected to the system. -The mpstat command reports global and per-processor statistics. -The pidstat command reports statistics for Linux tasks (processes). -The cifsiostat command reports I/O statistics for CIFS filesystems. - -%define debug_package %{nil} - -%prep -%setup - -%build -# To include cron installation, add options --enable-install-cron and --enable-copy-only -./configure --prefix=%{_prefix} \ - --disable-file-attr \ - sa_lib_dir=%{_libdir}/sa \ - --mandir=%{_mandir} \ - DESTDIR=$RPM_BUILD_ROOT -make - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/var/log/sa - -make install - -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m 755 sysstat $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -install -m 644 sysstat.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/sysstat -install -m 644 sysstat.ioconf $RPM_BUILD_ROOT/etc/sysconfig/sysstat.ioconf -mkdir -p $RPM_BUILD_ROOT/etc/cron.d -install -m 644 cron/sysstat.crond.sample $RPM_BUILD_ROOT/etc/cron.d/sysstat -mkdir -p $RPM_BUILD_ROOT/etc/rc2.d -cd $RPM_BUILD_ROOT/etc/rc2.d && ln -sf ../init.d/sysstat S01sysstat -mkdir -p $RPM_BUILD_ROOT/etc/rc3.d -cd $RPM_BUILD_ROOT/etc/rc3.d && ln -sf ../init.d/sysstat S01sysstat -mkdir -p $RPM_BUILD_ROOT/etc/rc5.d -cd $RPM_BUILD_ROOT/etc/rc5.d && ln -sf ../init.d/sysstat S01sysstat - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(644,root,root,755) -%doc %{_datadir}/doc/sysstat-%{version}/* -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/sa/* -%attr(644,root,root) %{_mandir}/man*/* -%attr(644,root,root) %{_datadir}/locale/*/LC_MESSAGES/sysstat.mo -%attr(755,root,root) %dir /var/log/sa -%attr(755,root,root) /etc/rc.d/init.d/sysstat -%attr(644,root,root) /etc/sysconfig/sysstat -%attr(644,root,root) /etc/sysconfig/sysstat.ioconf -/etc/rc2.d/S01sysstat -/etc/rc3.d/S01sysstat -/etc/rc5.d/S01sysstat -%config(noreplace) %attr(0644,root,root) /etc/cron.d/sysstat - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/sysstat-12.0.6.lsm new/sysstat-12.0.6/sysstat-12.0.6.lsm --- old/sysstat-12.0.5/sysstat-12.0.6.lsm 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-12.0.6/sysstat-12.0.6.lsm 2019-08-14 17:58:33.000000000 +0200 @@ -0,0 +1,35 @@ +Begin4 +Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux +Version: 12.0.6 +Entered-date: 2019-08-14 +Description: The sysstat package contains the sar, sadf, mpstat, iostat, tapestat, + pidstat, cifsiostat and sa tools for Linux. + The sar command collects and reports system activity + information. + The information collected by sar can be saved in a file + in a binary format for future inspection. + The statistics reported by sar concern I/O transfer rates, + paging activity, process-related activities, interrupts, + network activity, memory and swap space utilization, CPU + utilization, kernel activities and TTY statistics, among + others. Both UP and SMP machines are fully supported. + The sadf command is used to display data collected by sar in various + formats (XML, database-friendly, etc.) and to draw graphs (SVG). + The mpstat command reports global and per-processor statistics. + The iostat command reports CPU utilization and I/O statistics + for disks. + The tapestat command reports statistics for tape drives connected + to the system. + The pidstat command reports statistics for Linux tasks (processes). + The cifsiostat command reports I/O statistics for CIFS filesystems. + NB: Send bugs, patches, suggestions and/or questions to + (sysstat [at] orange.fr). + URL: http://pagesperso-orange.fr/sebastien.godard/ +Keywords: system administration, system monitoring, sar, sadf, iostat, mpstat, tapestat, pidstat, system accounting, performance, tuning +Author: syss...@nospam.orange.fr (Sebastien Godard) +Maintained-by: syss...@nospam.orange.fr (Sebastien Godard) +Primary-site: http://pagesperso-orange.fr/sebastien.godard/ + 536kiB sysstat-12.0.6.tar.xz +Alternate-site: +Copying-policy: GPL +End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/sysstat-12.0.6.spec new/sysstat-12.0.6/sysstat-12.0.6.spec --- old/sysstat-12.0.5/sysstat-12.0.6.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-12.0.6/sysstat-12.0.6.spec 2019-08-14 17:57:14.000000000 +0200 @@ -0,0 +1,83 @@ +Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux +Name: sysstat +Version: 12.0.6 +Release: 1 +License: GPL +Group: Applications/System +Source0: %{name}-%{version}.tar.gz +URL: http://pagesperso-orange.fr/sebastien.godard/ +Packager: Sebastien Godard <sysstat _at_ orange.fr> +BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) +Requires: gettext + +%description +The sysstat package contains the sar, sadf, mpstat, iostat, tapestat, +pidstat, cifsiostat and sa tools for Linux. +The sar command collects and reports system activity information. +The information collected by sar can be saved in a file in a binary +format for future inspection. The statistics reported by sar concern +I/O transfer rates, paging activity, process-related activities, +interrupts, network activity, memory and swap space utilization, CPU +utilization, kernel activities and TTY statistics, among others. Both +UP and SMP machines are fully supported. +The sadf command may be used to display data collected by sar in +various formats (CSV, XML, etc.) and to draw graphs (SVG). +The iostat command reports CPU utilization and I/O statistics for disks. +The tapestat command reports statistics for tapes connected to the system. +The mpstat command reports global and per-processor statistics. +The pidstat command reports statistics for Linux tasks (processes). +The cifsiostat command reports I/O statistics for CIFS filesystems. + +%define debug_package %{nil} + +%prep +%setup + +%build +# To include cron installation, add options --enable-install-cron and --enable-copy-only +./configure --prefix=%{_prefix} \ + --disable-file-attr \ + sa_lib_dir=%{_libdir}/sa \ + --mandir=%{_mandir} \ + DESTDIR=$RPM_BUILD_ROOT +make + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/var/log/sa + +make install + +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +install -m 755 sysstat $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig +install -m 644 sysstat.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/sysstat +install -m 644 sysstat.ioconf $RPM_BUILD_ROOT/etc/sysconfig/sysstat.ioconf +mkdir -p $RPM_BUILD_ROOT/etc/cron.d +install -m 644 cron/sysstat.crond.sample $RPM_BUILD_ROOT/etc/cron.d/sysstat +mkdir -p $RPM_BUILD_ROOT/etc/rc2.d +cd $RPM_BUILD_ROOT/etc/rc2.d && ln -sf ../init.d/sysstat S01sysstat +mkdir -p $RPM_BUILD_ROOT/etc/rc3.d +cd $RPM_BUILD_ROOT/etc/rc3.d && ln -sf ../init.d/sysstat S01sysstat +mkdir -p $RPM_BUILD_ROOT/etc/rc5.d +cd $RPM_BUILD_ROOT/etc/rc5.d && ln -sf ../init.d/sysstat S01sysstat + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc %{_datadir}/doc/sysstat-%{version}/* +%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_libdir}/sa/* +%attr(644,root,root) %{_mandir}/man*/* +%attr(644,root,root) %{_datadir}/locale/*/LC_MESSAGES/sysstat.mo +%attr(755,root,root) %dir /var/log/sa +%attr(755,root,root) /etc/rc.d/init.d/sysstat +%attr(644,root,root) /etc/sysconfig/sysstat +%attr(644,root,root) /etc/sysconfig/sysstat.ioconf +/etc/rc2.d/S01sysstat +/etc/rc3.d/S01sysstat +/etc/rc5.d/S01sysstat +%config(noreplace) %attr(0644,root,root) /etc/cron.d/sysstat + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-12.0.5/xml_stats.c new/sysstat-12.0.6/xml_stats.c --- old/sysstat-12.0.5/xml_stats.c 2019-05-31 08:28:49.000000000 +0200 +++ new/sysstat-12.0.6/xml_stats.c 2019-08-14 17:54:20.000000000 +0200 @@ -2175,7 +2175,7 @@ S_VALUE(sfcp->f_rxframes, sfcc->f_rxframes, itv), S_VALUE(sfcp->f_txframes, sfcc->f_txframes, itv), S_VALUE(sfcp->f_rxwords, sfcc->f_rxwords, itv), - S_VALUE(sfcp->f_txwords, sfcc->f_rxwords, itv)); + S_VALUE(sfcp->f_txwords, sfcc->f_txwords, itv)); } tab--;