From 5234cd6d8a7b322d978799e64fdfc52573b61ecb Mon Sep 17 00:00:00 2001
From: feld <feld@FreeBSD.org>
Date: Tue, 24 Nov 2015 16:07:28 +0000
Subject: net-mgmt/xymon-server: Update to 4.3.24

Also ensure 301 redirects are conisidered "GREEN". This has been
reported upstream.
---
 net-mgmt/xymon-server/Makefile                     |  4 ++--
 net-mgmt/xymon-server/distinfo                     |  4 ++--
 .../xymon-server/files/patch-xymonnet_httpresult.c | 25 ++++++++--------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 224624c1bcf3..d978c2910d23 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.23
-PORTREVISION=	1
+PORTVERSION=	4.3.24
+PORTREVISION=	0
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo
index 9555dad9c67e..26a1ccc04d18 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.23.tar.gz) = e48de2f266c652149f8a855785e4873be3351298ea5936695379606d73d9ec87
-SIZE (repacked/xymon-4.3.23.tar.gz) = 2983261
+SHA256 (repacked/xymon-4.3.24.tar.gz) = 29d5bffcf9c24d8107cdd2a4818a960f403c1322725bfa29ca9b44d2a1f82ba7
+SIZE (repacked/xymon-4.3.24.tar.gz) = 2983386
diff --git a/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c b/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c
index c8cadee2606d..d9c81afa9c89 100644
--- a/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c
+++ b/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c
@@ -1,17 +1,10 @@
---- xymonnet/httpresult.c.orig	2015-11-23 19:40:49 UTC
+--- xymonnet/httpresult.c.orig	2015-11-24 15:59:24 UTC
 +++ xymonnet/httpresult.c
-@@ -64,10 +64,10 @@ static int statuscolor(testedhost_t *h, 
- 		break;
- 	  default:
- 		/* Unknown or custom status */
--		result = (result < 100) ? (h->dialup ? COL_CLEAR : COL_RED) :
--			 (result < 200) ? COL_YELLOW :
--			 (result < 300) ? COL_GREEN  :
--			 (result < 400) ? COL_YELLOW :
-+		result = (status < 100) ? (h->dialup ? COL_CLEAR : COL_RED) :
-+			 (status < 200) ? COL_YELLOW :
-+			 (status < 300) ? COL_GREEN  :
-+			 (status < 400) ? COL_YELLOW :
- 			 COL_RED;
- 		break;
- 	}
+@@ -44,6 +44,7 @@ static int statuscolor(testedhost_t *h, 
+ 
+ 	switch(status) {
+ 	  case 200: /* OK - most common case */
++	  case 301: /* Permanent Redirect */
+ 	  case 302: /* Temp Redirect */
+ 	  case 303: /* See Other */
+ 	  case 307: /* Temp Redirect (HTTP 1.1) */
-- 
cgit