diff options
author | gendalia <gendalia> | 2012-04-28 20:55:31 +0000 |
---|---|---|
committer | gendalia <gendalia> | 2012-04-28 20:55:31 +0000 |
commit | 6a796efbc336b7511b30fb433764d9f75d374fac (patch) | |
tree | a571985f924bc0b2e670d7aa0400d46a84de6d01 /net/xymonclient/patches | |
parent | 36a6af35b551ff02f38158c92d0ce6275bbd7fc4 (diff) | |
download | pkgsrc-6a796efbc336b7511b30fb433764d9f75d374fac.tar.gz |
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.
Diffstat (limited to 'net/xymonclient/patches')
-rw-r--r-- | net/xymonclient/patches/patch-ac | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/net/xymonclient/patches/patch-ac b/net/xymonclient/patches/patch-ac index 38022bd7d5c..e1bd6f36a44 100644 --- a/net/xymonclient/patches/patch-ac +++ b/net/xymonclient/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2011/04/22 15:37:02 spz Exp $ +$NetBSD: patch-ac,v 1.3 2012/04/28 20:55:31 gendalia Exp $ --- client/Makefile.orig 2011-03-08 17:20:28.000000000 +0000 +++ client/Makefile @@ -25,52 +25,61 @@ $NetBSD: patch-ac,v 1.2 2011/04/22 15:37:02 spz Exp $ all: $(PROGRAMS) $(COMMONTOOLS) xymonclient.cfg clientlaunch.cfg $(EXTRATOOLS) xymonclient.cfg: xymonclient.cfg.DIST -@@ -58,26 +72,51 @@ netbsd-meminfo: netbsd-meminfo.c +@@ -58,28 +74,58 @@ netbsd-meminfo: netbsd-meminfo.c install: - if test ! -d $(INSTALLROOT)$(XYMONHOME) ; then mkdir -p $(INSTALLROOT)$(XYMONHOME) ; fi -- if test ! -d $(INSTALLROOT)$(XYMONHOME)/bin ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/bin ; fi -- if test ! -d $(INSTALLROOT)$(XYMONHOME)/etc ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/etc ; fi -- if test ! -d $(INSTALLROOT)$(XYMONHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/tmp ; fi -- if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs; fi -- if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext ; fi + if test ! -d $(INSTALLROOT)$(XYMONHOME) ; then mkdir -p $(INSTALLROOT)$(XYMONHOME) ; fi +- if test ! -d $(INSTALLROOT)$(XYMONHOME)/bin ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/bin ; fi +- if test ! -d $(INSTALLROOT)$(XYMONHOME)/etc ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/etc ; fi +- if test ! -d $(INSTALLROOT)$(XYMONHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/tmp ; fi +- if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs ; fi +- if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext ; fi +- if test ! -d $(INSTALLROOT)$(XYMONHOME)/local ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/local ; fi - if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/ ; fi +- if test ! -f $(INSTALLROOT)$(XYMONHOME)/local/README; then cp README-local $(INSTALLROOT)$(XYMONHOME)/local/README ; chmod 644 $(INSTALLROOT)$(XYMONHOME)/local/README; fi - cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME) - cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(XYMONHOME)/bin/ - chmod ugo+x $(INSTALLROOT)$(XYMONHOME)/bin/* -+ if test ! -d $(INSTALLROOT)$(INSTALLBINDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) ; fi ++ if test ! -d $(INSTALLROOT)$(INSTALLBINDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) ; fi +ifndef PKGBUILD +ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin) -+ ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin ++ ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin +endif +endif -+ if test ! -d $(INSTALLROOT)$(INSTALLETCDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLETCDIR) ; fi ++ if test ! -d $(INSTALLROOT)$(INSTALLETCDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLETCDIR) ; fi +ifndef PKGBUILD +ifneq ($(INSTALLETCDIR),$(XYMONHOME)/etc) -+ ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(XYMONHOME)/etc ++ ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(XYMONHOME)/etc +endif +endif -+ if test ! -d $(INSTALLROOT)$(INSTALLTMPDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR) ; fi ++ if test ! -d $(INSTALLROOT)$(INSTALLTMPDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR) ; fi +ifndef PKGBUILD +ifneq ($(INSTALLTMPDIR),$(XYMONHOME)/tmp) -+ ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONHOME)/tmp ++ ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONHOME)/tmp +endif +endif -+ if test ! -d $(INSTALLROOT)$(XYMONLOGDIR); then mkdir -p $(INSTALLROOT)$(XYMONLOGDIR); fi ++ if test ! -d $(INSTALLROOT)$(XYMONLOGDIR) ; then mkdir -p $(INSTALLROOT)$(XYMONLOGDIR) ; fi +ifndef PKGBUILD -+ifneq ($(BBLOGDIR),$(XYMONHOME)/logs) -+ ln -sf $(BBLOGDIR) $(INSTALLROOT)$(XYMONHOME)/logs ++ifneq ($(BBLOGDIR),$(XYMONHOME)/log) ++ ln -sf $(BBLOGDIR) $(INSTALLROOT)$(XYMONHOME)/log +endif +endif -+ if test ! -d $(INSTALLROOT)$(INSTALLEXTDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR) ; fi ++ if test ! -d $(INSTALLROOT)$(INSTALLEXTDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR) ; fi +ifndef PKGBUILD +ifneq ($(INSTALLEXTDIR),$(XYMONHOME)/ext) -+ ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(XYMONHOME)/ext ++ ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(XYMONHOME)/ext +endif +endif -+ if test ! -f $(INSTALLROOT)$(INSTALLEXADIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLEXADIR)/ ; fi ++ if test ! -d $(INSTALLROOT)$(INSTALLLOCALDIR) ; then mkdir -p $(INSTALLROOT)$(INSTALLLOCALDIR) ; fi ++ifndef PKGBUILD ++ifneq ($(INSTALLLOCALDIR),$(XYMONHOME)/local) ++ ln -sf $(INSTALLLOCALDIR) $(INSTALLROOT)$(XYMONHOME)/local ++endif ++endif ++ if test ! -f $(INSTALLROOT)$(INSTALLEXADIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLEXADIR) ; fi ++ if test ! -f $(INSTALLROOT)$(INSTALLLOCALDIR)/README; then cp README-local $(INSTALLROOT)$(INSTALLLOCALDIR)/README ; chmod 644 $(INSTALLROOT)$(INSTALLLOCALDIR)/README; fi + cp -fp runclient.sh $(INSTALLROOT)$(INSTALLBINDIR) -+ cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(INSTALLBINDIR)/ ++ cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(INSTALLBINDIR) + chmod ugo+x $(INSTALLROOT)$(INSTALLBINDIR)/* - ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg @@ -79,12 +88,12 @@ $NetBSD: patch-ac,v 1.2 2011/04/22 15:37:02 spz Exp $ + ../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(INSTALLETCDIR)/xymonclient.cfg ifndef PKGBUILD - chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) -+ chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(INSTALLETCDIR) $(INSTALLROOT)$(INSTALLEXADIR) $(INSTALLROOT)$(INSTALLEXTDIR) $(INSTALLROOT)$(INSTALLBINDIR) $(INSTALLROOT)$(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONLOGDIR) ++ chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(INSTALLETCDIR) $(INSTALLROOT)$(INSTALLEXADIR) $(INSTALLROOT)$(INSTALLEXTDIR) $(INSTALLROOT)$(INSTALLBINDIR) $(INSTALLROOT)$(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONLOGDIR) $$(INSTALLROOT)$(INSTALLLOCALDIR) endif install-localclient: - cp -fp xymond_client $(INSTALLROOT)$(XYMONHOME)/bin/ -+ cp -fp xymond_client $(INSTALLROOT)$(INSTALLBINDIR)/ ++ cp -fp xymond_client $(INSTALLROOT)$(INSTALLBINDIR) ifndef PKGBUILD - chown $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME)/bin/xymond_client + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLBINDIR)/xymond_client |