Up to 2.3.2

- https://github.com/monitoring-plugins/monitoring-plugins/releases/tag/v2.3.2

diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec
index 989f48bf980aa37e7d67b23486a1b1f176c3281c..f882f690295a8341e42368f08d197fd774b544ee 100644 (file)
--- a/monitoring-plugins.spec
+++ b/monitoring-plugins.spec
@@ -11,12 +11,12 @@
 Summary:       Network Monitoring Plugins for Nagios and compatible
 Summary(pl.UTF-8):     Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:          monitoring-plugins
-Version:       2.3
-Release:       2
+Version:       2.3.2
+Release:       1
 License:       GPL v3+
 Group:         Networking
 Source0:       https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: b373cb010bb1136aa5692a7e9c0c8ec1
+# Source0-md5: 8d98e0ca261ed3e6d796c2569b99c814
 # https://git.pld-linux.org/projects/nagios-config
 Source1:       nagios-plugins-config-20150412.tar.xz
 # Source1-md5: 2f0f29735345c158d11c2009be3e1478
@@ -29,7 +29,6 @@ Patch7:               nagios-plugins-pgsql.patch
 Patch9:                nagios-plugins-check_log_paths.patch
 Patch23:       nagios-plugins-check_disk_smb-zero-cap.patch
 Patch24:       nagios-plugins-paths.patch
-Patch27:       nagios-plugins-ping.patch
 URL:           https://www.monitoring-plugins.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -524,7 +523,6 @@ mv nagios-plugins-config-*/* .
 %patch7 -p1
 %patch23 -p1
 %patch24 -p1
-%patch27 -p1
 
 # remove libtool m4 macro copies, breaks when system libtool is older
 %{__rm} gl/m4/libtool.m4 gl/m4/lt*.m4

diff --git a/nagios-plugins-ping.patch b/nagios-plugins-ping.patch
deleted file mode 100644 (file)
index 83f5f8c..0000000
--- a/nagios-plugins-ping.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/monitoring-plugins/monitoring-plugins/pull/1412
-
---- nagios-plugins-1.4.16/plugins/check_ping.c~        2012-12-06 16:43:57.000000000 +0200
-+++ nagios-plugins-1.4.16/plugins/check_ping.c 2012-12-06 16:45:32.053840313 +0200
-@@ -515,12 +515,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)\n"), 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)\n"), 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)\n"), addr);
-       else if (strstr (buf, "Destination Protocol Unreachable"))
-               die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr);
-@@ -528,11 +529,11 @@
-               die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);
-       else if (strstr (buf, "Destination Host Prohibited"))
-               die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr);
--      else if (strstr (buf, "Packet filtered"))
-+      else if (strstr (buf, "Packet filtered") || strstr(buf, "Administratively prohibited"))
-               die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);
-       else if (strstr (buf, "unknown host" ))
-               die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), 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)\n"), addr);
-       else if (strstr (buf, "Destination unreachable: "))
-               die (STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr);