[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] 2 commits: d/rules: Set DH_VERBOSE=1

[Jan Wagner (@waja)]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins


Commits:
405406dd by Jan Wagner at 2023-01-18T13:28:57+00:00
d/rules: Set DH_VERBOSE=1

- - - - -
ff160b6f by Jan Wagner at 2023-01-18T21:16:27+00:00
Adding d/p/26_check_mailq_fix_nullmailer_regex from upstream

- - - - -


3 changed files:

- + debian/patches/26_check_mailq_fix_nullmailer_regex
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/26_check_mailq_fix_nullmailer_regex
=====================================
@@ -0,0 +1,28 @@
+From 7ae8456e7a89faf0d9a10c0e2720910cbe0317b8 Mon Sep 17 00:00:00 2001
+From: andrew bezella <abezella at archive.org>
+Date: Wed, 19 Oct 2022 21:33:18 +0200
+Subject: [PATCH] Fixing nullmailer regex
+
+attached is a patch that updates the format expected in the nullmailer
+mailq output.  the regex is a little more flexible and less specific
+than the previous version.
+---
+ plugins-scripts/check_mailq.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
+index 4c72332a5..27073d3cc 100755
+--- a/plugins-scripts/check_mailq.pl
++++ b/plugins-scripts/check_mailq.pl
+@@ -537,9 +537,9 @@
+ 	}
+ 
+ 	while (<MAILQ>) {
+-	    #2006-06-22 16:00:00  282 bytes
++	    #2022-08-25 01:30:40 502 bytes from <user at example.com>
+ 
+-	    if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-5][0-9]\:[0-5][0-9]\s+[0-9]+\sbytes/) {
++	    if (/^\d{4}-\d{2}-\d{2}\s+\d{2}\:\d{2}\:\d{2}\s+\d+\sbytes/) {
+ 		$msg_q++ ;
+ 	    }
+ 	}


=====================================
debian/patches/series
=====================================
@@ -14,3 +14,4 @@
 23_check_http_chunked_encoding
 24_check_apt_usage
 25_spell_fixes
+26_check_mailq_fix_nullmailer_regex


=====================================
debian/rules
=====================================
@@ -4,7 +4,7 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # for hardening
 DPKG_EXPORT_BUILDFLAGS = 1



View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/a0718c849ad6726c3e2b42fc9e6d4433ddd46c7a...ff160b6fe15b47eeb4b71815c5ef59b10590dddf

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/a0718c849ad6726c3e2b42fc9e6d4433ddd46c7a...ff160b6fe15b47eeb4b71815c5ef59b10590dddf
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20230118/8aa8b7f8/attachment-0001.htm>