up to 2.0.1

diff --git a/mawk-workaround.patch b/mawk-workaround.patch
new file mode 100644 (file)
index 0000000..c21ab9b
--- /dev/null
+++ b/mawk-workaround.patch
@@ -0,0 +1,39 @@
+
+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
+
+
+--- nagios-plugins-2.0.1/plugins-scripts/check_mailq.pl~       2014-04-21 14:33:35.000000000 +0300
++++ nagios-plugins-2.0.1/plugins-scripts/check_mailq.pl        2014-04-21 14:33:37.760719061 +0300
+@@ -610,17 +610,22 @@
+               {
+                       $mailq = 'qmail';
+               }
+-              elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix'
+-                     || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix')
++              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')
++              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'
++              elsif (-d '/usr/lib/nullmailer'
++                      || -d '/usr/local/lib/nullmailer'
+                      || -e '/usr/sbin/nullmailer-send'
+                      || -e '/usr/local/sbin/nullmailer-send')
+               {

diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 2ab14fa059645471c648d02ead193094674bbc6d..c242c7db8139ef52289de4a9d44251edeb280165 100644 (file)
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -12,12 +12,12 @@
 Summary:       Host/service/network monitoring program plugins for Nagios
 Summary(pl.UTF-8):     Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:          nagios-plugins
-Version:       2.0
+Version:       2.0.1
 Release:       1
 License:       GPL v3
 Group:         Networking
 Source0:       http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 567592556f59bd64108e28c23aa382d3
+# Source0-md5: 70daeb6d2d9ea7d41827488b80782a60
 # http://git.pld-linux.org/cgi-bin/cgit.cgi/projects/nagios-config.git/
 Source1:       %{name}-config-20140307.tar.bz2
 # Source1-md5: de5c205501cb89c183193d4088d48222
@@ -35,6 +35,7 @@ Patch21:      %{name}-check_hpjd-no-paper-out.patch
 Patch23:       %{name}-check_disk_smb-zero-cap.patch
 Patch24:       %{name}-paths.patch
 Patch27:       %{name}-ping.patch
+Patch28:       mawk-workaround.patch
 URL:           http://www.nagiosplugins.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -514,6 +515,7 @@ mv nagios-plugins-config-*/* .
 %patch23 -p1
 %patch24 -p1
 %patch27 -p1
+%patch28 -p1
 
 # remove libtool m4 macro copies, breaks when system libtool is older
 %{__rm} gl/m4/libtool.m4 gl/m4/lt*.m4