Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libstatgrab for openSUSE:Factory 
checked in at 2022-02-18 23:02:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstatgrab (Old)
 and      /work/SRC/openSUSE:Factory/.libstatgrab.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libstatgrab"

Fri Feb 18 23:02:59 2022 rev:18 rq:955791 version:0.92.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/libstatgrab/libstatgrab.changes  2020-08-31 
16:55:03.200492621 +0200
+++ /work/SRC/openSUSE:Factory/.libstatgrab.new.1958/libstatgrab.changes        
2022-02-18 23:03:33.705409943 +0100
@@ -1,0 +2,12 @@
+Fri Jan 28 23:14:04 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 0.92.1
+  * Fix build with autoconf 2.70+.
+  * Fix CPU stats on older Linux kernels.
+  * Make sure to count processes in an unknown state.
+  * Check if -ltinfo is needed when linking ncurses.
+  * Fixes to build when cross-compiling.
+  * Fix build with -DNDEBUG.
+  * Handle vmmeter changes in FreeBSD 12. 
+
+-------------------------------------------------------------------

Old:
----
  libstatgrab-0.92.tar.gz

New:
----
  libstatgrab-0.92.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libstatgrab.spec ++++++
--- /var/tmp/diff_new_pack.QDFKgW/_old  2022-02-18 23:03:34.169409907 +0100
+++ /var/tmp/diff_new_pack.QDFKgW/_new  2022-02-18 23:03:34.169409907 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libstatgrab
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,13 @@
 
 %define soname  10
 Name:           libstatgrab
-Version:        0.92
+Version:        0.92.1
 Release:        0
 Summary:        Interface to System Statistics
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://libstatgrab.org/
-Source:         
https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-%{version}.tar.gz
+Source:         
https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92_1/libstatgrab-%{version}.tar.gz
 Source1:        statgrab.desktop
 Source2:        saidar.desktop
 Source3:        baselibs.conf

++++++ libstatgrab-0.92.tar.gz -> libstatgrab-0.92.1.tar.gz ++++++
++++ 5546 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/ChangeLog new/libstatgrab-0.92.1/ChangeLog
--- old/libstatgrab-0.92/ChangeLog      2019-07-16 18:06:26.000000000 +0200
+++ new/libstatgrab-0.92.1/ChangeLog    2021-07-28 17:02:35.000000000 +0200
@@ -1,3 +1,258 @@
+2021-04-13  Tim Bishop  <t...@bishnet.net>
+
+    Update for 0.92.1 release.
+
+    
+  Hash: 13227a3baebe03d4eca147d860ca73f610984999
+  Files affected:
+
+    NEWS
+    configure.ac
+    src/libstatgrab/Makefile.am
+
+2021-07-21  mglae  <mglm...@arcor.de>
+
+    vector.c: fix building with -DNDEBUG
+
+    Fix for
+    ``` src/libstatgrab/vector.c:73:39: error: expected '=', ',', ';', 'asm'
+    or '__attribute__' before '{' token
+      73 | sg_prove_vector(const sg_vector *vec) {
+         |                                       ^ make[3]: ***
+    [Makefile:497: vector.lo] Error 1
+    ``` when compiling with -DNDEBUG
+
+    Signed-off-by: mglae <mglm...@arcor.de> Signed-off-by: Jens Rehsack
+    <s...@netbsd.org>
+
+  Hash: ea04ae1795e802fc0b7a5d3398151d7d9d047db8
+  Files affected:
+
+    src/libstatgrab/vector.c
+
+2021-07-26  Jens Rehsack  <s...@netbsd.org>
+
+    src/libstatgrab/cpu_stats.c: avoid vmmeter compile warnings
+
+    Add explicitely type conversion to (unsigned long long) from
+    counter_u64_t to avoid compile warnings:
+    ``` cpu_stats.c:347:35: warning: incompatible pointer to integer
+    conversion assigning to 'unsigned long long' from 'counter_u64_t' (aka
+    'unsigned long *') [-Wint-conversion]
+                   cpu_stats_buf->context_switches = vmmeter.v_swtch;
+                                                   ^ ~~~~~~~~~~~~~~~ 
+    cpu_stats.c:348:27: warning: incompatible pointer to integer conversion
+    assigning to 'unsigned long long' from 'counter_u64_t' (aka 'unsigned
+    long *') [-Wint-conversion]
+                   cpu_stats_buf->syscalls = vmmeter.v_syscall;
+                                           ^ ~~~~~~~~~~~~~~~~~ 
+    cpu_stats.c:349:27: warning: incompatible pointer to integer conversion
+    assigning to 'unsigned long long' from 'counter_u64_t' (aka 'unsigned
+    long *') [-Wint-conversion]
+                   cpu_stats_buf->syscalls += vmmeter.v_trap;
+                                           ^  ~~~~~~~~~~~~~~ 
+    cpu_stats.c:351:29: warning: incompatible pointer to integer conversion
+    assigning to 'unsigned long long' from 'counter_u64_t' (aka 'unsigned
+    long *') [-Wint-conversion]
+                   cpu_stats_buf->interrupts = vmmeter.v_intr;
+                                             ^ ~~~~~~~~~~~~~~ 
+    cpu_stats.c:352:34: warning: incompatible pointer to integer conversion
+    assigning to 'unsigned long long' from 'counter_u64_t' (aka 'unsigned
+    long *') [-Wint-conversion]
+                   cpu_stats_buf->soft_interrupts = vmmeter.v_soft;
+                                                  ^ ~~~~~~~~~~~~~~ 5
+    warnings generated.
+    ```
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: ffa2bb3c23cdc788330590e324bb8791d190877d
+  Files affected:
+
+    src/libstatgrab/cpu_stats.c
+
+2020-09-28  Jens Rehsack  <s...@netbsd.org>
+
+    configure.ac: please 'struct vmmeter'
+
+    According to https://github.com/libstatgrab/libstatgrab/issues/105, 
+    FreeBSD 12+ needs a small extra please to provide struct vmmeter access.
+
+    Give it a try by adding _WANT_VMMETER define in configure stage and in
+    case of successful probing in such case - in config.h (which is very
+    likely included before sys/vmmeter.h)
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: 2fd6002671f3c8a0c2ca46a18fff169ca5340f39
+  Files affected:
+
+    configure.ac
+
+2021-07-04  Jens Rehsack  <s...@netbsd.org>
+
+    {configure.ac,m4/ax_pthread.m4}: fix broken targetted system evaluation
+
+    According longer discussion in
+    
https://github.com/autoconf-archive/autoconf-archive/commit/2567e0ce0f3a11b535c6b527386197fb49ff172b#r52080885
 
