[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 02/04: Refreshing patches.

Fri Jul 4 09:39:20 UTC 2014

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit 111a0b4231f656e95b617870f1f0a5dfea70d894
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Fri Jul 4 11:35:38 2014 +0200

    Refreshing patches.
---
 debian/patches/check_drbd/fix_for_oos_and_cosmetic          |  2 --
 debian/patches/check_imap_quota/syntax_error_fix            |  8 +++-----
 .../check_raid/prefer_cciss_vol_status_over_hpacucli        |  2 +-
 debian/patches/check_rbl/disable_solid.net                  |  2 +-
 debian/patches/check_rbl/interpreter                        |  2 +-
 debian/patches/check_rbl/spelling_errors                    |  2 +-
 debian/patches/check_varnish/automake_foreign               |  6 ++----
 debian/patches/check_varnish/support-for-varnish-4          | 13 +++----------
 8 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/debian/patches/check_drbd/fix_for_oos_and_cosmetic b/debian/patches/check_drbd/fix_for_oos_and_cosmetic
index 56bcf7f..317555b 100644
--- a/debian/patches/check_drbd/fix_for_oos_and_cosmetic
+++ b/debian/patches/check_drbd/fix_for_oos_and_cosmetic
@@ -7,8 +7,6 @@ Date:   Mon Mar 3 08:11:31 2014 +0300
     1) add check for out of sync sectors (report WARNING for non-zero value)
     2) cosmetic: sort device list while processing
 
-diff --git a/check_drbd/check_drbd b/check_drbd/check_drbd
-index aeda397..45a4441 100644
 --- a/check_drbd/check_drbd
 +++ b/check_drbd/check_drbd
 @@ -12,7 +12,7 @@ use Getopt::Long;
diff --git a/debian/patches/check_imap_quota/syntax_error_fix b/debian/patches/check_imap_quota/syntax_error_fix
index 79ec943..1c4d9b6 100644
--- a/debian/patches/check_imap_quota/syntax_error_fix
+++ b/debian/patches/check_imap_quota/syntax_error_fix
@@ -4,11 +4,9 @@ Date:   Fri Mar 14 10:43:30 2014 +0100
 
     - fixed syntax error by added missing closing bracket as mentioned in issue #44
 
