- update to 2.1.1:

FIXES
  + Fix check_ntp's jitter checking
  + Fix check_ntp's handling of invalid server responses
  + Fix check_apt's handling of invalid regular expressions
  + Fix check_real's server response processing
  + Fix backslash escaping in check_tcp's --help output
  + Fix check_jabber to work with Openfire servers
  + Fix check_oracle bad string matching when testing TNS server
  + Fixed check_ifstatus performance data output
  + Fixed expire time output for sslutils
  + check_dns now verifies if the answer is returning from the queried
    server
  + Fix check_by_ssh to accept --hostname as argument
  ENHANCEMENTS
  + New check_hpjd -p option for port specification (abrist)
  + New ./configure --with-qmail-qstat-command option to specify the path to
    qmail-qstat(8)
  + New check_ifstatus -n option to ignore interfaces by name
  + check_ntp_peer has now specific state output for each metric
  + New check_mysql -n option to ignore authentication failures
  + Added IP and port or socket name to error messages
  + New check_ntp_time -o option to add expected offset
  + check_disk shows now troubled partions in verbose mode
  + check_dig has now support for drill and dig
  + check_dig has now support for -6 option
  + Add performance data to check_file_age
- removed upstreamed patches:
  + monitoring-plugins-1.4.14-ntpd.patch
  + monitoring-plugins.check_ntp.c-64bit-portability-issue.patch

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=12

monitoring-plugins-1.4.14-check_log.patch