+    relying on `$target_os` wasn't that smart as intend.
+
+    Roll forward to fix:
+       7ab89ec m4/ax_pthread.m4: target > host
+       cd479ea configure.ac: target > host
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: 35b747cebf6873db432fbf9a692870f3fad57cdc
+  Files affected:
+
+    configure.ac
+    m4/ax_pthread.m4
+
+2021-02-05  Khem Raj  <raj.k...@gmail.com>
+
+    configure.ac: Do not use single line comment
+
+    autoconf 2.70+ does not like it and regenerating configure script fails
+
+    | ../libstatgrab-0.92/configure: line 7818: syntax error near unexpected
+    token `ac_fn_check_decl'
+    | ../libstatgrab-0.92/configure: line 7818: `fi ac_fn_check_decl
+    "$LINENO" "__sun" "ac_cv_have_decl___sun" "$ac_includes_default"
+    "$ac_c_undeclared_builtin_options" "CFLAGS"'
+
+    Signed-off-by: Khem Raj <raj.k...@gmail.com>
+
+  Hash: 1205aed6593b83f69297512b89c7813d77be89d4
+  Files affected:
+
+    configure.ac
+
+2020-09-28  Jens Rehsack  <s...@netbsd.org>
+
+    src/libstatgrab/cpu_stats.c: handle reduced Linux
+
+    There are Linux kernels out there that do not provide information about
+    'cpu', 'intr', 'ctxt' or 'softirq'. Accept, that when information aren't 
+    provided via appropriate API, it's similar to the datum is available but 
+    nulled.
+
+    This patch should also help fixing
+    https://github.com/libstatgrab/libstatgrab/issues/124
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: 74a42a2ec96e50f203d202c81443f2f5a39348fd
+  Files affected:
+
+    src/libstatgrab/cpu_stats.c
+
+2020-03-02  Jens Rehsack  <s...@netbsd.org>
+
+    m4/ax_pthread.m4: target > host
+
+    Even if cross-compiling is not the most used use-case, it's much more 
+    important where we build for then where we run configure stage on (see 
+    autoconf-manual "18.6.3 Hosts and Cross-Compilation").
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: 7ab89ece14ca6ec8d652e909c66961ee711e67db
+  Files affected:
+
+    m4/ax_pthread.m4
+
+2020-03-02  Jens Rehsack  <s...@netbsd.org>
+
+    m4/ax_pthread.m4: ensure C++ is handled analogous
+
+    Since at least AIX behaves for CC_r/xlC_r as it does for cc_r/xlc_r and
+    so on, use the same logic for CXX <-> PTHREAD_CXX as provided for CC <->
+    PTHREAD_CC to avoid code & issue duplication.
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: 2296d8c14481da8647688cbdafda9f0868b88b43
+  Files affected:
+
+    m4/ax_pthread.m4
+
+2020-03-13  Jens Rehsack  <s...@netbsd.org>
+
+    m4: ax_pthread.m4: update to serial 27
+
+    Update to most recent version of ax_pthread.m4 from GNU
+    autoconf-archive.
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: 9bf78d1ef468ce96d3a6bf2670160489284883da
+  Files affected:
+
+    m4/ax_pthread.m4
+
+2020-03-02  Jens Rehsack  <s...@netbsd.org>
+
+    configure.ac: target > host
+
+    Even if cross-compiling is not the most used use-case, it's much more 
+    important where we build for then where we run configure stage on (see 
+    autoconf-manual "18.6.3 Hosts and Cross-Compilation").
+
+    Signed-off-by: Jens Rehsack <s...@netbsd.org>
+
+  Hash: cd479eae9ea5d67082b0235930f0a76b5ffd5732
+  Files affected:
+
+    configure.ac
+
+2020-09-04  Tim Bishop  <t...@bishnet.net>
+
+    Catch processes with an unknown state.
+
+    Without this change the state is undefined, but most likely 0 which is
+    SG_PROCESS_STATE_RUNNING.
+
+    Fixes #122.
+
+  Hash: a36df0079cab5d9f0bcc5af68a48e85d9fa037d6
+  Files affected:
+
+    src/libstatgrab/process_stats.c
+
+2020-08-20  Tim Bishop  <t...@bishnet.net>
+
+    On Gentoo -ltinfo is needed for linking ncurses.
+
+    
+  Hash: 3c20c13eeadab9ea22db31e924f68363d811431c
+  Files affected:
+
+    m4/ax_ncurses.m4
+
+2020-08-17  Tim Bishop  <t...@bishnet.net>
+
+    Add new OS versions.
+
+    Also remove old ones, and move distfile build to latest Ubuntu.
+
+  Hash: 0696f09cc1aa3329e80b85e22bc00caf45038ec9
+  Files affected:
+
+    .gitlab-ci.yml
+
+2019-10-03  Bartosz Fenski  <fe...@debian.org>
+
+    typos
+
+    
+  Hash: 9a6ff64238f8dfc0a1742fe70f018bbc811a69c6
+  Files affected:
+
+    docs/libstatgrab/sg_comp_init.xml
+    docs/libstatgrab/sg_init.xml
+    docs/libstatgrab/sg_vector_create.xml
+
 2019-07-16  Tim Bishop  <t...@bishnet.net>
 
     Fix build/install of manpages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/NEWS new/libstatgrab-0.92.1/NEWS
