Changes - SailfishOS Open Build Service

Changes of Revision 4

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:sysstat.spec
@@ -9,7 +9,7 @@ # << macros Summary: Performance monitoring tools -Version: 12.6.0+git1 +Version: 12.6.2+git1 Release: 1 Group: Applications License: GPLv2
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/sailfishos-chum/sysstat</param> <param name="branch"></param> - <param name="revision">12.6.0+git1</param> + <param name="revision">12.6.2+git1</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Deleted	_service:tar_git:sysstat-12.6.0+git1.tar.gz/upstream/sysstat-12.6.0.lsm ^
@@ -1,39 +0,0 @@ -Begin4 -Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux -Version: 12.6.0 -Entered-date: 2022-05-29 -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: sysstat@NOSPAM.orange.fr (Sebastien Godard) -Maintained-by: sysstat@NOSPAM.orange.fr (Sebastien Godard) -Primary-site: http://pagesperso-orange.fr/sebastien.godard/ - 1450kiB sysstat-12.6.0.tar.gz - 1159kiB sysstat-12.6.0.tar.bz2 - 863kiB sysstat-12.6.0.tar.xz - 1432kiB sysstat-12.6.0-1.src.rpm - 437kiB sysstat-12.6.0-1.x86_64.rpm -Alternate-site: -Copying-policy: GPL -End
[-] [+]	Deleted	_service:tar_git:sysstat-12.6.0+git1.tar.gz/upstream/sysstat-12.6.0.spec ^
@@ -1,83 +0,0 @@ -Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux -Name: sysstat -Version: 12.6.0 -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 -
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/CHANGES ^
@@ -1,5 +1,21 @@ Changes: +2023/01/29: Version 12.6.2 - Sebastien Godard (sysstat <at> orange.fr) + * sadf: PCP: Fix pmiID used for two USB metrics. + * sadc: Add another overflow check. + +2022/11/06: Version 12.6.1 - Sebastien Godard (sysstat <at> orange.fr) + * Fix possible overflow in sa_common.c (GHSL-2022-074). + * sa_conv.c: Make size of statistics structures from older sysstat + versions immutable. + * [Bernhard M. Wiedemann]: Declare sadc dependency on libsyscom.a. + * [Steve Kay]: Fix gcc v11.2 warnings. + * [Steve Kay]: Various cosmetic fixes. + * [Jan Christoph Uhde]: sar: Remove `-I int_list` from man-page and + help. + * [Frank Dana]: Consolidate systemctl commands in README file. + * [Rong Tao]: Remove whitespace characters at the end of lines. + 2022/05/29: Version 12.6.0 - Sebastien Godard (sysstat <at> orange.fr) * sar: Fix maximum value for A_IRQ activity. * sar/sadf: A_NET_SOFT: Add new metric softnet network backlog.
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/FAQ.md ^
@@ -319,8 +319,8 @@ with static graphs), sarjitsu (a more sophisticated application producing dynamic visualizations based on Grafana), sarvant, sar2gp, loadgraph, SysStat Charts, sarplot... -[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 [here](http://haroon.sis.utoronto.ca/perl/rrd.cgi/sar_stats/)). +[rrd.cgi](http://haroon.easi.utoronto.ca/rrd/scripts/) is a perl front-end for +rrdtool and can be used to make some graphs (see a demo [here](http://haroon.easi.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.
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/Makefile.in ^
@@ -1,5 +1,5 @@ # Makefile to build sysstat commands -# (C) 1999-2021 Sebastien GODARD (sysstat <at> orange.fr) +# (C) 1999-2023 Sebastien GODARD (sysstat <at> orange.fr) # Version and package name VERSION = @PACKAGE_VERSION@ @@ -338,7 +338,7 @@ sadc: LFLAGS += $(LFSENSORS) -sadc: sadc.o act_sadc.o sa_wrap.o sa_common_light.o common_light.o systest.o librdstats.a librdsensors.a +sadc: sadc.o act_sadc.o sa_wrap.o sa_common_light.o common_light.o systest.o librdstats.a librdsensors.a libsyscom.a sar.o: sar.c sa.h version.h common.h rd_stats.h rd_sensors.h @@ -539,7 +539,7 @@ catalogs="$(SOURCE_CODE) iconfig README.md sa1.in sa2.in sysconfig.in sysstat.in version.in"; \ for c in $$catalogs; do \ echo "Updating file: $$c"; \ - sed 's/-2021/-2022/g' $$c > copyyear.tmp; \ + sed 's/-2022/-2023/g' $$c > copyyear.tmp; \ mv copyyear.tmp $$c; \ done
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/README.md ^
@@ -5,7 +5,7 @@ [![Total Alerts](https://img.shields.io/lgtm/alerts/g/sysstat/sysstat.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/sysstat/sysstat/alerts) [![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=45U6F9R73ESFQ) -(C) 1999-2022 Sebastien GODARD (sysstat (at) orange (dot) fr) +(C) 1999-2023 Sebastien GODARD (sysstat (at) orange (dot) fr) ### Introduction @@ -98,8 +98,7 @@ On recent versions, systemd is used instead of cron. You may need to enable and start the sysstat service: ``` -$ sudo systemctl enable sysstat -$ sudo systemctl start sysstat +$ sudo systemctl enable --now sysstat ``` #### Install from Ubuntu @@ -146,7 +145,7 @@ $ ./configure --enable-install-cron ``` -Enter `./configure --help` to display all possible options. +Enter `./configure --help` to display all possible options. Note: There is another way to configure sysstat instead of entering `./configure`: This is the Interactive Configuration script (_iconfig_) which will ask you for the value of the main sysstat variables and parameters.
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/activity.c ^
@@ -1,6 +1,6 @@ /* * activity.c: Define system activities available for sar/sadc. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/cifsiostat.c ^
@@ -141,6 +141,7 @@ return NULL; while (clist != NULL) { + c = clist; if ((i = strcmp(c->name, name)) == 0) { /* cifs found in list */
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/common.c ^
@@ -1,6 +1,6 @@ /* * sar, sadc, sadf, mpstat and iostat common routines. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -434,6 +434,29 @@ return 0; } +/* + * ************************************************************************** + * Check if the multiplication of the 3 values may be greater than UINT_MAX. + * + * IN: + * @val1 First value. + * @val2 Second value. + * @val3 Third value. + *************************************************************************** + / +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) { +#ifdef DEBUG + fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", + __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * + (unsigned long long) val3); +#endif + exit(4); + } +} #ifndef SOURCE_SADC /* @@ -948,6 +971,7 @@ return (NULL); while (persist_names[++i]) { + /* Get absolute path for current persistent name / link = get_persistent_name_path(persist_names[i]); if (!link) @@ -1660,4 +1684,5 @@ return 0; } + #endif / SOURCE_SADC undefined */
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/common.h ^
@@ -1,6 +1,6 @@ /* * sysstat: System performance tools for Linux - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) / #ifndef _COMMON_H @@ -256,6 +256,8 @@ (char , unsigned long long , unsigned int ); int check_dir (char *); +void check_overflow + (unsigned int, unsigned int, unsigned int); #ifndef SOURCE_SADC int count_bits
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/configure ^
@@ -1,9 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sysstat 12.6.0. +# Generated by GNU Autoconf 2.71 for sysstat 12.6.2. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,14 +15,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( posix) : set -o posix ;; #( @@ -31,46 +34,46 @@ fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\$.\$"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - "$as_nl") - expr "X$arg" : "X\$.\$$as_nl"; - arg=`expr "X$arg" : ".$as_nl\$.\$"`;; - esac; - expr "X$arg" : "X\$.\$" \| tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \|\| @@ -79,13 +82,6 @@ fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -94,8 +90,12 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + /) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -107,30 +107,10 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -152,20 +132,22 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #(
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/configure.in ^
@@ -4,7 +4,7 @@ # Modified by Sebastien Godard (sysstat <at> orange.fr) # Initialization of $PACKAGE_VERSION and $PACKAGE_NAME variables -AC_INIT(sysstat, 12.6.0) +AC_INIT(sysstat, 12.6.2) # Ensure that a recent enough version of Autoconf is being used AC_PREREQ(2.53) @@ -379,7 +379,7 @@ fi AC_MSG_RESULT($SA_DIR) if test ! -d $SA_DIR; then - echo "INFO: Directory ${SA_DIR} will be created during installation stage." + echo "INFO: Directory ${SA_DIR} will be created during installation stage." fi AC_SUBST(SA_DIR) @@ -404,7 +404,7 @@ fi AC_MSG_RESULT($SYSCONFIG_DIR) if test ! -d $SYSCONFIG_DIR; then - echo "INFO: Directory ${SYSCONFIG_DIR} will be created during installation stage." + echo "INFO: Directory ${SYSCONFIG_DIR} will be created during installation stage." fi AC_SUBST(SYSCONFIG_DIR) @@ -436,15 +436,15 @@ AC_CHECK_LIB(intl, gettext, LFINTL="-lintl") AC_SUBST(LFINTL) LACKING_GETTEXT="n" -if test $AUX_NLS = "yes" && test x$MSGFMT != x"msgfmt"; then +if test $AUX_NLS = "yes" && test x$MSGFMT != x"msgfmt"; then echo "WARNING: msgfmt command not found!" LACKING_GETTEXT="y" fi -if test $AUX_NLS = "yes" && test x$XGETTEXT != x"xgettext"; then +if test $AUX_NLS = "yes" && test x$XGETTEXT != x"xgettext"; then echo "WARNING: xgettext command not found!" LACKING_GETTEXT="y" fi -if test $AUX_NLS = "yes" && test x$MSGMERGE != x"msgmerge"; then +if test $AUX_NLS = "yes" && test x$MSGMERGE != x"msgmerge"; then echo "WARNING: msgmerge command not found!" LACKING_GETTEXT="y" fi @@ -475,7 +475,7 @@ # Data history to keep by sa2 AC_MSG_CHECKING(number of daily data files to keep) -AC_ARG_VAR([history],[number of daily data files to keep (default value is 7)]) +AC_ARG_VAR([history],[number of daily data files to keep (default value is 7)]) if test x$history = x""; then HISTORY=7 else @@ -521,9 +521,9 @@ AC_MSG_RESULT($MAN_GROUP) else grep ^$man_group: /etc/group >/dev/null 2>&1 - if test $? = 1; then + if test $? = 1; then MAN_GROUP=$GRP - AC_MSG_RESULT($MAN_GROUP) + AC_MSG_RESULT($MAN_GROUP) echo "WARNING: Group ${man_group} not found: Using ${GRP} instead" else MAN_GROUP=$man_group @@ -579,14 +579,14 @@ # Start crontab AC_MSG_CHECKING(whether cron should start sar automatically) -AC_ARG_ENABLE(install-cron, +AC_ARG_ENABLE(install-cron, AC_HELP_STRING([--enable-install-cron], [install a crontab to start sar]), INSTALL_CRON=$enableval,INSTALL_CRON=n) if test $INSTALL_CRON != "yes"; then INSTALL_CRON=n AUX_CRON=no -else +else INSTALL_CRON=y AUX_CRON=yes fi @@ -595,7 +595,7 @@ # Crontab owner CUSR="root" -if test $INSTALL_CRON = "y"; then +if test $INSTALL_CRON = "y"; then AC_MSG_CHECKING(crontab owner) AC_ARG_VAR([cron_owner],[crontab owner]) if test x$cron_owner = x""; then @@ -607,17 +607,17 @@ CRON_OWNER=$CUSR; AC_MSG_RESULT($CRON_OWNER) echo "WARNING: User ${cron_owner} not found: Using ${CUSR} instead." - else + else CRON_OWNER=$cron_owner AC_MSG_RESULT($CRON_OWNER) fi fi echo "INFO: Crontab for ${CRON_OWNER} will be saved in current directory if necessary" - if test $CRON_OWNER = "root"; then + if test $CRON_OWNER = "root"; then SU_C_OWNER="" QUOTE="" REM_CHOWN="# REM_CHOWN" - else + else SU_C_OWNER="su $CRON_OWNER -c " QUOTE=\" # " (ignore this line) @@ -653,14 +653,14 @@ # Check whether sadc should collect all possible activities AC_MSG_CHECKING(whether sadc should collect all possible activities) - AC_ARG_ENABLE(collect-all, + AC_ARG_ENABLE(collect-all, AC_HELP_STRING([--enable-collect-all], [collect all possible activities]), COLLECT_ALL=$enableval,COLLECT_ALL=n) if test $COLLECT_ALL != "yes"; then COLLECT_ALL="" AUX_COLL=no - else + else COLLECT_ALL="-S XALL" AUX_COLL=yes fi @@ -731,7 +731,7 @@ # Check whether debug mode should be activated AC_MSG_CHECKING(whether debug mode should be activated) -AC_ARG_ENABLE(debuginfo, +AC_ARG_ENABLE(debuginfo, AC_HELP_STRING([--enable-debuginfo], [enable debug output (--debuginfo option)]), WITH_DEBUG=yes ; DFLAGS="$DFLAGS -DDEBUG" , WITH_DEBUG=no)
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/contrib/isag/isag ^
@@ -398,7 +398,7 @@ # sar switches as names for object-instances (final and current) set prog_swtch [list b B q r R S u v w W] -# maximal and current values for each graph indexed by sar switch i.e. for cpu +# maximal and current values for each graph indexed by sar switch i.e. for cpu # is index u not -u foreach l $prog_swtch {
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/contrib/isag/isag.1 ^
@@ -162,16 +162,16 @@ Default path is: \fI/var/log/sa\fR .Ip "\-c config_file" 4 .IX Item "-c config_file" -Specify the configuration file used by the \fIisag\fR command. +Specify the configuration file used by the \fIisag\fR command. The contents of this file may depend on \fIisag\fR version number. Default config file is: \fI$HOME/.isag.cfg\fR. .Ip "\-ght gr_height" 4 .IX Item "-ght gr_height" -Specify the height of the chart area. +Specify the height of the chart area. Default value is: \fI400\fR. .Ip "\-gwd gr_width" 4 .IX Item "-gwd gr_width" -Specify the width of the chart area. +Specify the width of the chart area. Default value is: \fI720\fR. .SH "CONFIG FILE" .IX Header "CONFIG FILE"
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/count.c ^
@@ -1,6 +1,6 @@ /* * count.c: Count items for which statistics will be collected. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -208,6 +208,7 @@ while ((fgets(line, INTERRUPTS_LINE + 11 * cpu_nr , fp) != NULL) && (irq < max_nr_irqcpu)) { + p = strcspn(line, ":"); if ((p > 0) && (p < 16)) { irq++; @@ -256,6 +257,7 @@ * the number of lines... / while (fgets(line, sizeof(line), fp) != NULL) { + if (!count_part) { i = sscanf(line, "%d %d %s %lu %u %u %u %lu", dev_name, &rd_ios, &wr_ios); @@ -473,7 +475,7 @@ continue; sscanf(pos2 + 1, "%127s", type); - if(strcmp(type, "autofs") == 0) + if (strcmp(type, "autofs") == 0) continue; /* Read filesystem name and mount point */
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/count.h ^
@@ -1,7 +1,7 @@ /* * count.h: Include file used to count items for which * statistics will be collected. - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _COUNT_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/format.c ^
@@ -1,6 +1,6 @@ /* * format.c: Output format definitions for sadf and sar - * (C) 2011-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2011-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/iconfig ^
@@ -1,6 +1,6 @@ #!/bin/sh #@(#) Configuration script for sysstat -# (C) 2000-2022 Sebastien GODARD (sysstat <at> orange.fr) +# (C) 2000-2023 Sebastien GODARD (sysstat <at> orange.fr) ASK="sh build/Ask.sh"
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/ioconf.c ^
@@ -107,6 +107,7 @@ } while (val > 0) { + *--p = syms[j = val % radix]; val /= radix; if (nozero && (j == 0)) {
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/iostat.c ^
@@ -1,6 +1,6 @@ /* * iostat: report CPU and I/O statistics - * (C) 1998-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1998-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -300,6 +300,7 @@ return NULL; while (dlist != NULL) { + d = dlist; if ((i = strcmp(d->name, name)) == 0) { /* Device found in list */
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/iostat.h ^
@@ -1,6 +1,6 @@ /* * iostat: report CPU and I/O statistics - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _IOSTAT_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/json_stats.c ^
@@ -1,6 +1,6 @@ /* * json_stats.c: Functions used by sadf to display statistics in JSON format. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/json_stats.h ^
@@ -1,6 +1,6 @@ /* * json_stats.h: Include file used to display system statistics in JSON format. - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _JSON_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/man/sadf.in ^
@@ -34,7 +34,7 @@ uses the standard system activity daily data file. It is also possible to enter .BR "-1" ", " "-2 " "etc. as an argument to " "sadf" -to display data of that days ago. For example, +to display data of that days ago. For example, .B -1 will point at the standard system activity file of yesterday. .PP
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/man/sar.in ^
@@ -1,5 +1,5 @@ .\" sar manual page - (C) 1999-2022 Sebastien Godard (sysstat <at> orange.fr) -.TH SAR 1 "MARCH 2022" Linux "Linux User's Manual" -- nroff -- +.TH SAR 1 "SEPTEMBER 2022" Linux "Linux User's Manual" -- nroff -- .SH NAME sar \- Collect, report, or save system activity information. @@ -1591,7 +1591,7 @@ ranges of values. .TP .B S_COLORS_SGR -Specify the colors and other attributes used to display statistics on the terminal. +Specify the colors and other attributes used to display statistics on the terminal. Its value is a colon-separated list of capabilities that defaults to .BR "C=33;22:H=31;1:I=32;22:M=35;1:N=34;1:R=31;22:Z=34;22" "." Supported capabilities are: @@ -1644,7 +1644,7 @@ .B sar -u 2 5 Report CPU utilization for each 2 seconds. 5 lines are displayed. .TP -.B sar -I 14 -o int14.file 2 10 +.B sar -I --int=14 -o int14.file 2 10 Report statistics on IRQ 14 for each 2 seconds. 10 lines are displayed. Data are stored in a file called .IR "int14.file" "."
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/man/sysstat.in ^
@@ -68,7 +68,7 @@ .RB "To figure out how a " "HISTORY" of 28 is applied in practice, we need to consider that the .BR "sa2 " "script that issues the " "find " "command to remove the" -old files typically runs just before mid-night on a given system, and since +old files typically runs just before midnight on a given system, and since the first record from .B sadc can also be written to the previous day's data file
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/man/tapestat.1 ^
@@ -34,7 +34,7 @@ .B tapestat report provides statistics for each tape drive connected to the system. The following data are displayed: -.IP r/s +.IP r/s The number of reads issued expressed as the number per second averaged over the interval. .IP w/s The number of writes issued expressed as the number per second averaged over the interval. @@ -107,7 +107,7 @@ command will never show a percentage value more than 999). If rewinding a tape takes 40 seconds where the interval time is 5 seconds the %Oa value would show as 0 in the intervals before the rewind completed and then show as approximately -800 percent when the rewind completes. +800 percent when the rewind completes. Similar values will be observed for %Rd and %Wr if a tape drive stops reading or writing and then restarts (that is it stopped streaming). In such a case you may see the r/s or w/s drop to zero and the %Rd/%Wr value could be higher than 100 when reading or writing continues
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/mpstat.c ^
@@ -1,6 +1,6 @@ /* * mpstat: per-processor statistics - * (C) 2000-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2000-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -290,6 +290,7 @@ int j; while (c < last) { + st_irq_i = st_irq[curr] + c + 1; st_irq_j = st_irq[!curr] + c + 1; st_irq_i->irq_nr = st_irq_j->irq_nr; @@ -1856,8 +1857,10 @@ * Parse header line to see which CPUs are online / while (fgets(line, INTERRUPTS_LINE + 11 cpu_nr, fp) != NULL) { + next = line; while (((cp = strstr(next, "CPU")) != NULL) && (index < cpu_nr)) { + cpu = strtol(cp + 3, &next, 10); if (cpu >= cpu_nr) break;
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/mpstat.h ^
@@ -1,6 +1,6 @@ /* * mpstat: per-processor statistics - * (C) 2000-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 2000-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _MPSTAT_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/nls/README-nls ^
@@ -36,7 +36,7 @@ Here is a complete example with iostat: $ export LANG=en_US -$ iostat -V +$ iostat -V sysstat version 5.1.4 (C) Sebastien Godard Usage: iostat [ options... ] [ <interval> [ <count> ] ]
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/nls/da.po ^
@@ -267,7 +267,7 @@ "\t\tStatistik for afbrydelser [A_IRQ]\n" # clock ? tog fra KDE ksysguard (klok) -# øjeblikkelig klokfrekvens / "CPU-klokfrevens lige nu:"/"CPUens +# øjeblikkelig klokfrekvens / "CPU-klokfrevens lige nu:"/"CPUens # klokfrekvens lige nu # spændingsinddata eller spændingsindgange. #: sar.c:155
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/nls/sysstat.pot ^
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n" -"POT-Creation-Date: 2022-02-28 08:35+0100\n" +"POT-Creation-Date: 2023-01-29 09:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,8 +43,8 @@ msgid "sysstat version %s\n" msgstr "" -#: count.c:118 ioconf.c:479 rd_stats.c:86 sa_common.c:1786 sadc.c:741 -#: sadc.c:804 +#: count.c:118 ioconf.c:480 rd_stats.c:86 sa_common.c:1802 sadc.c:747 +#: sadc.c:810 #, c-format msgid "Cannot open %s: %s\n" msgstr "" @@ -78,7 +78,7 @@ "[ <device> [...] \| ALL ]\n" msgstr "" -#: iostat.c:2177 sa_common.c:2334 +#: iostat.c:2178 sa_common.c:2350 #, c-format msgid "Invalid type of persistent device name\n" msgstr "" @@ -92,7 +92,7 @@ "[ --dec={ 0 \| 1 \| 2 } ] [ -o JSON ] [ -P { <cpu_list> \| ALL } ]\n" msgstr "" -#: mpstat.c:1757 pidstat.c:2292 sar.c:383 +#: mpstat.c:1758 pidstat.c:2299 sar.c:383 msgid "Average:" msgstr "" @@ -113,63 +113,63 @@ "[ --dec={ 0 \| 1 \| 2 } ] [ --human ]\n" msgstr "" -#: pidstat.c:211 sa_common.c:369 +#: pidstat.c:212 sa_common.c:368 #, c-format msgid "Requested activities not available\n" msgstr "" -#: pr_stats.c:2682 pr_stats.c:2689 pr_stats.c:2795 pr_stats.c:2842 +#: pr_stats.c:2680 pr_stats.c:2687 pr_stats.c:2793 pr_stats.c:2840 msgid "Summary:" msgstr "" -#: rd_stats.c:425 +#: rd_stats.c:427 #, c-format msgid "Cannot read %s\n" msgstr "" -#: sa_common.c:302 +#: sa_common.c:301 #, c-format msgid "File created by sar/sadc from sysstat version %d.%d.%d" msgstr "" -#: sa_common.c:335 +#: sa_common.c:334 #, c-format msgid "Invalid system activity file: %s\n" msgstr "" -#: sa_common.c:345 +#: sa_common.c:344 #, c-format msgid "Current sysstat version cannot read the format of this file (%#x)\n" msgstr "" -#: sa_common.c:349 +#: sa_common.c:348 #, c-format msgid "" "Try to convert it to current format. Enter:\n" "\n" msgstr "" -#: sa_common.c:352 +#: sa_common.c:351 #, c-format msgid "You should then be able to read the new file created (%s.new)\n" msgstr "" -#: sa_common.c:1368 +#: sa_common.c:1381 #, c-format msgid "Error while reading system activity file: %s\n" msgstr "" -#: sa_common.c:1378 +#: sa_common.c:1391 #, c-format msgid "End of system activity file unexpected\n" msgstr "" -#: sa_common.c:1789 +#: sa_common.c:1805 #, c-format msgid "Please check if data collecting is enabled\n" msgstr "" -#: sa_common.c:2124 +#: sa_common.c:2140 #, c-format msgid "Requested activities not available in file %s\n" msgstr "" @@ -179,38 +179,38 @@ msgid "Cannot convert the format of this file\n" msgstr "" -#: sa_conv.c:383 +#: sa_conv.c:385 #, c-format msgid "" "\n" "CPU activity not found in file. Aborting...\n" msgstr "" -#: sa_conv.c:406 +#: sa_conv.c:408 #, c-format msgid "" "\n" "Invalid data found. Aborting...\n" msgstr "" -#: sa_conv.c:1927 +#: sa_conv.c:1931 #, c-format msgid "Statistics:\n" msgstr "" -#: sa_conv.c:2028 +#: sa_conv.c:2032 #, c-format msgid "" "\n" "File format already up-to-date\n" msgstr "" -#: sa_conv.c:2040 +#: sa_conv.c:2044 #, c-format msgid "HZ: Using current value: %lu\n" msgstr "" -#: sa_conv.c:2071 +#: sa_conv.c:2075 #, c-format msgid "File successfully converted to sysstat format version %s\n" msgstr "" @@ -233,7 +233,7 @@ msgid "Cannot write data to system activity file: %s\n" msgstr "" -#: sadc.c:1028 +#: sadc.c:1040 #, c-format msgid "Cannot append data to that file (%s)\n" msgstr "" @@ -257,79 +257,79 @@ "[ -- <sar_options> ]\n" msgstr "" -#: sadf.c:1865 +#: sadf.c:1877 #, c-format msgid "PCP support not compiled in\n" msgstr "" -#: sadf_misc.c:1216 +#: sadf_misc.c:1220 #, c-format msgid "System activity data file: %s (%#x)\n" msgstr "" -#: sadf_misc.c:1225 +#: sadf_misc.c:1229 #, c-format msgid "Genuine sa datafile: %s (%x)\n" msgstr "" -#: sadf_misc.c:1226 +#: sadf_misc.c:1230 msgid "no" msgstr "" -#: sadf_misc.c:1226 +#: sadf_misc.c:1230 msgid "yes" msgstr ""
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pcp_def_metrics.c ^
@@ -1,6 +1,6 @@ /* * pcp_def_metrics.c: Functions used by sadf to define PCP metrics - * (C) 2019-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2019-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -60,6 +60,7 @@ /* Create instance for each interrupt for the current CPU / while (list != NULL) { + snprintf(buf, sizeof(buf), "%s::cpu%d", list->item_name, cpu); buf[sizeof(buf) - 1] = '\0'; @@ -319,6 +320,7 @@ / Create instances and metrics for each interrupts for CPU "all" / while (list != NULL) { + if (!strcmp(list->item_name, K_LOWERSUM)) { / * Create metric for interrupt "sum" for CPU "all". @@ -1704,11 +1706,11 @@ pmiUnits(0, 0, 0, 0, 0, 0)); pmiAddMetric("power.usb.manufacturer", - pmiID(34, 3, 3), PM_TYPE_STRING, indom, PM_SEM_DISCRETE, + pmiID(34, 3, 4), PM_TYPE_STRING, indom, PM_SEM_DISCRETE, pmiUnits(0, 0, 0, 0, 0, 0)); pmiAddMetric("power.usb.productName", - pmiID(34, 3, 3), PM_TYPE_STRING, indom, PM_SEM_DISCRETE, + pmiID(34, 3, 5), PM_TYPE_STRING, indom, PM_SEM_DISCRETE, pmiUnits(0, 0, 0, 0, 0, 0)); #endif /* HAVE_PCP */ }
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pcp_def_metrics.h ^
@@ -1,6 +1,6 @@ /* * pcp_def_metrics.h: Include file used to define PCP metrics. - * (C) 2019-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 2019-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _PCP_DEF_METRICS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pcp_stats.c ^
@@ -1,6 +1,6 @@ /* * pcp_stats.c: Functions used by sadf to create PCP archive files. - * (C) 2019-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2019-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pcp_stats.h ^
@@ -1,6 +1,6 @@ /* * pcp_stats.h: Include file used to display system statistics in PCP format. - * (C) 2019-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 2019-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _PCP_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pidstat.c ^
@@ -1,6 +1,6 @@ /* * pidstat: Report statistics for Linux tasks - * (C) 2007-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2007-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -138,6 +138,7 @@ struct st_pid p; while (plist != NULL) { + p = plist; if (!p->exist \|\| force) { plist = p->next; @@ -247,6 +248,7 @@ * other TIDs. / while (plist != NULL) { + p = plist; if (!p->tgid && (p->pid == pid)) / PID found in list / @@ -266,6 +268,7 @@ following its TGID. / while (plist != NULL) { + p = plist; if (p->pid == tgid) { / TGID found in list / @@ -282,6 +285,7 @@ plist = &(p->next); while (plist != NULL) { + p = plist; if ((p->tgid == tgid_p) && (p->pid == pid)) / TID found in list / @@ -605,6 +609,7 @@ return 1; while ((state < 3) && (fgets(line, sizeof(line), fp) != NULL)) { + switch (state) { case 0: if (strstr(line, "[stack]")) { @@ -882,6 +887,7 @@ return; while ((drp = __readdir(dir)) != NULL) { + if (!isdigit(drp->d_name[0])) { continue; } @@ -951,6 +957,7 @@ / Get directory entries */ while ((drp = __readdir(dir)) != NULL) { + if (!isdigit(drp->d_name[0])) { continue; }
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pidstat.h ^
@@ -1,6 +1,6 @@ /* * pidstat: Display per-process statistics. - * (C) 2007-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 2007-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _PIDSTAT_H #define _PIDSTAT_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pr_stats.c ^
@@ -1,6 +1,6 @@ /* * pr_stats.c: Functions used by sar to display statistics - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/pr_stats.h ^
@@ -1,6 +1,6 @@ /* * pr_stats.h: Include file used to display system statistics - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _PR_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/raw_stats.c ^
@@ -1,6 +1,6 @@ /* * raw_stats.c: Functions used by sar to display statistics in raw format. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/raw_stats.h ^
@@ -1,6 +1,6 @@ /* * raw_stats.h: Include file used to display statistics in raw format. - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _RAW_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/rd_sensors.c ^
@@ -1,6 +1,6 @@ /* * rd_sensors.c: Read sensors statistics - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -68,8 +68,10 @@ memset(st_pwr_fan, 0, STATS_PWR_FAN_SIZE); while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) { + i = 0; while ((feature = sensors_get_features(chip, &i))) { + if (feature->type == SENSORS_FEATURE_FAN) { j = 0; if (fan_read + 1 > nr_alloc) @@ -78,6 +80,7 @@ sensors_snprintf_chip_name(st_pwr_fan_i->device, MAX_SENSORS_DEV_LEN, chip); while ((sub = sensors_get_all_subfeatures(chip, feature, &j))) { + if ((sub->type == SENSORS_SUBFEATURE_FAN_INPUT) && (sub->flags & SENSORS_MODE_R)) { if (sensors_get_value(chip, sub->number, &st_pwr_fan_i->rpm)) { @@ -130,8 +133,10 @@ memset(st_pwr_temp, 0, STATS_PWR_TEMP_SIZE); while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) { + i = 0; while ((feature = sensors_get_features(chip, &i))) { + if (feature->type == SENSORS_FEATURE_TEMP) { j = 0; if (temp_read + 1 > nr_alloc) @@ -140,6 +145,7 @@ sensors_snprintf_chip_name(st_pwr_temp_i->device, MAX_SENSORS_DEV_LEN, chip); while ((sub = sensors_get_all_subfeatures(chip, feature, &j))) { + if ((sub->type == SENSORS_SUBFEATURE_TEMP_INPUT) && (sub->flags & SENSORS_MODE_R)) { if (sensors_get_value(chip, sub->number, &st_pwr_temp_i->temp)) { @@ -197,8 +203,10 @@ memset(st_pwr_in, 0, STATS_PWR_IN_SIZE); while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) { + i = 0; while ((feature = sensors_get_features(chip, &i))) { + if (feature->type == SENSORS_FEATURE_IN) { j = 0; if (in_read + 1 > nr_alloc) @@ -207,6 +215,7 @@ sensors_snprintf_chip_name(st_pwr_in_i->device, MAX_SENSORS_DEV_LEN, chip); while ((sub = sensors_get_all_subfeatures(chip, feature, &j))) { + if ((sub->type == SENSORS_SUBFEATURE_IN_INPUT) && (sub->flags & SENSORS_MODE_R)) { if (sensors_get_value(chip, sub->number, &st_pwr_in_i->in)) { @@ -254,8 +263,10 @@ int i; while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) { + i = 0; while ((feature = sensors_get_features(chip, &i))) { + if (feature->type == type) { count++; }
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/rd_sensors.h ^
@@ -1,6 +1,6 @@ /* * rd_sensors.h: Include file used to read sensors statistics - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _RD_SENSORS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/rd_stats.c ^
@@ -1,6 +1,6 @@ /* * rd_stats.c: Read system statistics - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -210,9 +210,11 @@ * Parse header line to see which CPUs are online / while (fgets(line, INTERRUPTS_LINE + 11 cpu_nr, fp) != NULL) { + next = line; while (((cp = strstr(next, "CPU")) != NULL) && (index < cpu_nr)) { cpu = strtol(cp + 3, &next, 10); + if (cpu + 2 > nr_alloc) { rc = -1; goto out; @@ -570,6 +572,7 @@ len = strlen(str); while (i < len - 3) { + if ((str[i] == '\\') && (str[i + 1] >= '0') && (str[i + 1] <= '3') && (str[i + 2] >= '0') && (str[i + 2] <= '7') && @@ -2625,7 +2628,7 @@ continue; sscanf(pos2 + 1, "%127s", type); - if(strcmp(type, "autofs") == 0) + if (strcmp(type, "autofs") == 0) continue; /* Read current filesystem name */
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/rd_stats.h ^
@@ -1,6 +1,6 @@ /* * rd_stats.h: Include file used to read system statistics - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _RD_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/rndr_stats.c ^
@@ -1,6 +1,6 @@ /* * rndr_stats.c: Functions used by sadf to display statistics in selected format. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/rndr_stats.h ^
@@ -1,6 +1,6 @@ /* * rndr_stats.h: Include file used to display system statistics in selected format. - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _RNDR_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa.h ^
@@ -1,6 +1,6 @@ /* * sar/sadc: Report system activity - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _SA_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa1.in ^
@@ -1,6 +1,6 @@ #!/bin/sh # @SA_LIB_DIR@/sa1 -# (C) 1999-2022 Sebastien Godard (sysstat <at> orange.fr) +# (C) 1999-2023 Sebastien Godard (sysstat <at> orange.fr) # #@(#) @PACKAGE_NAME@-@PACKAGE_VERSION@ #@(#) sa1: Collect and store binary data in system activity data file.
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa2.in ^
@@ -1,6 +1,6 @@ #!/bin/sh # @SA_LIB_DIR@/sa2 -# (C) 1999-2022 Sebastien Godard (sysstat <at> orange.fr) +# (C) 1999-2023 Sebastien Godard (sysstat <at> orange.fr) # #@(#) @PACKAGE_NAME@-@PACKAGE_VERSION@ #@(#) sa2: Write a daily report
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa_common.c ^
@@ -1,6 +1,6 @@ /* * sar and sadf common routines. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -427,6 +427,7 @@ char buffer = (char ) buf; while (nr_bytes > 0) { + block = write(fd, &buffer[offset], nr_bytes); if (block < 0) { @@ -458,7 +459,14 @@ int i, j; for (i = 0; i < NR_ACT; i++) { + if (act[i]->nr_ini > 0) { + + /* Look for a possible overflow / + check_overflow((unsigned int) act[i]->msize, + (unsigned int) act[i]->nr_ini, + (unsigned int) act[i]->nr2); + for (j = 0; j < 3; j++) { SREALLOC(act[i]->buf[j], void, (size_t) act[i]->msize (size_t) act[i]->nr_ini * (size_t) act[i]->nr2); @@ -522,6 +530,10 @@ while (nr_realloc < nr_min); } + /* Look for a possible overflow / + check_overflow((unsigned int) a->msize, (unsigned int) nr_realloc, + (unsigned int) a->nr2); + for (j = 0; j < 3; j++) { SREALLOC(a->buf[j], void, (size_t) a->msize nr_realloc * (size_t) a->nr2);
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa_conv.c ^
@@ -1,6 +1,6 @@ /* * sa_conv.c: Convert an old format sa file to the up-to-date format. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -221,14 +221,14 @@ file_hdr->sa_day = f_hdr_2173->sa_day; file_hdr->sa_month = f_hdr_2173->sa_month; file_hdr->sa_sizeof_long = f_hdr_2173->sa_sizeof_long; - strncpy(file_hdr->sa_sysname, f_hdr_2173->sa_sysname, UTSNAME_LEN); - file_hdr->sa_sysname[UTSNAME_LEN - 1] = '\0'; - strncpy(file_hdr->sa_nodename, f_hdr_2173->sa_nodename, UTSNAME_LEN); - file_hdr->sa_nodename[UTSNAME_LEN - 1] = '\0'; - strncpy(file_hdr->sa_release, f_hdr_2173->sa_release, UTSNAME_LEN); - file_hdr->sa_release[UTSNAME_LEN - 1] = '\0'; - strncpy(file_hdr->sa_machine, f_hdr_2173->sa_machine, UTSNAME_LEN); - file_hdr->sa_machine[UTSNAME_LEN - 1] = '\0'; + strncpy(file_hdr->sa_sysname, f_hdr_2173->sa_sysname, sizeof(file_hdr->sa_sysname)); + file_hdr->sa_sysname[sizeof(file_hdr->sa_sysname) - 1] = '\0'; + strncpy(file_hdr->sa_nodename, f_hdr_2173->sa_nodename, sizeof(file_hdr->sa_nodename)); + file_hdr->sa_nodename[sizeof(file_hdr->sa_nodename) - 1] = '\0'; + strncpy(file_hdr->sa_release, f_hdr_2173->sa_release, sizeof(file_hdr->sa_release)); + file_hdr->sa_release[sizeof(file_hdr->sa_release) - 1] = '\0'; + strncpy(file_hdr->sa_machine, f_hdr_2173->sa_machine, sizeof(file_hdr->sa_machine)); + file_hdr->sa_machine[sizeof(file_hdr->sa_machine) - 1] = '\0'; *vol_act_nr = f_hdr_2173->sa_vol_act_nr; } @@ -552,7 +552,8 @@ strcpy(sic->irq_name, K_LOWERSUM); } else { - sprintf(sic->irq_name, "%d", i - 1); + snprintf(sic->irq_name, sizeof(sic->irq_name), "%d", i - 1 > NR2_MAX ? NR2_MAX : i - 1); + sic->irq_name[sizeof(sic->irq_name) - 1] = '\0'; } } } @@ -570,7 +571,8 @@ strcpy(sic->irq_name, K_LOWERSUM); } else { - sprintf(sic->irq_name, "%d", i - 1); + snprintf(sic->irq_name, sizeof(sic->irq_name), "%d", i - 1 > NR2_MAX ? NR2_MAX : i - 1); + sic->irq_name[sizeof(sic->irq_name) - 1] = '\0'; } } }
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa_conv.h ^
@@ -1,6 +1,6 @@ /* * sa_conv.h: Include file for "sadf -c" command. - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) / #ifndef _SA_CONV_H @@ -11,6 +11,8 @@ 2171: v9.1.6 -> 10.2.1 * 2173: 10.3.1 -> 11.6.x / +#define UTSNAME_LEN_2171 65 + struct file_header_2171 { unsigned long sa_ust_time __attribute__ ((aligned (8))); unsigned int sa_act_nr __attribute__ ((aligned (8))); @@ -18,10 +20,10 @@ unsigned char sa_month; unsigned char sa_year; char sa_sizeof_long; - char sa_sysname[UTSNAME_LEN]; - char sa_nodename[UTSNAME_LEN]; - char sa_release[UTSNAME_LEN]; - char sa_machine[UTSNAME_LEN]; + char sa_sysname[UTSNAME_LEN_2171]; + char sa_nodename[UTSNAME_LEN_2171]; + char sa_release[UTSNAME_LEN_2171]; + char sa_machine[UTSNAME_LEN_2171]; }; #define FILE_HEADER_SIZE_2171 (sizeof(struct file_header_2171)) @@ -29,6 +31,8 @@ #define FILE_HEADER_2171_UL_NR 1 #define FILE_HEADER_2171_U_NR 1 +#define UTSNAME_LEN_2173 65 + struct file_header_2173 { unsigned long sa_ust_time __attribute__ ((aligned (8))); unsigned int sa_last_cpu_nr __attribute__ ((aligned (8))); @@ -38,10 +42,10 @@ unsigned char sa_month; unsigned char sa_year; char sa_sizeof_long; - char sa_sysname[UTSNAME_LEN]; - char sa_nodename[UTSNAME_LEN]; - char sa_release[UTSNAME_LEN]; - char sa_machine[UTSNAME_LEN]; + char sa_sysname[UTSNAME_LEN_2173]; + char sa_nodename[UTSNAME_LEN_2173]; + char sa_release[UTSNAME_LEN_2173]; + char sa_machine[UTSNAME_LEN_2173]; }; #define FILE_HEADER_2173_ULL_NR 0 @@ -199,69 +203,79 @@ }; / Structure stats_net_dev for ACTIVITY_MAGIC_BASE format / +#define MAX_IFACE_LEN_8A 16 + struct stats_net_dev_8a { - unsigned long rx_packets __attribute__ ((aligned (8))); - unsigned long tx_packets __attribute__ ((aligned (8))); - unsigned long rx_bytes __attribute__ ((aligned (8))); - unsigned long tx_bytes __attribute__ ((aligned (8))); - unsigned long rx_compressed __attribute__ ((aligned (8))); - unsigned long tx_compressed __attribute__ ((aligned (8))); - unsigned long multicast __attribute__ ((aligned (8))); - char interface[MAX_IFACE_LEN] __attribute__ ((aligned (8))); + unsigned long rx_packets __attribute__ ((aligned (8))); + unsigned long tx_packets __attribute__ ((aligned (8))); + unsigned long rx_bytes __attribute__ ((aligned (8))); + unsigned long tx_bytes __attribute__ ((aligned (8))); + unsigned long rx_compressed __attribute__ ((aligned (8))); + unsigned long tx_compressed __attribute__ ((aligned (8))); + unsigned long multicast __attribute__ ((aligned (8))); + char interface[MAX_IFACE_LEN_8A] __attribute__ ((aligned (8))); }; / Structure stats_net_dev for ACTIVITY_MAGIC_BASE + 1 format / +#define MAX_IFACE_LEN_8B 16 + struct stats_net_dev_8b { - unsigned long long rx_packets __attribute__ ((aligned (16))); - unsigned long long tx_packets __attribute__ ((aligned (16))); - unsigned long long rx_bytes __attribute__ ((aligned (16))); - unsigned long long tx_bytes __attribute__ ((aligned (16))); - unsigned long long rx_compressed __attribute__ ((aligned (16))); - unsigned long long tx_compressed __attribute__ ((aligned (16))); - unsigned long long multicast __attribute__ ((aligned (16))); - char interface[MAX_IFACE_LEN] __attribute__ ((aligned (16))); + unsigned long long rx_packets __attribute__ ((aligned (16))); + unsigned long long tx_packets __attribute__ ((aligned (16))); + unsigned long long rx_bytes __attribute__ ((aligned (16))); + unsigned long long tx_bytes __attribute__ ((aligned (16))); + unsigned long long rx_compressed __attribute__ ((aligned (16))); + unsigned long long tx_compressed __attribute__ ((aligned (16))); + unsigned long long multicast __attribute__ ((aligned (16))); + char interface[MAX_IFACE_LEN_8B] __attribute__ ((aligned (16))); }; / Structure stats_net_dev for ACTIVITY_MAGIC_BASE + 2 format / +#define MAX_IFACE_LEN_8C 16 + struct stats_net_dev_8c { - unsigned long long rx_packets __attribute__ ((aligned (16))); - unsigned long long tx_packets __attribute__ ((aligned (16))); - unsigned long long rx_bytes __attribute__ ((aligned (16))); - unsigned long long tx_bytes __attribute__ ((aligned (16))); - unsigned long long rx_compressed __attribute__ ((aligned (16))); - unsigned long long tx_compressed __attribute__ ((aligned (16))); - unsigned long long multicast __attribute__ ((aligned (16))); - unsigned int speed __attribute__ ((aligned (16))); - char interface[MAX_IFACE_LEN] __attribute__ ((aligned (4))); - char duplex; + unsigned long long rx_packets __attribute__ ((aligned (16))); + unsigned long long tx_packets __attribute__ ((aligned (16))); + unsigned long long rx_bytes __attribute__ ((aligned (16))); + unsigned long long tx_bytes __attribute__ ((aligned (16))); + unsigned long long rx_compressed __attribute__ ((aligned (16))); + unsigned long long tx_compressed __attribute__ ((aligned (16))); + unsigned long long multicast __attribute__ ((aligned (16))); + unsigned int speed __attribute__ ((aligned (16))); + char interface[MAX_IFACE_LEN_8C] __attribute__ ((aligned (4))); + char duplex; }; / Structure stats_net_edev for ACTIVITY_MAGIC_BASE format / +#define MAX_IFACE_LEN_8A 16 + struct stats_net_edev_8a { - unsigned long collisions __attribute__ ((aligned (8))); - unsigned long rx_errors __attribute__ ((aligned (8))); - unsigned long tx_errors __attribute__ ((aligned (8))); - unsigned long rx_dropped __attribute__ ((aligned (8))); - unsigned long tx_dropped __attribute__ ((aligned (8))); - unsigned long rx_fifo_errors __attribute__ ((aligned (8))); - unsigned long tx_fifo_errors __attribute__ ((aligned (8))); - unsigned long rx_frame_errors __attribute__ ((aligned (8))); - unsigned long tx_carrier_errors __attribute__ ((aligned (8))); - char interface[MAX_IFACE_LEN] __attribute__ ((aligned (8))); + unsigned long collisions __attribute__ ((aligned (8))); + unsigned long rx_errors __attribute__ ((aligned (8))); + unsigned long tx_errors __attribute__ ((aligned (8))); + unsigned long rx_dropped __attribute__ ((aligned (8))); + unsigned long tx_dropped __attribute__ ((aligned (8))); + unsigned long rx_fifo_errors __attribute__ ((aligned (8))); + unsigned long tx_fifo_errors __attribute__ ((aligned (8))); + unsigned long rx_frame_errors __attribute__ ((aligned (8))); + unsigned long tx_carrier_errors __attribute__ ((aligned (8))); + char interface[MAX_IFACE_LEN_8A] __attribute__ ((aligned (8))); }; / Structure stats_net_edev for ACTIVITY_MAGIC_BASE + 1 format / +#define MAX_IFACE_LEN_8B 16 + struct stats_net_edev_8b { - unsigned long long collisions __attribute__ ((aligned (16))); - unsigned long long rx_errors __attribute__ ((aligned (16))); - unsigned long long tx_errors __attribute__ ((aligned (16))); - unsigned long long rx_dropped __attribute__ ((aligned (16))); - unsigned long long tx_dropped __attribute__ ((aligned (16))); - unsigned long long rx_fifo_errors __attribute__ ((aligned (16))); - unsigned long long tx_fifo_errors __attribute__ ((aligned (16))); - unsigned long long rx_frame_errors __attribute__ ((aligned (16))); - unsigned long long tx_carrier_errors __attribute__ ((aligned (16))); - char interface[MAX_IFACE_LEN] __attribute__ ((aligned (16))); + unsigned long long collisions __attribute__ ((aligned (16))); + unsigned long long rx_errors __attribute__ ((aligned (16))); + unsigned long long tx_errors __attribute__ ((aligned (16))); + unsigned long long rx_dropped __attribute__ ((aligned (16))); + unsigned long long tx_dropped __attribute__ ((aligned (16))); + unsigned long long rx_fifo_errors __attribute__ ((aligned (16))); + unsigned long long tx_fifo_errors __attribute__ ((aligned (16))); + unsigned long long rx_frame_errors __attribute__ ((aligned (16))); + unsigned long long tx_carrier_errors __attribute__ ((aligned (16))); + char interface[MAX_IFACE_LEN_8B] __attribute__ ((aligned (16))); }; / Structure stats_net_ip for ACTIVITY_MAGIC_BASE format / @@ -383,15 +397,17 @@ }; / Structure stats_filesystem for ACTIVITY_MAGIC_BASE */ +#define MAX_FS_LEN_8A 128 + struct stats_filesystem_8a { - unsigned long long f_blocks __attribute__ ((aligned (16))); - unsigned long long f_bfree __attribute__ ((aligned (16))); - unsigned long long f_bavail __attribute__ ((aligned (16))); - unsigned long long f_files __attribute__ ((aligned (16))); - unsigned long long f_ffree __attribute__ ((aligned (16))); - char fs_name[MAX_FS_LEN] __attribute__ ((aligned (16))); + unsigned long long f_blocks __attribute__ ((aligned (16))); + unsigned long long f_bfree __attribute__ ((aligned (16))); + unsigned long long f_bavail __attribute__ ((aligned (16))); + unsigned long long f_files __attribute__ ((aligned (16))); + unsigned long long f_ffree __attribute__ ((aligned (16)));
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sa_wrap.c ^
@@ -1,6 +1,6 @@ /* * sysstat - sa_wrap.c: Functions used in activity.c - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -952,7 +952,7 @@ st_pwr_wghfreq = (struct stats_pwr_wghfreq *) a->_buf0; } } - while(nr_read < 0); + while (nr_read < 0); a->_nr0 = nr_read;
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sadc.c ^
@@ -1,6 +1,6 @@ /* * sadc: system activity data collector - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -360,6 +360,12 @@ } if (IS_COLLECTED(act[i]->options) && (act[i]->nr_ini > 0)) { + + /* Look for a possible overflow / + check_overflow((unsigned int) act[i]->msize, + (unsigned int) act[i]->nr_ini, + (unsigned int) act[i]->nr2); + / Allocate structures for current activity (using nr_ini and nr2 results) / SREALLOC(act[i]->_buf0, void, (size_t) act[i]->msize (size_t) act[i]->nr_ini * (size_t) act[i]->nr2); @@ -1007,6 +1013,12 @@ if (act[p]->nr_ini > act[p]->nr_allocated) { act[p]->nr_allocated = act[p]->nr_ini; } + + /* Look for a possible overflow / + check_overflow((unsigned int) act[p]->msize, + (unsigned int) act[p]->nr_allocated, + (unsigned int) act[p]->nr2); + SREALLOC(act[p]->_buf0, void, (size_t) act[p]->msize (size_t) act[p]->nr_allocated * (size_t) act[p]->nr2);
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sadf.c ^
@@ -1,6 +1,6 @@ /* * sadf: system activity data formatter - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sadf.h ^
@@ -1,6 +1,6 @@ /* * sadf: System activity data formatter - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _SADF_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sadf_misc.c ^
@@ -1,6 +1,6 @@ /* * sadf_misc.c: Functions used by sadf to display special records - * (C) 2011-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2011-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sar.c ^
@@ -1,6 +1,6 @@ /* * sar: report system activity - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -123,7 +123,7 @@ "[ -A ] [ -B ] [ -b ] [ -C ] [ -D ] [ -d ] [ -F [ MOUNT ] ] [ -H ] [ -h ]\n" "[ -p ] [ -r [ ALL ] ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ]\n" "[ -v ] [ -W ] [ -w ] [ -y ] [ -z ]\n" - "[ -I { <int_list> \| SUM \| ALL } ] [ -P { <cpu_list> \| ALL } ]\n" + "[ -I [ SUM \| ALL ] ] [ -P { <cpu_list> \| ALL } ]\n" "[ -m { <keyword> [,...] \| ALL } ] [ -n { <keyword> [,...] \| ALL } ]\n" "[ -q [ <keyword> [,...] \| ALL ] ]\n" "[ --dev=<dev_list> ] [ --fs=<fs_list> ] [ --iface=<iface_list> ] " @@ -153,7 +153,7 @@ printf(_("\t-F [ MOUNT ]\n")); printf(_("\t\tFilesystems statistics [A_FS]\n")); printf(_("\t-H\tHugepages utilization statistics [A_HUGE]\n")); - printf(_("\t-I { <int_list> \| SUM \| ALL }\n" + printf(_("\t-I [ SUM \| ALL ]\n" "\t\tInterrupts statistics [A_IRQ]\n")); printf(_("\t-m { <keyword> [,...] \| ALL }\n" "\t\tPower management statistics [A_PWR_...]\n"
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/svg_stats.c ^
@@ -1,6 +1,6 @@ /* * svg_stats.c: Functions used by sadf to display statistics in SVG format. - * (C) 2016-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2016-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it * @@ -174,7 +174,7 @@ *************************************************************************** * Find the min and max values of all the graphs that will be drawn in the * same view. The graphs have their own min and max values in - * spmin[pos...pos+n-1] and spmax[pos...pos+n-1]. + * spmin[pos...pos+n-1] and spmax[pos...pos+n-1]. * * IN: * @pos Position in array for the first graph extrema value.
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/svg_stats.h ^
@@ -1,6 +1,6 @@ /* * svg_stats.h: Include file used to display system statistics in SVG format. - * (C) 2016-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 2016-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _SVG_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sysconfig.in ^
@@ -1,6 +1,6 @@ /* * sysstat: System performance tools for Linux - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _SYSCONFIG_H
[-] [+]	Added	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sysstat-12.6.2.lsm ^
@@ -0,0 +1,35 @@ +Begin4 +Title: sysstat - the sar, sadf, mpstat, iostat, tapestat, pidstat and cifsiostat commands for Linux +Version: 12.6.2 +Entered-date: 2023-01-29 +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: sysstat@NOSPAM.orange.fr (Sebastien Godard) +Maintained-by: sysstat@NOSPAM.orange.fr (Sebastien Godard) +Primary-site: http://pagesperso-orange.fr/sebastien.godard/ + 853kiB sysstat-12.6.2.tar.xz +Alternate-site: +Copying-policy: GPL +End
[-] [+]	Added	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sysstat-12.6.2.spec ^
@@ -0,0 +1,83 @@ +Summary: SAR, SADF, MPSTAT, IOSTAT, TAPESTAT, PIDSTAT and CIFSIOSTAT for Linux +Name: sysstat +Version: 12.6.2 +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 +
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sysstat.in ^
@@ -4,7 +4,7 @@ # description: Reset the system activity logs # # @INIT_DIR@/sysstat -# (C) 2000-2022 Sebastien Godard (sysstat <at> orange.fr) +# (C) 2000-2023 Sebastien Godard (sysstat <at> orange.fr) # ### BEGIN INIT INFO # Provides: sysstat
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/sysstat.ioconf ^
@@ -66,7 +66,7 @@ #4:0:0:NODEV #5:0:0:NODEV #6:0:0:NODEV -7:loop::0:d:256::1:Loop Devices +7:loop::0:d:256::1:Loop Devices 8:sd::0:a:16::16:SCSI - Controller %d 65:8:1:
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/systest.c ^
@@ -1,6 +1,6 @@ /* * sysstat test functions. - * (C) 2019-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 2019-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/systest.h ^
@@ -1,6 +1,6 @@ /* * sysstat: System performance tools for Linux - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _SYSTEST_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/tapestat.c ^
@@ -178,6 +178,7 @@ return 0; while ((entry = readdir(dir)) != NULL) { + if (regexec(&tape_reg, &entry->d_name[0], 1, &match, 0) == 0) { /* d_name[2] to skip the st at the front */ tmp = atoi(&entry->d_name[2]) + 1;
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/tapestat.h ^
@@ -1,7 +1,7 @@ /* * tapestat: report tape statistics * (C) 2015 Hewlett-Packard Development Company, L.P. - * + * * Initial revision by Shane M. SEYMOUR (shane.seymour <at> hpe.com) * Modified for sysstat by Sebastien GODARD (sysstat <at> orange.fr) */
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/version.in ^
@@ -1,6 +1,6 @@ /* * sysstat: System performance tools for Linux - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _VERSION_H
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/xml_stats.c ^
@@ -1,6 +1,6 @@ /* * xml_stats.c: Functions used by sadf to display statistics in XML. - * (C) 1999-2022 by Sebastien GODARD (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien GODARD (sysstat <at> orange.fr) * *************************************************************************** * This program is free software; you can redistribute it and/or modify it *
[-] [+]	Changed	_service:tar_git:sysstat-12.6.2+git1.tar.gz/upstream/xml_stats.h ^
@@ -1,6 +1,6 @@ /* * xml_stats.h: Include file used to display system statistics in XML. - * (C) 1999-2022 by Sebastien Godard (sysstat <at> orange.fr) + * (C) 1999-2023 by Sebastien Godard (sysstat <at> orange.fr) */ #ifndef _XML_STATS_H
[-] [+]	Changed	_service:tar_git:sysstat.yaml ^
@@ -3,7 +3,7 @@ # CAREFUL!! upstream has even/odd stable/dev versioning scheme. # we probably always want the stable version. # check the URL for news. -Version: 12.6.0 +Version: 12.6.2 Release: 1 Group: Applications License: GPLv2