Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package monitoring-plugins-nwc_health for 
openSUSE:Factory checked in at 2021-06-16 20:34:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health (Old)
 and      /work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.32437 
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "monitoring-plugins-nwc_health"

Wed Jun 16 20:34:59 2021 rev:12 rq:900229 version:8.3.3.2

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/monitoring-plugins-nwc_health/monitoring-plugins-nwc_health.changes
      2021-05-10 15:41:32.673047644 +0200
+++ 
/work/SRC/openSUSE:Factory/.monitoring-plugins-nwc_health.new.32437/monitoring-plugins-nwc_health.changes
   2021-06-16 20:36:50.719325408 +0200
@@ -1,0 +2,11 @@
+Mon Jun 14 14:08:25 UTC 2021 - Martin Hauke <[email protected]>
+
+- Update to version 8.3.3.2
+  * bugfix in IOS cpu-load for very old models without
+    CISCO-PROCESS-MIB.
+  * bugfix in f5 memory-usage, correct negative values.
+  * Add vpn sessions for Fortigate.
+  * optimize etherlike and rmon walks.
+  * save bgp peer local addresses and show them in the error case.
+
+-------------------------------------------------------------------

Old:
----
  check_nwc_health-8.3.2.2.tar.gz

New:
----
  check_nwc_health-8.3.3.2.tar.gz

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

Other differences:
------------------
++++++ monitoring-plugins-nwc_health.spec ++++++
--- /var/tmp/diff_new_pack.Gk9Rp9/_old  2021-06-16 20:36:51.107326070 +0200
+++ /var/tmp/diff_new_pack.Gk9Rp9/_new  2021-06-16 20:36:51.111326077 +0200
@@ -19,7 +19,7 @@
 
 %define         realname check_nwc_health
 Name:           monitoring-plugins-nwc_health
-Version:        8.3.2.2
+Version:        8.3.3.2
 Release:        0
 Summary:        This plugin checks the health of network components and 
interfaces
 # https://github.com/lausser/check_nwc_health

++++++ check_nwc_health-8.3.2.2.tar.gz -> check_nwc_health-8.3.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/ChangeLog 
new/check_nwc_health-8.3.3.2/ChangeLog
--- old/check_nwc_health-8.3.2.2/ChangeLog      2021-04-29 15:48:20.214364700 
+0200
+++ new/check_nwc_health-8.3.3.2/ChangeLog      2021-05-31 17:33:27.250000000 
+0200
@@ -1,3 +1,13 @@
+* 2021-05-31 8.3.3.2
+  bugfix in IOS cpu-load for very old models without CISCO-PROCESS-MIB
+* 2021-05-31 8.3.3.1
+  bugfix in f5 memory-usage, correct negative values
+* 2021-05-20 8.3.3
+  Add vpn sessions for Fortigate PR #279
+* 2021-05-18 8.3.2.4
+  optimize etherlike and rmon walks
+* 2021-05-12 8.3.2.3
+  save bgp peer local addresses and show them in the error case
 * 2021-04-29 8.3.2.2
   Blacklist storage device "junosprocfs" on JunOS (Juniper) devices PR #278
 * 2021-04-15 8.3.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/MIB2MIB.pm
 
new/check_nwc_health-8.3.3.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/MIB2MIB.pm
--- 
old/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/MIB2MIB.pm
   2021-04-29 15:48:21.224387400 +0200
+++ 
new/check_nwc_health-8.3.3.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP/MibsAndOids/MIB2MIB.pm
   2021-05-12 18:49:03.380000000 +0200
@@ -77,6 +77,11 @@
             $dirutc, $hoursutc, $minutesutc) = unpack "C*", pack "H*", $value;
         $minutesutc ||= 0;
         $dirutc = ($dirutc == 43) ? "+" : ($dirutc == 45) ? "-" : "+";
+        if ($value eq "000000000000000000") {
+          $day = 1;
+          $month = 1;
+          $year = 1970;
+        }
       } else {
         ($month, $day, $hour, $minute, $second, $dseconds) = unpack "C*", pack 
"H*", $value;
         $second ||= 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm 
new/check_nwc_health-8.3.3.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm
--- old/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm       
2021-04-29 15:48:21.644984300 +0200
+++ new/check_nwc_health-8.3.3.2/GLPlugin/lib/Monitoring/GLPlugin/SNMP.pm       
2021-05-20 14:03:34.460294100 +0200
@@ -2149,6 +2149,7 @@
     $newparams{-contextengineid} = $self->opts->contextengineid if 
$self->opts->contextengineid;
     $newparams{-contextname} = $self->opts->contextname if 
$self->opts->contextname;
   }