--- old/libstatgrab-0.92/NEWS   2019-07-16 18:05:37.000000000 +0200
+++ new/libstatgrab-0.92.1/NEWS 2021-07-28 17:01:55.000000000 +0200
@@ -6,6 +6,15 @@
        but as always we'll like to hear about any bugs found in the
        current release.
 
+libstatgrab 0.92.1 (27 July 2021)
+ * Fix build with autoconf 2.70+.
+ * Fix CPU stats on older Linux kernels.
+ * Make sure to count processes in an unknown state.
+ * Check if -ltinfo is needed when linking ncurses.
+ * Fixes to build when cross-compiling.
+ * Fix build with -DNDEBUG.
+ * Handle vmmeter changes in FreeBSD 12.
+
 libstatgrab 0.92 (16 July 2019)
  * Fix various file descriptor leaks.
  * On Linux, read process thread name from comm where available (fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/ar-lib new/libstatgrab-0.92.1/ar-lib
--- old/libstatgrab-0.92/ar-lib 2019-07-16 18:06:35.000000000 +0200
+++ new/libstatgrab-0.92.1/ar-lib       2021-07-28 17:02:44.000000000 +0200
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010-2017 Free Software Foundation, Inc.
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
 # Written by Peter Rosin <p...@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/compile new/libstatgrab-0.92.1/compile
--- old/libstatgrab-0.92/compile        2019-07-16 18:06:35.000000000 +0200
+++ new/libstatgrab-0.92.1/compile      2021-07-28 17:02:44.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tro...@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/config.h.in new/libstatgrab-0.92.1/config.h.in
--- old/libstatgrab-0.92/config.h.in    2019-07-16 18:06:34.000000000 +0200
+++ new/libstatgrab-0.92.1/config.h.in  2021-07-28 17:02:43.000000000 +0200
@@ -939,6 +939,9 @@
    #define below would cause a syntax error. */
 #undef _UINT8_T
 
+/* struct vmmeter needs to be pleased */
+#undef _WANT_VMMETER
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/configure.ac new/libstatgrab-0.92.1/configure.ac
--- old/libstatgrab-0.92/configure.ac   2019-07-16 18:05:37.000000000 +0200
+++ new/libstatgrab-0.92.1/configure.ac 2021-07-28 17:01:55.000000000 +0200
@@ -13,27 +13,31 @@
 AC_PREREQ([2.69])
 
 # Change these to change the package name and version
-AC_INIT([libstatgrab],[0.92],[https://libstatgrab.org/issues],[],[https://libstatgrab.org/])
+AC_INIT([libstatgrab],[0.92.1],[https://libstatgrab.org/issues],[],[https://libstatgrab.org/])
 AC_CONFIG_SRCDIR([src/libstatgrab/cpu_stats.c])
-AM_INIT_AUTOMAKE()
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-# The file we use to pass #define's to the source
 AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE([disable])
-
-# Revision number (automatically updated)
-AC_REVISION($Revision$)
 
-dnl
 dnl Get cannonical host - the only one of build/host/target we care about
 dnl build is where we build, host the the machine we build for
 dnl
+dnl The 'build' machine                is the machine on which the software is 
built.
+dnl The 'host' machine         is the machine on which the software will run.
+dnl The 'target' machine       is the machine that the software is being
+dnl                            configured to operate on, such as a
+dnl                            cross-compiler or cross-linker.
 AC_CANONICAL_HOST
 dnl and store it for generic error message instead of lots of ifdef's
 AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os",
                    [Define to be the name of the operating system.])
 
+AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+# The file we use to pass #define's to the source
+AM_MAINTAINER_MODE([disable])
+
+dnl # Revision number (automatically updated)
+dnl AC_REVISION($Revision$)
+
 dnl AM_CONFIG_HEADER([config.h])
 
 dnl disable unnecessary compiler checks
@@ -99,7 +103,8 @@
 
 dnl Check for extra flags to enable some kind of behavior
 AC_CHECK_DECL([_AIX],[ac_cv_need_minus_d_linux_source_compat="yes"; 
ac_cv_need_minus_d_all_source="yes"])
-AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"]) dnl probably 
required by kfreebsd, too?
+dnl probably required by kfreebsd, too?
+AC_CHECK_DECL([__linux],[ac_cv_need_minus_d_gnu_source="yes"])
 AC_CHECK_DECL([__sun],[ac_cv_need_minus_d_extensions="yes"; 
ac_cv_need_minus_d_posix_pthread_semantics="yes"])
 AC_CHECK_DECL([__hpux],[ac_cv_need_minus_d_hpux_source="yes"])
 
@@ -1158,7 +1163,7 @@
                        ])
                ])
 
