packages: nagios-plugins/nagios-plugins.spec, nagios-plugins/nagios-plugins...

[arekm]

Author: arekm                        Date: Thu Sep 17 07:08:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 19; understang ping6 output from iputils package

---- Files affected:
packages/nagios-plugins:
   nagios-plugins.spec (1.118 -> 1.119) , nagios-plugins-ping.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugins/nagios-plugins.spec
diff -u packages/nagios-plugins/nagios-plugins.spec:1.118 packages/nagios-plugins/nagios-plugins.spec:1.119
--- packages/nagios-plugins/nagios-plugins.spec:1.118	Wed Sep  9 15:17:14 2009
+++ packages/nagios-plugins/nagios-plugins.spec	Thu Sep 17 09:08:45 2009
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
 Version:	1.4.13
-Release:	18
+Release:	19
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
@@ -42,6 +42,7 @@
 Patch24:	%{name}-paths.patch
 Patch25:	%{name}-check_snmp_disk_monitor-bulk.patch
 Patch26:	%{name}-check_snmp_disk_monitor-opts.patch
+Patch27:	%{name}-ping.patch
 URL:		http://www.nagiosplugins.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -492,6 +493,7 @@
 %patch24 -p1
 %patch25 -p0
 %patch26 -p0
+%patch27 -p1
 
 # bring contribs into shape...
 cd contrib
@@ -922,6 +924,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2009/09/17 07:08:45  arekm
+- rel 19; understang ping6 output from iputils package
+
 Revision 1.118  2009/09/09 13:17:14  glen
 - deps of -contrib to Suggests to encourage pld developers to make subpkgs of plugins they need
 

================================================================
Index: packages/nagios-plugins/nagios-plugins-ping.patch
diff -u /dev/null packages/nagios-plugins/nagios-plugins-ping.patch:1.1
--- /dev/null	Thu Sep 17 09:08:51 2009
+++ packages/nagios-plugins/nagios-plugins-ping.patch	Thu Sep 17 09:08:45 2009
@@ -0,0 +1,33 @@
+--- nagios-plugins-1.4.13/plugins/check_ping.c.org	2009-09-17 08:56:15.043692330 +0200
++++ nagios-plugins-1.4.13/plugins/check_ping.c	2009-09-17 09:04:41.830352692 +0200
+@@ -519,12 +519,13 @@
+ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
+ {
+ 	if (strstr (buf, "Network is unreachable") ||
+-		strstr (buf, "Destination Net Unreachable")
++		strstr (buf, "Destination Net Unreachable") ||
++		strstr (buf, "No route")
+ 		)
+ 		die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)"), addr);
+-	else if (strstr (buf, "Destination Host Unreachable"))
++	else if (strstr (buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable"))
+ 		die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)"), addr);
+-	else if (strstr (buf, "Destination Port Unreachable"))
++	else if (strstr (buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable"))
+ 		die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)"), addr);
+ 	else if (strstr (buf, "Destination Protocol Unreachable"))
+ 		die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"), addr);
+@@ -532,11 +533,11 @@
+ 		die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)"), addr);
+ 	else if (strstr (buf, "Destination Host Prohibited"))
+ 		die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)"), addr);
+-	else if (strstr (buf, "Packet filtered"))
++	else if (strstr (buf, "Packet filtered") || strstr(buf, "Administratively prohibited"))
+ 		die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)"), addr);
+ 	else if (strstr (buf, "unknown host" ))
+ 		die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
+-	else if (strstr (buf, "Time to live exceeded"))
++	else if (strstr (buf, "Time to live exceeded") || strstr(buf, "Time exceeded"))
+ 		die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)"), addr);
+ 
+ 	if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins/nagios-plugins.spec?r1=1.118&r2=1.119&f=u