net-mgmt/xymon-server net-mgmt/xymon-client: Update to 4.3.22

Changelog:	http://sourceforge.net/p/xymon/news/2015/11/xymon-4322-released/

6 files changed, 12 insertions, 43 deletions

diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 352ca032dbb7..7ca9f42ab10d 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.21
+PORTVERSION=	4.3.22
 PORTREVISION=	0
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo
index 8158ca874b64..196aa3f8a8ec 100644
--- a/net-mgmt/xymon-client/distinfo
+++ b/net-mgmt/xymon-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.21.tar.gz) = f7d0365eb79fd0b30563c99cd3400fc9f478bc5bc049780135567054719180d7
-SIZE (repacked/xymon-4.3.21.tar.gz) = 2970809
+SHA256 (repacked/xymon-4.3.22.tar.gz) = 72d089f472162f25db5de37610d2d8974455f2583cb01d9a5280d87d0f12ec56
+SIZE (repacked/xymon-4.3.22.tar.gz) = 2983162
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 441d1e72456d..a9de1d2e0d58 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xymon
-PORTVERSION=	4.3.21
-PORTREVISION=	3
+PORTVERSION=	4.3.22
+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 8158ca874b64..196aa3f8a8ec 100644
--- a/net-mgmt/xymon-server/distinfo
+++ b/net-mgmt/xymon-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/xymon-4.3.21.tar.gz) = f7d0365eb79fd0b30563c99cd3400fc9f478bc5bc049780135567054719180d7
-SIZE (repacked/xymon-4.3.21.tar.gz) = 2970809
+SHA256 (repacked/xymon-4.3.22.tar.gz) = 72d089f472162f25db5de37610d2d8974455f2583cb01d9a5280d87d0f12ec56
+SIZE (repacked/xymon-4.3.22.tar.gz) = 2983162
diff --git a/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c b/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c
deleted file mode 100644
index caeb3d6f008c..000000000000
--- a/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: xymonnet/httpresult.c
-===================================================================
---- xymonnet/httpresult.c	(revision 7670)
-+++ xymonnet/httpresult.c	(working copy)
-@@ -36,13 +36,26 @@
- 		result = (h->dialup ? COL_CLEAR : COL_RED);
- 		break;
- 	  case 100: /* Continue - should be ok */
--	  case 200: case 201: case 202: case 203: case 204: case 205: case 206:
--	  case 301: case 302: case 303: case 307:
--	  case 401: case 403: 		/* Is "Forbidden" an OK status ? */
-+	  case 200:
-+	  case 201:
-+	  case 202:
-+	  case 203:
-+	  case 204:
-+	  case 205:
-+	  case 206:
-+	  case 301:
-+	  case 302:
-+	  case 303:
-+	  case 307:
- 		result = COL_GREEN;
- 		break;
--	  case 400: case 404: case 405: case 406:
--		result = COL_RED;	/* Trouble getting page */
-+	  case 400:
-+	  case 401:
-+	  case 403:  /* Trouble getting page */
-+	  case 404:
-+	  case 405:
-+	  case 406:
-+		result = COL_RED;
- 		break;
- 	  case 500:
- 	  case 501:
diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist
index dc855b4f9a62..28b111654a72 100644
--- a/net-mgmt/xymon-server/pkg-plist
+++ b/net-mgmt/xymon-server/pkg-plist
@@ -94,6 +94,7 @@ man/man8/xymonproxy.8
 %%WWWDIR%%/cgi-bin/topchanges.sh
 %%WWWDIR%%/cgi-secure/ackinfo.sh
 %%WWWDIR%%/cgi-secure/acknowledge.sh
+%%WWWDIR%%/cgi-secure/chpasswd.sh
 %%WWWDIR%%/cgi-secure/criticaleditor.sh
 %%WWWDIR%%/cgi-secure/enadis.sh
 %%WWWDIR%%/cgi-secure/useradm.sh
@@ -109,6 +110,7 @@ man/man8/xymonproxy.8
 %%WWWDIR%%/server/bin/beastat
 %%WWWDIR%%/server/bin/boilerplate.cgi
 %%WWWDIR%%/server/bin/cgiwrap
+%%WWWDIR%%/server/bin/chpasswd.cgi
 %%WWWDIR%%/server/bin/combostatus
 %%WWWDIR%%/server/bin/confreport.cgi
 %%WWWDIR%%/server/bin/convertnk
@@ -191,6 +193,9 @@ man/man8/xymonproxy.8
 %%WWWDIR%%/server/web/acknowledgements_footer
 %%WWWDIR%%/server/web/acknowledgements_form
 %%WWWDIR%%/server/web/acknowledgements_header
+%%WWWDIR%%/server/web/chpasswd_footer
+%%WWWDIR%%/server/web/chpasswd_form
+%%WWWDIR%%/server/web/chpasswd_header
 %%WWWDIR%%/server/web/columndoc_footer
 %%WWWDIR%%/server/web/columndoc_header
 %%WWWDIR%%/server/web/confreport_back