commit 0cf0f3539ef2380e028068d804d856cfc1eb0727
Author: Elan Ruusamäe <[email protected]>
Date: Thu Dec 6 17:26:41 2012 +0200
up to 1.4.16; license is GPLv3
nagios plugins license is GPL v3 for whole package:
Confirm licensing of nagios-plugins - ID: 3310487 --
http://sourceforge.net/tracker/index.php?func=detail&aid=3310487&group_id=29880&atid=397597
nagios-plugins-check_disk_smb-zero-cap.patch | 14 ++++++-------
nagios-plugins-format_string.patch | 11 ----------
nagios-plugins-ping.patch | 30 ++++++++++++++--------------
nagios-plugins.spec | 14 ++++++-------
4 files changed, 28 insertions(+), 41 deletions(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index b652ade..320890e 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,4 +1,4 @@
-# NOTE TO PLD DEVELOPERS:
+# NOTE TO PLD LINUX DEVELOPERS:
# - if you use any plugin from -contrib package, move it to subpackage or main
# package so we can support it better!
# TODO:
@@ -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: 1.4.15
-Release: 4
-License: GPL v2
+Version: 1.4.16
+Release: 1
+License: GPL v3
Group: Networking
Source0:
http://downloads.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
-# Source0-md5: 56abd6ade8aa860b38c4ca4a6ac5ab0d
+# Source0-md5: 862f5e44fb5bc65ce7e5d86d654d4da0
Source1: %{name}-config-20100219.tar.bz2
# Source1-md5: 7914664eee7d77be9b8f05347a276e0f
Source2: nagios-utils.php
@@ -44,7 +44,6 @@ Patch26: %{name}-check_snmp_disk_monitor-opts.patch
Patch27: %{name}-ping.patch
Patch28: check_rbl.patch
Patch29: %{name}-gets.patch
-Patch30: %{name}-format_string.patch
Patch31: %{name}-radiusclient-ng.patch
URL: http://www.nagiosplugins.org/
BuildRequires: autoconf
@@ -510,14 +509,13 @@ mv nagios-plugins-config-*/* .
%patch20 -p1
%patch21 -p1
%patch22 -p0
-%patch23 -p0
+%patch23 -p1
%patch24 -p1
%patch25 -p0
%patch26 -p0
%patch27 -p1
%patch28 -p1
%patch29 -p1
-%patch30 -p1
%patch31 -p1
# bring contribs into shape...
diff --git a/nagios-plugins-check_disk_smb-zero-cap.patch
b/nagios-plugins-check_disk_smb-zero-cap.patch
index 002f20e..ecc9a7b 100644
--- a/nagios-plugins-check_disk_smb-zero-cap.patch
+++ b/nagios-plugins-check_disk_smb-zero-cap.patch
@@ -1,12 +1,12 @@
---- plugins-scripts/check_disk_smb.orig 2008-04-23 12:22:41.792842643
+0000
-+++ plugins-scripts/check_disk_smb.pl 2008-04-23 12:23:31.728177767 +0000
-@@ -181,7 +181,8 @@
-
- my ($avail) = ($3*$2)/1024;
- my ($avail_bytes) = $avail;
+--- nagios-plugins-1.4.16/plugins-scripts/check_disk_smb.pl~ 2012-06-27
20:32:47.000000000 +0300
++++ nagios-plugins-1.4.16/plugins-scripts/check_disk_smb.pl 2012-12-06
16:42:57.696786740 +0200
+@@ -209,7 +209,8 @@
+ my ($total_bytes) = $1 * $2;
+ my ($occupied_bytes) = $1 * $2 - $avail_bytes;
+ my ($avail) = $avail_bytes/1024;
- my ($capper) = int(($3/$1)*100);
+ my ($capper);
+ if ($1!=0) { $capper = int(($3/$1)*100) } else { $capper=100 };
my ($mountpt) = "\\\\$host\\$share";
-
+ # TODO : why is the kB the standard unit for args ?
diff --git a/nagios-plugins-format_string.patch
b/nagios-plugins-format_string.patch
deleted file mode 100644
index 93cffce..0000000
--- a/nagios-plugins-format_string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nagios-plugins-1.4.15.orig/plugins/check_radius.c 2012-11-23
19:30:28.000000000 +0100
-+++ nagios-plugins-1.4.15/plugins/check_radius.c 2012-11-23
19:45:33.357160263 +0100
-@@ -219,7 +219,7 @@
- if (result == OK_RC)
- die (STATE_OK, _("Auth OK"));
- (void)snprintf(msg, sizeof(msg), _("Unexpected result code %d"),
result);
-- die (STATE_UNKNOWN, msg);
-+ die (STATE_UNKNOWN, "%s", msg);
- }
-
-
diff --git a/nagios-plugins-ping.patch b/nagios-plugins-ping.patch
index 232d97f..da94ad4 100644
--- a/nagios-plugins-ping.patch
+++ b/nagios-plugins-ping.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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") ||
@@ -8,26 +8,26 @@
+ strstr (buf, "Destination Net Unreachable") ||
+ strstr (buf, "No route")
)
- die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)"),
addr);
+ 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)"),
addr);
+ 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)"), addr);
+ 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)"), addr);
-@@ -532,11 +533,11 @@
- die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)"),
addr);
+ 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)"),
addr);
+ 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)"),
addr);
+ die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"),
addr);
else if (strstr (buf, "unknown host" ))
- die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
+ 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)"), addr);
-
- if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
+ 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugins.git/commitdiff/0cf0f3539ef2380e028068d804d856cfc1eb0727
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
