diff options
author | spz <spz@pkgsrc.org> | 2011-04-22 14:52:18 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2011-04-22 14:52:18 +0000 |
commit | cfd3c957c3fc115be2dee747f47f86bd0fde8a70 (patch) | |
tree | 4fd3f037257206a4688f898a39c046709c8c671e /net/xymon | |
parent | 51d76b29e20c08faa588a605726a4f7e2ee846af (diff) | |
download | pkgsrc-cfd3c957c3fc115be2dee747f47f86bd0fde8a70.tar.gz |
package update to 4.3.2:
+ fixes cross-site scripting vulnerabilities (SA44036)
+ contains a lot of filename cleanup work (no more bb and hobbit)
please read upgrade-to-430.txt when upgrading from a previous pkg
(see also the install message)
Diffstat (limited to 'net/xymon')
-rw-r--r-- | net/xymon/DEINSTALL | 187 | ||||
-rw-r--r-- | net/xymon/INSTALL | 190 | ||||
-rw-r--r-- | net/xymon/MESSAGE | 7 | ||||
-rw-r--r-- | net/xymon/Makefile | 138 | ||||
-rw-r--r-- | net/xymon/PLIST | 494 | ||||
-rw-r--r-- | net/xymon/distinfo | 21 | ||||
-rw-r--r-- | net/xymon/patches/patch-aa | 6 | ||||
-rw-r--r-- | net/xymon/patches/patch-ab | 152 | ||||
-rw-r--r-- | net/xymon/patches/patch-ac | 20 | ||||
-rw-r--r-- | net/xymon/patches/patch-ad | 21 | ||||
-rw-r--r-- | net/xymon/patches/patch-ae | 6 | ||||
-rw-r--r-- | net/xymon/patches/patch-af | 22 | ||||
-rw-r--r-- | net/xymon/patches/patch-ah | 13 |
13 files changed, 674 insertions, 603 deletions
diff --git a/net/xymon/DEINSTALL b/net/xymon/DEINSTALL index 489844633a3..ac92c63feea 100644 --- a/net/xymon/DEINSTALL +++ b/net/xymon/DEINSTALL @@ -1,14 +1,14 @@ #! /bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +# $NetBSD: DEINSTALL,v 1.2 2011/04/22 14:52:18 spz Exp $ # # xymons user/group EXAMPLEDIR=@EXAMPLEDIR@ -BBHOME=@BBHOME@ -BBVAR=@BBVAR@ -BBLOGDIR=@BBLOGDIR@ +XYMONHOME=@XYMONHOME@ +XYMONVAR=@XYMONVAR@ +XYMONLOGDIR=@XYMONLOGDIR@ XYBINDIR=@XYBINDIR@ XYETCDIR=@XYETCDIR@ @@ -28,98 +28,108 @@ DEINSTALL) favicon-unknown.ico favicon-yellow.ico green-recent.gif \ green.gif purple-ack.gif purple-recent.gif purple.gif \ red-ack.gif red-recent.gif red.gif unknown-recent.gif \ - unknown.gif yellow-ack.gif yellow-recent.gif \ - yellow.gif zoom.gif" + unknown.gif xymonbody.css yellow-ack.gif \ + yellow-recent.gif yellow.gif zoom.gif" for file in ${GIFS}; do ${RM} ${XYWWWDIR}/gifs/${file} done - MENUFILES="README menu.css menu.js menu_items.js menu_tpl.js" + MENUFILES="b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif \ + xymonmenu-blue.css xymonmenu-grey.css" for file in ${MENUFILES}; do ${RM} ${XYWWWDIR}/menu/${file} done - DOCFILES="about.html bb-to-hobbit.html clonewarn.jpg \ - configure.txt criticalsystems.html \ - critview-detail-acked.jpg \ + DOCFILES="Renaming-430.txt about.html bb-to-xymon.html \ + clonewarn.jpg configure.txt \ + criticalsystems.html critview-detail-acked.jpg \ critview-detail-ackform.jpg \ critview-detail.jpg critview-disk.jpg \ critview-green.jpg editor-clonemaster.jpg \ editor-diskchanged.jpg editor-disksetup.jpg \ editor-main.jpg editor-makeclone.jpg \ editor-nohost.jpg editor-showclone.jpg \ - hobbit-alerts.html hobbit-apacheconf.txt \ - hobbit-bbhosts.png hobbit-clients.png \ - hobbit-config.html hobbit-mrtg.html \ - hobbit-tips.html hobbitmain.png hobbitprocs.png \ howtograph.html install.html known-issues.html \ mainview-acked.jpg mainview.jpg \ manpages/index.html \ - manpages/man1/bb-ack.cgi.1.html \ - manpages/man1/bb-csvinfo.cgi.1.html \ - manpages/man1/bb-datepage.cgi.1.html \ - manpages/man1/bb-eventlog.cgi.1.html \ - manpages/man1/bb-findhost.cgi.1.html \ - manpages/man1/bb-hist.cgi.1.html \ - manpages/man1/bb-rep.cgi.1.html \ - manpages/man1/bb-replog.cgi.1.html \ - manpages/man1/bb-snapshot.cgi.1.html \ - manpages/man1/bb-webpage.cgi.1.html \ - manpages/man1/bb.1.html \ - manpages/man1/bbcmd.1.html \ - manpages/man1/bbcombotest.1.html \ - manpages/man1/bbdigest.1.html \ - manpages/man1/bbgen.1.html \ - manpages/man1/bbhostgrep.1.html \ - manpages/man1/bbhostshow.1.html \ - manpages/man1/bbretest-net.sh.1.html \ - manpages/man1/bbtest-net.1.html \ + manpages/man1/ackinfo.cgi.1.html \ + manpages/man1/acknowledge.cgi.1.html \ manpages/man1/clientupdate.1.html \ - manpages/man1/hobbit-ackinfo.cgi.1.html \ - manpages/man1/hobbit-confreport.cgi.1.html \ - manpages/man1/hobbit-ghosts.cgi.1.html \ - manpages/man1/hobbit-hostgraphs.cgi.1.html \ - manpages/man1/hobbit-nkedit.cgi.1.html \ - manpages/man1/hobbit-nkview.cgi.1.html \ - manpages/man1/hobbit-statusreport.cgi.1.html \ - manpages/man1/hobbitgraph.cgi.1.html \ - manpages/man1/hobbitping.1.html \ - manpages/man1/hobbitsvc.cgi.1.html \ + manpages/man1/combostatus.1.html \ + manpages/man1/confreport.cgi.1.html \ + manpages/man1/criticaleditor.cgi.1.html \ + manpages/man1/criticalview.cgi.1.html \ + manpages/man1/csvinfo.cgi.1.html \ + manpages/man1/datepage.cgi.1.html \ + manpages/man1/eventlog.cgi.1.html \ + manpages/man1/findhost.cgi.1.html \ + manpages/man1/ghostlist.cgi.1.html \ + manpages/man1/history.cgi.1.html \ + manpages/man1/hostgraphs.cgi.1.html \ manpages/man1/logfetch.1.html \ - manpages/man1/orcahobbit.1.html \ - manpages/man5/bb-hosts.5.html \ - manpages/man5/bb-services.5.html \ - manpages/man5/bbcombotest.cfg.5.html \ + manpages/man1/orcaxymon.1.html \ + manpages/man1/report.cgi.1.html \ + manpages/man1/reportlog.cgi.1.html \ + manpages/man1/showgraph.cgi.1.html \ + manpages/man1/snapshot.cgi.1.html \ + manpages/man1/statusreport.cgi.1.html \ + manpages/man1/svcstatus.cgi.1.html \ + manpages/man1/xymon.1.html \ + manpages/man1/xymoncfg.1.html \ + manpages/man1/xymoncmd.1.html \ + manpages/man1/xymondigest.1.html \ + manpages/man1/xymongen.1.html \ + manpages/man1/xymongrep.1.html \ + manpages/man1/xymonnet-again.sh.1.html \ + manpages/man1/xymonnet.1.html \ + manpages/man1/xymonpage.cgi.1.html \ + manpages/man1/xymonping.1.html \ + manpages/man5/alerts.cfg.5.html \ + manpages/man5/analysis.cfg.5.html \ + manpages/man5/cgioptions.cfg.5.html \ manpages/man5/client-local.cfg.5.html \ manpages/man5/clientlaunch.cfg.5.html \ - manpages/man5/hobbit-alerts.cfg.5.html \ - manpages/man5/hobbit-clients.cfg.5.html \ - manpages/man5/hobbit-nkview.cfg.5.html \ - manpages/man5/hobbitcgi.cfg.5.html \ - manpages/man5/hobbitclient.cfg.5.html \ - manpages/man5/hobbitgraph.cfg.5.html \ - manpages/man5/hobbitlaunch.cfg.5.html \ - manpages/man5/hobbitserver.cfg.5.html \ - manpages/man5/hobbitweb.5.html \ + manpages/man5/combo.cfg.5.html \ + manpages/man5/critical.cfg.5.html \ + manpages/man5/graphs.cfg.5.html \ + manpages/man5/hosts.cfg.5.html \ + manpages/man5/protocols.cfg.5.html \ + manpages/man5/tasks.cfg.5.html \ + manpages/man5/xymon-xmh.5.html \ + manpages/man5/xymonclient.cfg.5.html \ + manpages/man5/xymonserver.cfg.5.html \ + manpages/man5/xymonweb.5.html \ manpages/man7/xymon.7.html \ - manpages/man8/bbmessage.cgi.8.html \ - manpages/man8/bbproxy.8.html \ - manpages/man8/hobbit-enadis.cgi.8.html \ - manpages/man8/hobbit-mailack.8.html \ - manpages/man8/hobbitd.8.html \ - manpages/man8/hobbitd_alert.8.html \ - manpages/man8/hobbitd_channel.8.html \ - manpages/man8/hobbitd_client.8.html \ - manpages/man8/hobbitd_filestore.8.html \ - manpages/man8/hobbitd_history.8.html \ - manpages/man8/hobbitd_hostdata.8.html \ - manpages/man8/hobbitd_rrd.8.html \ - manpages/man8/hobbitd_sample.8.html \ - manpages/man8/hobbitfetch.8.html \ - manpages/man8/hobbitlaunch.8.html \ + manpages/man8/enadis.cgi.8.html \ manpages/man8/msgcache.8.html \ manpages/man8/trimhistory.8.html \ - stdview-detail-acked.jpg" + manpages/man8/xymon-mailack.8.html \ + manpages/man8/xymoncgimsg.cgi.8.html \ + manpages/man8/xymond.8.html \ + manpages/man8/xymond_alert.8.html \ + manpages/man8/xymond_capture.8.html \ + manpages/man8/xymond_channel.8.html \ + manpages/man8/xymond_client.8.html \ + manpages/man8/xymond_filestore.8.html \ + manpages/man8/xymond_history.8.html \ + manpages/man8/xymond_hostdata.8.html \ + manpages/man8/xymond_rrd.8.html \ + manpages/man8/xymond_sample.8.html \ + manpages/man8/xymonfetch.8.html \ + manpages/man8/xymonlaunch.8.html \ + manpages/man8/xymonproxy.8.html \ + stdview-detail-acked.jpg \ + upgrade-to-430.txt \ + xymon-alerts.html \ + xymon-apacheconf.txt \ + xymon-clients.png \ + xymon-config.html \ + xymon-hosts.png \ + xymon-mrtg.html \ + xymon-tips.html \ + xymonmain.png \ + xymonprocs.png \ + " DOCDIRS="manpages/man8 manpages/man7 manpages/man5 \ manpages/man1 manpages" for file in ${DOCFILES}; do @@ -129,30 +139,31 @@ DEINSTALL) ${RMDIR} ${XYWWWDIR}/help/${dir} done - if [ -h ${BBHOME}/bin ]; then - ${RM} ${BBHOME}/bin + if [ -h ${XYMONHOME}/bin ]; then + ${RM} ${XYMONHOME}/bin fi - if [ -h ${BBHOME}/etc ]; then - ${RM} ${BBHOME}/etc + if [ -h ${XYMONHOME}/etc ]; then + ${RM} ${XYMONHOME}/etc fi - if [ -h ${BBHOME}/ext ]; then - ${RM} ${BBHOME}/ext + if [ -h ${XYMONHOME}/ext ]; then + ${RM} ${XYMONHOME}/ext fi - if [ -h ${BBHOME}/tmp ]; then - ${RM} ${BBHOME}/tmp + if [ -h ${XYMONHOME}/tmp ]; then + ${RM} ${XYMONHOME}/tmp fi - if [ -h ${BBHOME}/web ]; then - ${RM} ${BBHOME}/web + if [ -h ${XYMONHOME}/web ]; then + ${RM} ${XYMONHOME}/web fi - if [ -h ${BBHOME}/www ]; then - ${RM} ${BBHOME}/www + if [ -h ${XYMONHOME}/www ]; then + ${RM} ${XYMONHOME}/www fi - if [ -h ${BBHOME}/download ]; then - ${RM} ${BBHOME}/download + if [ -h ${XYMONHOME}/download ]; then + ${RM} ${XYMONHOME}/download fi - if [ -h ${BBHOME}/logs ]; then - ${RM} ${BBHOME}/logs + if [ -h ${XYMONHOME}/logs ]; then + ${RM} ${XYMONHOME}/logs fi ;; esac + diff --git a/net/xymon/INSTALL b/net/xymon/INSTALL index 40b3a513d63..39981206ce3 100644 --- a/net/xymon/INSTALL +++ b/net/xymon/INSTALL @@ -1,17 +1,17 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.1.1.1 2010/02/14 22:58:57 spz Exp $ +# $NetBSD: INSTALL,v 1.2 2011/04/22 14:52:18 spz Exp $ # # xymons user/group -BBUSER=xymon -BBGROUP=xymon +XYMONUSER=xymon +XYMONGROUP=xymon EXAMPLEDIR=@EXAMPLEDIR@ -BBHOME=@BBHOME@ -BBVAR=@BBVAR@ -BBLOGDIR=@BBLOGDIR@ +XYMONHOME=@XYMONHOME@ +XYMONVAR=@XYMONVAR@ +XYMONLOGDIR=@XYMONLOGDIR@ XYBINDIR=@XYBINDIR@ XYETCDIR=@XYETCDIR@ @@ -31,100 +31,110 @@ POST-INSTALL) favicon-unknown.ico favicon-yellow.ico green-recent.gif \ green.gif purple-ack.gif purple-recent.gif purple.gif \ red-ack.gif red-recent.gif red.gif unknown-recent.gif \ - unknown.gif yellow-ack.gif yellow-recent.gif \ - yellow.gif zoom.gif" + unknown.gif xymonbody.css yellow-ack.gif \ + yellow-recent.gif yellow.gif zoom.gif" for file in ${GIFS}; do ${CP} ${EXAMPLEDIR}/www/gifs/${file} ${XYWWWDIR}/gifs/${file} ${CHMOD} 0444 ${XYWWWDIR}/gifs/${file} done - MENUFILES="README menu.css menu.js menu_items.js menu_tpl.js" + MENUFILES="b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif \ + xymonmenu-blue.css xymonmenu-grey.css" for file in ${MENUFILES}; do ${CP} ${EXAMPLEDIR}/www/menu/${file} ${XYWWWDIR}/menu/${file} ${CHMOD} 0444 ${XYWWWDIR}/menu/${file} done - DOCFILES="about.html bb-to-hobbit.html clonewarn.jpg \ - configure.txt criticalsystems.html \ - critview-detail-acked.jpg \ + DOCFILES="Renaming-430.txt about.html bb-to-xymon.html \ + clonewarn.jpg configure.txt \ + criticalsystems.html critview-detail-acked.jpg \ critview-detail-ackform.jpg \ critview-detail.jpg critview-disk.jpg \ critview-green.jpg editor-clonemaster.jpg \ editor-diskchanged.jpg editor-disksetup.jpg \ editor-main.jpg editor-makeclone.jpg \ editor-nohost.jpg editor-showclone.jpg \ - hobbit-alerts.html hobbit-apacheconf.txt \ - hobbit-bbhosts.png hobbit-clients.png \ - hobbit-config.html hobbit-mrtg.html \ - hobbit-tips.html hobbitmain.png hobbitprocs.png \ howtograph.html install.html known-issues.html \ mainview-acked.jpg mainview.jpg \ manpages/index.html \ - manpages/man1/bb-ack.cgi.1.html \ - manpages/man1/bb-csvinfo.cgi.1.html \ - manpages/man1/bb-datepage.cgi.1.html \ - manpages/man1/bb-eventlog.cgi.1.html \ - manpages/man1/bb-findhost.cgi.1.html \ - manpages/man1/bb-hist.cgi.1.html \ - manpages/man1/bb-rep.cgi.1.html \ - manpages/man1/bb-replog.cgi.1.html \ - manpages/man1/bb-snapshot.cgi.1.html \ - manpages/man1/bb-webpage.cgi.1.html \ - manpages/man1/bb.1.html \ - manpages/man1/bbcmd.1.html \ - manpages/man1/bbcombotest.1.html \ - manpages/man1/bbdigest.1.html \ - manpages/man1/bbgen.1.html \ - manpages/man1/bbhostgrep.1.html \ - manpages/man1/bbhostshow.1.html \ - manpages/man1/bbretest-net.sh.1.html \ - manpages/man1/bbtest-net.1.html \ + manpages/man1/ackinfo.cgi.1.html \ + manpages/man1/acknowledge.cgi.1.html \ manpages/man1/clientupdate.1.html \ - manpages/man1/hobbit-ackinfo.cgi.1.html \ - manpages/man1/hobbit-confreport.cgi.1.html \ - manpages/man1/hobbit-ghosts.cgi.1.html \ - manpages/man1/hobbit-hostgraphs.cgi.1.html \ - manpages/man1/hobbit-nkedit.cgi.1.html \ - manpages/man1/hobbit-nkview.cgi.1.html \ - manpages/man1/hobbit-statusreport.cgi.1.html \ - manpages/man1/hobbitgraph.cgi.1.html \ - manpages/man1/hobbitping.1.html \ - manpages/man1/hobbitsvc.cgi.1.html \ + manpages/man1/combostatus.1.html \ + manpages/man1/confreport.cgi.1.html \ + manpages/man1/criticaleditor.cgi.1.html \ + manpages/man1/criticalview.cgi.1.html \ + manpages/man1/csvinfo.cgi.1.html \ + manpages/man1/datepage.cgi.1.html \ + manpages/man1/eventlog.cgi.1.html \ + manpages/man1/findhost.cgi.1.html \ + manpages/man1/ghostlist.cgi.1.html \ + manpages/man1/history.cgi.1.html \ + manpages/man1/hostgraphs.cgi.1.html \ manpages/man1/logfetch.1.html \ - manpages/man1/orcahobbit.1.html \ - manpages/man5/bb-hosts.5.html \ - manpages/man5/bb-services.5.html \ - manpages/man5/bbcombotest.cfg.5.html \ + manpages/man1/orcaxymon.1.html \ + manpages/man1/report.cgi.1.html \ + manpages/man1/reportlog.cgi.1.html \ + manpages/man1/showgraph.cgi.1.html \ + manpages/man1/snapshot.cgi.1.html \ + manpages/man1/statusreport.cgi.1.html \ + manpages/man1/svcstatus.cgi.1.html \ + manpages/man1/xymon.1.html \ + manpages/man1/xymoncfg.1.html \ + manpages/man1/xymoncmd.1.html \ + manpages/man1/xymondigest.1.html \ + manpages/man1/xymongen.1.html \ + manpages/man1/xymongrep.1.html \ + manpages/man1/xymonnet-again.sh.1.html \ + manpages/man1/xymonnet.1.html \ + manpages/man1/xymonpage.cgi.1.html \ + manpages/man1/xymonping.1.html \ + manpages/man5/alerts.cfg.5.html \ + manpages/man5/analysis.cfg.5.html \ + manpages/man5/cgioptions.cfg.5.html \ manpages/man5/client-local.cfg.5.html \ manpages/man5/clientlaunch.cfg.5.html \ - manpages/man5/hobbit-alerts.cfg.5.html \ - manpages/man5/hobbit-clients.cfg.5.html \ - manpages/man5/hobbit-nkview.cfg.5.html \ - manpages/man5/hobbitcgi.cfg.5.html \ - manpages/man5/hobbitclient.cfg.5.html \ - manpages/man5/hobbitgraph.cfg.5.html \ - manpages/man5/hobbitlaunch.cfg.5.html \ - manpages/man5/hobbitserver.cfg.5.html \ - manpages/man5/hobbitweb.5.html \ + manpages/man5/combo.cfg.5.html \ + manpages/man5/critical.cfg.5.html \ + manpages/man5/graphs.cfg.5.html \ + manpages/man5/hosts.cfg.5.html \ + manpages/man5/protocols.cfg.5.html \ + manpages/man5/tasks.cfg.5.html \ + manpages/man5/xymon-xmh.5.html \ + manpages/man5/xymonclient.cfg.5.html \ + manpages/man5/xymonserver.cfg.5.html \ + manpages/man5/xymonweb.5.html \ manpages/man7/xymon.7.html \ - manpages/man8/bbmessage.cgi.8.html \ - manpages/man8/bbproxy.8.html \ - manpages/man8/hobbit-enadis.cgi.8.html \ - manpages/man8/hobbit-mailack.8.html \ - manpages/man8/hobbitd.8.html \ - manpages/man8/hobbitd_alert.8.html \ - manpages/man8/hobbitd_channel.8.html \ - manpages/man8/hobbitd_client.8.html \ - manpages/man8/hobbitd_filestore.8.html \ - manpages/man8/hobbitd_history.8.html \ - manpages/man8/hobbitd_hostdata.8.html \ - manpages/man8/hobbitd_rrd.8.html \ - manpages/man8/hobbitd_sample.8.html \ - manpages/man8/hobbitfetch.8.html \ - manpages/man8/hobbitlaunch.8.html \ + manpages/man8/enadis.cgi.8.html \ manpages/man8/msgcache.8.html \ manpages/man8/trimhistory.8.html \ - stdview-detail-acked.jpg" + manpages/man8/xymon-mailack.8.html \ + manpages/man8/xymoncgimsg.cgi.8.html \ + manpages/man8/xymond.8.html \ + manpages/man8/xymond_alert.8.html \ + manpages/man8/xymond_capture.8.html \ + manpages/man8/xymond_channel.8.html \ + manpages/man8/xymond_client.8.html \ + manpages/man8/xymond_filestore.8.html \ + manpages/man8/xymond_history.8.html \ + manpages/man8/xymond_hostdata.8.html \ + manpages/man8/xymond_rrd.8.html \ + manpages/man8/xymond_sample.8.html \ + manpages/man8/xymonfetch.8.html \ + manpages/man8/xymonlaunch.8.html \ + manpages/man8/xymonproxy.8.html \ + stdview-detail-acked.jpg \ + upgrade-to-430.txt \ + xymon-alerts.html \ + xymon-apacheconf.txt \ + xymon-clients.png \ + xymon-config.html \ + xymon-hosts.png \ + xymon-mrtg.html \ + xymon-tips.html \ + xymonmain.png \ + xymonprocs.png \ + " DOCDIRS="manpages manpages/man1 manpages/man5 \ manpages/man7 manpages/man8" for dir in ${DOCDIRS}; do @@ -136,29 +146,29 @@ POST-INSTALL) ${CHMOD} 0444 ${XYWWWDIR}/help/${file} done - if [ ! -h ${BBHOME}/bin ]; then - ${LN} -s ${XYBINDIR} ${BBHOME}/bin + if [ ! -h ${XYMONHOME}/bin ]; then + ${LN} -s ${XYBINDIR} ${XYMONHOME}/bin fi - if [ ! -h ${BBHOME}/etc ]; then - ${LN} -s ${XYETCDIR} ${BBHOME}/etc + if [ ! -h ${XYMONHOME}/etc ]; then + ${LN} -s ${XYETCDIR} ${XYMONHOME}/etc fi - if [ ! -h ${BBHOME}/ext ]; then - ${LN} -s ${XYEXTDIR} ${BBHOME}/ext + if [ ! -h ${XYMONHOME}/ext ]; then + ${LN} -s ${XYEXTDIR} ${XYMONHOME}/ext fi - if [ ! -h ${BBHOME}/tmp ]; then - ${LN} -s ${XYTMPDIR} ${BBHOME}/tmp + if [ ! -h ${XYMONHOME}/tmp ]; then + ${LN} -s ${XYTMPDIR} ${XYMONHOME}/tmp fi - if [ ! -h ${BBHOME}/web ]; then - ${LN} -s ${XYWEBDIR} ${BBHOME}/web + if [ ! -h ${XYMONHOME}/web ]; then + ${LN} -s ${XYWEBDIR} ${XYMONHOME}/web fi - if [ ! -h ${BBHOME}/www ]; then - ${LN} -s ${XYWWWDIR} ${BBHOME}/www + if [ ! -h ${XYMONHOME}/www ]; then + ${LN} -s ${XYWWWDIR} ${XYMONHOME}/www fi - if [ ! -h ${BBHOME}/download ]; then - ${LN} -s ${BBVAR}/download ${BBHOME}/download + if [ ! -h ${XYMONHOME}/download ]; then + ${LN} -s ${XYMONVAR}/download ${XYMONHOME}/download fi - if [ ! -h ${BBHOME}/logs ]; then - ${LN} -s ${BBLOGDIR} ${BBHOME}/logs + if [ ! -h ${XYMONHOME}/logs ]; then + ${LN} -s ${XYMONLOGDIR} ${XYMONHOME}/logs fi ;; diff --git a/net/xymon/MESSAGE b/net/xymon/MESSAGE index 4e44a03047f..66f4469ef19 100644 --- a/net/xymon/MESSAGE +++ b/net/xymon/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2010/04/14 19:50:48 spz Exp $ +$NetBSD: MESSAGE,v 1.2 2011/04/22 14:52:18 spz Exp $ Please note that the ${SECCGIDIR} @@ -11,4 +11,9 @@ Please also note that anything beyond the xymon front page (eg cpu reports, which contain top output) are a privacy concern and also a potential excessive information disclosure concern, so you may want to restrict access to authenticated users. + +If you are updating from an earlier version of xymon, many config files +and the directory names have changed. Refer to +${EXAMPLEDIR}/www/help/upgrade-to-430.txt +for the necessary changes. =========================================================================== diff --git a/net/xymon/Makefile b/net/xymon/Makefile index e6e96cfc693..9f174087601 100644 --- a/net/xymon/Makefile +++ b/net/xymon/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2011/04/22 13:44:30 obache Exp $ +# $NetBSD: Makefile,v 1.8 2011/04/22 14:52:18 spz Exp $ # -DISTNAME= xymon-4.3.0-beta2 -PKGNAME= xymon-4.3.0b2 -PKGREVISION= 4 +DISTNAME= xymon-4.3.2 +PKGNAME= xymon-4.3.2 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} MAINTAINER= spz@NetBSD.org -HOMEPAGE= http://hobbitmon.sourceforge.net/ +HOMEPAGE= http://sourceforge.net/projects/xymon/ COMMENT= Network services monitor a la Big Brother LICENSE= gnu-gpl-v2 @@ -29,18 +28,18 @@ USE_TOOLS+= gmake # xymons user/group -BBUSER?= xymon -BBGROUP?= xymon +XYMONUSER?= xymon +XYMONGROUP?= xymon -PKG_GROUPS= ${BBGROUP} -PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q} +PKG_GROUPS= ${XYMONGROUP} +PKG_USERS= ${XYMONUSER:Q}:${XYMONGROUP:Q} -PKG_GECOS.${BBUSER}= Xymon monitor -PKG_HOME.${BBUSER}= ${BBHOME} +PKG_GECOS.${XYMONUSER}= Xymon monitor +PKG_HOME.${XYMONUSER}= ${XYMONHOME} -PKG_GROUPS_VARS+= BBGROUP +PKG_GROUPS_VARS+= XYMONGROUP PKG_GROUPS_VARS+= APACHE_GROUP -PKG_USERS_VARS+= BBUSER +PKG_USERS_VARS+= XYMONUSER # startup and config @@ -51,36 +50,36 @@ EXAMPLEDIR= ${PREFIX}/share/examples/xymon INSTALLATION_DIRS+= ${EXAMPLEDIR} INSTALLATION_DIRS+= ${PKG_SYSCONFDIR.xymon} -BBHOME?= ${PREFIX}/share/xymon/bbhome -BBTOPDIR?= ${PREFIX}/libexec/xymon -BBHOSTURL?= / -CGIDIR?= ${BBTOPDIR}/cgi-bin -BBCGIURL?= /cgi-bin -SECCGIDIR?= ${BBTOPDIR}/cgi-secure -SECUREBBCGIURL?= /xymon-seccgi +XYMONHOME?= ${PREFIX}/share/xymon/xymonhome +XYMONTOPDIR?= ${PREFIX}/libexec/xymon +XYMONHOSTURL?= / +CGIDIR?= ${XYMONTOPDIR}/cgi-bin +XYMONCGIURL?= /cgi-bin +SECCGIDIR?= ${XYMONTOPDIR}/cgi-secure +SECUREXYMONCGIURL?= /xymon-seccgi -BBSERVERNAME?= "`uname -n`" -BBSERVERIP?= 127.0.0.1 +XYMONSERVERNAME?= "`uname -n`" +XYMONSERVERIP?= 127.0.0.1 -BBLOGDIR?= ${VARBASE}/log/xymon -BBVAR?= ${VARBASE}/xymon +XYMONLOGDIR?= ${VARBASE}/log/xymon +XYMONVAR?= ${VARBASE}/xymon -XYBINDIR?= ${BBTOPDIR} +XYBINDIR?= ${XYMONTOPDIR} XYETCDIR?= ${PKG_SYSCONFDIR.xymon} -XYEXTDIR?= ${BBTOPDIR}/ext +XYEXTDIR?= ${XYMONTOPDIR}/ext XYTMPDIR?= ${VARBASE}/xymon/tmp XYWEBDIR?= ${PREFIX}/share/xymon/web XYWWWDIR?= ${VARBASE}/xymon/www BUILD_DEFS+= VARBASE -BUILD_DEFS+= BBHOSTURL -BUILD_DEFS+= BBSERVERNAME -BUILD_DEFS+= BBSERVERIP +BUILD_DEFS+= XYMONHOSTURL +BUILD_DEFS+= XYMONSERVERNAME +BUILD_DEFS+= XYMONSERVERIP FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} -FILES_SUBST+= BBHOME=${BBHOME:Q} -FILES_SUBST+= BBLOGDIR=${BBLOGDIR} -FILES_SUBST+= BBVAR=${BBVAR:Q} +FILES_SUBST+= XYMONHOME=${XYMONHOME:Q} +FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR} +FILES_SUBST+= XYMONVAR=${XYMONVAR:Q} FILES_SUBST+= XYBINDIR=${XYBINDIR} FILES_SUBST+= XYETCDIR=${XYETCDIR} FILES_SUBST+= XYEXTDIR=${XYEXTDIR} @@ -88,6 +87,8 @@ FILES_SUBST+= XYTMPDIR=${XYTMPDIR} FILES_SUBST+= XYWEBDIR=${XYWEBDIR} FILES_SUBST+= XYWWWDIR=${XYWWWDIR} +MESSAGE_SUBST+= DESTDIR=${DESTDIR} +MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR} EVAL_PREFIX+= PREFIX.fping=fping @@ -95,7 +96,7 @@ EVAL_PREFIX+= PREFIX.fping=fping CONFIGURE_ARGS+= "--server" CONFIGURE_ENV+= USERFPING=${PREFIX.fping}/sbin/fping -CONFIGURE_ENV+= USEHOBBITPING=n +CONFIGURE_ENV+= USEXYMONPING=n CONFIGURE_ENV+= RRDINC=${BUILDLINK_PREFIX.rrdtool}/include CONFIGURE_ENV+= RRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a CONFIGURE_ENV+= PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a @@ -108,19 +109,19 @@ CONFIGURE_ENV+= LDAPINC=${BUILDLINK_PREFIX.openldap-client}/include CONFIGURE_ENV+= LDAPLIB=${BUILDLINK_PREFIX.openldap-client}/lib CONFIGURE_ENV+= PCREINC=${BUILDLINK_PREFIX.pcre}/include CONFIGURE_ENV+= PCRELIB=${BUILDLINK_PREFIX.pcre}/lib -CONFIGURE_ENV+= BBHOSTNAME=${BBSERVERNAME:Q} -CONFIGURE_ENV+= BBHOSTIP=${BBSERVERIP:Q} -CONFIGURE_ENV+= BBUSER=${BBUSER:Q} -CONFIGURE_ENV+= BBHOME=${BBHOME:Q} -CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR} -CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL:Q} +CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q} +CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q} +CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q} +CONFIGURE_ENV+= XYMONHOME=${XYMONHOME:Q} +CONFIGURE_ENV+= XYMONTOPDIR=${XYMONTOPDIR} +CONFIGURE_ENV+= XYMONHOSTURL=${XYMONHOSTURL:Q} CONFIGURE_ENV+= CGIDIR=${CGIDIR} -CONFIGURE_ENV+= BBCGIURL=${BBCGIURL:Q} +CONFIGURE_ENV+= XYMONCGIURL=${XYMONCGIURL:Q} CONFIGURE_ENV+= SECURECGIDIR=${SECCGIDIR} -CONFIGURE_ENV+= SECUREBBCGIURL=${SECUREBBCGIURL:Q} +CONFIGURE_ENV+= SECUREXYMONCGIURL=${SECUREXYMONCGIURL:Q} CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP} -CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR} -CONFIGURE_ENV+= BBVAR=${BBVAR:Q} +CONFIGURE_ENV+= XYMONLOGDIR=${XYMONLOGDIR} +CONFIGURE_ENV+= XYMONVAR=${XYMONVAR:Q} CONFIGURE_ENV+= INSTALLROOT=${DESTDIR} CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR} CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR} @@ -132,7 +133,7 @@ CONFIGURE_ENV+= INSTALLWWWDIR=${XYWWWDIR} CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/ SUBST_CLASSES+= bashpath -SUBST_FILES.bashpath= hobbitd/hobbitreports.sh.DIST +SUBST_FILES.bashpath= xymond/xymonreports.sh.DIST SUBST_SED.bashpath= -e 's,/bin/bash,'${BASH:Q}',' SUBST_STAGE.bashpath= post-patch @@ -145,37 +146,43 @@ USE_TOOLS+= sort:run tail:run touch:run USE_TOOLS+= tr:run wc:run bash:run -MAKE_DIRS+= ${BBTOPDIR} -MAKE_DIRS+= ${BBHOME} +MAKE_DIRS+= ${XYMONTOPDIR} +MAKE_DIRS+= ${XYMONHOME} -OWN_DIRS_PERMS+= ${XYEXTDIR} ${BBUSER} ${BBGROUP} 0755 -OWN_DIRS_PERMS+= ${BBLOGDIR} ${BBUSER} ${BBGROUP} 0755 -OWN_DIRS_PERMS+= ${XYTMPDIR} ${BBUSER} ${BBGROUP} 0755 +OWN_DIRS_PERMS+= ${XYEXTDIR} ${XYMONUSER} ${XYMONGROUP} 0755 +OWN_DIRS_PERMS+= ${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755 +OWN_DIRS_PERMS+= ${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755 -OWN_DIRS_PERMS+= ${BBVAR} ${BBUSER} ${BBGROUP} 0755 +OWN_DIRS_PERMS+= ${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755 VAR_SUBDIRS= acks data disabled download hist histlogs hostdata rrd .for dir in ${VAR_SUBDIRS} -OWN_DIRS_PERMS+= ${BBVAR}/${dir} ${BBUSER} ${BBGROUP} 0755 +OWN_DIRS_PERMS+= ${XYMONVAR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755 .endfor -OWN_DIRS_PERMS+= ${XYWWWDIR} ${BBUSER} ${BBGROUP} 0755 +OWN_DIRS_PERMS+= ${XYWWWDIR} ${XYMONUSER} ${XYMONGROUP} 0755 WWW_SUBDIRS= gifs help html menu notes wml .for dir in ${WWW_SUBDIRS} -OWN_DIRS_PERMS+= ${XYWWWDIR}/${dir} ${BBUSER} ${BBGROUP} 0755 +OWN_DIRS_PERMS+= ${XYWWWDIR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755 .endfor -OWN_DIRS_PERMS+= ${XYWWWDIR}/rep ${BBUSER} ${APACHE_GROUP} 0755 -OWN_DIRS_PERMS+= ${XYWWWDIR}/snap ${BBUSER} ${APACHE_GROUP} 0755 +OWN_DIRS_PERMS+= ${XYWWWDIR}/rep ${XYMONUSER} ${APACHE_GROUP} 0755 +OWN_DIRS_PERMS+= ${XYWWWDIR}/snap ${XYMONUSER} ${APACHE_GROUP} 0755 -MAKE_DIRS_PERMS+= ${SECCGIDIR} root ${BBGROUP} 0000 +MAKE_DIRS_PERMS+= ${SECCGIDIR} root ${XYMONGROUP} 0000 # actual config files -CFILES= bb-hosts bb-services bbcombotest.cfg client-local.cfg -CFILES+= columndoc.csv hobbit-alerts.cfg hobbit-apache.conf -CFILES+= hobbit-clients.cfg hobbit-nkview.cfg hobbitcgi.cfg -CFILES+= hobbitgraph.cfg hobbitlaunch.cfg hobbitserver.cfg +CFILES= alerts.cfg analysis.cfg cgioptions.cfg client-local.cfg +CFILES+= columndoc.csv columndoc.csv combo.cfg +CFILES+= graphs.cfg holidays.cfg hosts.cfg protocols.cfg +CFILES+= rrddefinitions.cfg snmpmibs.cfg tasks.cfg +CFILES+= xymon-apache.conf xymonmenu.cfg xymonserver.cfg .for file in ${CFILES} -CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${BBUSER} ${BBGROUP} 0644 +CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644 +.endfor + +CFILES2= critical.cfg critical.cfg.bak +.for file in ${CFILES2} +CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0664 .endfor MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} @@ -184,6 +191,13 @@ MAKE_ENV+= INSTALLROOT=${DESTDIR} MAKE_ENV+= PKGBUILD=y MAKE_ENV+= ${TOOLS_ENV} +MENUFILES= b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif +MENUFILES+= xymonmenu-blue.css xymonmenu-grey.css +post-install: +.for file in ${MENUFILES} + chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/menu/${file} +.endfor + .include "../../databases/rrdtool/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/xymon/PLIST b/net/xymon/PLIST index 89bfab7e17f..44a3b391d62 100644 --- a/net/xymon/PLIST +++ b/net/xymon/PLIST @@ -1,170 +1,177 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/14 22:58:57 spz Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/04/22 14:52:18 spz Exp $ +libexec/xymon/ackinfo.cgi +libexec/xymon/acknowledge.cgi libexec/xymon/bb -libexec/xymon/bb-ack.cgi -libexec/xymon/bb-csvinfo.cgi -libexec/xymon/bb-datepage.cgi -libexec/xymon/bb-eventlog.cgi -libexec/xymon/bb-findhost.cgi -libexec/xymon/bb-hist.cgi -libexec/xymon/bb-rep.cgi -libexec/xymon/bb-replog.cgi -libexec/xymon/bb-snapshot.cgi -libexec/xymon/bb-webpage libexec/xymon/bbcmd -libexec/xymon/bbcombotest libexec/xymon/bbdigest -libexec/xymon/bbgen libexec/xymon/bbhostgrep libexec/xymon/bbhostshow -libexec/xymon/bbmessage.cgi -libexec/xymon/bbproxy -libexec/xymon/bbtest-net libexec/xymon/beastat libexec/xymon/boilerplate.cgi -libexec/xymon/cgi-bin/bb-csvinfo.sh -libexec/xymon/cgi-bin/bb-datepage.sh -libexec/xymon/cgi-bin/bb-eventlog.sh -libexec/xymon/cgi-bin/bb-findhost.sh -libexec/xymon/cgi-bin/bb-hist.sh -libexec/xymon/cgi-bin/bb-histlog.sh -libexec/xymon/cgi-bin/bb-hostsvc.sh -libexec/xymon/cgi-bin/bb-rep.sh -libexec/xymon/cgi-bin/bb-replog.sh -libexec/xymon/cgi-bin/bb-snapshot.sh -libexec/xymon/cgi-bin/hobbit-certreport.sh -libexec/xymon/cgi-bin/hobbit-confreport-critical.sh -libexec/xymon/cgi-bin/hobbit-confreport.sh -libexec/xymon/cgi-bin/hobbit-ghosts.sh -libexec/xymon/cgi-bin/hobbit-hostgraphs.sh -libexec/xymon/cgi-bin/hobbit-hostlist.sh -libexec/xymon/cgi-bin/hobbit-nkview.sh -libexec/xymon/cgi-bin/hobbit-nongreen.sh -libexec/xymon/cgi-bin/hobbit-notifylog.sh -libexec/xymon/cgi-bin/hobbit-perfdata.sh -libexec/xymon/cgi-bin/hobbit-topchanges.sh -libexec/xymon/cgi-bin/hobbitcolumn.sh -libexec/xymon/cgi-bin/hobbitgraph.sh -libexec/xymon/cgi-secure/bb-ack.sh -libexec/xymon/cgi-secure/hobbit-ackinfo.sh -libexec/xymon/cgi-secure/hobbit-enadis.sh -libexec/xymon/cgi-secure/hobbit-nkedit.sh -libexec/xymon/cgi-secure/hobbit-useradm.sh +libexec/xymon/cgi-bin/certreport.sh +libexec/xymon/cgi-bin/columndoc.sh +libexec/xymon/cgi-bin/confreport-critical.sh +libexec/xymon/cgi-bin/confreport.sh +libexec/xymon/cgi-bin/criticalview.sh +libexec/xymon/cgi-bin/csvinfo.sh +libexec/xymon/cgi-bin/datepage.sh +libexec/xymon/cgi-bin/eventlog.sh +libexec/xymon/cgi-bin/findhost.sh +libexec/xymon/cgi-bin/ghostlist.sh +libexec/xymon/cgi-bin/history.sh +libexec/xymon/cgi-bin/historylog.sh +libexec/xymon/cgi-bin/hostgraphs.sh +libexec/xymon/cgi-bin/hostlist.sh +libexec/xymon/cgi-bin/nongreen.sh +libexec/xymon/cgi-bin/notifications.sh +libexec/xymon/cgi-bin/perfdata.sh +libexec/xymon/cgi-bin/report.sh +libexec/xymon/cgi-bin/reportlog.sh +libexec/xymon/cgi-bin/showgraph.sh +libexec/xymon/cgi-bin/snapshot.sh +libexec/xymon/cgi-bin/svcstatus.sh +libexec/xymon/cgi-bin/topchanges.sh +libexec/xymon/cgi-secure/ackinfo.sh +libexec/xymon/cgi-secure/acknowledge.sh +libexec/xymon/cgi-secure/criticaleditor.sh +libexec/xymon/cgi-secure/enadis.sh +libexec/xymon/cgi-secure/useradm.sh +libexec/xymon/combostatus +libexec/xymon/confreport.cgi libexec/xymon/convertnk -libexec/xymon/ext/bbretest-net.sh -libexec/xymon/hobbit-ackinfo.cgi -libexec/xymon/hobbit-confreport.cgi -libexec/xymon/hobbit-enadis.cgi -libexec/xymon/hobbit-ghosts.cgi -libexec/xymon/hobbit-hostgraphs.cgi -libexec/xymon/hobbit-hostlist.cgi -libexec/xymon/hobbit-mailack -libexec/xymon/hobbit-nkedit.cgi -libexec/xymon/hobbit-nkview.cgi -libexec/xymon/hobbit-notifylog.cgi -libexec/xymon/hobbit-perfdata.cgi -libexec/xymon/hobbit-statusreport.cgi -libexec/xymon/hobbit-useradm.cgi -libexec/xymon/hobbit.sh -libexec/xymon/hobbitd -libexec/xymon/hobbitd_alert -libexec/xymon/hobbitd_capture -libexec/xymon/hobbitd_channel -libexec/xymon/hobbitd_client -libexec/xymon/hobbitd_filestore -libexec/xymon/hobbitd_history -libexec/xymon/hobbitd_hostdata -libexec/xymon/hobbitd_larrd -libexec/xymon/hobbitd_locator -libexec/xymon/hobbitd_rrd -libexec/xymon/hobbitd_sample -libexec/xymon/hobbitfetch -libexec/xymon/hobbitgraph.cgi -libexec/xymon/hobbitlaunch -libexec/xymon/hobbitping -libexec/xymon/hobbitreports.sh -libexec/xymon/hobbitsvc.cgi +libexec/xymon/criticaleditor.cgi +libexec/xymon/criticalview.cgi +libexec/xymon/csvinfo.cgi +libexec/xymon/datepage.cgi +libexec/xymon/enadis.cgi +libexec/xymon/eventlog.cgi +libexec/xymon/ext/xymonnet-again.sh +libexec/xymon/findhost.cgi +libexec/xymon/ghostlist.cgi +libexec/xymon/history.cgi +libexec/xymon/hostgraphs.cgi +libexec/xymon/hostlist.cgi libexec/xymon/moverrd.sh +libexec/xymon/notifications.cgi +libexec/xymon/perfdata.cgi +libexec/xymon/report.cgi +libexec/xymon/reportlog.cgi libexec/xymon/rrdcachectl +libexec/xymon/showgraph.cgi +libexec/xymon/snapshot.cgi +libexec/xymon/statusreport.cgi +libexec/xymon/svcstatus.cgi libexec/xymon/trimhistory -man/man1/bb-ack.cgi.1 -man/man1/bb-csvinfo.cgi.1 -man/man1/bb-datepage.cgi.1 -man/man1/bb-eventlog.cgi.1 -man/man1/bb-findhost.cgi.1 -man/man1/bb-hist.cgi.1 -man/man1/bb-rep.cgi.1 -man/man1/bb-replog.cgi.1 -man/man1/bb-snapshot.cgi.1 -man/man1/bb-webpage.cgi.1 -man/man1/bb.1 -man/man1/bbcmd.1 -man/man1/bbcombotest.1 -man/man1/bbdigest.1 -man/man1/bbgen.1 -man/man1/bbhostgrep.1 -man/man1/bbhostshow.1 -man/man1/bbretest-net.sh.1 -man/man1/bbtest-net.1 +libexec/xymon/useradm.cgi +libexec/xymon/xymon +libexec/xymon/xymon-mailack +libexec/xymon/xymon.sh +libexec/xymon/xymoncfg +libexec/xymon/xymoncgimsg.cgi +libexec/xymon/xymoncmd +libexec/xymon/xymond +libexec/xymon/xymond_alert +libexec/xymon/xymond_capture +libexec/xymon/xymond_channel +libexec/xymon/xymond_client +libexec/xymon/xymond_filestore +libexec/xymon/xymond_history +libexec/xymon/xymond_hostdata +libexec/xymon/xymond_locator +libexec/xymon/xymond_rrd +libexec/xymon/xymond_sample +libexec/xymon/xymondigest +libexec/xymon/xymonfetch +libexec/xymon/xymongen +libexec/xymon/xymongrep +libexec/xymon/xymonlaunch +libexec/xymon/xymonnet +libexec/xymon/xymonpage +libexec/xymon/xymonping +libexec/xymon/xymonproxy +libexec/xymon/xymonreports.sh +man/man1/ackinfo.cgi.1 +man/man1/acknowledge.cgi.1 man/man1/clientupdate.1 -man/man1/hobbit-ackinfo.cgi.1 -man/man1/hobbit-confreport.cgi.1 -man/man1/hobbit-ghosts.cgi.1 -man/man1/hobbit-hostgraphs.cgi.1 -man/man1/hobbit-nkedit.cgi.1 -man/man1/hobbit-nkview.cgi.1 -man/man1/hobbit-statusreport.cgi.1 -man/man1/hobbitgraph.cgi.1 -man/man1/hobbitping.1 -man/man1/hobbitsvc.cgi.1 +man/man1/combostatus.1 +man/man1/confreport.cgi.1 +man/man1/criticaleditor.cgi.1 +man/man1/criticalview.cgi.1 +man/man1/csvinfo.cgi.1 +man/man1/datepage.cgi.1 +man/man1/eventlog.cgi.1 +man/man1/findhost.cgi.1 +man/man1/ghostlist.cgi.1 +man/man1/history.cgi.1 +man/man1/hostgraphs.cgi.1 man/man1/logfetch.1 -man/man1/orcahobbit.1 -man/man5/bb-hosts.5 -man/man5/bb-services.5 -man/man5/bbcombotest.cfg.5 +man/man1/orcaxymon.1 +man/man1/report.cgi.1 +man/man1/reportlog.cgi.1 +man/man1/showgraph.cgi.1 +man/man1/snapshot.cgi.1 +man/man1/statusreport.cgi.1 +man/man1/svcstatus.cgi.1 +man/man1/xymon.1 +man/man1/xymoncfg.1 +man/man1/xymoncmd.1 +man/man1/xymondigest.1 +man/man1/xymongen.1 +man/man1/xymongrep.1 +man/man1/xymonnet-again.sh.1 +man/man1/xymonnet.1 +man/man1/xymonpage.cgi.1 +man/man1/xymonping.1 +man/man5/alerts.cfg.5 +man/man5/analysis.cfg.5 +man/man5/cgioptions.cfg.5 man/man5/client-local.cfg.5 man/man5/clientlaunch.cfg.5 -man/man5/hobbit-alerts.cfg.5 -man/man5/hobbit-clients.cfg.5 -man/man5/hobbit-nkview.cfg.5 -man/man5/hobbitcgi.cfg.5 -man/man5/hobbitclient.cfg.5 -man/man5/hobbitgraph.cfg.5 -man/man5/hobbitlaunch.cfg.5 -man/man5/hobbitserver.cfg.5 -man/man5/hobbitweb.5 +man/man5/combo.cfg.5 +man/man5/critical.cfg.5 +man/man5/graphs.cfg.5 +man/man5/hosts.cfg.5 +man/man5/protocols.cfg.5 +man/man5/tasks.cfg.5 +man/man5/xymon-xmh.5 +man/man5/xymonclient.cfg.5 +man/man5/xymonserver.cfg.5 +man/man5/xymonweb.5 man/man7/xymon.7 -man/man8/bbmessage.cgi.8 -man/man8/bbproxy.8 -man/man8/hobbit-enadis.cgi.8 -man/man8/hobbit-mailack.8 -man/man8/hobbitd.8 -man/man8/hobbitd_alert.8 -man/man8/hobbitd_channel.8 -man/man8/hobbitd_client.8 -man/man8/hobbitd_filestore.8 -man/man8/hobbitd_history.8 -man/man8/hobbitd_hostdata.8 -man/man8/hobbitd_rrd.8 -man/man8/hobbitd_sample.8 -man/man8/hobbitfetch.8 -man/man8/hobbitlaunch.8 +man/man8/enadis.cgi.8 man/man8/msgcache.8 man/man8/trimhistory.8 +man/man8/xymon-mailack.8 +man/man8/xymoncgimsg.cgi.8 +man/man8/xymond.8 +man/man8/xymond_alert.8 +man/man8/xymond_capture.8 +man/man8/xymond_channel.8 +man/man8/xymond_client.8 +man/man8/xymond_filestore.8 +man/man8/xymond_history.8 +man/man8/xymond_hostdata.8 +man/man8/xymond_rrd.8 +man/man8/xymond_sample.8 +man/man8/xymonfetch.8 +man/man8/xymonlaunch.8 +man/man8/xymonproxy.8 share/examples/rc.d/xymon -share/examples/xymon/bb-hosts -share/examples/xymon/bb-services -share/examples/xymon/bbcombotest.cfg +share/examples/xymon/alerts.cfg +share/examples/xymon/analysis.cfg +share/examples/xymon/cgioptions.cfg share/examples/xymon/client-local.cfg share/examples/xymon/columndoc.csv -share/examples/xymon/hobbit-alerts.cfg -share/examples/xymon/hobbit-apache.conf -share/examples/xymon/hobbit-clients.cfg -share/examples/xymon/hobbit-nkview.cfg -share/examples/xymon/hobbit-nkview.cfg.bak -share/examples/xymon/hobbitcgi.cfg -share/examples/xymon/hobbitgraph.cfg -share/examples/xymon/hobbitlaunch.cfg -share/examples/xymon/hobbitserver.cfg +share/examples/xymon/combo.cfg +share/examples/xymon/critical.cfg +share/examples/xymon/critical.cfg.bak +share/examples/xymon/graphs.cfg +share/examples/xymon/holidays.cfg +share/examples/xymon/hosts.cfg +share/examples/xymon/protocols.cfg +share/examples/xymon/rrddefinitions.cfg +share/examples/xymon/snmpmibs.cfg +share/examples/xymon/tasks.cfg share/examples/xymon/www/gifs/README share/examples/xymon/www/gifs/arrow.gif share/examples/xymon/www/gifs/bkg-blue.gif @@ -195,12 +202,14 @@ share/examples/xymon/www/gifs/red-recent.gif share/examples/xymon/www/gifs/red.gif share/examples/xymon/www/gifs/unknown-recent.gif share/examples/xymon/www/gifs/unknown.gif +share/examples/xymon/www/gifs/xymonbody.css share/examples/xymon/www/gifs/yellow-ack.gif share/examples/xymon/www/gifs/yellow-recent.gif share/examples/xymon/www/gifs/yellow.gif share/examples/xymon/www/gifs/zoom.gif +share/examples/xymon/www/help/Renaming-430.txt share/examples/xymon/www/help/about.html -share/examples/xymon/www/help/bb-to-hobbit.html +share/examples/xymon/www/help/bb-to-xymon.html share/examples/xymon/www/help/clonewarn.jpg share/examples/xymon/www/help/configure.txt share/examples/xymon/www/help/criticalsystems.html @@ -216,114 +225,113 @@ share/examples/xymon/www/help/editor-main.jpg share/examples/xymon/www/help/editor-makeclone.jpg share/examples/xymon/www/help/editor-nohost.jpg share/examples/xymon/www/help/editor-showclone.jpg -share/examples/xymon/www/help/hobbit-alerts.html -share/examples/xymon/www/help/hobbit-apacheconf.txt -share/examples/xymon/www/help/hobbit-bbhosts.png -share/examples/xymon/www/help/hobbit-clients.png -share/examples/xymon/www/help/hobbit-config.html -share/examples/xymon/www/help/hobbit-mrtg.html -share/examples/xymon/www/help/hobbit-tips.html -share/examples/xymon/www/help/hobbitmain.png -share/examples/xymon/www/help/hobbitprocs.png share/examples/xymon/www/help/howtograph.html share/examples/xymon/www/help/install.html share/examples/xymon/www/help/known-issues.html share/examples/xymon/www/help/mainview-acked.jpg share/examples/xymon/www/help/mainview.jpg share/examples/xymon/www/help/manpages/index.html -share/examples/xymon/www/help/manpages/man1/bb-ack.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-csvinfo.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-datepage.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-eventlog.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-findhost.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-hist.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-rep.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-replog.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-snapshot.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb-webpage.cgi.1.html -share/examples/xymon/www/help/manpages/man1/bb.1.html -share/examples/xymon/www/help/manpages/man1/bbcmd.1.html -share/examples/xymon/www/help/manpages/man1/bbcombotest.1.html -share/examples/xymon/www/help/manpages/man1/bbdigest.1.html -share/examples/xymon/www/help/manpages/man1/bbgen.1.html -share/examples/xymon/www/help/manpages/man1/bbhostgrep.1.html -share/examples/xymon/www/help/manpages/man1/bbhostshow.1.html -share/examples/xymon/www/help/manpages/man1/bbretest-net.sh.1.html -share/examples/xymon/www/help/manpages/man1/bbtest-net.1.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/clientupdate.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-ackinfo.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-confreport.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-ghosts.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-hostgraphs.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-nkedit.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-nkview.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbit-statusreport.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbitgraph.cgi.1.html -share/examples/xymon/www/help/manpages/man1/hobbitping.1.html -share/examples/xymon/www/help/manpages/man1/hobbitsvc.cgi.1.html +share/examples/xymon/www/help/manpages/man1/combostatus.1.html +share/examples/xymon/www/help/manpages/man1/confreport.cgi.1.html +share/examples/xymon/www/help/manpages/man1/criticaleditor.cgi.1.html +share/examples/xymon/www/help/manpages/man1/criticalview.cgi.1.html +share/examples/xymon/www/help/manpages/man1/csvinfo.cgi.1.html +share/examples/xymon/www/help/manpages/man1/datepage.cgi.1.html +share/examples/xymon/www/help/manpages/man1/eventlog.cgi.1.html +share/examples/xymon/www/help/manpages/man1/findhost.cgi.1.html +share/examples/xymon/www/help/manpages/man1/ghostlist.cgi.1.html +share/examples/xymon/www/help/manpages/man1/history.cgi.1.html +share/examples/xymon/www/help/manpages/man1/hostgraphs.cgi.1.html share/examples/xymon/www/help/manpages/man1/logfetch.1.html -share/examples/xymon/www/help/manpages/man1/orcahobbit.1.html -share/examples/xymon/www/help/manpages/man5/bb-hosts.5.html -share/examples/xymon/www/help/manpages/man5/bb-services.5.html -share/examples/xymon/www/help/manpages/man5/bbcombotest.cfg.5.html +share/examples/xymon/www/help/manpages/man1/orcaxymon.1.html +share/examples/xymon/www/help/manpages/man1/report.cgi.1.html +share/examples/xymon/www/help/manpages/man1/reportlog.cgi.1.html +share/examples/xymon/www/help/manpages/man1/showgraph.cgi.1.html +share/examples/xymon/www/help/manpages/man1/snapshot.cgi.1.html +share/examples/xymon/www/help/manpages/man1/statusreport.cgi.1.html +share/examples/xymon/www/help/manpages/man1/svcstatus.cgi.1.html +share/examples/xymon/www/help/manpages/man1/xymon.1.html +share/examples/xymon/www/help/manpages/man1/xymoncfg.1.html +share/examples/xymon/www/help/manpages/man1/xymoncmd.1.html +share/examples/xymon/www/help/manpages/man1/xymondigest.1.html +share/examples/xymon/www/help/manpages/man1/xymongen.1.html +share/examples/xymon/www/help/manpages/man1/xymongrep.1.html +share/examples/xymon/www/help/manpages/man1/xymonnet-again.sh.1.html +share/examples/xymon/www/help/manpages/man1/xymonnet.1.html +share/examples/xymon/www/help/manpages/man1/xymonpage.cgi.1.html +share/examples/xymon/www/help/manpages/man1/xymonping.1.html +share/examples/xymon/www/help/manpages/man5/alerts.cfg.5.html +share/examples/xymon/www/help/manpages/man5/analysis.cfg.5.html +share/examples/xymon/www/help/manpages/man5/cgioptions.cfg.5.html share/examples/xymon/www/help/manpages/man5/client-local.cfg.5.html share/examples/xymon/www/help/manpages/man5/clientlaunch.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbit-alerts.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbit-clients.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbit-nkview.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbitcgi.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbitclient.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbitgraph.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbitlaunch.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbitserver.cfg.5.html -share/examples/xymon/www/help/manpages/man5/hobbitweb.5.html +share/examples/xymon/www/help/manpages/man5/combo.cfg.5.html +share/examples/xymon/www/help/manpages/man5/critical.cfg.5.html +share/examples/xymon/www/help/manpages/man5/graphs.cfg.5.html +share/examples/xymon/www/help/manpages/man5/hosts.cfg.5.html +share/examples/xymon/www/help/manpages/man5/protocols.cfg.5.html +share/examples/xymon/www/help/manpages/man5/tasks.cfg.5.html +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/man7/xymon.7.html -share/examples/xymon/www/help/manpages/man8/bbmessage.cgi.8.html -share/examples/xymon/www/help/manpages/man8/bbproxy.8.html -share/examples/xymon/www/help/manpages/man8/hobbit-enadis.cgi.8.html -share/examples/xymon/www/help/manpages/man8/hobbit-mailack.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_alert.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_channel.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_client.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_filestore.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_history.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_hostdata.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_rrd.8.html -share/examples/xymon/www/help/manpages/man8/hobbitd_sample.8.html -share/examples/xymon/www/help/manpages/man8/hobbitfetch.8.html -share/examples/xymon/www/help/manpages/man8/hobbitlaunch.8.html +share/examples/xymon/www/help/manpages/man8/enadis.cgi.8.html share/examples/xymon/www/help/manpages/man8/msgcache.8.html share/examples/xymon/www/help/manpages/man8/trimhistory.8.html +share/examples/xymon/www/help/manpages/man8/xymon-mailack.8.html +share/examples/xymon/www/help/manpages/man8/xymoncgimsg.cgi.8.html +share/examples/xymon/www/help/manpages/man8/xymond.8.html +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_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 +share/examples/xymon/www/help/manpages/man8/xymond_rrd.8.html +share/examples/xymon/www/help/manpages/man8/xymond_sample.8.html +share/examples/xymon/www/help/manpages/man8/xymonfetch.8.html +share/examples/xymon/www/help/manpages/man8/xymonlaunch.8.html +share/examples/xymon/www/help/manpages/man8/xymonproxy.8.html share/examples/xymon/www/help/stdview-detail-acked.jpg -share/examples/xymon/www/menu/README -share/examples/xymon/www/menu/menu.css -share/examples/xymon/www/menu/menu.js -share/examples/xymon/www/menu/menu_items.js -share/examples/xymon/www/menu/menu_tpl.js +share/examples/xymon/www/help/upgrade-to-430.txt +share/examples/xymon/www/help/xymon-alerts.html +share/examples/xymon/www/help/xymon-apacheconf.txt +share/examples/xymon/www/help/xymon-clients.png +share/examples/xymon/www/help/xymon-config.html +share/examples/xymon/www/help/xymon-hosts.png +share/examples/xymon/www/help/xymon-mrtg.html +share/examples/xymon/www/help/xymon-tips.html +share/examples/xymon/www/help/xymonmain.png +share/examples/xymon/www/help/xymonprocs.png +share/examples/xymon/www/menu/b2t-blue.gif +share/examples/xymon/www/menu/b2t-grey.gif +share/examples/xymon/www/menu/t2b-blue.gif +share/examples/xymon/www/menu/t2b-grey.gif +share/examples/xymon/www/menu/xymonmenu-blue.css +share/examples/xymon/www/menu/xymonmenu-grey.css +share/examples/xymon/xymon-apache.conf +share/examples/xymon/xymonmenu.cfg +share/examples/xymon/xymonserver.cfg share/xymon/web/acknowledge_footer share/xymon/web/acknowledge_form share/xymon/web/acknowledge_header -share/xymon/web/bb2_footer -share/xymon/web/bb2_header -share/xymon/web/bb_footer -share/xymon/web/bb_header -share/xymon/web/bbnk_footer -share/xymon/web/bbnk_header -share/xymon/web/bbrep_footer -share/xymon/web/bbrep_header -share/xymon/web/bbsnap2_footer -share/xymon/web/bbsnap2_header -share/xymon/web/bbsnap_footer -share/xymon/web/bbsnap_header -share/xymon/web/bbsnapnk_footer -share/xymon/web/bbsnapnk_header share/xymon/web/columndoc_footer share/xymon/web/columndoc_header share/xymon/web/confreport_back share/xymon/web/confreport_footer share/xymon/web/confreport_front share/xymon/web/confreport_header +share/xymon/web/critack_form +share/xymon/web/critedit_footer +share/xymon/web/critedit_form +share/xymon/web/critedit_header +share/xymon/web/critical_footer +share/xymon/web/critical_header share/xymon/web/event_footer share/xymon/web/event_form share/xymon/web/event_header @@ -338,8 +346,6 @@ share/xymon/web/hist_footer share/xymon/web/hist_header share/xymon/web/histlog_footer share/xymon/web/histlog_header -share/xymon/web/hobbitnk_footer -share/xymon/web/hobbitnk_header share/xymon/web/hostgraphs_footer share/xymon/web/hostgraphs_form share/xymon/web/hostgraphs_header @@ -355,10 +361,6 @@ share/xymon/web/maint_form share/xymon/web/maint_header share/xymon/web/maintact_footer share/xymon/web/maintact_header -share/xymon/web/nkack_form -share/xymon/web/nkedit_footer -share/xymon/web/nkedit_form -share/xymon/web/nkedit_header share/xymon/web/notify_footer share/xymon/web/notify_form share/xymon/web/notify_header @@ -367,15 +369,29 @@ share/xymon/web/perfdata_form share/xymon/web/perfdata_header share/xymon/web/replog_footer share/xymon/web/replog_header +share/xymon/web/repnormal_footer +share/xymon/web/repnormal_header share/xymon/web/report_footer share/xymon/web/report_form share/xymon/web/report_form_daily share/xymon/web/report_form_monthly share/xymon/web/report_form_weekly share/xymon/web/report_header +share/xymon/web/snapcritical_footer +share/xymon/web/snapcritical_header +share/xymon/web/snapnongreen_footer +share/xymon/web/snapnongreen_header +share/xymon/web/snapnormal_footer +share/xymon/web/snapnormal_header share/xymon/web/snapshot_footer share/xymon/web/snapshot_form share/xymon/web/snapshot_header +share/xymon/web/stdcritical_footer +share/xymon/web/stdcritical_header +share/xymon/web/stdnongreen_footer +share/xymon/web/stdnongreen_header +share/xymon/web/stdnormal_footer +share/xymon/web/stdnormal_header share/xymon/web/topchanges_footer share/xymon/web/topchanges_form share/xymon/web/topchanges_header @@ -384,3 +400,5 @@ share/xymon/web/useradm_footer share/xymon/web/useradm_form share/xymon/web/useradm_header share/xymon/web/zoom.js +@pkgdir share/xymon/xymonhome +@pkgdir etc/xymon diff --git a/net/xymon/distinfo b/net/xymon/distinfo index c12bc120b50..1c77a6cfd73 100644 --- a/net/xymon/distinfo +++ b/net/xymon/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/02/14 22:58:57 spz Exp $ +$NetBSD: distinfo,v 1.2 2011/04/22 14:52:18 spz Exp $ -SHA1 (xymon-4.3.0-beta2.tar.gz) = 484ab668358856c7bbc7ba85bfe2afa7c0fa2f10 -RMD160 (xymon-4.3.0-beta2.tar.gz) = ab8db88d1e2cb7363c8a9b35396094ea921cc5b5 -Size (xymon-4.3.0-beta2.tar.gz) = 2405826 bytes -SHA1 (patch-aa) = ce534d384fe0936f7ad6e1a2601c0f4cb1fc3346 -SHA1 (patch-ab) = 255892c607845790641924a4febea18a030685cb -SHA1 (patch-ac) = 653f3496ce2a6107f0c5f30d50b8d7ecc947b196 -SHA1 (patch-ad) = e5a42cbc6537e23a5a44ed343c86e121adadb139 -SHA1 (patch-ae) = 8be66af4b877958f2bc64e18494c67a73acd4360 -SHA1 (patch-af) = a81d3e73ffd6718e20320c6bd59c56ac4616524a +SHA1 (xymon-4.3.2.tar.gz) = 6663470565545d1801d2ff05cab78bc89695a821 +RMD160 (xymon-4.3.2.tar.gz) = 45b75a7d3b8a57518aa12f12ee36c6de6de96aae +Size (xymon-4.3.2.tar.gz) = 2698224 bytes +SHA1 (patch-aa) = aa0634088b82ad045435321e354d39923c67873e +SHA1 (patch-ab) = 9a8edca943211101f387e5a21d638d44a23cf6a7 +SHA1 (patch-ac) = c894c809ec4584636bb9705a521a0208dc2dbc05 +SHA1 (patch-ad) = 5073ccab556b2b6c787bcc640cd4c8b112f0c97d +SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5 +SHA1 (patch-af) = d486344e3f7fe05f61ea8ec0f811052a56ceb52f +SHA1 (patch-ah) = 152d3b993559b349f241e0a2f6419721bfb3c4b3 diff --git a/net/xymon/patches/patch-aa b/net/xymon/patches/patch-aa index 8cf55d70260..f3a04df1c41 100644 --- a/net/xymon/patches/patch-aa +++ b/net/xymon/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +$NetBSD: patch-aa,v 1.2 2011/04/22 14:52:18 spz Exp $ ---- configure.server.orig 2009-02-12 13:09:34.000000000 +0000 +--- configure.server.orig 2011-03-08 17:20:28.000000000 +0000 +++ configure.server -@@ -495,6 +495,9 @@ fi +@@ -507,6 +507,9 @@ fi if test "$INSTALLETCDIR" != ""; then echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile fi diff --git a/net/xymon/patches/patch-ab b/net/xymon/patches/patch-ab index 65bc6576514..ef23e4ec8f5 100644 --- a/net/xymon/patches/patch-ab +++ b/net/xymon/patches/patch-ab @@ -1,157 +1,159 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +$NetBSD: patch-ab,v 1.2 2011/04/22 14:52:18 spz Exp $ ---- build/Makefile.rules.orig 2009-02-12 13:00:50.000000000 +0000 +--- build/Makefile.rules.orig 2011-03-08 17:20:28.000000000 +0000 +++ build/Makefile.rules @@ -22,9 +22,9 @@ else INSTALLTARGETS = install-client install-clientmsg endif else -- BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build client +- BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client - CLIENTTARGETS = lib-client common-client build-build -- INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-client install-servermsg -+ BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build # client +- INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg ++ BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build # client + CLIENTTARGETS = # lib-client common-client build-build -+ INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-servermsg # install-client ++ INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg # install-client CFLAGS += $(PCREINCDIR) endif @@ -34,6 +34,9 @@ endif ifndef INSTALLETCDIR - INSTALLETCDIR = $(BBHOME)/etc + INSTALLETCDIR = $(XYMONHOME)/etc endif +ifndef INSTALLEXADIR -+INSTALLEXADIR = $(BBHOME)/etc ++INSTALLEXADIR = $(XYMONHOME)/etc +endif ifndef INSTALLEXTDIR - INSTALLEXTDIR = $(BBHOME)/ext + INSTALLEXTDIR = $(XYMONHOME)/ext endif -@@ -156,58 +159,67 @@ install-servermsg: - @echo "To view the Hobbit webpages, go to http://${BBHOSTNAME}${BBHOSTURL}" +@@ -167,72 +170,77 @@ install-servermsg: + @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}" install-dirs: -- mkdir -p $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(BBHOME)/download $(INSTALLROOT)$(BBVAR) -+ mkdir -p $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(BBVAR) -+ -+ mkdir -p $(INSTALLROOT)$(BBVAR)/download -+ifndef PKGBUILD -+ifneq ($(BBVAR),$(BBHOME)) -+ ln -sf $(BBVAR)/download $(INSTALLROOT)$(BBHOME)/download -+endif -+endif +- mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR) ++ mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR) ++ mkdir -p $(INSTALLROOT)$(XYMONVAR)/download mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) +ifndef PKGBUILD - ifneq ($(INSTALLBINDIR),$(BBHOME)/bin) - ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(BBHOME)/bin + ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin) + rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true + ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true endif -ifndef PKGBUILD - chown $(BBUSER) $(INSTALLROOT)$(INSTALLBINDIR) - chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLBINDIR) + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLBINDIR) + chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLBINDIR) endif mkdir -p $(INSTALLROOT)$(INSTALLETCDIR) +ifndef PKGBUILD - ifneq ($(INSTALLETCDIR),$(BBHOME)/etc) - ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(BBHOME)/etc + ifneq ($(INSTALLETCDIR),$(XYMONHOME)/etc) + rm -f $(INSTALLROOT)$(XYMONHOME)/etc || true + ln -s $(INSTALLETCDIR) $(INSTALLROOT)$(XYMONHOME)/etc || true endif -ifndef PKGBUILD - chown $(BBUSER) $(INSTALLROOT)$(INSTALLETCDIR) - chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLETCDIR) + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLETCDIR) + chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLETCDIR) endif + mkdir -p $(INSTALLROOT)$(INSTALLEXADIR) + mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR) +ifndef PKGBUILD - ifneq ($(INSTALLEXTDIR),$(BBHOME)/ext) - ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(BBHOME)/ext + ifneq ($(INSTALLEXTDIR),$(XYMONHOME)/ext) + rm -f $(INSTALLROOT)$(XYMONHOME)/ext || true + ln -s $(INSTALLEXTDIR) $(INSTALLROOT)$(XYMONHOME)/ext || true endif -ifndef PKGBUILD - chown $(BBUSER) $(INSTALLROOT)$(INSTALLEXTDIR) - chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLEXTDIR) + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLEXTDIR) + chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLEXTDIR) endif mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR) +ifndef PKGBUILD - ifneq ($(INSTALLTMPDIR),$(BBHOME)/tmp) - ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(BBHOME)/tmp + ifneq ($(INSTALLTMPDIR),$(XYMONHOME)/tmp) + rm -f $(INSTALLROOT)$(XYMONHOME)/tmp || true + ln -s $(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONHOME)/tmp || true endif -ifndef PKGBUILD - chown $(BBUSER) $(INSTALLROOT)$(INSTALLTMPDIR) - chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLTMPDIR) + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLTMPDIR) + chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLTMPDIR) endif mkdir -p $(INSTALLROOT)$(INSTALLWEBDIR) +ifndef PKGBUILD - ifneq ($(INSTALLWEBDIR),$(BBHOME)/web) - ln -sf $(INSTALLWEBDIR) $(INSTALLROOT)$(BBHOME)/web + ifneq ($(INSTALLWEBDIR),$(XYMONHOME)/web) + rm -f $(INSTALLROOT)$(XYMONHOME)/web || true + ln -s $(INSTALLWEBDIR) $(INSTALLROOT)$(XYMONHOME)/web || true endif -ifndef PKGBUILD - chown $(BBUSER) $(INSTALLROOT)$(INSTALLWEBDIR) - chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLWEBDIR) + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWEBDIR) + chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWEBDIR) endif mkdir -p $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml +ifndef PKGBUILD - ifneq ($(INSTALLWWWDIR),$(BBHOME)/www) - ln -sf $(INSTALLWWWDIR) $(INSTALLROOT)$(BBHOME)/www + ifneq ($(INSTALLWWWDIR),$(XYMONHOME)/www) + rm -f $(INSTALLROOT)$(XYMONHOME)/www || true + ln -s $(INSTALLWWWDIR) $(INSTALLROOT)$(XYMONHOME)/www || true endif -ifndef PKGBUILD - chown $(BBUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml - chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml + chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml + chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml ifdef HTTPDGID -@@ -215,6 +227,8 @@ ifdef HTTPDGID + # The www/rep and www/snap directories must be writable by the apache daemon chgrp $(HTTPDGID) $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap - endif +-endif chmod g+w $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap -+else -+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)/www $(INSTALLROOT)$(INSTALLEXADIR)/www/gifs $(INSTALLROOT)$(INSTALLEXADIR)/www/help $(INSTALLROOT)$(INSTALLEXADIR)/www/menu endif ++else ++ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)/www $(INSTALLROOT)$(INSTALLEXADIR)/www/gifs $(INSTALLROOT)$(INSTALLEXADIR)/www/help $(INSTALLROOT)$(INSTALLEXADIR)/www/menu ++endif - mkdir -p $(INSTALLROOT)$(BBVAR)/acks -@@ -266,25 +280,25 @@ ifndef PKGBUILD + mkdir -p $(INSTALLROOT)$(XYMONVAR)/acks + ifndef PKGBUILD +@@ -283,25 +291,25 @@ ifndef PKGBUILD endif install-common: install-dirs -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install - install-bbdisplay: install-common -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install + install-xymongen: install-common +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install - install-bbdisplay-nocgi: install-common -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install-nocgi -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install-nocgi + install-xymongen-nocgi: install-common +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi - install-bbnet: install-common -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C bbnet install -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C bbnet install + install-xymonnet: install-common +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install - install-bbproxy: install-common -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbproxy install -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbproxy install + install-xymonproxy: install-common +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install - install-hobbitd: install-common -- MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C hobbitd install -+ MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C hobbitd install + install-xymond: install-common +- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install ++ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install install-web: install-common -- MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install -+ MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install +- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install ++ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install" -@@ -297,10 +311,10 @@ install-man: - BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man +@@ -314,10 +322,10 @@ install-man: + XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man install-docs: -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" $(MAKE) -C docs install +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" $(MAKE) -C docs install install-custom: -- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" -+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" +- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" client-install: install-client diff --git a/net/xymon/patches/patch-ac b/net/xymon/patches/patch-ac index c88f0a8879e..0a870cfd45f 100644 --- a/net/xymon/patches/patch-ac +++ b/net/xymon/patches/patch-ac @@ -1,14 +1,14 @@ -$NetBSD: patch-ac,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +$NetBSD: patch-ac,v 1.2 2011/04/22 14:52:18 spz Exp $ ---- hobbitd/Makefile.orig 2009-02-12 13:09:34.000000000 +0000 -+++ hobbitd/Makefile -@@ -159,7 +159,9 @@ install-cfg: +--- xymond/Makefile.orig 2011-03-08 17:20:28.000000000 +0000 ++++ xymond/Makefile +@@ -157,7 +157,9 @@ install-cfg: cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv - cd etcfiles; (echo "bb-hosts"; echo "hobbit-alerts.cfg"; echo "hobbit-clients.cfg"; echo "bbcombotest.cfg"; echo "client-local.cfg") | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ - cd etcfiles; cp -fp hobbit-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-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) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ + cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf +ifndef PKGBUILD - cd $(INSTALLROOT)$(BBHOME); rm -f hobbit.sh; ln -sf bin/hobbit.sh . + cd $(INSTALLROOT)$(XYMONHOME); rm -f xymon.sh; ln -sf bin/xymon.sh . +endif - cd wwwfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat - cd webfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat - touch $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-nkview.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-nkview.cfg.bak + cd wwwfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat + cd webfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat + touch $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg.bak diff --git a/net/xymon/patches/patch-ad b/net/xymon/patches/patch-ad index 1f4f9692d44..dd81912f9fb 100644 --- a/net/xymon/patches/patch-ad +++ b/net/xymon/patches/patch-ad @@ -1,14 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +$NetBSD: patch-ad,v 1.2 2011/04/22 14:52:18 spz Exp $ ---- build/Makefile.NetBSD.orig 2010-02-08 23:58:57.000000000 +0000 +--- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000 +++ build/Makefile.NetBSD -@@ -10,7 +10,8 @@ NETLIBS = - CC= gcc - PKGDIR?=/usr/pkg - CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \ -- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib -+ -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib \ -+ -DHAVE_STDINT_H - RPATH = "-Wl,--rpath," +@@ -1,7 +1,7 @@ + # Xymon compile-time settings for NetBSD systems + # From Emmanuel Dreyfus. + # +-OSDEF = -DBSD ++OSDEF = -DBSD -DHAVE_STDINT_H - # Compile flags for debugging + # NETLIBS: None needed + NETLIBS = diff --git a/net/xymon/patches/patch-ae b/net/xymon/patches/patch-ae index c9a4d5bd486..670af34fb1e 100644 --- a/net/xymon/patches/patch-ae +++ b/net/xymon/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +$NetBSD: patch-ae,v 1.2 2011/04/22 14:52:18 spz Exp $ ---- build/bb-commands.sh.orig 2007-04-14 00:20:21.000000000 -0500 +--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000 +++ build/bb-commands.sh @@ -9,6 +9,11 @@ @@ -26,5 +26,5 @@ $NetBSD: patch-ae,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ # DFCMD is an alias for DF +ENVNAME=DF PGM=`findbin df | head -n 1` - echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Hobbit client" + echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Xymon client" echo "DF=\"${PGM} -Pk\"" diff --git a/net/xymon/patches/patch-af b/net/xymon/patches/patch-af index 21eff9ed674..e6966cbefe5 100644 --- a/net/xymon/patches/patch-af +++ b/net/xymon/patches/patch-af @@ -1,14 +1,12 @@ -$NetBSD: patch-af,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ +$NetBSD: patch-af,v 1.2 2011/04/22 14:52:18 spz Exp $ ---- ./hobbitd/etcfiles/hobbitlaunch.cfg.DIST.orig 2008-11-27 13:12:12.000000000 +0000 -+++ ./hobbitd/etcfiles/hobbitlaunch.cfg.DIST -@@ -198,7 +198,8 @@ - # Note: If you are using another client package, you should disable this one. - - [hobbitclient] -- ENVFILE @BBTOPDIR@/client/etc/hobbitclient.cfg +--- xymond/etcfiles/tasks.cfg.DIST.orig 2011-03-08 17:20:28.000000000 +0000 ++++ xymond/etcfiles/tasks.cfg.DIST +@@ -180,6 +180,7 @@ + # Xymon server ?), but there's no need to have two xymonlaunch instances + # running at the same time. So we'll just run it from here. + [xymonclient] + DISABLED -+ ENVFILE @BBHOME@/client/etc/hobbitclient.cfg - NEEDS hobbitd - CMD @BBTOPDIR@/client/bin/hobbitclient.sh - LOGFILE $BBSERVERLOGS/hobbitclient.log + ENVFILE @XYMONTOPDIR@/client/etc/xymonclient.cfg + NEEDS xymond + CMD @XYMONTOPDIR@/client/bin/xymonclient.sh diff --git a/net/xymon/patches/patch-ah b/net/xymon/patches/patch-ah new file mode 100644 index 00000000000..178a923bde2 --- /dev/null +++ b/net/xymon/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2011/04/22 14:52:18 spz Exp $ + +--- xymonnet/Makefile.orig 2011-03-08 17:20:28.000000000 +0000 ++++ xymonnet/Makefile +@@ -59,6 +59,8 @@ c-ares/configure: c-ares-$(ARESVER).tar. + mv c-ares-$(ARESVER) c-ares + # Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file. + touch c-ares/configure ++ mkdir c-ares/.libs ++ touch c-ares/.libs/libcares.la + + beastat: $(BEASTATOBJS) ../lib/libxymon.a + $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) ../lib/libxymon.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF) |