-               AC_CHECK_TYPES([struct vmtotal, struct vmmeter], , , 
[AC_LANG_SOURCE([
+           AC_CHECK_TYPES([struct vmtotal, struct vmmeter], , , 
[AC_LANG_SOURCE([
 AC_INCLUDES_DEFAULT
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -1171,10 +1176,31 @@
 #endif
                ])])
 
-                       AC_CHECK_MEMBER(struct vmmeter.v_cache_count,
-                                       [AC_DEFINE(HAVE_VMMETER_V_CACHE_COUNT, 
1, [v_cache_count member of struct vmmeter available])], ,
-                                       [AC_LANG_SOURCE([
+               # when <sys/vmmeter.h> is available but struct vmmeter not 
found, ask kindly for access via _WANT_VMMETER
+           AS_IF(      [test "x$ac_cv_header_sys_vmmeter_h" = "xyes" -a 
"x$ac_cv_type_struct_vmmeter" != "xyes"], [
+               unset ac_cv_type_struct_vmmeter
+               AC_CHECK_TYPES([struct vmmeter], , , [AC_LANG_SOURCE([
+AC_INCLUDES_DEFAULT
+#define _WANT_VMMETER
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+#ifdef HAVE_SYS_VMMETER_H
+#include <sys/vmmeter.h>
+#endif
+                   ])])
+
+               AS_IF(  [test "x$ac_cv_type_struct_vmmeter" = "xyes"], 
[AC_DEFINE([_WANT_VMMETER], 1, [struct vmmeter needs to be pleased])], [])
+           ])
+
+               AC_CHECK_MEMBER(struct vmmeter.v_cache_count,
+                               [AC_DEFINE(HAVE_VMMETER_V_CACHE_COUNT, 1, 
[v_cache_count member of struct vmmeter available])], ,
+                               [AC_LANG_SOURCE([
 AC_INCLUDES_DEFAULT
+#define _WANT_VMMETER
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
@@ -1184,8 +1210,8 @@
 #ifdef HAVE_SYS_VMMETER_H
 # include <sys/vmmeter.h>
 #endif
-                                       ]
-                       )])
+                               ]
+               )])
 
                AC_CHECK_TYPES([struct xswdev, struct xsw_usage], , , 
[AC_LANG_SOURCE([
 AC_INCLUDES_DEFAULT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_comp_destroy.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_comp_destroy.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_comp_destroy.3     2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_comp_destroy.3   2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_comp_init 3 2019-03-08 libstatgrab ""
+.TH sg_comp_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_comp_init, sg_comp_destroy, sg_comp_get_tls, sg_global_lock, 
sg_global_unlock \- managing system statistics delivery
 .SH SYNOPSIS
@@ -307,7 +307,7 @@
 \*(T<\fBEXTENDED_COMP_SETUP\fR\*(T>() cares about anything
 to be automatically done for instantiating an component information
 structure for the specified component \*(T<comp\*(T>
-but the required defintion of the initialisation, destruction and
+but the required definition of the initialisation, destruction and
 cleanup routines. The created TLS storage structure will hold
 \*(T<nvect\*(T> pointer elements and that's it. After
 the amount of required vector pointers to be stored, the list of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_comp_get_tls.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_comp_get_tls.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_comp_get_tls.3     2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_comp_get_tls.3   2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_comp_init 3 2019-03-08 libstatgrab ""
+.TH sg_comp_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_comp_init, sg_comp_destroy, sg_comp_get_tls, sg_global_lock, 
sg_global_unlock \- managing system statistics delivery
 .SH SYNOPSIS
@@ -307,7 +307,7 @@
 \*(T<\fBEXTENDED_COMP_SETUP\fR\*(T>() cares about anything
 to be automatically done for instantiating an component information
 structure for the specified component \*(T<comp\*(T>
-but the required defintion of the initialisation, destruction and
+but the required definition of the initialisation, destruction and
 cleanup routines. The created TLS storage structure will hold
 \*(T<nvect\*(T> pointer elements and that's it. After
 the amount of required vector pointers to be stored, the list of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_comp_init.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_comp_init.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_comp_init.3        2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_comp_init.3      2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_comp_init 3 2019-03-08 libstatgrab ""
+.TH sg_comp_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_comp_init, sg_comp_destroy, sg_comp_get_tls, sg_global_lock, 
sg_global_unlock \- managing system statistics delivery
 .SH SYNOPSIS
@@ -307,7 +307,7 @@
 \*(T<\fBEXTENDED_COMP_SETUP\fR\*(T>() cares about anything
 to be automatically done for instantiating an component information
 structure for the specified component \*(T<comp\*(T>
-but the required defintion of the initialisation, destruction and
+but the required definition of the initialisation, destruction and
 cleanup routines. The created TLS storage structure will hold
 \*(T<nvect\*(T> pointer elements and that's it. After
 the amount of required vector pointers to be stored, the list of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_drop_privileges.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_drop_privileges.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_drop_privileges.3  2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_drop_privileges.3        
2021-07-28 17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_init 3 2019-03-24 libstatgrab ""
+.TH sg_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_init, sg_snapshot, sg_shutdown, sg_drop_privileges \- initialise libstatgrab
 .SH SYNOPSIS
@@ -83,7 +83,7 @@
 .PP
 \*(T<\fBsg_shutdown\fR\*(T>() decrements the initialisation
 counter. If the counter reaches zero, components' destructors are
-called, mutual exclusion semaphores (exept "statgrab") are
+called, mutual exclusion semaphores (except "statgrab") are
 destroyed etc.
 \*(T<\fBsg_shutdown\fR\*(T>() is protected by the mutex named
 "statgrab".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_free_stats_buf.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_free_stats_buf.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_free_stats_buf.3   2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_free_stats_buf.3 2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_get_nelements.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_get_nelements.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_get_nelements.3    2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_get_nelements.3  2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_global_lock.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_global_lock.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_global_lock.3      2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_global_lock.3    2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_comp_init 3 2019-03-08 libstatgrab ""
+.TH sg_comp_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_comp_init, sg_comp_destroy, sg_comp_get_tls, sg_global_lock, 
sg_global_unlock \- managing system statistics delivery
 .SH SYNOPSIS
@@ -307,7 +307,7 @@
 \*(T<\fBEXTENDED_COMP_SETUP\fR\*(T>() cares about anything
 to be automatically done for instantiating an component information
 structure for the specified component \*(T<comp\*(T>
-but the required defintion of the initialisation, destruction and
+but the required definition of the initialisation, destruction and
 cleanup routines. The created TLS storage structure will hold
 \*(T<nvect\*(T> pointer elements and that's it. After
 the amount of required vector pointers to be stored, the list of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_global_unlock.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_global_unlock.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_global_unlock.3    2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_global_unlock.3  2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_comp_init 3 2019-03-08 libstatgrab ""
+.TH sg_comp_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_comp_init, sg_comp_destroy, sg_comp_get_tls, sg_global_lock, 
sg_global_unlock \- managing system statistics delivery
 .SH SYNOPSIS
@@ -307,7 +307,7 @@
 \*(T<\fBEXTENDED_COMP_SETUP\fR\*(T>() cares about anything
 to be automatically done for instantiating an component information
 structure for the specified component \*(T<comp\*(T>
-but the required defintion of the initialisation, destruction and
+but the required definition of the initialisation, destruction and
 cleanup routines. The created TLS storage structure will hold
 \*(T<nvect\*(T> pointer elements and that's it. After
 the amount of required vector pointers to be stored, the list of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_init.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_init.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_init.3     2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_init.3   2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_init 3 2019-03-24 libstatgrab ""
+.TH sg_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_init, sg_snapshot, sg_shutdown, sg_drop_privileges \- initialise libstatgrab
 .SH SYNOPSIS
@@ -83,7 +83,7 @@
 .PP
 \*(T<\fBsg_shutdown\fR\*(T>() decrements the initialisation
 counter. If the counter reaches zero, components' destructors are
-called, mutual exclusion semaphores (exept "statgrab") are
+called, mutual exclusion semaphores (except "statgrab") are
 destroyed etc.
 \*(T<\fBsg_shutdown\fR\*(T>() is protected by the mutex named
 "statgrab".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_prove_vector.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_prove_vector.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_prove_vector.3     2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_prove_vector.3   2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_shutdown.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_shutdown.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_shutdown.3 2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_shutdown.3       2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_init 3 2019-03-24 libstatgrab ""
+.TH sg_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_init, sg_snapshot, sg_shutdown, sg_drop_privileges \- initialise libstatgrab
 .SH SYNOPSIS
@@ -83,7 +83,7 @@
 .PP
 \*(T<\fBsg_shutdown\fR\*(T>() decrements the initialisation
 counter. If the counter reaches zero, components' destructors are
-called, mutual exclusion semaphores (exept "statgrab") are
+called, mutual exclusion semaphores (except "statgrab") are
 destroyed etc.
 \*(T<\fBsg_shutdown\fR\*(T>() is protected by the mutex named
 "statgrab".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_snapshot.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_snapshot.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_snapshot.3 2019-07-16 
18:06:53.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_snapshot.3       2021-07-28 
17:03:01.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_init 3 2019-03-24 libstatgrab ""
+.TH sg_init 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_init, sg_snapshot, sg_shutdown, sg_drop_privileges \- initialise libstatgrab
 .SH SYNOPSIS
@@ -83,7 +83,7 @@
 .PP
 \*(T<\fBsg_shutdown\fR\*(T>() decrements the initialisation
 counter. If the counter reaches zero, components' destructors are
-called, mutual exclusion semaphores (exept "statgrab") are
+called, mutual exclusion semaphores (except "statgrab") are
 destroyed etc.
 \*(T<\fBsg_shutdown\fR\*(T>() is protected by the mutex named
 "statgrab".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_clear.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_clear.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_clear.3     2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_clear.3   2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_clone.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_clone.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_clone.3     2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_clone.3   2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_clone_into.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_clone_into.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_clone_into.3        
2019-07-16 18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_clone_into.3      
2021-07-28 17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_compute_diff.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_compute_diff.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_compute_diff.3      
2019-07-16 18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_compute_diff.3    
2021-07-28 17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_create.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_create.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_create.3    2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_create.3  2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_free.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_free.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_free.3      2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_free.3    2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/docs/libstatgrab/sg_vector_resize.3 
new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_resize.3
--- old/libstatgrab-0.92/docs/libstatgrab/sg_vector_resize.3    2019-07-16 
18:06:52.000000000 +0200
+++ new/libstatgrab-0.92.1/docs/libstatgrab/sg_vector_resize.3  2021-07-28 
17:03:00.000000000 +0200
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH sg_vector_create 3 2019-03-08 libstatgrab ""
+.TH sg_vector_create 3 2019-10-03 libstatgrab ""
 .SH NAME
 sg_vector_create, sg_vector_clear, sg_vector_resize, sg_vector_free, 
sg_vector_clone, sg_vector_clone_into, sg_vector_compute_diff, sg_prove_vector, 
sg_get_nelements, sg_free_stats_buf \- statgrab vector management
 .SH SYNOPSIS
@@ -127,7 +127,7 @@
 .PP
 \*(T<\fBsg_vector_resize\fR\*(T>() increases or decreases the
 amount of allocated elements in the specified vector. The amount of
-allocated elements is always a multiple of the intialisation parameter
+allocated elements is always a multiple of the initialisation parameter
 \*(T<block_size\*(T>. In the special case,
 \*(T<\fBsg_vector_resize\fR\*(T>() is called with 0 in
 argument \*(T<new_count\*(T>, the vector is freed after
@@ -370,7 +370,7 @@
 NULL otherwise.
 When \*(T<\fBVECTOR_CREATE_OR_RESIZE\fR\*(T>() returns a NULL
 pointer and \*(T<new_count\*(T> is not equal to 0 (zero),
-the intructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
+the instructions from the macro \*(T<\fBVECTOR_UPDATE_ERROR_CLEANUP\fR\*(T>
 are executed to cleanup before returning from current subroutine with
 the error which has been occurred.
 .PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/m4/ax_ncurses.m4 new/libstatgrab-0.92.1/m4/ax_ncurses.m4
--- old/libstatgrab-0.92/m4/ax_ncurses.m4       2019-07-16 18:05:37.000000000 
+0200
+++ new/libstatgrab-0.92.1/m4/ax_ncurses.m4     2021-07-28 17:01:55.000000000 
+0200
@@ -23,12 +23,19 @@
           mp_cv_ncurses="ncurses/ncurses.h"
           CURSES_LIB="-lncurses"
         ], [
-          LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses"
+          LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses -ltinfo"
           CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
-          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], 
[
-            mp_cv_ncurses="curses.h"
-            CURSES_LIB="-lcurses"
-          ], [mp_cv_ncurses=no])
+          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], 
[testcode])], [
+            mp_cv_ncurses="ncurses.h"
+            CURSES_LIB="-lncurses -ltinfo"
+          ], [
+            LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses"
+            CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS"
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], 
[testcode])], [
+              mp_cv_ncurses="curses.h"
+              CURSES_LIB="-lcurses"
+            ], [mp_cv_ncurses=no])
+          ])
         ])
       ])
     ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/m4/ax_pthread.m4 new/libstatgrab-0.92.1/m4/ax_pthread.m4
--- old/libstatgrab-0.92/m4/ax_pthread.m4       2019-07-16 18:05:37.000000000 
+0200
+++ new/libstatgrab-0.92.1/m4/ax_pthread.m4     2021-07-28 17:01:55.000000000 
+0200
@@ -14,20 +14,24 @@
 #   flags that are needed. (The user can also force certain compiler
 #   flags/libs to be tested by setting these environment variables.)
 #
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
+#   Also sets PTHREAD_CC and PTHREAD_CXX to any special C compiler that is
+#   needed for multi-threaded programs (defaults to the value of CC
+#   respectively CXX otherwise). (This is necessary on e.g. AIX to use the
+#   special cc_r/CC_r compiler alias.)
 #
 #   NOTE: You are assumed to not only compile your program with these flags,
 #   but also to link with them as well. For example, you might link with
 #   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#   $PTHREAD_CXX $CXXFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
 #
 #   If you are only building threaded programs, you may wish to use these
 #   variables in your default LIBS, CFLAGS, and CC:
 #
 #     LIBS="$PTHREAD_LIBS $LIBS"
 #     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
 #     CC="$PTHREAD_CC"
+#     CXX="$PTHREAD_CXX"
 #
 #   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
 #   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
@@ -55,6 +59,7 @@
 #
 #   Copyright (c) 2008 Steven G. Johnson <stev...@alum.mit.edu>
 #   Copyright (c) 2011 Daniel Richard G. <sk...@iskunk.org>
+#   Copyright (c) 2019 Marc Stevens <marc.stev...@cwi.nl>
 #
 #   This program is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -82,7 +87,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 24
+#serial 31
 
 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
 AC_DEFUN([AX_PTHREAD], [
@@ -104,6 +109,7 @@
         ax_pthread_save_CFLAGS="$CFLAGS"
         ax_pthread_save_LIBS="$LIBS"
         AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        AS_IF([test "x$PTHREAD_CXX" != "x"], [CXX="$PTHREAD_CXX"])
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
         LIBS="$PTHREAD_LIBS $LIBS"
         AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS 
$PTHREAD_LIBS])
@@ -123,10 +129,12 @@
 # (e.g. DEC) have both -lpthread and -lpthreads, where one of the
 # libraries is broken (non-POSIX).
 
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
+# Create a list of thread flags to try. Items with a "," contain both
+# C compiler flags (before ",") and linker flags (after ","). Other items
+# starting with a "-" are C compiler flags, and remaining items are
+# library names, except for "none" which indicates that we try without
+# any flags at all, and "pthread-config" which is a program returning
+# the flags for the Pth emulation library.
 
 ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread 
--thread-safe -mt pthread-config"
 
@@ -194,14 +202,47 @@
         # that too in a future libc.)  So we'll check first for the
         # standard Solaris way of linking pthreads (-mt -lpthread).
 
-        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
         ;;
 esac
 
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+
 # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
 
+# Note that for GCC and Clang -pthread generally implies -lpthread,
+# except when -nostdlib is passed.
+# This is problematic using libtool to build C++ shared libraries with pthread:
+# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
+# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
+# To solve this, first try -pthread together with -lpthread for GCC
+
 AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
+      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads 
$ax_pthread_flags"])
+
+# Clang takes -pthread (never supported any other flag), but we'll try with 
-lpthread first
+
+AS_IF([test "x$ax_pthread_clang" = "xyes"],
+      [ax_pthread_flags="-pthread,-lpthread -pthread"])
+
 
 # The presence of a feature test macro requesting re-entrant function
 # definitions is, on some systems, a strong hint that pthreads support is
@@ -224,25 +265,86 @@
       [ax_pthread_check_cond=0],
       [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
 
-# Are we compiling with Clang?
 
-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                *,*)
+                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed 
"s/^\(.*\),\(.*\)$/\1/"`
+                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed 
"s/^\(.*\),\(.*\)$/\2/"`
+                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" 
and "$PTHREAD_LIBS"])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with 
$ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], 
[no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config 
--libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library 
-l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void *some_global = NULL;
+                        static void routine(void *a)
+                          {
+                             /* To avoid any unused-parameter or
+                                unused-but-set-parameter warning.  */
+                             some_global = a;
+                          }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
 
-ax_pthread_clang_warning=no
 
 # Clang needs special handling, because older versions handle the -pthread
 # option in a rather... idiosyncratic way
@@ -261,11 +363,6 @@
         # -pthread does define _REENTRANT, and while the Darwin headers
         # ignore this macro, third-party headers might not.)
 
-        PTHREAD_CFLAGS="-pthread"
-        PTHREAD_LIBS=
-
-        ax_pthread_ok=yes
-
         # However, older versions of Clang make a point of warning the user
         # that, in an invocation where only linking and no compilation is
         # taking place, the -pthread option has no effect ("argument unused
@@ -294,7 +391,7 @@
              # step
              ax_pthread_save_ac_link="$ac_link"
              ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_link_step=`AS_ECHO(["$ac_link"]) | sed 
"$ax_pthread_sed"`
              ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && 
($ax_pthread_link_step)"
              ax_pthread_save_CFLAGS="$CFLAGS"
              for ax_pthread_try in '' -Qunused-arguments 
-Wno-unused-command-line-argument unknown; do
@@ -320,78 +417,7 @@
 
 fi # $ax_pthread_clang = yes
 
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -mt,pthread)
-                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
-                PTHREAD_CFLAGS="-mt"
-                PTHREAD_LIBS="-lpthread"
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with 
$ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
 
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], 
[no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config 
--libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library 
-l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
 
 # Various other checks:
 if test "x$ax_pthread_ok" = "xyes"; then
@@ -438,7 +464,8 @@
         AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
             [ax_cv_PTHREAD_PRIO_INHERIT],
             [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = 
PTHREAD_PRIO_INHERIT;]])],
+                                             [[int i = PTHREAD_PRIO_INHERIT;
+                                               return i;]])],
                             [ax_cv_PTHREAD_PRIO_INHERIT=yes],
                             [ax_cv_PTHREAD_PRIO_INHERIT=no])
             ])
@@ -460,18 +487,28 @@
                     [#handle absolute path differently from PATH based program 
lookup
                      AS_CASE(["x$CC"],
                          [x/*],
-                         
[AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                         [
+                          
AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
+                          AS_IF([test "x${CXX}" != "x"], 
[AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
+                        ],
+                         [
+                          AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
+                          AS_IF([test "x${CXX}" != "x"], 
[AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
+                        ]
+                     )
+                    ])
                 ;;
             esac
         fi
 fi
 
 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"
 
 AC_SUBST([PTHREAD_LIBS])
 AC_SUBST([PTHREAD_CFLAGS])
 AC_SUBST([PTHREAD_CC])
+AC_SUBST([PTHREAD_CXX])
 
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "x$ax_pthread_ok" = "xyes"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/m4/libtool.m4 new/libstatgrab-0.92.1/m4/libtool.m4
--- old/libstatgrab-0.92/m4/libtool.m4  2019-07-16 18:06:30.000000000 +0200
+++ new/libstatgrab-0.92.1/m4/libtool.m4        2021-07-28 17:02:39.000000000 
+0200
@@ -1041,8 +1041,8 @@
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
       echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
       cat > conftest.c << _LT_EOF
@@ -1492,7 +1492,7 @@
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
 _LT_DECL([], [AR], [1], [The archiver])
 _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
 
@@ -4063,7 +4063,8 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" 
\> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | 
$lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> 
$nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
        mv -f "$nlist"T "$nlist"
@@ -4703,6 +4704,12 @@
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
@@ -6438,7 +6445,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | 
$GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | 
$GREP -v "^Configured with:" | $GREP " \-L"'
 
     else
       GXX=no
@@ -6813,7 +6820,7 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v 
conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z 
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; 
done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v 
conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z 
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; 
done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -6878,7 +6885,7 @@
            # explicitly linking system object files so we need to strip them
            # from the output so that they don't get included in the library
            # dependencies.
-           output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v 
conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z 
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; 
done; func_echo_all "$list"'
+           output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v 
conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z 
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; 
done; func_echo_all "$list"'
            ;;
           *)
            if test yes = "$GXX"; then
@@ -7217,7 +7224,7 @@
              # Commands to make compiler produce verbose output that lists
              # what "hidden" libraries, object files and flags are used when
              # linking a shared library.
-             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 
2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
            else
              # FIXME: insert proper C++ library support
@@ -7301,7 +7308,7 @@
                # Commands to make compiler produce verbose output that lists
                # what "hidden" libraries, object files and flags are used when
                # linking a shared library.
-               output_verbose_link_cmd='$CC -shared $CFLAGS -v 
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+               output_verbose_link_cmd='$CC -shared $CFLAGS -v 
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
              else
                # g++ 2.7 appears to require '-G' NOT '-shared' on this
                # platform.
@@ -7312,7 +7319,7 @@
                # Commands to make compiler produce verbose output that lists
                # what "hidden" libraries, object files and flags are used when
                # linking a shared library.
-               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 
2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
              fi
 
              _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/missing new/libstatgrab-0.92.1/missing
--- old/libstatgrab-0.92/missing        2019-07-16 18:06:35.000000000 +0200
+++ new/libstatgrab-0.92.1/missing      2021-07-28 17:02:44.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
   exit $st
 fi
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/src/libstatgrab/Makefile.am 
new/libstatgrab-0.92.1/src/libstatgrab/Makefile.am
--- old/libstatgrab-0.92/src/libstatgrab/Makefile.am    2019-07-16 
18:05:37.000000000 +0200
+++ new/libstatgrab-0.92.1/src/libstatgrab/Makefile.am  2021-07-28 
17:01:55.000000000 +0200
@@ -10,7 +10,7 @@
 nodist_include_HEADERS = statgrab.h
 lib_LTLIBRARIES = libstatgrab.la
 
-libstatgrab_la_LDFLAGS = -version-info 10:1:0 @LINKFLAGS@
+libstatgrab_la_LDFLAGS = -version-info 10:2:0 @LINKFLAGS@
 
 if MINGW
 libstatgrab_la_MINGWSOURCES = win32.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/src/libstatgrab/cpu_stats.c 
new/libstatgrab-0.92.1/src/libstatgrab/cpu_stats.c
--- old/libstatgrab-0.92/src/libstatgrab/cpu_stats.c    2019-07-16 
18:05:37.000000000 +0200
+++ new/libstatgrab-0.92.1/src/libstatgrab/cpu_stats.c  2021-07-28 
17:01:55.000000000 +0200
@@ -260,8 +260,8 @@
 
        fclose(f);
 
-       if( matched < 4 ) {
-               RETURN_WITH_SET_ERROR("cpu", SG_ERROR_PARSE, "not all from 
'cpu', 'intr', 'ctxt', 'softirq' found in '/proc/stat'");
+       if( matched == 0 ) {
+               RETURN_WITH_SET_ERROR("cpu", SG_ERROR_PARSE, "all from 'cpu', 
'intr', 'ctxt', 'softirq' missing from '/proc/stat'");
        }
 
        cpu_stats_buf->total = cpu_stats_buf->user + cpu_stats_buf->nice + 
cpu_stats_buf->kernel + cpu_stats_buf->idle;
@@ -344,12 +344,12 @@
        size = sizeof(vmmeter);
        memset(&vmmeter, 0, sizeof(vmmeter));
        if( (sysctl( mib, 2, &vmmeter, &size, NULL, 0 ) == 0) && (size == 
sizeof(vmmeter)) ) {
-               cpu_stats_buf->context_switches = vmmeter.v_swtch;
-               cpu_stats_buf->syscalls = vmmeter.v_syscall;
-               cpu_stats_buf->syscalls += vmmeter.v_trap;
+               cpu_stats_buf->context_switches = (unsigned long 
long)vmmeter.v_swtch;
+               cpu_stats_buf->syscalls = (unsigned long long)vmmeter.v_syscall;
+               cpu_stats_buf->syscalls += (unsigned long long)vmmeter.v_trap;
                cpu_stats_buf->voluntary_context_switches = 
cpu_stats_buf->involuntary_context_switches = 0;
-               cpu_stats_buf->interrupts = vmmeter.v_intr;
-               cpu_stats_buf->soft_interrupts = vmmeter.v_soft;
+               cpu_stats_buf->interrupts = (unsigned long long)vmmeter.v_intr;
+               cpu_stats_buf->soft_interrupts = (unsigned long 
long)vmmeter.v_soft;
        }
        else {
                cpu_stats_buf->context_switches = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/src/libstatgrab/process_stats.c 
new/libstatgrab-0.92.1/src/libstatgrab/process_stats.c
--- old/libstatgrab-0.92/src/libstatgrab/process_stats.c        2019-07-16 
18:05:37.000000000 +0200
+++ new/libstatgrab-0.92.1/src/libstatgrab/process_stats.c      2021-07-28 
17:01:55.000000000 +0200
@@ -552,6 +552,8 @@
                case 'D':
                        proc_stats_ptr[proc_items].state = 
SG_PROCESS_STATE_STOPPED;
                        break;
+               default:
+                       proc_stats_ptr[proc_items].state = 
SG_PROCESS_STATE_UNKNOWN;
                }
 
                /* pa_name[0] should = '(' */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/libstatgrab-0.92/src/libstatgrab/vector.c 
new/libstatgrab-0.92.1/src/libstatgrab/vector.c
--- old/libstatgrab-0.92/src/libstatgrab/vector.c       2019-07-16 
18:05:37.000000000 +0200
+++ new/libstatgrab-0.92.1/src/libstatgrab/vector.c     2021-07-28 
17:01:55.000000000 +0200
@@ -69,6 +69,7 @@
                vector->used_count = new_count;
 }
 
+#ifndef NDEBUG
 sg_error
 sg_prove_vector(const sg_vector *vec) {
        TRACE_LOG_FMT("vector", "sg_prove_vector(%p)", vec);
@@ -76,6 +77,7 @@
        assert( SG_VECTOR_FINAL_EYE == vec->final_eye );
        return SG_ERROR_NONE;
 }
+#endif
 
 static sg_error
 sg_prove_vector_compat(const sg_vector *one, const sg_vector *two) {

Reply via email to