+  delete $newparams{'-maxrepetitions'}; # bulk howe gsagt!!
   $result = $Monitoring::GLPlugin::SNMP::session->get_entries(%newparams);
   return $result;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin.pm 
new/check_nwc_health-8.3.3.2/GLPlugin/lib/Monitoring/GLPlugin.pm
--- old/check_nwc_health-8.3.2.2/GLPlugin/lib/Monitoring/GLPlugin.pm    
2021-04-29 15:48:21.674985800 +0200
+++ new/check_nwc_health-8.3.3.2/GLPlugin/lib/Monitoring/GLPlugin.pm    
2021-05-20 14:03:34.460294100 +0200
@@ -20,7 +20,7 @@
   $Data::Dumper::Sparseseen = 1;
 };
 our $AUTOLOAD;
-*VERSION = \'3.4';
+*VERSION = \'3.4.0.3';
 
 use constant { OK => 0, WARNING => 1, CRITICAL => 2, UNKNOWN => 3 };
 
@@ -1453,7 +1453,9 @@
     });
   } else {
     # if the device gives us an clearly wrong value, simply use the last value.
-    my $laststate = $self->load_state(name => 'protect_'.$ident.'_'.$key);
+    my $laststate = $self->load_state(name => 'protect_'.$ident.'_'.$key) || {
+        exception => 0,
+    };
     $self->debug(sprintf "self->{%s} is %s and invalid for the %dth time",
         $key, defined $self->{$key} ? $self->{$key} : "<undef>",
          $laststate->{exception} + 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/Makefile.in 
new/check_nwc_health-8.3.3.2/Makefile.in
--- old/check_nwc_health-8.3.2.2/Makefile.in    2021-04-29 15:48:21.711505700 
+0200
+++ new/check_nwc_health-8.3.3.2/Makefile.in    2021-05-31 17:34:16.910000000 
+0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -134,7 +134,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-       cscope distdir dist dist-all distcheck
+       cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -318,8 +318,8 @@
            echo ' $(SHELL) ./config.status'; \
            $(SHELL) ./config.status;; \
          *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ 
$(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $@ 
$(am__depfiles_maybe);; \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ 
$(am__maybe_remake_depfiles)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $@ 
$(am__maybe_remake_depfiles);; \
        esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure 
$(CONFIG_STATUS_DEPENDENCIES)
@@ -437,7 +437,10 @@
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
        -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
        $(am__remove_distdir)
        test -d "$(distdir)" || mkdir "$(distdir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/aclocal.m4 
new/check_nwc_health-8.3.3.2/aclocal.m4
--- old/check_nwc_health-8.3.2.2/aclocal.m4     2021-04-29 15:48:20.198885200 
+0200
+++ new/check_nwc_health-8.3.3.2/aclocal.m4     2021-05-31 17:34:16.160000000 
+0200
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 
'autoreconf'.])])
 
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -230,8 +230,8 @@
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -298,7 +298,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -340,7 +340,7 @@
 done
 echo "timestamp for $_am_arg" 
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -361,7 +361,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -383,7 +383,7 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -418,7 +418,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -457,7 +457,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -486,7 +486,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -505,7 +505,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -586,7 +586,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -646,7 +646,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -674,7 +674,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -693,7 +693,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/configure 
new/check_nwc_health-8.3.3.2/configure
--- old/check_nwc_health-8.3.2.2/configure      2021-04-29 15:48:10.549179500 
+0200
+++ new/check_nwc_health-8.3.3.2/configure      2021-05-31 17:34:16.550000000 
+0200
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for check_nwc_health 8.3.2.2.
+# Generated by GNU Autoconf 2.69 for check_nwc_health 8.3.3.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='check_nwc_health'
 PACKAGE_TARNAME='check_nwc_health'
