Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2015-06-24 20:52:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysstat" Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2015-05-18 22:32:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2015-06-24 20:52:14.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 22 07:01:56 UTC 2015 - [email protected] + +- Update to 11.0.5 + * [Peter Schiffer]: Fixed and simplified some math expressions + in pr_stats.c. + * [Peter Schiffer]: ioconf.c: Check value of variable "major" + read from file. + * [Peter Schiffer]: ioconf.c: Use strncpy instead of strcpy. + * cifsiostat: Fixed possible integer overflowed argument. + * sar: Fixed untrusted loop bound. + +------------------------------------------------------------------- Old: ---- sysstat-11.0.4.tar.xz New: ---- sysstat-11.0.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.fZOKJa/_old 2015-06-24 20:52:16.000000000 +0200 +++ /var/tmp/diff_new_pack.fZOKJa/_new 2015-06-24 20:52:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: sysstat -Version: 11.0.4 +Version: 11.0.5 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0+ ++++++ sysstat-11.0.4.tar.xz -> sysstat-11.0.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/CHANGES new/sysstat-11.0.5/CHANGES --- old/sysstat-11.0.4/CHANGES 2015-04-07 21:40:34.000000000 +0200 +++ new/sysstat-11.0.5/CHANGES 2015-06-12 12:02:29.000000000 +0200 @@ -1,5 +1,15 @@ Changes: +2015/06/12: Version 11.0.5 - Sebastien Godard (sysstat <at> orange.fr) + * [Peter Schiffer]: Fixed and simplified some math expressions + in pr_stats.c. + * [Peter Schiffer]: ioconf.c: Check value of variable "major" + read from file. + * [Peter Schiffer]: ioconf.c: Use strncpy instead of strcpy. + * cifsiostat: Fixed possible integer overflowed argument. + * sar: Fixed untrusted loop bound. + * FAQ updated. + 2015/04/07: Version 11.0.4 - Sebastien Godard (sysstat <at> orange.fr) * Makefile: sysstat init script may sometimes be called rc.sysstat. So use that name when needed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/FAQ new/sysstat-11.0.5/FAQ --- old/sysstat-11.0.4/FAQ 2015-04-07 21:35:54.000000000 +0200 +++ new/sysstat-11.0.5/FAQ 2015-06-12 12:01:21.000000000 +0200 @@ -20,7 +20,7 @@ 2.2. The sar command complains with the following message: "Cannot append data to that file (...)". 2.3. The sar command complains with the following message: - "Invalid data format". + "Inconsistent input data". 2.4. I get the following error message when I try to run sar: "Cannot open /var/log/sa/sa30: No such file or directory". 2.5. Are sar daily data files fully compatible with Sun Solaris format @@ -196,14 +196,15 @@ ~~~ 2.3. The sar command complains with the following message: -Invalid data format +Inconsistent input data This error message means that sadc (the system activity data collector that sar is using) is not consistent with the sar command. In most cases this is because the sar and sadc commands do not belong to the same release of the sysstat package. Remember that sar may search for sadc in predefined directories (/usr/local/lib/sa, /usr/lib/sa, ...) before looking in the -current directory! +current directory! With sysstat version 11.1.5 and later, enter "sar --sadc" +to determine which data collector is called by sar. ~~~ @@ -343,6 +344,9 @@ rrd.cgi (http://haroon.sis.utoronto.ca/rrd/scripts/) is a perl front-end for rrdtool and can be used to make some graphs (see a demo at http://haroon.sis.utoronto.ca/perl/rrd.cgi/sar_stats/). +sysstat_mail_report (https://github.com/desbma/sysstat_mail_report) is a script +that automatically generates and sends an email report every day/week/month +with graphs generated from sysstat data. I've also heard of commercial tools which use sysstat: PerfMan comes to mind, among others. If you find others which you think are of real interest, please let me know diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/cifsiostat.c new/sysstat-11.0.5/cifsiostat.c --- old/sysstat-11.0.4/cifsiostat.c 2015-04-07 21:35:54.000000000 +0200 +++ new/sysstat-11.0.5/cifsiostat.c 2015-06-12 12:01:21.000000000 +0200 @@ -174,18 +174,28 @@ if ((cifs_nr = get_cifs_nr()) > 0) { cifs_nr += NR_CIFS_PREALLOC; } - if ((st_hdr_cifs = (struct io_hdr_stats *) calloc(cifs_nr, IO_HDR_STATS_SIZE)) == NULL) { - perror("malloc"); - exit(4); - } - /* Allocate structures for number of CIFS directories found */ - for (i = 0; i < 2; i++) { - if ((st_cifs[i] = - (struct cifs_stats *) calloc(cifs_nr, CIFS_STATS_SIZE)) == NULL) { + if (cifs_nr > 0) { + if ((st_hdr_cifs = (struct io_hdr_stats *) calloc(cifs_nr, IO_HDR_STATS_SIZE)) == NULL) { perror("malloc"); exit(4); } + + /* Allocate structures for number of CIFS directories found */ + for (i = 0; i < 2; i++) { + if ((st_cifs[i] = + (struct cifs_stats *) calloc(cifs_nr, CIFS_STATS_SIZE)) == NULL) { + perror("malloc"); + exit(4); + } + } + } + else { + /* + * cifs_nr value is probably zero, but it can also be negative + * (possible overflow when adding NR_CIFS_PREALLOC above). + */ + cifs_nr = 0; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/configure new/sysstat-11.0.5/configure --- old/sysstat-11.0.4/configure 2015-04-07 21:35:54.000000000 +0200 +++ new/sysstat-11.0.5/configure 2015-06-12 12:01:21.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 11.0.4. +# Generated by GNU Autoconf 2.69 for sysstat 11.0.5. # # # 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='11.0.4' -PACKAGE_STRING='sysstat 11.0.4' +PACKAGE_VERSION='11.0.5' +PACKAGE_STRING='sysstat 11.0.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1306,7 +1306,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 11.0.4 to adapt to many kinds of systems. +\`configure' configures sysstat 11.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1367,7 +1367,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysstat 11.0.4:";; + short | recursive ) echo "Configuration of sysstat 11.0.5:";; esac cat <<\_ACEOF @@ -1486,7 +1486,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysstat configure 11.0.4 +sysstat configure 11.0.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1905,7 +1905,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 11.0.4, which was +It was created by sysstat $as_me 11.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3800,7 +3800,7 @@ ac_cv_prog_ZIP="$ZIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3835,10 +3835,8 @@ INSTALL_BIN="\${INSTALL} -m 755" -for ac_prog in cp -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "cp", so it can be a program name with args. +set dummy cp; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PATH_CP+:} false; then : @@ -3850,7 +3848,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3877,14 +3875,8 @@ fi - test -n "$PATH_CP" && break -done -test -n "$PATH_CP" || PATH_CP="cp" - -for ac_prog in chkconfig -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "chkconfig", so it can be a program name with args. +set dummy chkconfig; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PATH_CHKCONFIG+:} false; then : @@ -3896,7 +3888,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3923,10 +3915,6 @@ fi - test -n "$PATH_CHKCONFIG" && break -done -test -n "$PATH_CHKCONFIG" || PATH_CHKCONFIG="chkconfig" - # Check for systemd # Extract the first word of "pkg-config", so it can be a program name with args. @@ -3966,10 +3954,8 @@ fi -for ac_prog in systemctl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "systemctl", so it can be a program name with args. +set dummy systemctl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_SYSTEMCTL+:} false; then : @@ -3981,7 +3967,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin /etc /sbin /usr/bin /usr/etc /usr/sbin /usr/ucb /usr/local/bin /usr/local/etc /usr/local/sbin +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4008,10 +3994,6 @@ fi - test -n "$SYSTEMCTL" && break -done -test -n "$SYSTEMCTL" || SYSTEMCTL="systemctl" - # Check whether --with-systemdsystemunitdir was given. if test "${with_systemdsystemunitdir+set}" = set; then : @@ -4931,11 +4913,19 @@ SADC_DIR=$AuxPrefix/lib if test -d $AuxPrefix/lib64; then - # Look for lm (long mode) flag to know if CPU is 64 bit - grep " lm " /proc/cpuinfo >/dev/null 2>&1 - if test $? = 0; then - SADC_DIR=$AuxPrefix/lib64 - fi + # Verify that this OS is really 64 bit + BITS=$(getconf LONG_BIT 2>/dev/null) + if test $? = 0; then + if test $BITS = 64; then + SADC_DIR=$AuxPrefix/lib64 + fi + else + # Fallback: look for lm (long mode) flag to know if CPU is 64 bit + grep " lm " /proc/cpuinfo >/dev/null 2>&1 + if test $? = 0; then + SADC_DIR=$AuxPrefix/lib64 + fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking sadc directory" >&5 @@ -5974,7 +5964,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 11.0.4, which was +This file was extended by sysstat $as_me 11.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6027,7 +6017,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 11.0.4 +sysstat config.status 11.0.5 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-11.0.4/configure.in new/sysstat-11.0.5/configure.in --- old/sysstat-11.0.4/configure.in 2015-04-07 21:35:54.000000000 +0200 +++ new/sysstat-11.0.5/configure.in 2015-06-12 12:01:21.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, 11.0.4) +AC_INIT(sysstat, 11.0.5) # 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-11.0.4/ioconf.c new/sysstat-11.0.5/ioconf.c --- old/sysstat-11.0.4/ioconf.c 2015-04-07 21:35:54.000000000 +0200 +++ new/sysstat-11.0.5/ioconf.c 2015-06-12 12:01:21.000000000 +0200 @@ -190,11 +190,16 @@ /* conventional usage for unsupported device */ continue; } - if (indirect >= MAX_BLKDEV) { + if (indirect > MAX_BLKDEV) { fprintf(stderr, "%s: Indirect major #%u out of range\n", ioconf_name, indirect); continue; } + if (major > MAX_BLKDEV) { + fprintf(stderr, "%s: Major #%u out of range\n", + ioconf_name, major); + continue; + } if (ioconf[indirect] == NULL) { fprintf(stderr, "%s: Indirect record '%u:%u:%u:...'" @@ -310,7 +315,7 @@ break; case '%': - strcpy(blkp->dfmt, dfmt + 1); + strncpy(blkp->dfmt, dfmt + 1, IOC_FMTLEN); case 'd': blkp->cconv = ioc_ito10; strcat(blkp->dfmt, "%s"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/nls/sysstat.pot new/sysstat-11.0.5/nls/sysstat.pot --- old/sysstat-11.0.4/nls/sysstat.pot 2015-04-07 21:55:35.000000000 +0200 +++ new/sysstat-11.0.5/nls/sysstat.pot 2015-06-12 12:05: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: 2015-04-07 21:55+0200\n" +"POT-Creation-Date: 2015-06-12 12:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -17,54 +17,39 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: iostat.c:86 nfsiostat-sysstat.c:69 cifsiostat.c:70 mpstat.c:90 sar.c:94 -#: pidstat.c:87 +#: sadf_misc.c:621 #, c-format -msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n" +msgid "System activity data file: %s (%#x)\n" msgstr "" -#: iostat.c:89 +#: sadf_misc.c:630 #, c-format -msgid "" -"Options are:\n" -"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" -"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" -"[ [ -T ] -g <group_name> ] [ -p [ <device> [,...] | ALL ] ]\n" -"[ <device> [...] | ALL ] [ --debuginfo ]\n" +msgid "Host: " msgstr "" -#: iostat.c:95 +#: sadf_misc.c:636 #, c-format -msgid "" -"Options are:\n" -"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" -"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" -"[ [ -T ] -g <group_name> ] [ -p [ <device> [,...] | ALL ] ]\n" -"[ <device> [...] | ALL ]\n" +msgid "Number of CPU for last samples in file: %u\n" msgstr "" -#: iostat.c:328 +#: sadf_misc.c:640 #, c-format -msgid "Cannot find disk data\n" +msgid "File time: " msgstr "" -#: iostat.c:1385 sa_common.c:1540 +#: sadf_misc.c:645 #, c-format -msgid "Invalid type of persistent device name\n" +msgid "Size of a long int: %d\n" msgstr "" -#: nfsiostat-sysstat.c:73 cifsiostat.c:74 +#: sadf_misc.c:651 #, c-format -msgid "" -"Options are:\n" -"[ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ]\n" +msgid "List of activities:\n" msgstr "" -#: nfsiostat-sysstat.c:76 cifsiostat.c:77 +#: sadf_misc.c:664 #, c-format -msgid "" -"Options are:\n" -"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n" +msgid "\t[Unknown activity format]" msgstr "" #: sadc.c:87 @@ -90,7 +75,7 @@ msgid "Cannot write system activity file header: %s\n" msgstr "" -#: sadc.c:768 sadc.c:777 sadc.c:845 ioconf.c:489 rd_stats.c:69 +#: sadc.c:768 sadc.c:777 sadc.c:845 ioconf.c:494 rd_stats.c:69 #: sa_common.c:1245 count.c:118 #, c-format msgid "Cannot open %s: %s\n" @@ -106,56 +91,24 @@ msgid "sysstat version %s\n" msgstr "" -#: mpstat.c:93 -#, c-format -msgid "" -"Options are:\n" -"[ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ]\n" -"[ -P { <cpu> [,...] | ON | ALL } ]\n" -msgstr "" - -#: mpstat.c:616 sar.c:402 pidstat.c:2263 -msgid "Average:" -msgstr "" - -#: mpstat.c:985 -#, c-format -msgid "Not that many processors!\n" -msgstr "" - -#: sadf_misc.c:621 -#, c-format -msgid "System activity data file: %s (%#x)\n" -msgstr "" - -#: sadf_misc.c:630 +#: cifsiostat.c:70 mpstat.c:90 sar.c:94 nfsiostat-sysstat.c:69 pidstat.c:87 +#: iostat.c:86 #, c-format -msgid "Host: " -msgstr "" - -#: sadf_misc.c:636 -#, c-format -msgid "Number of CPU for last samples in file: %u\n" -msgstr "" - -#: sadf_misc.c:640 -#, c-format -msgid "File time: " +msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n" msgstr "" -#: sadf_misc.c:645 +#: cifsiostat.c:74 nfsiostat-sysstat.c:73 #, c-format -msgid "Size of a long int: %d\n" -msgstr "" - -#: sadf_misc.c:651 -#, c-format -msgid "List of activities:\n" +msgid "" +"Options are:\n" +"[ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ]\n" msgstr "" -#: sadf_misc.c:664 +#: cifsiostat.c:77 nfsiostat-sysstat.c:76 #, c-format -msgid "\t[Unknown activity format]" +msgid "" +"Options are:\n" +"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n" msgstr "" #: sadf.c:86 @@ -173,6 +126,23 @@ "[ -- <sar_options> ]\n" msgstr "" +#: mpstat.c:93 +#, c-format +msgid "" +"Options are:\n" +"[ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ]\n" +"[ -P { <cpu> [,...] | ON | ALL } ]\n" +msgstr "" + +#: mpstat.c:616 sar.c:402 pidstat.c:2263 +msgid "Average:" +msgstr "" + +#: mpstat.c:985 +#, c-format +msgid "Not that many processors!\n" +msgstr "" + #: sar.c:109 #, c-format msgid "" @@ -317,37 +287,32 @@ msgid "End of data collecting unexpected\n" msgstr "" -#: sar.c:856 -#, c-format -msgid "Invalid data format\n" -msgstr "" - -#: sar.c:860 +#: sar.c:858 #, c-format msgid "Using a wrong data collector from a different sysstat version\n" msgstr "" -#: sar.c:889 +#: sar.c:910 #, c-format msgid "Inconsistent input data\n" msgstr "" -#: sar.c:1075 pidstat.c:219 +#: sar.c:1084 pidstat.c:219 #, c-format msgid "Requested activities not available\n" msgstr "" -#: sar.c:1365 +#: sar.c:1374 #, c-format msgid "-f and -o options are mutually exclusive\n" msgstr "" -#: sar.c:1371 +#: sar.c:1380 #, c-format msgid "Not reading from a system activity file (use -f option)\n" msgstr "" -#: sar.c:1507 +#: sar.c:1516 #, c-format msgid "Cannot find the data collector (%s)\n" msgstr "" @@ -388,6 +353,11 @@ msgid "Requested activities not available in file %s\n" msgstr "" +#: sa_common.c:1540 iostat.c:1385 +#, c-format +msgid "Invalid type of persistent device name\n" +msgstr "" + #: pidstat.c:90 #, c-format msgid "" @@ -398,15 +368,40 @@ "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n" msgstr "" +#: iostat.c:89 +#, c-format +msgid "" +"Options are:\n" +"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" +"[ [ -T ] -g <group_name> ] [ -p [ <device> [,...] | ALL ] ]\n" +"[ <device> [...] | ALL ] [ --debuginfo ]\n" +msgstr "" + +#: iostat.c:95 +#, c-format +msgid "" +"Options are:\n" +"[ -c ] [ -d ] [ -h ] [ -k | -m ] [ -N ] [ -t ] [ -V ] [ -x ] [ -y ] [ -z ]\n" +"[ -j { ID | LABEL | PATH | UUID | ... } ]\n" +"[ [ -T ] -g <group_name> ] [ -p [ <device> [,...] | ALL ] ]\n" +"[ <device> [...] | ALL ]\n" +msgstr "" + +#: iostat.c:328 +#, c-format +msgid "Cannot find disk data\n" +msgstr "" + #: count.c:168 #, c-format msgid "Cannot handle so many processors!\n" msgstr "" -#: pr_stats.c:2355 pr_stats.c:2368 pr_stats.c:2468 pr_stats.c:2480 +#: pr_stats.c:2354 pr_stats.c:2367 pr_stats.c:2467 pr_stats.c:2479 msgid "Summary" msgstr "" -#: pr_stats.c:2406 +#: pr_stats.c:2405 msgid "Other devices not listed here" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/pr_stats.c new/sysstat-11.0.5/pr_stats.c --- old/sysstat-11.0.4/pr_stats.c 2015-04-07 21:49:54.000000000 +0200 +++ new/sysstat-11.0.5/pr_stats.c 2015-06-12 12:01:21.000000000 +0200 @@ -524,15 +524,14 @@ (double) avg_frskb / avg_count, ((double) avg_tlskb / avg_count) - ((double) avg_frskb / avg_count), - ((double) (avg_tlskb / avg_count)) ? - SP_VALUE((double) (avg_frskb / avg_count), - (double) (avg_tlskb / avg_count), - (double) (avg_tlskb / avg_count)) : + avg_tlskb ? + SP_VALUE((double) avg_frskb / avg_count, + (double) avg_tlskb / avg_count, + (double) avg_tlskb / avg_count) : 0.0, - (double) (avg_caskb / avg_count), - (((double) avg_tlskb / avg_count) - - ((double) avg_frskb / avg_count)) ? - SP_VALUE(0.0, (double) (avg_caskb / avg_count), + (double) avg_caskb / avg_count, + (avg_tlskb != avg_frskb) ? + SP_VALUE(0.0, (double) avg_caskb / avg_count, ((double) avg_tlskb / avg_count) - ((double) avg_frskb / avg_count)) : 0.0); @@ -2210,10 +2209,10 @@ (double) avg_frhkb / avg_count, ((double) avg_tlhkb / avg_count) - ((double) avg_frhkb / avg_count), - ((double) (avg_tlhkb / avg_count)) ? - SP_VALUE((double) (avg_frhkb / avg_count), - (double) (avg_tlhkb / avg_count), - (double) (avg_tlhkb / avg_count)) : + avg_tlhkb ? + SP_VALUE((double) avg_frhkb / avg_count, + (double) avg_tlhkb / avg_count, + (double) avg_tlhkb / avg_count) : 0.0); /* Reset average counters */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/sar.c new/sysstat-11.0.5/sar.c --- old/sysstat-11.0.4/sar.c 2015-04-07 21:51:09.000000000 +0200 +++ new/sysstat-11.0.5/sar.c 2015-06-12 12:01:21.000000000 +0200 @@ -853,13 +853,12 @@ strcmp(version, VERSION)) { /* sar and sadc commands are not consistent */ - fprintf(stderr, _("Invalid data format\n")); - if (!rc && (file_magic.sysstat_magic == SYSSTAT_MAGIC)) { fprintf(stderr, _("Using a wrong data collector from a different sysstat version\n")); } - exit(3); + + goto input_error; } /* @@ -872,6 +871,9 @@ print_read_error(); } + if (file_hdr.sa_act_nr > NR_ACT) + goto input_error; + /* Read activity list */ for (i = 0; i < file_hdr.sa_act_nr; i++) { @@ -884,11 +886,9 @@ if ((p < 0) || (act[p]->fsize != file_act.size) || !file_act.nr || !file_act.nr2 - || (act[p]->magic != file_act.magic)) { + || (act[p]->magic != file_act.magic)) /* Remember that we are reading data from sadc and not from a file... */ - fprintf(stderr, _("Inconsistent input data\n")); - exit(3); - } + goto input_error; id_seq[i] = file_act.id; /* We necessarily have "i < NR_ACT" */ act[p]->nr = file_act.nr; @@ -901,6 +901,15 @@ /* Check that all selected activties are actually sent by sadc */ reverse_check_act(file_hdr.sa_act_nr); + + return; + +input_error: + + /* Strange data sent by sadc...! */ + fprintf(stderr, _("Inconsistent input data\n")); + + exit(3); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/sysstat-11.0.4.lsm new/sysstat-11.0.5/sysstat-11.0.4.lsm --- old/sysstat-11.0.4/sysstat-11.0.4.lsm 2015-04-07 21:43:54.000000000 +0200 +++ new/sysstat-11.0.5/sysstat-11.0.4.lsm 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -Begin4 -Title: sysstat - the sar, sadf, mpstat, iostat, nfsiostat-sysstat, cifsiostat and pidstat commands for Linux -Version: 11.0.4 -Entered-date: 2015-04-07 -Description: The sysstat package contains the sar, sadf, mpstat, iostat, - pidstat, nfsiostat-sysstat, 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 iostat command reports CPU utilization - and I/O statistics for disks. The mpstat command reports - global and per-processor statistics. The sadf command - is used to display data collected by sar in various - formats (XML, database-friendly, etc.). - The pidstat command reports statistics for Linux tasks (processes). - The nfsiostat-sysstat command reports I/O statistics for network filesystems. - 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, sar, sadf, iostat, mpstat, pidstat, nfsiostat-sysstat, cifsiostat, system accounting, performance, tuning -Author: sysstat [at] orange.fr (Sebastien Godard) -Maintained-by: sysstat [at] orange.fr (Sebastien Godard) -Primary-site: http://pagesperso-orange.fr/sebastien.godard/ - 287kB sysstat-11.0.4.tar.xz -Alternate-site: -Copying-policy: GPL -End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/sysstat-11.0.4.spec new/sysstat-11.0.5/sysstat-11.0.4.spec --- old/sysstat-11.0.4/sysstat-11.0.4.spec 2015-04-07 21:42:50.000000000 +0200 +++ new/sysstat-11.0.5/sysstat-11.0.4.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -Summary: SAR, SADF, MPSTAT, IOSTAT, NFSIOSTAT-SYSSTAT, CIFSIOSTAT and PIDSTAT for Linux -Name: sysstat -Version: 11.0.4 -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, pidstat, -nfsiostat-sysstat, 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.). -The iostat command reports CPU utilization and I/O statistics for disks. -The mpstat command reports global and per-processor statistics. -The pidstat command reports statistics for Linux tasks (processes). -The nfsiostat-sysstat command reports I/O statistics for network filesystems. -The cifsiostat command reports I/O statistics for CIFS filesystems. - -%prep -%setup - -%build -./configure --prefix=%{_prefix} \ - --disable-man-group \ - 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 -%attr(755,root,root) /etc/rc2.d/S01sysstat -%attr(755,root,root) /etc/rc3.d/S01sysstat -%attr(755,root,root) /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-11.0.4/sysstat-11.0.5.lsm new/sysstat-11.0.5/sysstat-11.0.5.lsm --- old/sysstat-11.0.4/sysstat-11.0.5.lsm 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-11.0.5/sysstat-11.0.5.lsm 2015-06-12 12:06:02.000000000 +0200 @@ -0,0 +1,34 @@ +Begin4 +Title: sysstat - the sar, sadf, mpstat, iostat, nfsiostat-sysstat, cifsiostat and pidstat commands for Linux +Version: 11.0.5 +Entered-date: 2015-06-12 +Description: The sysstat package contains the sar, sadf, mpstat, iostat, + pidstat, nfsiostat-sysstat, 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 iostat command reports CPU utilization + and I/O statistics for disks. The mpstat command reports + global and per-processor statistics. The sadf command + is used to display data collected by sar in various + formats (XML, database-friendly, etc.). + The pidstat command reports statistics for Linux tasks (processes). + The nfsiostat-sysstat command reports I/O statistics for network filesystems. + 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, sar, sadf, iostat, mpstat, pidstat, nfsiostat-sysstat, cifsiostat, system accounting, performance, tuning +Author: sysstat [at] orange.fr (Sebastien Godard) +Maintained-by: sysstat [at] orange.fr (Sebastien Godard) +Primary-site: http://pagesperso-orange.fr/sebastien.godard/ + 288kB sysstat-11.0.5.tar.xz +Alternate-site: +Copying-policy: GPL +End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.4/sysstat-11.0.5.spec new/sysstat-11.0.5/sysstat-11.0.5.spec --- old/sysstat-11.0.4/sysstat-11.0.5.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-11.0.5/sysstat-11.0.5.spec 2015-06-12 12:04:30.000000000 +0200 @@ -0,0 +1,80 @@ +Summary: SAR, SADF, MPSTAT, IOSTAT, NFSIOSTAT-SYSSTAT, CIFSIOSTAT and PIDSTAT for Linux +Name: sysstat +Version: 11.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, pidstat, +nfsiostat-sysstat, 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.). +The iostat command reports CPU utilization and I/O statistics for disks. +The mpstat command reports global and per-processor statistics. +The pidstat command reports statistics for Linux tasks (processes). +The nfsiostat-sysstat command reports I/O statistics for network filesystems. +The cifsiostat command reports I/O statistics for CIFS filesystems. + +%prep +%setup + +%build +./configure --prefix=%{_prefix} \ + --disable-man-group \ + 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 +%attr(755,root,root) /etc/rc2.d/S01sysstat +%attr(755,root,root) /etc/rc3.d/S01sysstat +%attr(755,root,root) /etc/rc5.d/S01sysstat +%config(noreplace) %attr(0644,root,root) /etc/cron.d/sysstat + ++++++ sysstat-8.0.4-sysconfdir.diff ++++++ --- /var/tmp/diff_new_pack.fZOKJa/_old 2015-06-24 20:52:16.000000000 +0200 +++ /var/tmp/diff_new_pack.fZOKJa/_new 2015-06-24 20:52:16.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FAQ.orig +++ FAQ -@@ -430,9 +430,9 @@ to verify that for yourself. +@@ -434,9 +434,9 @@ to verify that for yourself. Nor do you have to be concerned about using up all your disk space. sar will use a few hundred kilobytes for a whole day's worth of data, and it normally only stores one week worth (this can be configured via the HISTORY @@ -14,7 +14,7 @@ configuration file. ~~~ -@@ -472,7 +472,7 @@ another file or create a new one. See al +@@ -476,7 +476,7 @@ another file or create a new one. See al By default sar saves its data in the standard system activity data file, the /var/log/sa/saDD file, where DD is the current day in the month. To prevent sar from overwriting any existing files, just set the variable
