From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 13 Sep 2016 16:59:06 +0000 (+0300)
Subject: up to 2.1.3
X-Git-Tag: auto/th/nagios-plugins-2.1.3-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=56b1be7618b236919b37ee4a2c9a52f868502639;p=packages%2Fnagios-plugins.git

up to 2.1.3

This Nagios Plugins bug fix release fix's the following items:

- Added SNI support in check_tcp
- Added support for -k for kerberos authentication in
- check_file_age now allows wildcard matching
- check_tcp.c: tools/build_perl_modules hardcodes the perl used
- Fix for check_game reporting 'ping' as number of players
- Fix some gcc5 warnings
- check_nagios could not locate a running nagios process
- check_swap will now accept threshold of zero and not allow negative thresholds
- In check_snmp, the --offset parameter didn't do anything
- Several checks that use SSL had a first line of "SSL Version: xxxxxx" (bug introduced in last release)
- When using ssh with ControlMaster/ControlPersist, nagios will no longer time out the first time or get zombie processes
---

diff --git a/nagios-plugins-check_hpjd-no-paper-out.patch b/nagios-plugins-check_hpjd-no-paper-out.patch
index f8bf17c..575f05e 100644
--- a/nagios-plugins-check_hpjd-no-paper-out.patch
+++ b/nagios-plugins-check_hpjd-no-paper-out.patch
@@ -1,5 +1,5 @@
---- nagios-plugins-2.0/plugins/check_hpjd.c~	2014-04-21 11:57:30.000000000 +0300
-+++ nagios-plugins-2.0/plugins/check_hpjd.c	2014-04-21 12:56:26.818058154 +0300
+--- nagios-plugins-2.1.3/plugins/check_hpjd.c~	2016-09-13 19:59:41.000000000 +0300
++++ nagios-plugins-2.1.3/plugins/check_hpjd.c	2016-09-13 20:00:10.839538694 +0300
 @@ -41,7 +41,7 @@
  #define DEFAULT_COMMUNITY "public"
  #define DEFAULT_PORT "161"
@@ -12,7 +12,7 @@
 @@ -67,6 +67,7 @@
  char *community = NULL;
  char *address = NULL;
- char *port = NULL;
+ int port = 0;
 +int nopaperout = 0;
  
  int
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index de85003..17323e7 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.1
-Release:	7
+Version:	2.1.3
+Release:	1
 License:	GPL v3
 Group:		Networking
 Source0:	http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	e199ca874df5723bfaca8c43887b1a79
+# Source0-md5:	b7cabb283cb6d1f18439217461aa1f44
 # https://git.pld-linux.org/projects/nagios-config
 Source1:	%{name}-config-20150805.tar.xz
 # Source1-md5:	50c1eff5152ff03948b984631fa0ff61
@@ -37,8 +37,6 @@ Patch21:	%{name}-check_hpjd-no-paper-out.patch
 Patch23:	%{name}-check_disk_smb-zero-cap.patch
 Patch24:	%{name}-paths.patch
 Patch27:	%{name}-ping.patch
-Patch28:	use-lib.patch
-Patch29:	syntax-error.patch
 URL:		http://www.nagiosplugins.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -533,8 +531,6 @@ mv nagios-plugins-config-*/* .
 %patch23 -p1
 %patch24 -p1
 %patch27 -p1
-%patch28 -p1
-%patch29 -p1
 
 # remove libtool m4 macro copies, breaks when system libtool is older
 %{__rm} gl/m4/libtool.m4 gl/m4/lt*.m4
diff --git a/syntax-error.patch b/syntax-error.patch
deleted file mode 100644
index f092ebd..0000000
--- a/syntax-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-upstream:
-https://github.com/nagios-plugins/nagios-plugins/pull/110
-
-commit 842384a9097f30265637040d7f719f619a310118
-Author: Elan Ruusamäe <glen@delfi.ee>
-Date:   Fri Oct 2 15:06:24 2015 +0300
-
-    fix stupid syntax error!
-    
-    can be catched with trival compile only run:
-    
-    $ perl -c check_mailq.pl
-    syntax error at check_mailq.pl line 40, near ")
-    
-    sub print_help ()"
-    check_mailq.pl had compilation errors.
-
-diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
-index 65247a2..e503fa9 100755
---- a/plugins-scripts/check_mailq.pl
-+++ b/plugins-scripts/check_mailq.pl
-@@ -35,7 +35,7 @@ use FindBin;
- use lib "$FindBin::Bin";
- use utils qw(%ERRORS &print_revision &support &usage );
- 
--my ($sudo)
-+my ($sudo);
- 
- sub print_help ();
- sub print_usage ();
diff --git a/use-lib.patch b/use-lib.patch
deleted file mode 100644
index a461585..0000000
--- a/use-lib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-upstream link:
-https://github.com/nagios-plugins/nagios-plugins/pull/109
-
-also:
-https://github.com/monitoring-plugins/monitoring-plugins/pull/1360
-
---- nagios-plugins-2.1.1/plugins-scripts/check_file_age.pl~	2015-08-05 22:45:01.000000000 +0300
-+++ nagios-plugins-2.1.1/plugins-scripts/check_file_age.pl	2015-10-02 13:47:44.633618522 +0300
-@@ -26,7 +26,8 @@
- use Getopt::Long;
- use File::stat;
- use vars qw($PROGNAME);
--use lib ".";
-+use FindBin;
-+use lib "$FindBin::Bin";
- use utils qw (%ERRORS &print_revision &support);
- 
- sub print_help ();