Update xymon to 4.3.7

Upstream changelog:

Changes from 4.3.6 -> 4.3.7 (13 Dec 2011)
=========================================
* rev 6803
* Fix acknowledge CGI (broken in 4.3.6)
* Fix broken uptime calculation for systems reporting "1 day"
* Workaround Solaris breakage in the LFS-support detection
* Fix/add links to the HTML man-page index.
* Fix "Stop after" value not being shown on the "info" page.
* Fix broken alert texts when using FORMAT=SMS
* Fix wrong description of xymondboard CRITERIA in xymon(1)
* Fix missing columnname in analysis.cfg(5) DS example
* Fix missing space in output from disk IGNORE rules in
  xymond_client --dump-config
* Fix overwrite of xymon-apache.conf when upgrading
* Fix installation so it does not remove include/directory
  lines from configuration files.
* Add client/local/ directory for custom client script

Changes from 4.3.5 -> 4.3.6 (5 Dec 2011)
========================================
* rev 6788
* Optionally choose the color for the "cpu" status when it goes
  non-green due to uptime or clock offset.
* Allow for "include" and "directory" in combo.cfg and protocols.cfg
* New INTERFACES definition in hosts.cfg to select which network
  interfaces are tracked in graphs.
* New access control mechanism for some CGI scripts returning
  host-specific information. Access optionally checked against
  an Apache-style "group" file (see xymonwebaccess(5) CGI manpage).
* New "vertical" page-definitions (vpage, vsubpage,vsubparent)
  for listing hosts across and tests down on a page.
* Fix hostlist CGI crash when called with HTTP "HEAD"
* Fix svcstatus CGI crash when called with non-existing hostname
* Fix "ackinfo" updates being cleared when host hits a
  DOWNTIME period.
* Fix compile-errors on Solaris due to network libraries
  not being included.
* Fix "logrotate" messages not being sent to some channels.
* Fix problem with loading the hosts.cfg file.
* STATUSLIFETIME now provides the default time a status is valid (in xymond).
* Critical systems view: Use priority 99 for un-categorised priorities
  (imported from NK tags) and show this as 'No priority' on the webpage.
* useradm CGI: Sort usernames
* New xymond module - xymond_distribute - can forward
  administrative commands (drop, rename, disable, enable)
  from one Xymon server to another.
* New tool: appfeed CGI provides data for the Android "xymonQV" app
  by Darrik Mazey.

4 files changed, 24 insertions, 14 deletions

diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index 15568c81195..86637775965 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2012/03/03 00:13:48 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/04/28 18:26:18 gendalia Exp $
 #
 
-DISTNAME=		xymon-4.3.5
-PKGREVISION=		5
+DISTNAME=		xymon-4.3.7
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xymon/}
 
diff --git a/net/xymon/PLIST b/net/xymon/PLIST
index 4a7ed0d067f..659ddc1388b 100644
--- a/net/xymon/PLIST
+++ b/net/xymon/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2011/10/15 23:07:24 spz Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/04/28 18:26:19 gendalia Exp $
 libexec/xymon/ackinfo.cgi
 libexec/xymon/acknowledge.cgi
+libexec/xymon/appfeed.cgi
 libexec/xymon/bb
 libexec/xymon/bbcmd
 libexec/xymon/bbdigest
@@ -8,6 +9,8 @@ libexec/xymon/bbhostgrep
 libexec/xymon/bbhostshow
 libexec/xymon/beastat
 libexec/xymon/boilerplate.cgi
+libexec/xymon/cgi-bin/appfeed-critical.sh
+libexec/xymon/cgi-bin/appfeed.sh
 libexec/xymon/cgi-bin/certreport.sh
 libexec/xymon/cgi-bin/columndoc.sh
 libexec/xymon/cgi-bin/confreport-critical.sh
@@ -65,6 +68,7 @@ libexec/xymon/trimhistory
 libexec/xymon/useradm.cgi
 libexec/xymon/xymon
 libexec/xymon/xymon-mailack
+libexec/xymon/xymon-snmpcollect
 libexec/xymon/xymon.sh
 libexec/xymon/xymoncfg
 libexec/xymon/xymoncgimsg.cgi
@@ -74,6 +78,7 @@ libexec/xymon/xymond_alert
 libexec/xymon/xymond_capture
 libexec/xymon/xymond_channel
 libexec/xymon/xymond_client
+libexec/xymon/xymond_distribute
 libexec/xymon/xymond_filestore
 libexec/xymon/xymond_history
 libexec/xymon/xymond_hostdata
@@ -92,6 +97,7 @@ libexec/xymon/xymonproxy
 libexec/xymon/xymonreports.sh
 man/man1/ackinfo.cgi.1
 man/man1/acknowledge.cgi.1
+man/man1/appfeed.cgi.1
 man/man1/clientupdate.1
 man/man1/combostatus.1
 man/man1/confreport.cgi.1
@@ -137,6 +143,7 @@ man/man5/xymon-xmh.5
 man/man5/xymonclient.cfg.5
 man/man5/xymonserver.cfg.5
 man/man5/xymonweb.5
+man/man5/xymonwebaccess.5
 man/man7/xymon.7
 man/man8/enadis.cgi.8
 man/man8/msgcache.8
