diff options
Diffstat (limited to 'net/netsaint-base/patches')
| -rw-r--r-- | net/netsaint-base/patches/patch-aa | 56 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ab | 14 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ac | 49 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ad | 69 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ae | 126 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-af | 69 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ag | 32 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ah | 52 | ||||
| -rw-r--r-- | net/netsaint-base/patches/patch-ai | 40 |
9 files changed, 261 insertions, 246 deletions
diff --git a/net/netsaint-base/patches/patch-aa b/net/netsaint-base/patches/patch-aa index f17394248e4..4658743f84c 100644 --- a/net/netsaint-base/patches/patch-aa +++ b/net/netsaint-base/patches/patch-aa @@ -1,13 +1,45 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-aa,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- configure.orig Thu Dec 28 13:49:35 2000 -+++ configure -@@ -1210,7 +1210,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -- LIBS="-lgd -lz -lm -lpng $LIBS" -+ LIBS="-lgd -lz -lm -lpng -lxpm $LIBS" - cat > conftest.$ac_ext <<EOF - #line 1216 "configure" - #include "confdefs.h" +--- Makefile.in.orig Mon Oct 22 04:49:39 2001 ++++ Makefile.in +@@ -95,28 +95,26 @@ + cd $(SRC_BASE); $(MAKE) $@ ; cd .. + cd $(SRC_CGI); $(MAKE) $@ ; cd .. + cd $(SRC_HTM); $(MAKE) $@ ; cd .. +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives +- if [ $(INSTALLPERLSTUFF) = yes ]; then \ +- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ +- fi; ++# $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) ++# $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives ++# if [ $(INSTALLPERLSTUFF) = yes ]; then \ ++# $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ ++# fi; + + install-config: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR) ++ [ -d ${DESTDIR}${CFGDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CFGDIR} ++ ${BSD_INSTALL_DATA} netsaint.cfg $(DESTDIR)$(CFGDIR) ++ ${BSD_INSTALL_DATA} hosts.cfg $(DESTDIR)$(CFGDIR) ++ ${BSD_INSTALL_DATA} commands.cfg $(DESTDIR)$(CFGDIR) ++ ${BSD_INSTALL_DATA} nscgi.cfg $(DESTDIR)$(CFGDIR) ++ ${BSD_INSTALL_DATA} resource.cfg $(DESTDIR)$(CFGDIR) + + install-init: install-daemoninit + + install-daemoninit: +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ ${BSD_INSTALL_SCRIPT} daemon-init $(DESTDIR)$(INIT_DIR)/netsaint + + install-commandmode: +- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw +- chmod g+s $(DESTDIR)$(LOGDIR)/rw + + fullinstall: install install-init install-commandmode + diff --git a/net/netsaint-base/patches/patch-ab b/net/netsaint-base/patches/patch-ab index 644587e0ee5..731cf7ea625 100644 --- a/net/netsaint-base/patches/patch-ab +++ b/net/netsaint-base/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- cgi/Makefile.in.orig Sun Oct 29 23:43:53 2000 +--- cgi/Makefile.in.orig Mon Dec 24 08:23:45 2001 +++ cgi/Makefile.in @@ -14,7 +14,7 @@ LOGDIR=@localstatedir@ @@ -16,18 +16,18 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ CP=@CP@ CC=@CC@ -CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI -+CFLAGS=@CFLAGS@ @DEFS@ -I${prefix}/include -DNSCGI ++CFLAGS=@CFLAGS@ @DEFS@ -I${PREFIX}/include -DNSCGI #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI LDFLAGS=@LDFLAGS@ @LIBS@ -@@ -131,8 +131,8 @@ - rm -f *~ +@@ -142,8 +142,6 @@ + devclean: clean install: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) + [ -d ${DESTDIR}${CGIDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CGIDIR} for file in *.cgi; \ - do $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); done +- +- + do ${BSD_INSTALL_SCRIPT} $$file $(DESTDIR)$(CGIDIR); done - - diff --git a/net/netsaint-base/patches/patch-ac b/net/netsaint-base/patches/patch-ac index 4727233b453..c89c4f2f28a 100644 --- a/net/netsaint-base/patches/patch-ac +++ b/net/netsaint-base/patches/patch-ac @@ -1,38 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ac,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- Makefile.in.orig Sun Oct 29 23:43:54 2000 -+++ Makefile.in -@@ -94,25 +94,22 @@ - cd $(SRC_BASE); $(MAKE) $@ ; cd .. - cd $(SRC_CGI); $(MAKE) $@ ; cd .. - cd $(SRC_HTM); $(MAKE) $@ ; cd .. -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives - - install-config: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) netsaint.cfg $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) hosts.cfg $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR) -+ [ -d ${DESTDIR}${CFGDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CFGDIR} -+ ${BSD_INSTALL_DATA} netsaint.cfg $(DESTDIR)$(CFGDIR)/netsaint.cfg.sample -+ ${BSD_INSTALL_DATA} hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg.sample -+ ${BSD_INSTALL_DATA} commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg.sample -+ ${BSD_INSTALL_DATA} nscgi.cfg $(DESTDIR)$(CFGDIR)/nscgi.cfg.sample -+ ${BSD_INSTALL_DATA} resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.sample - - install-init: -- $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint -+ ${BSD_INSTALL_SCRIPT} init-script $(DESTDIR)$(INIT_DIR)/netsaint - - install-daemoninit: -- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint -+ ${BSD_INSTALL_SCRIPT} daemon-init $(DESTDIR)$(INIT_DIR)/netsaint - - install-commandmode: -- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw - - uninstall: - rm -rf $(DESTDIR)$(BINDIR)/netsaint $(DESTDIR)$(CGIDIR)/*.cgi $(DESTDIR)$(CFGDIR)/*.cfg $(DESTDIR)$(HTMLDIR) +--- base/Makefile.in.orig Fri Apr 27 01:08:27 2001 ++++ base/Makefile.in +@@ -87,7 +87,4 @@ + devclean: clean + + install: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) +- +- ++ ${BSD_INSTALL_PROGRAM} netsaint $(DESTDIR)$(BINDIR) diff --git a/net/netsaint-base/patches/patch-ad b/net/netsaint-base/patches/patch-ad index 456d7c9c83a..71e3d392113 100644 --- a/net/netsaint-base/patches/patch-ad +++ b/net/netsaint-base/patches/patch-ad @@ -1,13 +1,64 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ad,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- base/Makefile.in.orig Sun Oct 29 23:43:53 2000 -+++ base/Makefile.in -@@ -83,7 +83,5 @@ - rm -f *~ +--- html/Makefile.in.orig Mon Feb 19 09:33:30 2001 ++++ html/Makefile.in +@@ -41,38 +41,38 @@ + devclean: clean install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) -- -+ ${BSD_INSTALL_PROGRAM} netsaint $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos +- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer/images ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos ++ ${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR) ++ ${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs + for file in *.html; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done + for file in media/*.wav; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done + for file in stylesheets/*.css; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done + for file in docs/*.html; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs; done + for file in docs/developer/*.html; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done + for file in docs/developer/images/*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done + for file in docs/images/*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/images; done + for file in images/*.gif; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.jpg; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.png; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/logos/*; \ +- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done ++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done + + diff --git a/net/netsaint-base/patches/patch-ae b/net/netsaint-base/patches/patch-ae index e2c7c571a95..a809ee766d2 100644 --- a/net/netsaint-base/patches/patch-ae +++ b/net/netsaint-base/patches/patch-ae @@ -1,63 +1,67 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ae,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- html/Makefile.in.orig Sun Oct 29 23:43:53 2000 -+++ html/Makefile.in -@@ -36,38 +36,34 @@ - rm -f docs/developer/*~ - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/developer/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos -- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR) -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/developer/images -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images -+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos -+ ${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR) -+ ${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs - for file in *.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done - for file in media/*.wav; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done - for file in stylesheets/*.css; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done - for file in docs/*.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs; done - for file in docs/developer/*.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer; done - for file in docs/developer/images/*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/developer/images; done - for file in docs/images/*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/docs/images; done - for file in images/*.gif; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/*.png; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/logos/*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done -- -- -- -- -+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done +--- netsaint.cfg.in.orig Mon Dec 3 07:27:51 2001 ++++ netsaint.cfg.in +@@ -16,7 +16,7 @@ + # for historical purposes. This should be the first option specified + # in the config file!!! + +-log_file=@localstatedir@/netsaint.log ++log_file=@localstatedir@/log/netsaint/netsaint.log + + + +@@ -72,7 +72,7 @@ + # The contentsof the status file are deleted every time NetSaint + # restarts. + +-status_file=@localstatedir@/status.log ++status_file=@localstatedir@/log/netsaint/status.log + + + +@@ -138,7 +138,7 @@ + # directory level instead of on the file, as the file is deleted every + # time its contents are processed. + +-command_file=@localstatedir@/rw/netsaint.cmd ++command_file=@localstatedir@/run/netsaint/rw/netsaint.cmd + + + +@@ -146,7 +146,7 @@ + # This is the file that NetSaint will use for storing host and service + # comments. + +-comment_file=@localstatedir@/comment.log ++comment_file=@localstatedir@/log/netsaint/comment.log + + + +@@ -164,7 +164,7 @@ + # is created, used, and deleted throughout the time that NetSaint is + # running. + +-temp_file=@localstatedir@/netsaint.tmp ++temp_file=@localstatedir@/run/netsaint/netsaint.tmp + + + +@@ -185,7 +185,7 @@ + # This is the directory where archived (rotated) log files should be + # placed (assuming you've chosen to do log rotation). + +-log_archive_path=@localstatedir@/archives ++log_archive_path=@localstatedir@/log/netsaint/archives + + + +@@ -378,7 +378,7 @@ + # This file is used only if the preserve_state_information + # variable is set to 1. + +-state_retention_file=@localstatedir@/status.sav ++state_retention_file=@localstatedir@/log/netsaint/status.sav + + diff --git a/net/netsaint-base/patches/patch-af b/net/netsaint-base/patches/patch-af index ff107a7d417..0367824fbc8 100644 --- a/net/netsaint-base/patches/patch-af +++ b/net/netsaint-base/patches/patch-af @@ -1,66 +1,13 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-af,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- netsaint.cfg.in.orig Tue Jan 16 11:05:53 2001 -+++ netsaint.cfg.in -@@ -16,7 +16,7 @@ - # for historical purposes. This should be the first option specified - # in the config file!!! +--- nscgi.cfg.in.orig Thu Jan 17 16:12:59 2002 ++++ nscgi.cfg.in +@@ -55,7 +55,7 @@ + # NetSaint. Run the 'ps' command manually to see what the command + # line entry for the NetSaint process looks like. --log_file=@localstatedir@/netsaint.log -+log_file=@localstatedir@/log/netsaint/netsaint.log +-#netsaint_check_command=@libexecdir@/check_netsaint @localstatedir@/status.log 5 '@bindir@/netsaint' ++#netsaint_check_command=@libexecdir@/check_netsaint -F @localstatedir@/log/netsaint/status.log -e 5 -C 'netsaint' - # OBJECT CONFIGURATION FILE (A.K.A "HOST" CONFIG FILE) -@@ -64,7 +64,7 @@ - # The contentsof the status file are deleted every time NetSaint - # restarts. --status_file=@localstatedir@/status.log -+status_file=@localstatedir@/log/netsaint/status.log - - - # NETSAINT USER -@@ -124,14 +124,14 @@ - # directory level instead of on the file, as the file is deleted every - # time its contents are processed. - --command_file=@localstatedir@/rw/netsaint.cmd -+command_file=@localstatedir@/run/netsaint/rw/netsaint.cmd - - - # COMMENT FILE - # This is the file that NetSaint will use for storing host and service - # comments. - --comment_file=@localstatedir@/comment.log -+comment_file=@localstatedir@/log/netsaint/comment.log - - - # LOCK FILE -@@ -149,7 +149,7 @@ - # the other files (status log, comment file, main log file) are - # located on. This limitation will likely disappear in future versions. - --temp_file=@localstatedir@/netsaint.tmp -+temp_file=@localstatedir@/run/netsaint/netsaint.tmp - - - # LOG ROTATION METHOD -@@ -168,7 +168,7 @@ - # This is the directory where archived (rotated) log files should be - # placed (assuming you've chosen to do log rotation). - --log_archive_path=@localstatedir@/archives -+log_archive_path=@localstatedir@/log/netsaint/archives - - - # LOG SEVERITY LEVEL -@@ -370,7 +370,7 @@ - # This file is used only if the preserve_state_information - # variable is set to 1. - --state_retention_file=@localstatedir@/status.sav -+state_retention_file=@localstatedir@/log/netsaint/status.sav - - - # INTERVAL LENGTH diff --git a/net/netsaint-base/patches/patch-ag b/net/netsaint-base/patches/patch-ag index b4144bd3786..7eb6cf2201a 100644 --- a/net/netsaint-base/patches/patch-ag +++ b/net/netsaint-base/patches/patch-ag @@ -1,13 +1,23 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ag,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- nscgi.cfg.in.orig Sun Oct 29 23:43:54 2000 -+++ nscgi.cfg.in -@@ -55,7 +55,7 @@ - # NetSaint. Run the 'ps' command manually to see what the command - # line entry for the NetSaint process looks like. - --#netsaint_check_command=@libexecdir@/check_netsaint @localstatedir@/status.log 5 '@bindir@/netsaint' -+#netsaint_check_command=@libexecdir@/check_netsaint @localstatedir@/log/netsaint/status.log 5 'netsaint' - - +--- common/locations.h.in.orig Mon Feb 19 09:33:28 2001 ++++ common/locations.h.in +@@ -19,12 +19,12 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + ************************************************************************/ +-#define DEFAULT_TEMP_FILE "@localstatedir@/netsaint.tmp" +-#define DEFAULT_STATUS_FILE "@localstatedir@/status.log" +-#define DEFAULT_LOG_FILE "@localstatedir@/netsaint.log" +-#define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/" +-#define DEFAULT_COMMENT_FILE "@localstatedir@/comment.log" +-#define DEFAULT_COMMAND_FILE "@localstatedir@/rw/netsaint.cmd" ++#define DEFAULT_TEMP_FILE "@localstatedir@/run/netsaint/netsaint.tmp" ++#define DEFAULT_STATUS_FILE "@localstatedir@/log/netsaint/status.log" ++#define DEFAULT_LOG_FILE "@localstatedir@/log/netsaint/netsaint.log" ++#define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/log/netsaint/archives/" ++#define DEFAULT_COMMENT_FILE "@localstatedir@/log/netsaint/comment.log" ++#define DEFAULT_COMMAND_FILE "@localstatedir@/run/netsaint/rw/netsaint.cmd" + #define DEFAULT_PHYSICAL_HTML_PATH "@datadir@" + #define DEFAULT_URL_HTML_PATH "@htmurl@" + #define DEFAULT_PHYSICAL_CGIBIN_PATH "@sbindir@" diff --git a/net/netsaint-base/patches/patch-ah b/net/netsaint-base/patches/patch-ah index a77941ed5fd..170f8fca74f 100644 --- a/net/netsaint-base/patches/patch-ah +++ b/net/netsaint-base/patches/patch-ah @@ -1,29 +1,27 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ah,v 1.2 2002/03/25 12:54:19 rh Exp $ ---- hosts.cfg.in.orig Tue Jan 16 12:57:49 2001 -+++ hosts.cfg.in -@@ -199,20 +199,20 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e '***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $DATETIME$\n\nAdditional Info:\n\n$OUTPUT$' | /bin/mail -s '** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/bin/echo -e '***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $DATETIME$\n\nAdditional Info:\n\n$OUTPUT$' | /usr/bin/mail -s '** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e "Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\nInfo: $OUTPUT$\nDate: $DATETIME$" | /bin/mail -s '$NOTIFICATIONTYPE$: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$' $CONTACTPAGER$ -+command[notify-by-epager]=/bin/echo -e "Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\nInfo: $OUTPUT$\nDate: $DATETIME$" | /usr/bin/mail -s '$NOTIFICATIONTYPE$: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e "***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$\n\nDate/Time: $DATETIME$\n" | /bin/mail -s 'Host $HOSTSTATE$ alert for $HOSTNAME$!' $CONTACTEMAIL$ -+command[host-notify-by-email]=/bin/echo -e "***** NetSaint 0.0.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$\n\nDate/Time: $DATETIME$\n" | /usr/bin/mail -s 'Host $HOSTSTATE$ alert for $HOSTNAME$!' $CONTACTEMAIL$ - --command[host-notify-by-epager]=/bin/echo -e "Host '$HOSTALIAS$' is $HOSTSTATE$\nInfo: $OUTPUT$\nTime: $DATETIME$" | /bin/mail -s '$NOTIFICATIONTYPE$ alert - Host $HOSTNAME$ is $HOSTSTATE$' $CONTACTPAGER$ -+command[host-notify-by-epager]=/bin/echo -e "Host '$HOSTALIAS$' is $HOSTSTATE$\nInfo: $OUTPUT$\nTime: $DATETIME$" | /usr/bin/mail -s '$NOTIFICATIONTYPE$ alert - Host $HOSTNAME$ is $HOSTSTATE$' $CONTACTPAGER$ - - +--- daemon-init.in.orig Thu Jan 10 16:38:57 2002 ++++ daemon-init.in +@@ -79,15 +79,15 @@ + exec_prefix=@exec_prefix@ + NetsaintBin=@bindir@/netsaint + NetsaintCfg=@sysconfdir@/netsaint.cfg +-NetsaintLog=@localstatedir@/status.log +-NetsaintTmp=@localstatedir@/netsaint.tmp +-NetsaintSav=@localstatedir@/status.sav +-NetsaintCmd=@localstatedir@/rw/netsaint.cmd ++NetsaintLog=@localstatedir@/log/netsaint/status.log ++NetsaintTmp=@localstatedir@/run/netsaint/netsaint.tmp ++NetsaintSav=@localstatedir@/log/netsaint/status.sav ++NetsaintCmd=@localstatedir@/run/netsaint/rw/netsaint.cmd + NetsaintVar=@localstatedir@ + NetsaintRun=@lockfile@ +-NetsaintLckDir=/var/lock/subsys +-NetsaintLckFile=netsaint +-NetsaintCGI=@sbindir@ ++NetsaintLckDir=/var/run/netsaint ++NetsaintLckFile=netsaint.lock ++NetsaintCGI=@libexecdir@ + Netsaint=@netsaint_user@ + diff --git a/net/netsaint-base/patches/patch-ai b/net/netsaint-base/patches/patch-ai index a00c2f805fe..256b8e4eec9 100644 --- a/net/netsaint-base/patches/patch-ai +++ b/net/netsaint-base/patches/patch-ai @@ -1,23 +1,21 @@ -$NetBSD: patch-ai,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $ +$NetBSD: patch-ai,v 1.2 2002/03/25 12:54:20 rh Exp $ ---- common/locations.h.in.orig Tue Jan 16 14:06:12 2001 -+++ common/locations.h.in -@@ -19,12 +19,12 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ +--- commands.cfg.in.orig Thu Jan 17 16:12:59 2002 ++++ commands.cfg.in +@@ -55,7 +55,15 @@ + command[check_http]=$USER1$/check_http -H $HOSTADDRESS$ + command[check_telnet]=$USER1$/check_tcp -H $HOSTADDRESS$ -p 23 + command[check_ping]=$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5 +- ++command[check_disk]=$USER1$/check_disk 85 95 $ARG1$ ++command[check_users]=$USER1$/check_users $ARG1$ $ARG2$ ++command[check_procs]=$USER1$/check_procs $ARG1$ $ARG2$ $ARG3$ ++command[check_http2]=$USER1$/check_http $ARG1$ $ARG2$ $ARG3$ ++command[check_dns]=$USER1$/check_dns www.yahoo.com $HOSTADDRESS$ ++command[check_hpjd]=$USER1$/check_hpjd $HOSTADDRESS$ public ++command[check_mrtg]=$USER1$/check_mrtg $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$ ++command[traffic_average]=$USER1$/check_mrtgtraf $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$ ++command[check_load]=$USER1$/check_load $ARG1$ $ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$ --#define DEFAULT_TEMP_FILE "@localstatedir@/netsaint.tmp" --#define DEFAULT_STATUS_FILE "@localstatedir@/status.log" --#define DEFAULT_LOG_FILE "@localstatedir@/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/" --#define DEFAULT_COMMENT_FILE "@localstatedir@/comment.log" --#define DEFAULT_COMMAND_FILE "@localstatedir@/rw/netsaint.cmd" -+#define DEFAULT_TEMP_FILE "@localstatedir@/run/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "@localstatedir@/log/netsaint/status.log" -+#define DEFAULT_LOG_FILE "@localstatedir@/log/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/log/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "@localstatedir@/log/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "@localstatedir@/run/netsaint/rw/netsaint.cmd" - #define DEFAULT_PHYSICAL_HTML_PATH "@datadir@" - #define DEFAULT_URL_HTML_PATH "@htmurl@" - #define DEFAULT_PHYSICAL_CGIBIN_PATH "@sbindir@" + # These are examples of commands for checking "local" services - i.e. things + # on this machine that cannot be checked from remote machines. If you want |