kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update xymon to 4.3.7

Browse source 
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.
This commit is contained in:
gendalia 2012-04-28 20:55:31 +00:00
parent f465f0264b
commit 15953e62f0
3 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/xymonclient/Makefile
View file

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.10 2011/11/16 21:45:01 spz Exp $
# $NetBSD: Makefile,v 1.11 2012/04/28 20:55:31 gendalia Exp $
#
DISTNAME= xymon-4.3.5
PKGNAME= xymonclient-4.3.5
PKGREVISION= 1
DISTNAME= xymon-4.3.7
PKGNAME= xymonclient-4.3.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}

10
net/xymonclient/distinfo
View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.6 2011/11/16 21:45:01 spz Exp $
$NetBSD: distinfo,v 1.7 2012/04/28 20:55:31 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) = 0475a9a92883ab3350bb8043366d455d841cb173
SHA1 (patch-ab) = 7486e1cb5733898c8511d7ee212fd90741ba3d83
SHA1 (patch-ac) = 1777cd0f2a179e4d4099130210396fd06e904187
SHA1 (patch-ac) = 0258c470159d648e9b7499b6665e36793d2aac41
SHA1 (patch-ad) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
SHA1 (patch-ae) = dadd2d81ed55c70f03994b2d868cfe643969a8ba
SHA1 (patch-af) = ae5d0acde8e2cd05527253c41e31a806b04614f6

55
net/xymonclient/patches/patch-ac
View file

@ -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