@@ -1,85 +0,0 @@
-Index: plugins-scripts/check_log.sh
-===================================================================
---- plugins-scripts/check_log.sh.orig
-+++ plugins-scripts/check_log.sh
-@@ -61,15 +61,16 @@
- #PATH=""
- 
- ECHO="/bin/echo"
--GREP="/bin/egrep"
--DIFF="/bin/diff"
--TAIL="/bin/tail"
-+GREP="/usr/bin/egrep"
-+DIFF="/usr/bin/diff"
-+TAIL="/usr/bin/tail"
- CAT="/bin/cat"
- RM="/bin/rm"
- CHMOD="/bin/chmod"
--TOUCH="/bin/touch"
-+TOUCH="/usr/bin/touch"
-+MKTEMP="/bin/mktemp"
- 
--PROGNAME=`/bin/basename $0`
-+PROGNAME=`/usr/bin/basename $0`
- PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
- REVISION="@NP_VERSION@"
- 
-@@ -166,10 +167,10 @@
- 
- # If the source log file doesn't exist, exit
- 
--if [ ! -e $logfile ]; then
-+if [ ! -e "$logfile" ]; then
-     $ECHO "Log check error: Log file $logfile does not exist!\n"
-     exit $STATE_UNKNOWN
--elif [ ! -r $logfile ] ; then
-+elif [ ! -r "$logfile" ] ; then
-     $ECHO "Log check error: Log file $logfile is not readable!\n"
-     exit $STATE_UNKNOWN
- fi
-@@ -178,8 +179,8 @@
- # we're running this test, so copy the original log file over to
- # the old diff file and exit
- 
--if [ ! -e $oldlog ]; then
--    $CAT $logfile > $oldlog
-+if [ ! -e "$oldlog" ]; then
-+    $CAT "$logfile" > "$oldlog"
-     $ECHO "Log check data initialized...\n"
-     exit $STATE_OK
- fi
-@@ -188,25 +189,25 @@
- 
- # The temporary file that the script should use while
- # processing the log file.
--if [ -x /bin/mktemp ]; then
--    tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX`
-+if [ -x "$MKTEMP" ]; then
-+    tempdiff=`$MKTEMP /tmp/check_log.XXXXXXXXXX`
- else
-     tempdiff=`/bin/date '+%H%M%S'`
-     tempdiff="/tmp/check_log.${tempdiff}"
--    $TOUCH $tempdiff
--    $CHMOD 600 $tempdiff
-+    $TOUCH "$tempdiff"
-+    $CHMOD 600 "$tempdiff"
- fi
- 
--$DIFF $logfile $oldlog | $GREP -v "^>" > $tempdiff
-+$DIFF "$logfile" "$oldlog" | $GREP -v "^>" > "$tempdiff"
- 
- # Count the number of matching log entries we have
--count=`$GREP -c "$query" $tempdiff`
-+count=`$GREP -c "$query" "$tempdiff"`
- 
- # Get the last matching entry in the diff file
--lastentry=`$GREP "$query" $tempdiff | $TAIL -1`
-+lastentry=`$GREP "$query" "$tempdiff" | $TAIL -1`
- 
--$RM -f $tempdiff
--$CAT $logfile > $oldlog
-+$RM -f "$tempdiff"
-+$CAT "$logfile" > "$oldlog"
- 
- if [ "$count" = "0" ]; then # no matches, exit with no error
-     $ECHO "Log check ok - 0 pattern matches found\n"

monitoring-plugins-1.4.14-ntpd.patch

@@ -1,12 +0,0 @@
-Index: plugins-scripts/check_ntp.pl
-===================================================================
---- plugins-scripts/check_ntp.pl.orig
-+++ plugins-scripts/check_ntp.pl
-@@ -313,7 +313,6 @@
- 				}
- 			} else {
- 				print "No match!\n" if $verbose;
--				$jitter = '(not parsed)';
- 			}
- 			
- 		}

monitoring-plugins-2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da55221547d56d680810c57ca943a83806aa38902c9afd3e44cda8d780fbff98
-size 2209391

monitoring-plugins-2.1.1-check_logfile.patch

@@ -0,0 +1,90 @@
+Index: monitoring-plugins-2.1.1/plugins-scripts/check_log.sh
+===================================================================
+--- monitoring-plugins-2.1.1.orig/plugins-scripts/check_log.sh
++++ monitoring-plugins-2.1.1/plugins-scripts/check_log.sh
+@@ -115,27 +115,27 @@ while test -n "$1"; do
+             exit $STATE_OK
+             ;;
+         --filename)
+-            logfile=$2
++            logfile="$2"
+             shift
+             ;;
+         -F)
+-            logfile=$2
++            logfile="$2"
+             shift
+             ;;
+         --oldlog)
+-            oldlog=$2
++            oldlog="$2"
+             shift
+             ;;
+         -O)
+-            oldlog=$2
++            oldlog="$2"
+             shift
+             ;;
+         --query)
+-            query=$2
++            query="$2"
+             shift
+             ;;
+         -q)
+-            query=$2
++            query="$2"
+             shift
+             ;;
+         -x)
+@@ -157,10 +157,10 @@ done
+ 
+ # If the source log file doesn't exist, exit
+ 
+-if [ ! -e $logfile ]; then
++if [ ! -e "$logfile" ]; then
+     echo "Log check error: Log file $logfile does not exist!"
+     exit $STATE_UNKNOWN
+-elif [ ! -r $logfile ] ; then
++elif [ ! -r "$logfile" ] ; then
+     echo "Log check error: Log file $logfile is not readable!"
+     exit $STATE_UNKNOWN
+ fi
+@@ -169,8 +169,8 @@ fi
+ # we're running this test, so copy the original log file over to
+ # the old diff file and exit
+ 
+-if [ ! -e $oldlog ]; then
+-    cat $logfile > $oldlog
++if [ ! -e "$oldlog" ]; then
++    cat "$logfile" > "$oldlog"
+     echo "Log check data initialized..."
+     exit $STATE_OK
+ fi
+@@ -184,20 +184,20 @@ if [ -x /bin/mktemp ]; then
+ else
+     tempdiff=`/bin/date '+%H%M%S'`
+     tempdiff="/tmp/check_log.${tempdiff}"
+-    touch $tempdiff
+-    chmod 600 $tempdiff
++    touch "$tempdiff"
++    chmod 600 "$tempdiff"
+ fi
+ 
+-diff $logfile $oldlog | grep -v "^>" > $tempdiff
++diff "$logfile" "$oldlog" | grep -v "^>" > "$tempdiff"
+ 
+ # Count the number of matching log entries we have
+-count=`grep -c "$query" $tempdiff`
++count=`grep -c "$query" "$tempdiff"`
+ 
+ # Get the last matching entry in the diff file
+-lastentry=`grep "$query" $tempdiff | tail -1`
++lastentry=`grep "$query" "$tempdiff" | tail -1`
+ 
+-rm -f $tempdiff
+-cat $logfile > $oldlog
++rm -f "$tempdiff"
++cat "$logfile" > "$oldlog"
+ 
+ if [ "$count" = "0" ]; then # no matches, exit with no error
+     echo "Log check ok - 0 pattern matches found"

monitoring-plugins-2.1.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5118d0a231c8d0870c17c8420354053106fc03b91dfc37ab535a943451a6c45e
+size 2209756

monitoring-plugins-too_few_arguments_for_check_disk.patch

@@ -2,7 +2,7 @@ Index: plugins/check_disk.c
 ===================================================================
 --- plugins/check_disk.c.orig
 +++ plugins/check_disk.c
-@@ -996,7 +996,7 @@ get_stats (struct parameter_list *p, str
+@@ -1002,7 +1002,7 @@ get_stats (struct parameter_list *p, str
          if (verbose >= 3)
            printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n",
                   p_list->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize, p_list->best_match->me_mountdir, p_list->dused_units, p_list->dfree_units,

monitoring-plugins-wrong_return_in_check_swap.patch

@@ -29,10 +29,10 @@ SWAP CRITICAL - 0% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0
 Additional info:
 https://bugzilla.redhat.com/512559
 
-Index: monitoring-plugins-2.0/plugins/check_swap.c
+Index: monitoring-plugins-2.1.1/plugins/check_swap.c
 ===================================================================
---- monitoring-plugins-2.0.orig/plugins/check_swap.c
+--- monitoring-plugins-2.1.1.orig/plugins/check_swap.c
-+++ monitoring-plugins-2.0/plugins/check_swap.c
++++ monitoring-plugins-2.1.1/plugins/check_swap.c
 @@ -125,7 +125,7 @@ main (int argc, char **argv)
  			free_swap_mb += dskfree_mb;
  			if (allswaps) {

monitoring-plugins.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Sat Dec 27 12:41:01 UTC 2014 - lars@linux-schulserver.de
+
+- update to 2.1.1:
+  FIXES
+  + Fix check_ntp's jitter checking
+  + Fix check_ntp's handling of invalid server responses
+  + Fix check_apt's handling of invalid regular expressions
+  + Fix check_real's server response processing
+  + Fix backslash escaping in check_tcp's --help output
+  + Fix check_jabber to work with Openfire servers
+  + Fix check_oracle bad string matching when testing TNS server
+  + Fixed check_ifstatus performance data output
+  + Fixed expire time output for sslutils
+  + check_dns now verifies if the answer is returning from the queried
+    server
+  + Fix check_by_ssh to accept --hostname as argument
+  ENHANCEMENTS
+  + New check_hpjd -p option for port specification (abrist)
+  + New ./configure --with-qmail-qstat-command option to specify the path to
+    qmail-qstat(8)
+  + New check_ifstatus -n option to ignore interfaces by name
+  + check_ntp_peer has now specific state output for each metric
+  + New check_mysql -n option to ignore authentication failures
+  + Added IP and port or socket name to error messages
+  + New check_ntp_time -o option to add expected offset
+  + check_disk shows now troubled partions in verbose mode
+  + check_dig has now support for drill and dig
+  + check_dig has now support for -6 option
+  + Add performance data to check_file_age
+- removed upstreamed patches:
+  + monitoring-plugins-1.4.14-ntpd.patch
+  + monitoring-plugins.check_ntp.c-64bit-portability-issue.patch
+- adapted monitoring-plugins-1.4.14-check_log.patch to new version:
+  + monitoring-plugins-2.1.1-check_logfile.patch
+- added the following new patch:
+  + monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch
+- refreshed the other patches
+- ran spec-cleaner
+
 -------------------------------------------------------------------
 Sun Aug 10 17:11:48 UTC 2014 - lars@linux-schulserver.de
 

monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch

@@ -0,0 +1,13 @@
+Index: monitoring-plugins-2.1.1/plugins/check_hpjd.c
+===================================================================
+--- monitoring-plugins-2.1.1.orig/plugins/check_hpjd.c
++++ monitoring-plugins-2.1.1/plugins/check_hpjd.c
+@@ -66,7 +66,7 @@ void print_usage (void);
+ 
+ char *community = NULL;
+ char *address = NULL;
+-char *port = NULL;
++int port = NULL;
+ 
+ int
+ main (int argc, char **argv)

monitoring-plugins.check_ntp.c-64bit-portability-issue.patch

@@ -1,13 +0,0 @@
-Index: monitoring-plugins-2.0/plugins/check_ntp.c
-===================================================================
---- monitoring-plugins-2.0.orig/plugins/check_ntp.c
-+++ monitoring-plugins-2.0/plugins/check_ntp.c
-@@ -616,7 +616,7 @@ double jitter_request(const char *host,
- 				if (bytes_read != ntp_cm_ints + req.count)
- 					die(STATE_UNKNOWN, _("Invalid NTP response: %d bytes read does not equal %d plus %d data segment"), bytes_read, ntp_cm_ints, req.count); 
- 				/* else null terminate */
--				strncpy(req.data[req.count], "\0", 1);
-+				req.data[req.count] = "\0";
- 
- 				DBG(print_ntp_control_message(&req));
- 

monitoring-plugins.check_snmp.snmpv3-context.patch

@@ -1,7 +1,7 @@
-Index: monitoring-plugins-2.0/plugins/check_snmp.c
+Index: monitoring-plugins-2.1.1/plugins/check_snmp.c
 ===================================================================
---- monitoring-plugins-2.0.orig/plugins/check_snmp.c
+--- monitoring-plugins-2.1.1.orig/plugins/check_snmp.c
-+++ monitoring-plugins-2.0/plugins/check_snmp.c
++++ monitoring-plugins-2.1.1/plugins/check_snmp.c
 @@ -104,6 +104,8 @@ int errcode, excode;
  
  char *server_address = NULL;

monitoring-plugins.negate.validate_arguments.patch

@@ -1,26 +0,0 @@
----
- plugins/negate.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: plugins/negate.c
-===================================================================
---- plugins/negate.c.orig
-+++ plugins/negate.c
-@@ -44,7 +44,7 @@ const char *email = "nagiosplug-devel@li
- /* char *command_line; */
- 
- static const char **process_arguments (int, char **);
--int validate_arguments (char **);
-+void validate_arguments (char **);
- int translate_state (char *);
- void print_help (void);
- void print_usage (void);
-@@ -207,7 +207,7 @@ process_arguments (int argc, char **argv
- }
- 
- 
--int
-+void
- validate_arguments (char **command_line)
- {
- 	if (command_line[0] == NULL)