Update to 2.3.0.

1 files changed, 0 insertions, 57 deletions

diff --git a/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl b/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl
deleted file mode 100644
index 06e51e89c987..000000000000
--- a/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl
+++ /dev/null
@@ -1,57 +0,0 @@
-commit d56818f5121b05439c7b7a1655d96ab39e066797
-Author: Filias Heidt <fh@netzkommune.de>
-Date:   2017-04-24 11:00:43 +0200
-
-    add support for opensmtpd
-
---- plugins-scripts/check_mailq.pl.orig	2017-04-19 16:03:12 UTC
-+++ plugins-scripts/check_mailq.pl
-@@ -558,6 +558,39 @@ elsif ( $mailq eq "nullmailer" ) {
- 	}
- } # end of ($mailq eq "nullmailer")
- 
-+elsif ( $mailq eq "opensmtp" ) {
-+	## open mailq
-+	if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
-+		if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
-+			print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
-+			exit $ERRORS{'UNKNOWN'};
-+		}
-+	}elsif( defined $utils::PATH_TO_MAILQ){
-+		unless (-x $utils::PATH_TO_MAILQ) {
-+			print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
-+			exit $ERRORS{'UNKNOWN'};
-+		}
-+	} else {
-+		print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
-+		exit $ERRORS{'UNKNOWN'};
-+	}
-+
-+	$msg_q++ while (<MAILQ>);
-+
-+	close(MAILQ) ;
-+	if ($msg_q < $opt_w) {
-+		$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 mailq is $msg_q (threshold w = $opt_w)";
-+		$state = $ERRORS{'WARNING'};
-+	}else {
-+		$msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
-+		$state = $ERRORS{'CRITICAL'};
-+	}
-+} # end of ($mailq eq "opensmtp")
-+
-+
- # Perfdata support
- print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
- exit $state;
-@@ -618,7 +651,7 @@ sub process_arguments(){
- 	}
- 
- 	if (defined $opt_M) {
--		if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
-+		if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer|opensmtp)$/) {
- 			$mailq = $opt_M ;
- 		}elsif( $opt_M eq ''){
- 			$mailq = 'sendmail';