@@ -148,6 +155,7 @@ man/man8/xymond_alert.8
 man/man8/xymond_capture.8
 man/man8/xymond_channel.8
 man/man8/xymond_client.8
+man/man8/xymond_distribute.8
 man/man8/xymond_filestore.8
 man/man8/xymond_history.8
 man/man8/xymond_hostdata.8
@@ -233,6 +241,7 @@ share/examples/xymon/www/help/mainview.jpg
 share/examples/xymon/www/help/manpages/index.html
 share/examples/xymon/www/help/manpages/man1/ackinfo.cgi.1.html
 share/examples/xymon/www/help/manpages/man1/acknowledge.cgi.1.html
+share/examples/xymon/www/help/manpages/man1/appfeed.cgi.1.html
 share/examples/xymon/www/help/manpages/man1/clientupdate.1.html
 share/examples/xymon/www/help/manpages/man1/combostatus.1.html
 share/examples/xymon/www/help/manpages/man1/confreport.cgi.1.html
@@ -278,6 +287,7 @@ share/examples/xymon/www/help/manpages/man5/xymon-xmh.5.html
 share/examples/xymon/www/help/manpages/man5/xymonclient.cfg.5.html
 share/examples/xymon/www/help/manpages/man5/xymonserver.cfg.5.html
 share/examples/xymon/www/help/manpages/man5/xymonweb.5.html
+share/examples/xymon/www/help/manpages/man5/xymonwebaccess.5.html
 share/examples/xymon/www/help/manpages/man7/xymon.7.html
 share/examples/xymon/www/help/manpages/man8/enadis.cgi.8.html
 share/examples/xymon/www/help/manpages/man8/msgcache.8.html
@@ -289,6 +299,7 @@ share/examples/xymon/www/help/manpages/man8/xymond_alert.8.html
 share/examples/xymon/www/help/manpages/man8/xymond_capture.8.html
 share/examples/xymon/www/help/manpages/man8/xymond_channel.8.html
 share/examples/xymon/www/help/manpages/man8/xymond_client.8.html
+share/examples/xymon/www/help/manpages/man8/xymond_distribute.8.html
 share/examples/xymon/www/help/manpages/man8/xymond_filestore.8.html
 share/examples/xymon/www/help/manpages/man8/xymond_history.8.html
 share/examples/xymon/www/help/manpages/man8/xymond_hostdata.8.html
diff --git a/net/xymon/distinfo b/net/xymon/distinfo
index 588e84a3637..cdbb1c40a0e 100644
--- a/net/xymon/distinfo
+++ b/net/xymon/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2011/11/16 21:12:34 spz Exp $
+$NetBSD: distinfo,v 1.8 2012/04/28 18:26:19 gendalia Exp $
 
-SHA1 (xymon-4.3.5.tar.gz) = cd49d689bbf9c27ed4d2010cf75223d7f43f656e
-RMD160 (xymon-4.3.5.tar.gz) = 31110454d30835f758d844e3c142066566546548
-Size (xymon-4.3.5.tar.gz) = 2715187 bytes
+SHA1 (xymon-4.3.7.tar.gz) = 29339157a1a6155d134ed1ad9985391d43034ee8
+RMD160 (xymon-4.3.7.tar.gz) = 9547eac47a5893f978cace54b5761e9cabe75941
+Size (xymon-4.3.7.tar.gz) = 2740378 bytes
 SHA1 (patch-aa) = c74991627bfc4286a67f66e45915c3af69b38c2f
 SHA1 (patch-ab) = d6079a2f09c38f701c553ab9744731050f66772c
-SHA1 (patch-ac) = 0c191268606b1bc8547a0403b440e7628b6e2928
+SHA1 (patch-ac) = f65831af9899167e291aabd691945e9e4fc1d44b
 SHA1 (patch-ad) = dadd2d81ed55c70f03994b2d868cfe643969a8ba
 SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
 SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5
diff --git a/net/xymon/patches/patch-ac b/net/xymon/patches/patch-ac
index 86955b2c3fb..8834b461945 100644
--- a/net/xymon/patches/patch-ac
+++ b/net/xymon/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2011/10/16 15:19:09 spz Exp $
+$NetBSD: patch-ac,v 1.4 2012/04/28 18:26:19 gendalia Exp $
 
 pkgsrc uses rc.d files to stop/start, don't copy that xymon.sh
 
---- xymond/Makefile.orig	2011-03-08 17:20:28.000000000 +0000
+--- xymond/Makefile.orig	2011-12-12 22:18:17.000000000 +0000
 +++ xymond/Makefile
-@@ -157,7 +157,9 @@ install-cfg:
+@@ -160,7 +160,9 @@ install-cfg:
+ 	cd etcfiles; ../../build/merge-sects graphs.cfg $(INSTALLROOT)$(INSTALLETCDIR)/graphs.cfg
  	cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv
- 	cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/
- 	cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf
+ 	cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg; echo xymon-apache.conf) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/
 +ifndef PKGBUILD
  	cd $(INSTALLROOT)$(XYMONHOME); rm -f xymon.sh; ln -sf bin/xymon.sh .
 +endif