-PACKAGE_VERSION='8.3.2.2'
-PACKAGE_STRING='check_nwc_health 8.3.2.2'
+PACKAGE_VERSION='8.3.3.2'
+PACKAGE_STRING='check_nwc_health 8.3.3.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1236,7 +1236,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures check_nwc_health 8.3.2.2 to adapt to many kinds of 
systems.
+\`configure' configures check_nwc_health 8.3.3.2 to adapt to many kinds of 
systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1308,7 +1308,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of check_nwc_health 8.3.2.2:";;
+     short | recursive ) echo "Configuration of check_nwc_health 8.3.3.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1393,7 +1393,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-check_nwc_health configure 8.3.2.2
+check_nwc_health configure 8.3.3.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1410,7 +1410,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by check_nwc_health $as_me 8.3.2.2, which was
+It was created by check_nwc_health $as_me 8.3.3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1758,7 +1758,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.15'
+am__api_version='1.16'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2273,7 +2273,7 @@
 
 # Define the identity of the package.
  PACKAGE='check_nwc_health'
- VERSION='8.3.2.2'
+ VERSION='8.3.3.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2303,8 +2303,8 @@
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -2440,7 +2440,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3324,7 +3324,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by check_nwc_health $as_me 8.3.2.2, which was
+This file was extended by check_nwc_health $as_me 8.3.3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3377,7 +3377,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-check_nwc_health config.status 8.3.2.2
+check_nwc_health config.status 8.3.3.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/configure.ac 
new/check_nwc_health-8.3.3.2/configure.ac
--- old/check_nwc_health-8.3.2.2/configure.ac   2021-04-29 15:48:20.262902000 
+0200
+++ new/check_nwc_health-8.3.3.2/configure.ac   2021-05-31 17:33:38.520000000 
+0200
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision: 1.150 $)
 AC_PREREQ(2.58)
-AC_INIT(check_nwc_health,8.3.2.2)
+AC_INIT(check_nwc_health,8.3.3.2)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
 AM_MAINTAINER_MODE([disable])
 AC_CANONICAL_HOST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Arista/ARISTABGP4V2MIB/Components/PeerSubsystem.pm
 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Arista/ARISTABGP4V2MIB/Components/PeerSubsystem.pm
--- 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Arista/ARISTABGP4V2MIB/Components/PeerSubsystem.pm
     2021-04-29 15:48:21.857572900 +0200
+++ 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Arista/ARISTABGP4V2MIB/Components/PeerSubsystem.pm
     2021-05-12 19:03:10.360000000 +0200
@@ -235,8 +235,13 @@
   ##$self->{aristaBgp4V2PeerLocalAddr} = $self->mibs_and_oids_definition(
   ##    'INET-ADDRESS-MIB', 'InetAddress',
   ##    $self->{aristaBgp4V2PeerLocalAddr}, $self->{aristaBgp4V2PeerType}) if 
$self->{aristaBgp4V2PeerLocalAddr};
-  $self->{aristaBgp4V2PeerLocalAddr} = "999.999.999.999" if ! 
$self->{aristaBgp4V2PeerLocalAddr};
-
+  # save a valid localaddr and reuse it if empty, works for 5 attempts
+  $self->protect_value("localaddr_".$self->{aristaBgp4V2PeerRemoteAddr},
+      "aristaBgp4V2PeerLocalAddr", sub {
+      my $value = shift;
+      return $value ? 1 : 0;
+  });
+  $self->{aristaBgp4V2PeerLocalAddr} = "=empty=" if ! 
$self->{aristaBgp4V2PeerLocalAddr};
   $self->{aristaBgp4V2PeerLastError} |= "00 00";
   my $errorcode = 0;
   my $subcode = 0;
@@ -305,11 +310,12 @@
     # aristaBgp4V2PeerRemoteAsName is "", aristaBgp4V2PeerAdminStatus is 
"running",
     # aristaBgp4V2PeerState is "active"
     $self->add_message($self->{aristaBgp4V2PeerRemoteAsImportant} ? CRITICAL : 
OK,
-        sprintf "peer %s (AS%s) state is %s (last error: %s)",
+        sprintf "peer %s (AS%s) state is %s (last error: %s, local address: 
%s)",
         $self->{aristaBgp4V2PeerRemoteAddr},
         
$self->{aristaBgp4V2PeerRemoteAs}.$self->{aristaBgp4V2PeerRemoteAsName},
         $self->{aristaBgp4V2PeerState},
-        $self->{aristaBgp4V2PeerLastError}||"no error"
+        $self->{aristaBgp4V2PeerLastError}||"no error",
+        $self->{aristaBgp4V2PeerLocalAddr}
     );
     $self->{aristaBgp4V2PeerFaulty} = 
$self->{aristaBgp4V2PeerRemoteAsImportant} ? 1 : 0;
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Cisco/CISCOBGP4MIB/Components/PeerSubsystem.pm
 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Cisco/CISCOBGP4MIB/Components/PeerSubsystem.pm
--- 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Cisco/CISCOBGP4MIB/Components/PeerSubsystem.pm
 2021-04-29 15:48:22.427712200 +0200
+++ 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Cisco/CISCOBGP4MIB/Components/PeerSubsystem.pm
 2021-05-12 19:03:10.360000000 +0200
@@ -242,7 +242,13 @@
   $self->{cbgpPeer2LocalAddr} = $self->mibs_and_oids_definition(
       'INET-ADDRESS-MIB', 'InetAddress',
       $self->{cbgpPeer2LocalAddr}, $self->{cbgpPeer2Type}) if 
$self->{cbgpPeer2LocalAddr};
-  $self->{cbgpPeer2LocalAddr} = "999.999.999.999" if ! 
$self->{cbgpPeer2LocalAddr};
+  # save a valid localaddr and reuse it if empty, works for 5 attempts
+  $self->protect_value("localaddr_".$self->{cbgpPeer2RemoteAddr},
+      "cbgpPeer2LocalAddr", sub {
+      my $value = shift;
+      return $value ? 1 : 0;
+  });
+  $self->{cbgpPeer2LocalAddr} = "=empty=" if ! $self->{cbgpPeer2LocalAddr};
 
   $self->{cbgpPeer2LastError} |= "00 00";
   my $errorcode = 0;
@@ -309,11 +315,12 @@
     # cbgpPeer2RemoteAsName is "", cbgpPeer2AdminStatus is "start",
     # cbgpPeer2State is "active"
     $self->add_message($self->{cbgpPeer2RemoteAsImportant} ? CRITICAL : OK,
-        sprintf "peer %s (AS%s) state is %s (last error: %s)",
+        sprintf "peer %s (AS%s) state is %s (last error: %s, local address: 
%s)",
         $self->{cbgpPeer2RemoteAddr},
         $self->{cbgpPeer2RemoteAs}.$self->{cbgpPeer2RemoteAsName},
         $self->{cbgpPeer2State},
-        $self->{cbgpPeer2LastError}||"no error"
+        $self->{cbgpPeer2LastError}||"no error",
+        $self->{cbgpPeer2LocalAddr}
     );
     $self->{cbgpPeer2Faulty} = $self->{cbgpPeer2RemoteAsImportant} ? 1 : 0;
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
--- 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
    2021-04-29 15:48:22.651709500 +0200
+++ 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Cisco/IOS/Component/CpuSubsystem.pm
    2021-05-31 17:32:43.890000000 +0200
@@ -23,6 +23,7 @@
     if (defined $self->{avgBusy1}) {
       push(@{$self->{cpus}},
           Classes::Cisco::IOS::Component::CpuSubsystem::Cpu->new(
+              flat_indices => 0,
               cpmCPUTotalPhysicalIndex => 0, #fake
               cpmCPUTotalIndex => 0, #fake
               cpmCPUTotal5sec => 0, #fake
@@ -30,7 +31,7 @@
               cpmCPUTotal1min => $self->{avgBusy1},
               cpmCPUTotal1minRev => $self->{avgBusy1},
               cpmCPUTotal5min => $self->{avgBusy5},
-              cpmCPUTotal5minRev => $self->{avgBusy51},
+              cpmCPUTotal5minRev => $self->{avgBusy5},
               cpmCPUMonInterval => 0, #fake
               cpmCPUTotalMonIntervalValue => 0, #fake
               cpmCPUInterruptMonIntervalValue => 0, #fake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
--- 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
   2021-04-29 15:48:23.176703600 +0200
+++ 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/F5/F5BIGIP/Component/MemSubsystem.pm
   2021-05-31 12:18:19.570000000 +0200
@@ -8,6 +8,8 @@
       sysStatMemoryTotal sysStatMemoryUsed sysHostMemoryTotal 
sysHostMemoryUsed)));
   $self->{stat_mem_usage} = ($self->{sysStatMemoryUsed} / 
$self->{sysStatMemoryTotal}) * 100;
   $self->{host_mem_usage} = ($self->{sysHostMemoryUsed} / 
$self->{sysHostMemoryTotal}) * 100;
+  $self->protect_value('f5_stat_mem_usage', 'stat_mem_usage', 'percent');
+  $self->protect_value('f5_host_mem_usage', 'host_mem_usage', 'percent');
 }
 
 sub check {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Fortigate/Component/VpnSubsystem.pm
 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Fortigate/Component/VpnSubsystem.pm
--- 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Fortigate/Component/VpnSubsystem.pm
    1970-01-01 01:00:00.000000000 +0100
+++ 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Fortigate/Component/VpnSubsystem.pm
    2021-05-20 14:02:00.580294100 +0200
@@ -0,0 +1,24 @@
+package Classes::Fortigate::Component::VpnSubsystem;
+our @ISA = qw(Monitoring::GLPlugin::SNMP::Item);
+use strict;
+
+sub init {
+  my ($self, %params) = @_;
+  my $type = 0;
+  $self->get_snmp_objects('FORTINET-FORTIGATE-MIB', (qw(
+      fgSysSesCount)));
+}
+
+sub check {
+  my ($self) = @_;
+  my $errorfound = 0;
+  $self->add_info('checking vpn sessions');
+  $self->add_info(sprintf '%u vpn sessions', $self->{fgSysSesCount});
+  $self->set_thresholds(warning => 25000, critical => 50000);
+  $self->add_message($self->check_thresholds($self->{fgSysSesCount}));
+  $self->add_perfdata(
+      label => 'vpn_session_count',
+      value => $self->{fgSysSesCount},
+  );
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Fortigate.pm 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Fortigate.pm
--- old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/Fortigate.pm   
2021-04-29 15:48:23.385579600 +0200
+++ new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/Fortigate.pm   
2021-05-20 14:02:00.580294100 +0200
@@ -12,6 +12,8 @@
     
$self->analyze_and_check_mem_subsystem("Classes::Fortigate::Component::MemSubsystem");
   } elsif ($self->mode =~ /device::ha::/) {
     
$self->analyze_and_check_mem_subsystem("Classes::Fortigate::Component::HaSubsystem");
+  } elsif ($self->mode =~ /device::vpn::sessions/) {
+    
$self->analyze_and_check_config_subsystem("Classes::Fortigate::Component::VpnSubsystem");
   } else {
     $self->no_such_mode();
   }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
--- 
old/check_nwc_health-8.3.2.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
  2021-04-29 15:48:23.710367600 +0200
+++ 
new/check_nwc_health-8.3.3.2/plugins-scripts/Classes/IFMIB/Component/InterfaceSubsystem.pm
  2021-05-20 14:00:35.840294100 +0200
@@ -253,34 +253,38 @@
         if (@ethertable_columns) {
           # es gibt interfaces mit ifSpeed == 4294967295
           # aber nix in dot3HCStatsTable. also dann dot3StatsTable fuer alle
-          foreach my $etherstat ($self->get_snmp_table_objects(
-              'EtherLike-MIB', 'dot3StatsTable', \@etherindices, 
\@ethertable_columns)) {
-            foreach my $interface (@{$self->{interfaces}}) {
-              if ($interface->{ifIndex} == $etherstat->{flat_indices}) {
-                foreach my $key (grep /^dot3/, keys %{$etherstat}) {
-                  $interface->{$key} = $etherstat->{$key};
-                  push(@{$interface->{columns}}, $key);
+          if ($self->implements_mib('EtherLike-MIB', 'dot3StatsTable')) {
+            foreach my $etherstat ($self->get_snmp_table_objects(
+                'EtherLike-MIB', 'dot3StatsTable', \@etherindices, 
\@ethertable_columns)) {
+              foreach my $interface (@{$self->{interfaces}}) {
+                if ($interface->{ifIndex} == $etherstat->{flat_indices}) {
+                  foreach my $key (grep /^dot3/, keys %{$etherstat}) {
+                    $interface->{$key} = $etherstat->{$key};
+                    push(@{$interface->{columns}}, $key);
+                  }
+                  last;
                 }
-                last;
               }
             }
           }
         }
         if (@ethertablehc_columns && scalar(@etherhcindices)) {
-          foreach my $etherstat ($self->get_snmp_table_objects(
-              'EtherLike-MIB', 'dot3HCStatsTable', \@etherhcindices, 
\@ethertablehc_columns)) {
-            foreach my $interface (@{$self->{interfaces}}) {
-              if ($interface->{ifIndex} == $etherstat->{flat_indices}) {
-                foreach my $key (grep /^dot3/, keys %{$etherstat}) {
-                  $interface->{$key} = $etherstat->{$key};
-                  push(@{$interface->{columns}}, $key);
+          if ($self->implements_mib('EtherLike-MIB', 'dot3HCStatsTable')) {
+            foreach my $etherstat ($self->get_snmp_table_objects(
+                'EtherLike-MIB', 'dot3HCStatsTable', \@etherhcindices, 
\@ethertablehc_columns)) {
+              foreach my $interface (@{$self->{interfaces}}) {
+                if ($interface->{ifIndex} == $etherstat->{flat_indices}) {
+                  foreach my $key (grep /^dot3/, keys %{$etherstat}) {
+                    $interface->{$key} = $etherstat->{$key};
+                    push(@{$interface->{columns}}, $key);
+                  }
+                  if (grep /^dot3HCStatsFCSErrors/, @{$interface->{columns}}) {
+                    @{$interface->{columns}} = grep {
+                      $_ if $_ ne 'dot3StatsFCSErrors';
+                    } @{$interface->{columns}};
+                  }
+                  last;
                 }
-                if (grep /^dot3HCStatsFCSErrors/, @{$interface->{columns}}) {
-                  @{$interface->{columns}} = grep {
-                    $_ if $_ ne 'dot3StatsFCSErrors';
-                  } @{$interface->{columns}};
-                }
-                last;
               }
             }
           }
@@ -292,16 +296,18 @@
             $self->override_opt('regexp', 1);
           }
           # Value von etherStatsDataSource entspricht ifIndex 
1.3.6.1.2.1.2.2.1.1.idx
-          foreach my $etherstat ($self->get_snmp_table_objects_with_cache(
-              'RMON-MIB', 'etherStatsTable', 'etherStatsDataSource', 
\@rmontable_columns, $if_has_changed ? 1 : -1)) {
-              $etherstat->{etherStatsDataSource} =~ s/^\.//g;
-            foreach my $interface (@{$self->{interfaces}}) {
-              if ('1.3.6.1.2.1.2.2.1.1.'.$interface->{ifIndex} eq 
$etherstat->{etherStatsDataSource}) {
-                foreach my $key (grep /^etherStats/, keys %{$etherstat}) {
-                  $interface->{$key} = $etherstat->{$key};
-                  push(@{$interface->{columns}}, $key);
+          if ($self->implements_mib('RMON-MIB', 'etherStatsTable')) {
+            foreach my $etherstat ($self->get_snmp_table_objects_with_cache(
+                'RMON-MIB', 'etherStatsTable', 'etherStatsDataSource', 
\@rmontable_columns, $if_has_changed ? 1 : -1)) {
+                $etherstat->{etherStatsDataSource} =~ s/^\.//g;
+              foreach my $interface (@{$self->{interfaces}}) {
+                if ('1.3.6.1.2.1.2.2.1.1.'.$interface->{ifIndex} eq 
$etherstat->{etherStatsDataSource}) {
+                  foreach my $key (grep /^etherStats/, keys %{$etherstat}) {
+                    $interface->{$key} = $etherstat->{$key};
+                    push(@{$interface->{columns}}, $key);
+                  }
+                  last;
                 }
-                last;
               }
             }
           }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/plugins-scripts/Makefile.am 
new/check_nwc_health-8.3.3.2/plugins-scripts/Makefile.am
--- old/check_nwc_health-8.3.2.2/plugins-scripts/Makefile.am    2021-04-29 
15:48:24.607530000 +0200
+++ new/check_nwc_health-8.3.3.2/plugins-scripts/Makefile.am    2021-05-20 
14:02:00.590294100 +0200
@@ -267,6 +267,7 @@
   Classes/Fortigate/Component/DiskSubsystem.pm \
   Classes/Fortigate/Component/MemSubsystem.pm \
   Classes/Fortigate/Component/CpuSubsystem.pm \
+  Classes/Fortigate/Component/VpnSubsystem.pm \
   Classes/Fortigate/Component/EnvironmentalSubsystem.pm \
   Classes/Fortigate/Component/SensorSubsystem.pm \
   Classes/Fortigate.pm \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/plugins-scripts/Makefile.in 
new/check_nwc_health-8.3.3.2/plugins-scripts/Makefile.in
--- old/check_nwc_health-8.3.2.2/plugins-scripts/Makefile.in    2021-04-29 
15:48:24.617528900 +0200
+++ new/check_nwc_health-8.3.3.2/plugins-scripts/Makefile.in    2021-05-31 
17:34:16.930000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -510,6 +510,7 @@
   Classes/Fortigate/Component/DiskSubsystem.pm \
   Classes/Fortigate/Component/MemSubsystem.pm \
   Classes/Fortigate/Component/CpuSubsystem.pm \
+  Classes/Fortigate/Component/VpnSubsystem.pm \
   Classes/Fortigate/Component/EnvironmentalSubsystem.pm \
   Classes/Fortigate/Component/SensorSubsystem.pm \
   Classes/Fortigate.pm \
@@ -734,8 +735,8 @@
          *config.status*) \
            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
          *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe);; \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__maybe_remake_depfiles)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__maybe_remake_depfiles);; \
        esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure 
$(CONFIG_STATUS_DEPENDENCIES)
@@ -790,7 +791,10 @@
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        list='$(DISTFILES)'; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/check_nwc_health-8.3.2.2/plugins-scripts/subst.in 
new/check_nwc_health-8.3.3.2/plugins-scripts/subst.in
--- old/check_nwc_health-8.3.2.2/plugins-scripts/subst.in       2021-04-29 
15:48:24.629037800 +0200
+++ new/check_nwc_health-8.3.3.2/plugins-scripts/subst.in       2017-02-06 
15:30:23.000000000 +0100
@@ -1,60 +1,60 @@
-#!/usr/bin/awk
-
-function which(c,path) {
-       cmd = "test -x " c;
-
-       if (system(cmd)==0) {
-               return c;
-       } 
-
-       sub(/\/.*\//,"",c);
-  for (dir in path) {
-                       cmd = "test -x " path[dir] "/" c;
-                       if (system(cmd)==0) {
-                                       return path[dir] "/" c;
-                       } 
-       }
-
-
-       return c;
-}
-
-# used to replace "use lib utils.pm" with "use lib @libexecdir"
-#
-function led() {
-       led1 = "@libexecdir@";
-       led2 = "@exec_prefix@";
-       led3 = "@prefix@";
-       if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
-               return "\"" led3 "/libexec\" " ;
-       
-       }
-       return "\"" led1 "\"" ;
-}
-
-BEGIN {
-       split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/);
-
-}
-
-# scripting language (first line)
-
-/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
-/^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");}
-/^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}
-/^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}
-
-# add to libexecdir to INC for perl utils.pm
-/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
-
-
-# Replace the placeholders with the values from configure
-/#PERL#/ {sub(/#PERL#/,"@PERL@");}
-/#STATEFILES_DIR#/ {sub(/#STATEFILES_DIR#/,"@STATEFILES_DIR@");}
-/#PACKAGE_VERSION#/ {sub(/#PACKAGE_VERSION#/,"@PACKAGE_VERSION@");}
-/#STANDALONE#/ {sub(/#STANDALONE#/,"@STANDALONE@");}
-
-{
-       print;
-}
-
+#!/usr/bin/awk
+
+function which(c,path) {
+       cmd = "test -x " c;
+
+       if (system(cmd)==0) {
+               return c;
+       } 
+
+       sub(/\/.*\//,"",c);
+  for (dir in path) {
+                       cmd = "test -x " path[dir] "/" c;
+                       if (system(cmd)==0) {
+                                       return path[dir] "/" c;
+                       } 
+       }
+
+
+       return c;
+}
+
+# used to replace "use lib utils.pm" with "use lib @libexecdir"
+#
+function led() {
+       led1 = "@libexecdir@";
+       led2 = "@exec_prefix@";
+       led3 = "@prefix@";
+       if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
+               return "\"" led3 "/libexec\" " ;
+       
+       }
+       return "\"" led1 "\"" ;
+}
+
+BEGIN {
+       split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/);
+
+}
+
+# scripting language (first line)
+
+/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
+/^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");}
+/^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}
+/^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}
+
+# add to libexecdir to INC for perl utils.pm
+/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
+
+
+# Replace the placeholders with the values from configure
+/#PERL#/ {sub(/#PERL#/,"@PERL@");}
+/#STATEFILES_DIR#/ {sub(/#STATEFILES_DIR#/,"@STATEFILES_DIR@");}
+/#PACKAGE_VERSION#/ {sub(/#PACKAGE_VERSION#/,"@PACKAGE_VERSION@");}
+/#STANDALONE#/ {sub(/#STANDALONE#/,"@STANDALONE@");}
+
+{
+       print;
+}
+

Reply via email to