From 2f64b1b45115a12c53cb524e4c6b513e5b189876 Mon Sep 17 00:00:00 2001
From: manu <manu>
Date: Wed, 28 Aug 2013 12:14:49 +0000
Subject: Bugfix from upstream: do not send error when value is just on limit
 https://bugzilla.redhat.com/show_bug.cgi?id=913085

---
 net/nagios-plugins/Makefile             |  4 ++--
 net/nagios-plugins/distinfo             |  3 ++-
 net/nagios-plugins/patches/patch-913085 | 40 +++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 net/nagios-plugins/patches/patch-913085

(limited to 'net/nagios-plugins')

diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 17f576514d6..1466e8c314a 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/05/31 12:41:35 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/08/28 12:14:49 manu Exp $
 #
 
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
index 911f3c0fa17..248dace3db8 100644
--- a/net/nagios-plugins/distinfo
+++ b/net/nagios-plugins/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2013/01/19 09:59:12 manu Exp $
+$NetBSD: distinfo,v 1.14 2013/08/28 12:14:49 manu Exp $
 
 SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
 RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
 Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
+SHA1 (patch-913085) = bf8d28555f50c24d12a67bbecdf7e44a404a5a89
 SHA1 (patch-ab) = fdde9e8e98f222ab7e24adea205ce402bd64342d
 SHA1 (patch-ad) = 1418682ff599f91aa01a1eeb90f11c9e571212c8
 SHA1 (patch-ae) = 9975dfe9e7a1e448fe273ccb8427dcf3a74e195f
diff --git a/net/nagios-plugins/patches/patch-913085 b/net/nagios-plugins/patches/patch-913085
new file mode 100644
index 00000000000..48796885e04
--- /dev/null
+++ b/net/nagios-plugins/patches/patch-913085
@@ -0,0 +1,40 @@
+$NetBSD: patch-913085,v 1.1 2013/08/28 12:14:49 manu Exp $
+
+Bugfix from upstream: do not send error when value is just on limit
+https://bugzilla.redhat.com/show_bug.cgi?id=913085
+
+--- plugins/check_ide_smart.c.orig	2013-08-28 14:05:08.000000000 +0200
++++ plugins/check_ide_smart.c	2013-08-28 14:05:15.000000000 +0200
+@@ -361,9 +361,9 @@
+ 	int passed = 0;
+ 	int i;
+ 	for (i = 0; i < NR_ATTRIBUTES; i++) {
+ 		if (value->id && threshold->id && value->id == threshold->id) {
+-			if (value->value <= threshold->threshold) {
++			if (value->value < threshold->threshold) {
+ 				++failed;
+ 			}
+ 			else {
+ 				++passed;
+@@ -390,9 +390,9 @@
+ 	int total = 0;
+ 	int i;
+ 	for (i = 0; i < NR_ATTRIBUTES; i++) {
+ 		if (value->id && threshold->id && value->id == threshold->id) {
+-			if (value->value <= threshold->threshold) {
++			if (value->value < threshold->threshold) {
+ 				++failed;
+ 				if (value->status & 1) {
+ 					status = PREFAILURE;
+ 					++prefailure;
+@@ -447,9 +447,9 @@
+ {
+ 	printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
+ 					p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
+ 					p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
+-					p->value > t->threshold ? "Passed" : "Failed");
++					p->value >= t->threshold ? "Passed" : "Failed");
+ }
+ 
+ 
+ 
-- 
cgit v1.2.3