From 9237fc89724ed2f5074913b5427266cfddcbcbbc Mon Sep 17 00:00:00 2001
From: Jochen Neumeister <joneum@FreeBSD.org>
Date: Sat, 8 Nov 2025 19:50:48 +0100
Subject: net-mgmt/monitoring-olugins: Update to 2.4.0

Changelog: https://www.monitoring-plugins.org/news/index.html

Sponsored by:	Netzkommune GmbH
---
 .../files/patch-plugins-scripts_check__mailq.pl    | 89 ++++++++++------------
 1 file changed, 42 insertions(+), 47 deletions(-)

(limited to 'net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl')

diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
index 4274663ddb21..fc244ca94d41 100644
--- a/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
@@ -1,56 +1,51 @@
-From 94acff9f2616fbca8fd31292d374d9ce8a45263a Mon Sep 17 00:00:00 2001
-From: Filias Heidt <fh@netzkommune.de>
-Date: Fri, 9 Jun 2017 14:46:00 +0200
-Subject: [PATCH] add support for opensmtpd
-
---- plugins-scripts/check_mailq.pl.orig	2020-12-09 21:38:01 UTC
-+++ plugins-scripts/check_mailq.pl
-@@ -550,6 +550,39 @@ elsif ( $mailq eq "nullmailer" ) {
- 	}
+--- plugins-scripts/check_mailq.pl.orig	2025-11-08 16:31:19.283295000 +0100
++++ plugins-scripts/check_mailq.pl	2025-11-08 16:39:40.042634000 +0100
+@@ -571,7 +571,39 @@ elsif ( $mailq eq "nullmailer" ) {
+         $state = $ERRORS{'CRITICAL'};
+     }
  } # 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>);
++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'};
++       }
 +
-+	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'};
-+	}
++       $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;
-@@ -612,7 +645,7 @@ sub process_arguments(){
- 	}
+@@ -635,7 +667,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';
+     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';
-- 
cgit v1.2.3