commit a70c1c7e6ef067c3fe3bfff02af86e836640b002
Author: Elan Ruusamäe <[email protected]>
Date: Mon Apr 20 22:30:06 2015 +0300
drop obsolete files
mawk-workaround.patch | 172 ------------------------------------------
nagios-plugins-cosmetic.patch | 11 ---
nagios-plugins-subst.patch | 29 -------
3 files changed, 212 deletions(-)
---
diff --git a/mawk-workaround.patch b/mawk-workaround.patch
deleted file mode 100644
index 12cbbab..0000000
--- a/mawk-workaround.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-
-mawk pattern matching is probably too greedy as it fails when two paths on
same line:
-
-
-mawk: run time error: regular expression compile failed (missing operand)
-/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer
- FILENAME="check_mailq.pl" FNR=627 NR=627
-
-however upstream removed autodetection (GRRR), revert that change
-https://nagios-plugins.org/nagios-plugins-2-0-3-released/
-
-this is resolved differently in monitoring-plugins:
-https://github.com/monitoring-plugins/monitoring-plugins/commit/c08d6a429ba0e0cd3642ba2c2fe85687472ee22f
-
---- nagios-plugins-2.0.3/plugins-scripts/check_mailq.pl 2015-04-12
00:49:58.451674277 +0300
-+++ nagios-plugins-2.0.1/plugins-scripts/check_mailq.pl 2015-04-12
00:49:01.892078238 +0300
-@@ -199,20 +199,20 @@
- ## now check the queue length(s)
-
- if ($msg_q == 0) {
-- $msg = "OK: mailq is empty";
-+ $msg = "OK: $mailq mailq is empty";
- $state = $ERRORS{'OK'};
- } else {
- print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
-
- # overall queue length
- if ($msg_q < $opt_w) {
-- $msg = "OK: mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
-+ $msg = "OK: $mailq mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
- $state = $ERRORS{'OK'};
- }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) {
-- $msg = "WARNING: mailq is $msg_q (threshold w =
$opt_w)";
-+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w =
$opt_w)";
- $state = $ERRORS{'WARNING'};
- }else {
-- $msg = "CRITICAL: mailq is $msg_q (threshold c =
$opt_c)";
-+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c =
$opt_c)";
- $state = $ERRORS{'CRITICAL'};
- }
-
-@@ -344,20 +344,20 @@
-
- # check queue length(s)
- if ($msg_q == 0){
-- $msg = "OK: mailq reports queue is empty";
-+ $msg = "OK: $mailq mailq reports queue is empty";
- $state = $ERRORS{'OK'};
- } else {
- print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
-
- # overall queue length
- if ($msg_q < $opt_w) {
-- $msg = "OK: mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
-+ $msg = "OK: $mailq mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
- $state = $ERRORS{'OK'};
- }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) {
-- $msg = "WARNING: mailq is $msg_q (threshold w =
$opt_w)";
-+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w
= $opt_w)";
- $state = $ERRORS{'WARNING'};
- }else {
-- $msg = "CRITICAL: mailq is $msg_q (threshold c =
$opt_c)";
-+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c
= $opt_c)";
- $state = $ERRORS{'CRITICAL'};
- }
-
-@@ -431,13 +431,13 @@
-
- # overall queue length
- if ($msg_q < $opt_w) {
-- $msg = "OK: mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
-+ $msg = "OK: $mailq mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
- $state = $ERRORS{'OK'};
- }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) {
-- $msg = "WARNING: mailq is $msg_q (threshold w =
$opt_w)";
-+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w =
$opt_w)";
- $state = $ERRORS{'WARNING'};
- }else {
-- $msg = "CRITICAL: mailq is $msg_q (threshold c =
$opt_c)";
-+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c =
$opt_c)";
- $state = $ERRORS{'CRITICAL'};
- }
-
-@@ -489,13 +489,13 @@
- exit $ERRORS{CRITICAL};
- }
- if ($msg_q < $opt_w) {
-- $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
-+ $msg = "OK: $mailq mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
- $state = $ERRORS{'OK'};
- }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) {
-- $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
-+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
- $state = $ERRORS{'WARNING'};
- }else {
-- $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
-+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c =
$opt_c)";
- $state = $ERRORS{'CRITICAL'};
- }
- } # end of ($mailq eq "exim")
-@@ -526,13 +526,13 @@
- }
- close(MAILQ) ;
- if ($msg_q < $opt_w) {
-- $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
-+ $msg = "OK: $mailq mailq ($msg_q) is below threshold
($opt_w/$opt_c)";
- $state = $ERRORS{'OK'};
- }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) {
-- $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
-+ $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
- $state = $ERRORS{'WARNING'};
- }else {
-- $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
-+ $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c =
$opt_c)";
- $state = $ERRORS{'CRITICAL'};
- }
- } # end of ($mailq eq "nullmailer")
-@@ -605,7 +605,35 @@
- exit $ERRORS{'UNKNOWN'};
- }
- }else{
-- $mailq = 'sendmail' ;
-+ if (defined $utils::PATH_TO_QMAIL_QSTAT
-+ && -x $utils::PATH_TO_QMAIL_QSTAT)
-+ {
-+ $mailq = 'qmail';
-+ }
-+ elsif (-d '/var/lib/postfix'
-+ || -d '/var/local/lib/postfix'
-+ || -e '/usr/sbin/postfix'
-+ || -e '/usr/local/sbin/postfix')
-+ {
-+ $mailq = 'postfix';
-+ }
-+ elsif (-d '/usr/lib/exim4'
-+ || -d '/usr/local/lib/exim4'
-+ || -e '/usr/sbin/exim'
-+ || -e '/usr/local/sbin/exim')
-+ {
-+ $mailq = 'exim';
-+ }
-+ elsif (-d '/usr/lib/nullmailer'
-+ || -d '/usr/local/lib/nullmailer'
-+ || -e '/usr/sbin/nullmailer-send'
-+ || -e '/usr/local/sbin/nullmailer-send')
-+ {
-+ $mailq = 'nullmailer';
-+ }
-+ else {
-+ $mailq = 'sendmail';
-+ }
- }
-
- return $ERRORS{'OK'};
-@@ -628,7 +656,7 @@
- print "-W (--Warning) = Min. number of messages for same domain in
queue to generate warning\n";
- print "-C (--Critical) = Min. number of messages for same domain in
queue to generate critical alert ( W < C )\n";
- print "-t (--timeout) = Plugin timeout in seconds (default =
$utils::TIMEOUT)\n";
-- print "-M (--mailserver) = [ sendmail | qmail | postfix | exim |
nullmailer ] (default = sendmail)\n";
-+ print "-M (--mailserver) = [ sendmail | qmail | postfix | exim |
nullmailer ] (default = autodetect)\n";
- print "-h (--help)\n";
- print "-V (--version)\n";
- print "-v (--verbose) = debugging output\n";
-@@ -636,6 +664,8 @@
- print "Note: -w and -c are required arguments. -W and -C are
optional.\n";
- print " -W and -C are applied to domains listed on the queues - both
FROM and TO. (sendmail)\n";
- print " -W and -C are applied message not yet preproccessed. (qmail)\n";
-+ print " This plugin tries to autodetect which mailserver you are
running,\n";
-+ print " you can override the autodetection with -M.\n";
- print " This plugin uses the system mailq command (sendmail) or
qmail-stat (qmail)\n";
- print " to look at the queues. Mailq can usually only be accessed by
root or \n";
- print " a TrustedUser. You will have to set appropriate permissions for
the plugin to work.\n";
diff --git a/nagios-plugins-cosmetic.patch b/nagios-plugins-cosmetic.patch
deleted file mode 100644
index b1d0964..0000000
--- a/nagios-plugins-cosmetic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nagios-plugins-1.4.13/plugins-scripts/check_mailq.pl~ 2006-07-05
16:45:57.000000000 +0300
-+++ nagios-plugins-1.4.13/plugins-scripts/check_mailq.pl 2008-10-11
14:52:47.407968164 +0300
-@@ -32,7 +32,7 @@
- use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t
- $opt_M $mailq $status $state $msg
$msg_q $msg_p $opt_W $opt_C $mailq @lines
- %srcdomains %dstdomains);
--use lib utils.pm;
-+use lib utils.pm;
- use utils qw(%ERRORS &print_revision &support &usage );
-
-
diff --git a/nagios-plugins-subst.patch b/nagios-plugins-subst.patch
deleted file mode 100644
index 6b79252..0000000
--- a/nagios-plugins-subst.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-do the utils.pm substitution AFTER path based substitution
-otherwise if 'nagios' is in $PATH somewhy, then wrong perl library path is
-substituted to perl programs
-
-glen, 2004-12-08
-
---- ./plugins-scripts/subst.in~ 2003-07-02 18:01:22.000000000 +0300
-+++ ./plugins-scripts/subst.in 2005-04-02 00:11:24.000000000 +0300
-@@ -44,10 +44,6 @@
- /^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}
- /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}
-
--# add to libexecdir to INC for perl utils.pm
--/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
--
--
- # Trusted path mechanism (deprecated)
-
- /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
-@@ -68,6 +64,9 @@
- sub(c,which(c,path));
- }
-
-+# add to libexecdir to INC for perl utils.pm
-+/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
-+
- {
- print;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/monitoring-plugins.git/commitdiff/c0ced8315d39508922ba44055f875118c3f23844
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