-diff --git a/check_email_delivery/check_email_delivery-0.7.1b/check_imap_quota b/check_email_delivery/check_email_delivery-0.7.1b/check_imap_quota
-index 13f3504..b4f4643 100644
---- a/check_email_delivery/check_email_delivery-0.7.1b/check_imap_quota
-+++ b/check_email_delivery/check_email_delivery-0.7.1b/check_imap_quota
-@@ -151,7 +151,7 @@ eval {
+--- a/check_email_delivery/src/check_imap_quota
++++ b/check_email_delivery/src/check_imap_quota
+@@ -153,7 +153,7 @@ eval {
  	  }
  	  if (!length($quotaUsed) && !length($quotaLimit)) {
  		print "no answer from imap host\n" if $verbose > 2;
diff --git a/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli b/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli
index 902c5dd..1733c15 100644
--- a/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli
+++ b/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli
@@ -1,6 +1,6 @@
 --- a/check_raid/check_raid
 +++ b/check_raid/check_raid
-@@ -3112,8 +3112,10 @@ sub check {
+@@ -3251,8 +3251,10 @@ sub check {
  package hpacucli;
  use base 'plugin';
  
diff --git a/debian/patches/check_rbl/disable_solid.net b/debian/patches/check_rbl/disable_solid.net
index c12e2c2..eafb7b2 100644
--- a/debian/patches/check_rbl/disable_solid.net
+++ b/debian/patches/check_rbl/disable_solid.net
@@ -1,6 +1,6 @@
 --- a/check_rbl/src/check_rbl.ini
 +++ b/check_rbl/src/check_rbl.ini
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ server=access.redhawk.org
  server=blacklist.sci.kun.nl
  server=bl.technovision.dk
  server=dnsbl.kempt.net
diff --git a/debian/patches/check_rbl/interpreter b/debian/patches/check_rbl/interpreter
index 984165b..f67e230 100644
--- a/debian/patches/check_rbl/interpreter
+++ b/debian/patches/check_rbl/interpreter
@@ -4,5 +4,5 @@
 -#!perl
 +#!/usr/bin/perl
  
- package main;
+ # nagios: -epn
  
diff --git a/debian/patches/check_rbl/spelling_errors b/debian/patches/check_rbl/spelling_errors
index 5213e96..ffdd0e9 100644
--- a/debian/patches/check_rbl/spelling_errors
+++ b/debian/patches/check_rbl/spelling_errors
@@ -1,6 +1,6 @@
 --- a/check_rbl/src/check_rbl.pod
 +++ b/check_rbl/src/check_rbl.pod
-@@ -58,7 +58,7 @@ the querying mechanism.
+@@ -60,7 +60,7 @@ the querying mechanism.
  =head1 EXIT STATUS
  
  0 if OK, 1 in case of a warning, 2 in case of a critical status and 3
diff --git a/debian/patches/check_varnish/automake_foreign b/debian/patches/check_varnish/automake_foreign
index e2c33e8..74ada45 100644
--- a/debian/patches/check_varnish/automake_foreign
+++ b/debian/patches/check_varnish/automake_foreign
@@ -2,10 +2,8 @@ Author: Jan Wagner <waja at cyconet.org>
 Description:
  Ignore missing of required files on autoreconf
 
-diff --git a/check_varnish/varnish-nagios-1.1/configure.ac b/check_varnish/varnish-nagios-1.1/configure.ac
-index feac2bd..5a51b89 100644
---- a/check_varnish/varnish-nagios-1.1/configure.ac
-+++ b/check_varnish/varnish-nagios-1.1/configure.ac
+--- a/check_varnish/src/configure.ac
++++ b/check_varnish/src/configure.ac
 @@ -10,7 +10,7 @@ AM_CONFIG_HEADER(config.h)
  AC_CANONICAL_SYSTEM
  AC_LANG(C)
diff --git a/debian/patches/check_varnish/support-for-varnish-4 b/debian/patches/check_varnish/support-for-varnish-4
index ea3e0c7..110a579 100644
--- a/debian/patches/check_varnish/support-for-varnish-4
+++ b/debian/patches/check_varnish/support-for-varnish-4
@@ -9,8 +9,6 @@ closes #2
  configure.ac    |  8 +++++++-
  2 files changed, 46 insertions(+), 3 deletions(-)
 
-diff --git a/check_varnish.c b/check_varnish.c
-index 2ba36aa..95156f3 100644
 --- a/check_varnish/varnish-nagios-1.1/check_varnish.c
 +++ b/check_varnish/varnish-nagios-1.1/check_varnish.c
 @@ -43,8 +43,13 @@
@@ -27,7 +25,7 @@ index 2ba36aa..95156f3 100644
  
  static int verbose = 0;
  
-@@ -177,6 +182,22 @@ check_stats_cb(void *priv, const struct VSC_point * const pt)
+@@ -177,6 +182,22 @@ check_stats_cb(void *priv, const struct
  	struct stat_priv *p;
  	char tmp[1024];
  
@@ -50,7 +48,7 @@ index 2ba36aa..95156f3 100644
  	assert(sizeof(tmp) > (strlen(pt->class) + 1 +
  			      strlen(pt->ident) + 1 +
  			      strlen(pt->name) + 1));
-@@ -188,15 +209,20 @@ check_stats_cb(void *priv, const struct VSC_point * const pt)
+@@ -188,15 +209,20 @@ check_stats_cb(void *priv, const struct
  		 pt->name);
  	p = priv;
  	assert(!strcmp(pt->fmt, "uint64_t"));
@@ -73,7 +71,7 @@ index 2ba36aa..95156f3 100644
  			p->cache_miss = *(const volatile uint64_t*)pt->ptr;
  		}
  	}
-@@ -215,7 +241,11 @@ check_stats(struct VSM_data *vd, char *param)
+@@ -215,7 +241,11 @@ check_stats(struct VSM_data *vd, char *p
  	priv.found = 0;
  	priv.param = param;
  
@@ -109,8 +107,6 @@ index 2ba36aa..95156f3 100644
  
  	/* Default: if no param specified, check hit ratio.  If no warning
  	 * and critical values are specified either, set these to default.
-diff --git a/configure.ac b/configure.ac
-index feac2bd..a3df21e 100644
 --- a/check_varnish/varnish-nagios-1.1/configure.ac
 +++ b/check_varnish/varnish-nagios-1.1/configure.ac
 @@ -21,7 +21,13 @@ AC_PROG_LIBTOOL
@@ -128,6 +124,3 @@ index feac2bd..a3df21e 100644
  
  # Checks for header files.
  AC_HEADER_STDC
--- 
-2.0.0.rc0
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib

