Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2015-09-09 20:21:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-24 20:52:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2015-09-09 20:21:26.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 9 11:10:04 UTC 2015 - [email protected] + +- Update to 11.0.6 + * Check /proc/net/snmp format to collect ICMP statistics at + their right positions. + * ioconf.c: Fix several ressource leaks. + * mpstat: Fix alignment output, really. + * [Sampsa Kiiskinen]: Fix bug in isag. + * iostat manual page updated. + * CREDITS file updated. + +------------------------------------------------------------------- Old: ---- sysstat-11.0.5.tar.xz New: ---- sysstat-11.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.4ZxHUb/_old 2015-09-09 20:21:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4ZxHUb/_new 2015-09-09 20:21:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: sysstat -Version: 11.0.5 +Version: 11.0.6 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0+ ++++++ sysstat-11.0.5.tar.xz -> sysstat-11.0.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/CHANGES new/sysstat-11.0.6/CHANGES --- old/sysstat-11.0.5/CHANGES 2015-06-12 12:02:29.000000000 +0200 +++ new/sysstat-11.0.6/CHANGES 2015-08-24 17:14:37.000000000 +0200 @@ -1,5 +1,14 @@ Changes: +2015/08/24: Version 11.0.6 - Sebastien Godard (sysstat <at> orange.fr) + * Check /proc/net/snmp format to collect ICMP statistics at + their right positions. + * ioconf.c: Fix several ressource leaks. + * mpstat: Fix alignment output, really. + * [Sampsa Kiiskinen]: Fix bug in isag. + * iostat manual page updated. + * CREDITS file updated. + 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/CREDITS new/sysstat-11.0.6/CREDITS --- old/sysstat-11.0.5/CREDITS 2015-06-12 12:01:21.000000000 +0200 +++ new/sysstat-11.0.6/CREDITS 2015-08-24 17:15:31.000000000 +0200 @@ -175,6 +175,7 @@ Jurriaan <thunder7@xs4[...].nl> Jonathan Kamens <jik@kam[...].us> Ilya Katsnelson <ilya.katsnelson@mot[...].com> + Sampsa Kiiskinen <tuplanolla@gma[...].com> Mike Kobler <mkobler@gma[...].com> John Lau <johnlcf@gma[...].com> Byeong-taek Lee <btlee@psy[...].kr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/configure new/sysstat-11.0.6/configure --- old/sysstat-11.0.5/configure 2015-06-12 12:01:21.000000000 +0200 +++ new/sysstat-11.0.6/configure 2015-08-24 17:13:49.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.5. +# Generated by GNU Autoconf 2.69 for sysstat 11.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='11.0.5' -PACKAGE_STRING='sysstat 11.0.5' +PACKAGE_VERSION='11.0.6' +PACKAGE_STRING='sysstat 11.0.6' 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.5 to adapt to many kinds of systems. +\`configure' configures sysstat 11.0.6 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.5:";; + short | recursive ) echo "Configuration of sysstat 11.0.6:";; 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.5 +sysstat configure 11.0.6 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.5, which was +It was created by sysstat $as_me 11.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5964,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.5, which was +This file was extended by sysstat $as_me 11.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6017,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.5 +sysstat config.status 11.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-11.0.5/configure.in new/sysstat-11.0.6/configure.in --- old/sysstat-11.0.5/configure.in 2015-06-12 12:01:21.000000000 +0200 +++ new/sysstat-11.0.6/configure.in 2015-08-24 17:13:49.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.5) +AC_INIT(sysstat, 11.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-11.0.5/contrib/isag/isag.in new/sysstat-11.0.6/contrib/isag/isag.in --- old/sysstat-11.0.5/contrib/isag/isag.in 2009-09-12 20:59:04.000000000 +0200 +++ new/sysstat-11.0.6/contrib/isag/isag.in 2015-07-09 16:28:50.000000000 +0200 @@ -990,6 +990,20 @@ if { 0 != $f_grid } { puts $fp "set grid" } + + # The last event recorded by sysstat may come after 23:59:59 and + # make isag think it happened at the beginning of the day. + # This shuffle works around the assumption by + # discarding each point that seems to travel backwards in time. + # Enforcing an ordered domain is a good idea regardless. + puts $fp "x2 = x1 = NaN" + puts $fp "cache(x) = (x2 = x1, x1 = x)" + regsub -all {using ([0-9]+):([0-9]+)} $plot_str {using \1:(cache($\1), $\1 < x2 ? 1 / 0 : $\2)} plot_str + # It is worth noting that in gnuplot + # both 1 / 0 and NaN produce the same value, but + # behave differently depending on context. + # The same applies to \1 and ($\1) for no reason. + puts $fp "plot $plot_str" close $fp } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/ioconf.c new/sysstat-11.0.6/ioconf.c --- old/sysstat-11.0.5/ioconf.c 2015-06-12 12:01:21.000000000 +0200 +++ new/sysstat-11.0.6/ioconf.c 2015-08-24 17:13:49.000000000 +0200 @@ -352,6 +352,18 @@ ioc_parsed = 1; return (count); + +free_and_return: + /* Free pointers and return */ + fclose(fp); + if (blkp) { + free(blkp); + } + if (iocp) { + free(iocp); + } + + return 0; } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/ioconf.h new/sysstat-11.0.6/ioconf.h --- old/sysstat-11.0.5/ioconf.h 2015-04-06 17:54:19.000000000 +0200 +++ new/sysstat-11.0.6/ioconf.h 2015-07-13 17:19:43.000000000 +0200 @@ -35,7 +35,7 @@ if (P == NULL) { \ perror("malloc"); \ ioc_free(); \ - return 0; \ + goto free_and_return; \ } \ } \ } \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/man/iostat.in new/sysstat-11.0.6/man/iostat.in --- old/sysstat-11.0.5/man/iostat.in 2015-02-13 16:03:09.000000000 +0100 +++ new/sysstat-11.0.6/man/iostat.in 2015-08-24 17:13:49.000000000 +0200 @@ -1,4 +1,4 @@ -.TH IOSTAT 1 "NOVEMBER 2014" Linux "Linux User's Manual" -*- nroff -*- +.TH IOSTAT 1 "AUGUST 2015" Linux "Linux User's Manual" -*- nroff -*- .SH NAME iostat \- Report Central Processing Unit (CPU) statistics and input/output statistics for devices and partitions. @@ -64,12 +64,7 @@ The .I interval parameter specifies the amount of time in seconds between -each report. The first report contains statistics for the time since -system startup (boot), unless the -.B -y -option is used (in this case, this report is omitted). -Each subsequent report contains statistics -collected during the interval since the previous report. The +each report. The .I count parameter can be specified in conjunction with the .I interval diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/mpstat.c new/sysstat-11.0.6/mpstat.c --- old/sysstat-11.0.5/mpstat.c 2015-06-12 12:01:21.000000000 +0200 +++ new/sysstat-11.0.6/mpstat.c 2015-08-24 17:13:49.000000000 +0200 @@ -261,10 +261,10 @@ /* Width is IRQ name + 2 for the trailing "/s" */ colwidth[j] = strlen(p0->irq_name) + 2; /* - * Normal space for printing a number is 14 chars - * (space + 10 digits + period + mantissa). + * Normal space for printing a number is 11 chars + * (space + 10 digits including the period). */ - if (colwidth[j] < 14) { + if (colwidth[j] < 10) { colwidth[j] = 10; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/nls/sysstat.pot new/sysstat-11.0.6/nls/sysstat.pot --- old/sysstat-11.0.5/nls/sysstat.pot 2015-06-12 12:05:04.000000000 +0200 +++ new/sysstat-11.0.6/nls/sysstat.pot 2015-08-24 17:22: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-06-12 12:05+0200\n" +"POT-Creation-Date: 2015-08-24 17:22+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,39 +17,24 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: sadf_misc.c:621 -#, c-format -msgid "System activity data file: %s (%#x)\n" -msgstr "" - -#: sadf_misc.c:630 -#, c-format -msgid "Host: " -msgstr "" - -#: sadf_misc.c:636 +#: cifsiostat.c:70 mpstat.c:90 pidstat.c:87 iostat.c:86 sar.c:94 +#: nfsiostat-sysstat.c:69 #, c-format -msgid "Number of CPU for last samples in file: %u\n" -msgstr "" - -#: sadf_misc.c:640 -#, c-format -msgid "File time: " -msgstr "" - -#: sadf_misc.c:645 -#, c-format -msgid "Size of a long int: %d\n" +msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n" msgstr "" -#: sadf_misc.c:651 +#: cifsiostat.c:74 nfsiostat-sysstat.c:73 #, 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 "" #: sadc.c:87 @@ -75,7 +60,7 @@ msgid "Cannot write system activity file header: %s\n" msgstr "" -#: sadc.c:768 sadc.c:777 sadc.c:845 ioconf.c:494 rd_stats.c:69 +#: sadc.c:768 sadc.c:777 sadc.c:845 ioconf.c:506 rd_stats.c:69 #: sa_common.c:1245 count.c:118 #, c-format msgid "Cannot open %s: %s\n" @@ -86,61 +71,170 @@ msgid "Cannot append data to that file (%s)\n" msgstr "" -#: common.c:62 +#: mpstat.c:93 #, c-format -msgid "sysstat version %s\n" +msgid "" +"Options are:\n" +"[ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ]\n" +"[ -P { <cpu> [,...] | ON | ALL } ]\n" +msgstr "" + +#: mpstat.c:616 pidstat.c:2263 sar.c:402 +msgid "Average:" msgstr "" -#: cifsiostat.c:70 mpstat.c:90 sar.c:94 nfsiostat-sysstat.c:69 pidstat.c:87 -#: iostat.c:86 +#: mpstat.c:985 #, c-format -msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n" +msgid "Not that many processors!\n" msgstr "" -#: cifsiostat.c:74 nfsiostat-sysstat.c:73 +#: sadf.c:86 #, c-format msgid "" -"Options are:\n" -"[ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ]\n" +"Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> | -[0-9]+ ]\n" msgstr "" -#: cifsiostat.c:77 nfsiostat-sysstat.c:76 +#: sadf.c:89 #, c-format msgid "" "Options are:\n" -"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n" +"[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T | -t | -U ] [ -V ]\n" +"[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n" +"[ -- <sar_options> ]\n" msgstr "" -#: sadf.c:86 +#: sa_common.c:1050 +#, c-format +msgid "Error while reading system activity file: %s\n" +msgstr "" + +#: sa_common.c:1060 +#, c-format +msgid "End of system activity file unexpected\n" +msgstr "" + +#: sa_common.c:1079 +#, c-format +msgid "File created by sar/sadc from sysstat version %d.%d.%d" +msgstr "" + +#: sa_common.c:1110 +#, c-format +msgid "Invalid system activity file: %s\n" +msgstr "" + +#: sa_common.c:1117 #, c-format msgid "" -"Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> | -[0-9]+ ]\n" +"Current sysstat version can no longer read the format of this file (%#x)\n" msgstr "" -#: sadf.c:89 +#: sa_common.c:1248 +#, c-format +msgid "Please check if data collecting is enabled\n" +msgstr "" + +#: sa_common.c:1370 +#, c-format +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 "" "Options are:\n" -"[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T | -t | -U ] [ -V ]\n" -"[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n" -"[ -- <sar_options> ]\n" +"[ -d ] [ -h ] [ -I ] [ -l ] [ -R ] [ -r ] [ -s ] [ -t ] [ -U " +"[ <username> ] ]\n" +"[ -u ] [ -V ] [ -v ] [ -w ] [ -C <command> ] [ -G <process_name> ]\n" +"[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n" msgstr "" -#: mpstat.c:93 +#: pidstat.c:219 sar.c:1084 +#, c-format +msgid "Requested activities not available\n" +msgstr "" + +#: sadf_misc.c:621 +#, c-format +msgid "System activity data file: %s (%#x)\n" +msgstr "" + +#: sadf_misc.c:630 +#, 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: " +msgstr "" + +#: sadf_misc.c:645 +#, c-format +msgid "Size of a long int: %d\n" +msgstr "" + +#: sadf_misc.c:651 +#, c-format +msgid "List of activities:\n" +msgstr "" + +#: sadf_misc.c:664 +#, c-format +msgid "\t[Unknown activity format]" +msgstr "" + +#: count.c:168 +#, c-format +msgid "Cannot handle so many processors!\n" +msgstr "" + +#: iostat.c:89 #, c-format msgid "" "Options are:\n" -"[ -A ] [ -u ] [ -V ] [ -I { SUM | CPU | SCPU | ALL } ]\n" -"[ -P { <cpu> [,...] | ON | ALL } ]\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 "" -#: mpstat.c:616 sar.c:402 pidstat.c:2263 -msgid "Average:" +#: 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 "" -#: mpstat.c:985 +#: iostat.c:328 #, c-format -msgid "Not that many processors!\n" +msgid "Cannot find disk data\n" +msgstr "" + +#: common.c:62 +#, c-format +msgid "sysstat version %s\n" +msgstr "" + +#: pr_stats.c:2354 pr_stats.c:2367 pr_stats.c:2467 pr_stats.c:2479 +msgid "Summary" +msgstr "" + +#: pr_stats.c:2405 +msgid "Other devices not listed here" msgstr "" #: sar.c:109 @@ -297,11 +391,6 @@ msgid "Inconsistent input data\n" msgstr "" -#: sar.c:1084 pidstat.c:219 -#, c-format -msgid "Requested activities not available\n" -msgstr "" - #: sar.c:1374 #, c-format msgid "-f and -o options are mutually exclusive\n" @@ -316,92 +405,3 @@ #, c-format msgid "Cannot find the data collector (%s)\n" msgstr "" - -#: sa_common.c:1050 -#, c-format -msgid "Error while reading system activity file: %s\n" -msgstr "" - -#: sa_common.c:1060 -#, c-format -msgid "End of system activity file unexpected\n" -msgstr "" - -#: sa_common.c:1079 -#, c-format -msgid "File created by sar/sadc from sysstat version %d.%d.%d" -msgstr "" - -#: sa_common.c:1110 -#, c-format -msgid "Invalid system activity file: %s\n" -msgstr "" - -#: sa_common.c:1117 -#, c-format -msgid "" -"Current sysstat version can no longer read the format of this file (%#x)\n" -msgstr "" - -#: sa_common.c:1248 -#, c-format -msgid "Please check if data collecting is enabled\n" -msgstr "" - -#: sa_common.c:1370 -#, c-format -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 "" -"Options are:\n" -"[ -d ] [ -h ] [ -I ] [ -l ] [ -R ] [ -r ] [ -s ] [ -t ] [ -U " -"[ <username> ] ]\n" -"[ -u ] [ -V ] [ -v ] [ -w ] [ -C <command> ] [ -G <process_name> ]\n" -"[ -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:2354 pr_stats.c:2367 pr_stats.c:2467 pr_stats.c:2479 -msgid "Summary" -msgstr "" - -#: 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.5/rd_stats.c new/sysstat-11.0.6/rd_stats.c --- old/sysstat-11.0.5/rd_stats.c 2015-06-12 12:01:21.000000000 +0200 +++ new/sysstat-11.0.6/rd_stats.c 2015-08-24 17:13:49.000000000 +0200 @@ -1211,6 +1211,7 @@ { FILE *fp; char line[1024]; + static char format[256] = ""; int sw = FALSE; if ((fp = fopen(NET_SNMP, "r")) == NULL) @@ -1220,9 +1221,7 @@ if (!strncmp(line, "Icmp:", 5)) { if (sw) { - sscanf(line + 5, "%lu %*u %*u %*u %*u %*u %*u " - "%lu %lu %lu %lu %lu %lu %lu %*u %*u %*u %*u " - "%*u %*u %lu %lu %lu %lu %lu %lu", + sscanf(line + 5, format, &st_net_icmp->InMsgs, &st_net_icmp->InEchos, &st_net_icmp->InEchoReps, @@ -1241,6 +1240,26 @@ break; } else { + if (!strlen(format)) { + if (strstr(line, "InCsumErrors")) { + /* + * New format: InCsumErrors field exists at position #3. + * Capture: 1,9,10,11,12,13,14,15,22,23,24,25,26,27. + */ + strcpy(format, "%lu %*u %*u %*u %*u %*u %*u %*u " + "%lu %lu %lu %lu %lu %lu %lu %*u %*u %*u %*u " + "%*u %*u %lu %lu %lu %lu %lu %lu"); + } + else { + /* + * Old format: InCsumErrors field doesn't exist. + * Capture: 1,8,9,10,11,12,13,14,21,22,23,24,25,26. + */ + strcpy(format, "%lu %*u %*u %*u %*u %*u %*u " + "%lu %lu %lu %lu %lu %lu %lu %*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-11.0.5/sysstat-11.0.5.lsm new/sysstat-11.0.6/sysstat-11.0.5.lsm --- old/sysstat-11.0.5/sysstat-11.0.5.lsm 2015-06-12 12:06:02.000000000 +0200 +++ new/sysstat-11.0.6/sysstat-11.0.5.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.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.5/sysstat-11.0.5.spec new/sysstat-11.0.6/sysstat-11.0.5.spec --- old/sysstat-11.0.5/sysstat-11.0.5.spec 2015-06-12 12:04:30.000000000 +0200 +++ new/sysstat-11.0.6/sysstat-11.0.5.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.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 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/sysstat-11.0.6.lsm new/sysstat-11.0.6/sysstat-11.0.6.lsm --- old/sysstat-11.0.5/sysstat-11.0.6.lsm 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-11.0.6/sysstat-11.0.6.lsm 2015-08-24 17:23:49.000000000 +0200 @@ -0,0 +1,34 @@ +Begin4 +Title: sysstat - the sar, sadf, mpstat, iostat, pidstat, nfsiostat-sysstat and cifsiostat commands for Linux +Version: 11.0.6 +Entered-date: 2015-08-24 +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/ + 298kB sysstat-11.0.6.tar.xz +Alternate-site: +Copying-policy: GPL +End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysstat-11.0.5/sysstat-11.0.6.spec new/sysstat-11.0.6/sysstat-11.0.6.spec --- old/sysstat-11.0.5/sysstat-11.0.6.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/sysstat-11.0.6/sysstat-11.0.6.spec 2015-08-24 17:16:46.000000000 +0200 @@ -0,0 +1,80 @@ +Summary: SAR, SADF, MPSTAT, IOSTAT, PIDSTAT, NFSIOSTAT-SYSSTAT and CIFSIOSTAT for Linux +Name: sysstat +Version: 11.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, 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 + Files old/sysstat-11.0.5/tapestat and new/sysstat-11.0.6/tapestat differ
