[packages/nagios-plugins] - up to 2.2.1

arekm arekm at pld-linux.org
Mon Oct 16 17:45:23 CEST 2017


commit 62a10611cee9a463aef6fa5b428e1af628ee1a3c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Oct 16 17:45:16 2017 +0200

    - up to 2.2.1

 nagios-plugins-check_hpjd-no-paper-out.patch | 28 ++++++++++++++--------------
 nagios-plugins.spec                          |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index f036740..69f001b 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -16,12 +16,12 @@
 Summary:	Host/service/network monitoring program plugins for Nagios
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
-Version:	2.1.4
-Release:	2
+Version:	2.2.1
+Release:	1
 License:	GPL v3
 Group:		Networking
 Source0:	http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	62f4473ed97a548eb7b982c5ff074895
+# Source0-md5:	fb521d5c05897f165b0b1862c1e5cb27
 # https://git.pld-linux.org/projects/nagios-config
 Source1:	%{name}-config-20150805.tar.xz
 # Source1-md5:	50c1eff5152ff03948b984631fa0ff61
diff --git a/nagios-plugins-check_hpjd-no-paper-out.patch b/nagios-plugins-check_hpjd-no-paper-out.patch
index 575f05e..4f360c7 100644
--- a/nagios-plugins-check_hpjd-no-paper-out.patch
+++ b/nagios-plugins-check_hpjd-no-paper-out.patch
@@ -9,10 +9,10 @@
  
  #define HPJD_LINE_STATUS           ".1.3.6.1.4.1.11.2.3.9.1.1.2.1"
  #define HPJD_PAPER_STATUS          ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
-@@ -67,6 +67,7 @@
- char *community = NULL;
+@@ -68,6 +68,7 @@ char *community = NULL;
  char *address = NULL;
  int port = 0;
+ char flawcorrection =0; // There are devices which report offline when that is not the case. Correct that.
 +int nopaperout = 0;
  
  int
@@ -28,33 +28,33 @@
  			strcpy (errmsg, _("Out of Paper"));
  		}
  		else if (line_status == OFFLINE) {
-@@ -317,6 +318,7 @@
+@@ -329,6 +329,7 @@ process_arguments (int argc, char **argv
  /*  		{"critical",       required_argument,0,'c'}, */
  /*  		{"warning",        required_argument,0,'w'}, */
    		{"port", required_argument,0,'p'}, 
 +		{"nopaperout", no_argument, 0, 'n'},
+ 		{"flawcorrection", no_argument, 0, 'N'},
  		{"version", no_argument, 0, 'V'},
  		{"help", no_argument, 0, 'h'},
- 		{0, 0, 0, 0}
 @@ -327,7 +329,7 @@
  
  
  	while (1) {
--		c = getopt_long (argc, argv, "+hVH:C:p:", longopts, &option);
-+		c = getopt_long (argc, argv, "+hnVH:C:p:", longopts, &option);
+-		c = getopt_long (argc, argv, "+hVNH:C:p:", longopts, &option);
++		c = getopt_long (argc, argv, "+hnNVH:C:p:", longopts, &option);
  
  		if (c == -1 || c == EOF || c == 1)
  			break;
-@@ -345,6 +349,9 @@
- 		case 'C':									/* community */
- 			community = strscpy (community, optarg);
+@@ -364,6 +364,9 @@ process_arguments (int argc, char **argv
+ 			else
+ 				port = atoi(optarg);
  			break;
 +		case 'n':									/* nopaperout */
 +			nopaperout = 1;
 +			break;
- 		case 'V':									/* version */
- 			print_revision (progname, revision);
- 			exit (STATE_OK);
+                 case 'N':                                                                       /* flaw correction */
+                         flawcorrection=1;
+                         break;
 @@ -404,7 +411,9 @@
  
  	printf (" %s\n", "-C, --community=STRING");
@@ -69,6 +69,6 @@
  print_usage (void)
  {
    printf ("%s\n", _("Usage:"));
--	printf ("%s -H host [-C community] [-p port]\n", progname);
-+	printf ("%s -H host [-C community] [-p port] [-n]\n", progname);
+-	printf ("%s -H host [-C community] [-p port][-N]\n", progname);
++	printf ("%s -H host [-C community] [-p port] [-N] [-n]\n", progname);
  }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugins.git/commitdiff/62a10611cee9a463aef6fa5b428e1af628ee1a3c



More information about the pld-cvs-commit mailing list