debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update from git

Browse source
This commit is contained in:
Jan Wagner 2010-04-12 14:58:18 +00:00
parent a455dd188b
commit 79e99a75a5
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -12,6 +12,8 @@ nagios-plugins (1.4.14-5) UNRELEASED; urgency=low
13_subst.in_again.dpatch 13_subst.in_again.dpatch
* Fix 34_fix_smbclient_check_disk_smb.dpatch and drop * Fix 34_fix_smbclient_check_disk_smb.dpatch and drop
23_check_smb_password.dpatch, thanks Holger Weiss for notification 23_check_smb_password.dpatch, thanks Holger Weiss for notification
* Update 39_check_ircd_fix_epn.dpatch with fix from upstream, thanks
Holger Weiss
-- Jan Wagner <waja@cyconet.org> Thu, 08 Apr 2010 23:54:05 +0200 -- Jan Wagner <waja@cyconet.org> Thu, 08 Apr 2010 23:54:05 +0200

20
debian/patches/39_check_ircd_fix_epn.dpatch vendored
View file

@ -1,34 +1,40 @@
#! /bin/sh /usr/share/dpatch/dpatch-run #! /bin/sh /usr/share/dpatch/dpatch-run
## 39_check_ircd_fix_epn.dpatch by Alexander Wirt <formorer@formorer.de> ## 39_check_ircd_fix_epn.dpatch by Alexander Wirt <formorer@formorer.de>
## From: Holger Weiss <holger@zedat.fu-berlin.de>
## Date: Mon, 12 Apr 2010 13:36:33 +0000 (+0200)
## Subject: Fix Failure when run via ePN
## X-Git-Url: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug%2Fnagiosplug;a=commitdiff_plain;h=7a661c7aed2a0bad4ce1e3786bc707cd2b07c128
## ##
## DP: Fixes epn in check_ircd (#545940) (bugs.debian.org/545940) ## DP: Fixes epn in check_ircd (#545940) (bugs.debian.org/545940)
## DP: Upstream bug is: https://sourceforge.net/tracker/?func=detail&atid=397597&aid=2864973&group_id=29880 ## DP: Upstream bug is: https://sourceforge.net/tracker/?func=detail&atid=397597&aid=2864973&group_id=29880
@DPATCH@ @DPATCH@
--- nagios-plugins-1.4.12~/plugins-scripts/check_ircd.pl 2009-08-23 09:40:38.000000000 +0200 diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
+++ nagios-plugins-1.4.12/plugins-scripts/check_ircd.pl 2009-09-22 23:35:52.000000000 +0200 index 3fbce2e..42a9bca 100755
@@ -194,19 +194,19 @@ --- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -187,19 +187,19 @@ MAIN:
if ($opt_h) {print_help(); exit $ERRORS{'OK'};} if ($opt_h) {print_help(); exit $ERRORS{'OK'};}
- ($opt_H) || ($opt_H = shift) || usage("Host name/address not specified\n"); - ($opt_H) || ($opt_H = shift) || usage("Host name/address not specified\n");
+ ($opt_H) || usage("Host name/address not specified\n"); + ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n");
my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/);
($remotehost) || usage("Invalid host: $opt_H\n"); ($remotehost) || usage("Invalid host: $opt_H\n");
- ($opt_w) || ($opt_w = shift) || ($opt_w = 50); - ($opt_w) || ($opt_w = shift) || ($opt_w = 50);
+ ($opt_w) || ($opt_w = 50); + ($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 50);
my $warn = $1 if ($opt_w =~ /^([0-9]+)$/); my $warn = $1 if ($opt_w =~ /^([0-9]+)$/);
($warn) || usage("Invalid warning threshold: $opt_w\n"); ($warn) || usage("Invalid warning threshold: $opt_w\n");
- ($opt_c) || ($opt_c = shift) || ($opt_c = 100); - ($opt_c) || ($opt_c = shift) || ($opt_c = 100);
+ ($opt_c) || ($opt_c = 100); + ($opt_c) || ($opt_c = shift @ARGV) || ($opt_c = 100);
my $crit = $1 if ($opt_c =~ /^([0-9]+)$/); my $crit = $1 if ($opt_c =~ /^([0-9]+)$/);
($crit) || usage("Invalid critical threshold: $opt_c\n"); ($crit) || usage("Invalid critical threshold: $opt_c\n");
- ($opt_p) || ($opt_p = shift) || ($opt_p = 6667); - ($opt_p) || ($opt_p = shift) || ($opt_p = 6667);
+ ($opt_p) || ($opt_p = 6667); + ($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = 6667);
my $remoteport = $1 if ($opt_p =~ /^([0-9]+)$/); my $remoteport = $1 if ($opt_p =~ /^([0-9]+)$/);
($remoteport) || usage("Invalid port: $opt_p\n"); ($remoteport) || usage("Invalid port: $opt_p\n");