update to 0.0.6

5 files changed, 22 insertions, 155 deletions

diff --git a/net-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa
index 3eb6719e49f6..ed255141379c 100644
--- a/net-mgmt/nagios12/files/patch-aa
+++ b/net-mgmt/nagios12/files/patch-aa
@@ -1,31 +1,20 @@
---- Makefile.in	Fri Apr  7 11:11:31 2000
-+++ Makefile.in.new	Mon Jun 12 19:33:19 2000
-@@ -36,7 +36,7 @@
- 		@echo "Please supply a command line argument (i.e. 'make all').  Other targets are:"
- 		@echo "   netsaint cgis config"
- 		@echo "   clean distclean devclean"
--		@echo "   install install-html install-config install-init install-daemoninit install-commandmode"
-+		@echo "   install install-html install-config install-init install-daemoninit install-commandmode install-all"
- 		@echo "   uninstall"
+--- Makefile.in.orig	Sun Oct 29 14:43:54 2000
++++ Makefile.in	Fri Jan 12 14:54:45 2001
+@@ -27,7 +27,7 @@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+ INIT_DIR=@init_dir@
+-INIT_OPTS=-o root -g root
++INIT_OPTS=-o root -g wheel
+ CGICFGDIR=$(CGIDIR)
  
- # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999)
-@@ -99,13 +99,17 @@
- 	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR)
- 
- install-init:
--	$(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint
-+	$(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh
-+	$(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions
+ CGIEXTRAS=@CGIEXTRAS@
+@@ -109,7 +109,7 @@
+ 	$(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint
  
  install-daemoninit:
--	$(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint
-+	$(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh
-+	$(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions
+-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint
++	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh
  
  install-commandmode:
- 	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw
- 
- uninstall:
- 	rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR)
-+
-+install-all: all install config install-config install-daemoninit
+ 	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
diff --git a/net-mgmt/nagios12/files/patch-ab b/net-mgmt/nagios12/files/patch-ab
index f7ce712a1276..bbaa1d00e8ba 100644
--- a/net-mgmt/nagios12/files/patch-ab
+++ b/net-mgmt/nagios12/files/patch-ab
@@ -1,8 +1,10 @@
---- base/Makefile.in	Fri Apr  7 11:11:32 2000
-+++ base/Makefile.in.new	Sat Jun 10 21:45:15 2000
-@@ -52,5 +52,4 @@
+--- base/Makefile.in.orig	Sun Jan  7 21:53:15 2001
++++ base/Makefile.in	Sun Jan  7 21:53:27 2001
+@@ -83,7 +83,6 @@
  	rm -f *~
  
  install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR)
- 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR)
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR)
+ 
+ 
diff --git a/net-mgmt/nagios12/files/patch-ac b/net-mgmt/nagios12/files/patch-ac
deleted file mode 100644
index 1eb997a043fc..000000000000
--- a/net-mgmt/nagios12/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/locations.sub	Wed Apr 26 21:10:13 2000
-+++ common/locations.sub.new	Mon Jun 12 21:29:23 2000
-@@ -19,16 +19,16 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  ************************************************************************/
- 
--#define DEFAULT_TEMP_FILE			"${prefix}/var/netsaint.tmp"
--#define DEFAULT_STATUS_FILE			"${prefix}/var/status.log"
--#define DEFAULT_LOG_FILE			"${prefix}/var/netsaint.log"
--#define DEFAULT_LOG_ARCHIVE_PATH		"${prefix}/var/archives/"
--#define DEFAULT_COMMENT_FILE			"${prefix}/var/comment.log"
--#define DEFAULT_COMMAND_FILE			"${prefix}/var/rw/netsaint.cmd"
--#define DEFAULT_PHYSICAL_HTML_PATH		"${prefix}/share"
-+#define DEFAULT_TEMP_FILE			"${prefix}/var/netsaint/netsaint.tmp"
-+#define DEFAULT_STATUS_FILE			"${prefix}/var/netsaint/status.log"
-+#define DEFAULT_LOG_FILE			"${prefix}/var/netsaint/netsaint.log"
-+#define DEFAULT_LOG_ARCHIVE_PATH		"${prefix}/var/netsaint/archives/"
-+#define DEFAULT_COMMENT_FILE			"${prefix}/var/netsaint/comment.log"
-+#define DEFAULT_COMMAND_FILE			"${prefix}/var/netsaint/rw/netsaint.cmd"
-+#define DEFAULT_PHYSICAL_HTML_PATH		"${prefix}/share/netsaint"
- #define DEFAULT_URL_HTML_PATH			"/netsaint"
--#define DEFAULT_PHYSICAL_CGIBIN_PATH		"${exec_prefix}/sbin"
-+#define DEFAULT_PHYSICAL_CGIBIN_PATH		"${exec_prefix}/share/netsaint/sbin"
- #define DEFAULT_URL_CGIBIN_PATH			"/cgi-bin/netsaint"
--#define DEFAULT_CGI_CONFIG_FILE			"${exec_prefix}/sbin/nscgi.cfg"
-+#define DEFAULT_CGI_CONFIG_FILE			"${exec_prefix}/share/netsaint/sbin/nscgi.cfg"
- 
--#define LOCKFILE				"${prefix}/var/netsaint.lock"
-+#define LOCKFILE				"${prefix}/var/netsaint/netsaint.lock"
diff --git a/net-mgmt/nagios12/files/patch-af b/net-mgmt/nagios12/files/patch-af
deleted file mode 100644
index 58d7998ff8d8..000000000000
--- a/net-mgmt/nagios12/files/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
---- daemon-init.in	Fri Apr  7 11:11:34 2000
-+++ daemon-init.in.new	Mon Jun  5 16:11:44 2000
-@@ -27,10 +27,11 @@
-   
- # Source function library
- # Solaris doesn't have an rc.d directory, so do a test first
--if [ -f /etc/rc.d/init.d/functions ]; then
--. /etc/rc.d/init.d/functions
--elif [ -f /etc/init.d/functions ]; then
--. /etc/init.d/functions
-+if [ -f /usr/local/etc/netsaint/functions ]; then
-+. /usr/local/etc/netsaint/functions
-+else
-+   echo "/usr/local/etc/netsaint/functions missing"
-+   exit 1
- fi
- 
- prefix=@prefix@
-@@ -85,4 +86,4 @@
-         exit 1
- esac
-   
--# End of this script
-+# End of this script
diff --git a/net-mgmt/nagios12/files/patch-ah b/net-mgmt/nagios12/files/patch-ah
deleted file mode 100644
index a8023ecea7f1..000000000000
--- a/net-mgmt/nagios12/files/patch-ah
+++ /dev/null
@@ -1,71 +0,0 @@
---- hosts.cfg.in	Fri Apr  7 11:11:34 2000
-+++ hosts.cfg.in.new	Thu Jun 15 10:19:42 2000
-@@ -151,10 +151,10 @@
- 
- hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp
- hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris
--hostgroup[linux-boxes]=All Linux Servers;linux-admins;real
-+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real
- hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan
- hostgroup[routers]=Routers;router-admins;ageng-router
--hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000
-+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000
- 
- 
- ################################################################################
-@@ -183,19 +183,19 @@
- 
- # Service notification command - send email with problem summary
- 
--command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$
-+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $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$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$
-+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $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.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$
--command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$
-+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$
-+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$
- 
- # These are some example service check commands.  See the HTML documentation on the plugins for
- # examples of how to configure command definitions.
-@@ -316,7 +316,7 @@
- 
- contactgroup[novell-admins]=Novell Administrators;@netsaint_user@
- contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe
--contactgroup[linux-admins]=Linux Administrators;@netsaint_user@
-+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@
- contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@
- contactgroup[router-admins]=Router Technicians;@netsaint_user@
- contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe
-@@ -428,14 +428,14 @@
- service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping
- service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications
- 
--# Linux Box
--service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping
--service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http
--service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150
--service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z
--service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200
--service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1
--service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2
-+# FreeBSD Box
-+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping
-+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http
-+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150
-+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z
-+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200
-+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1
-+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2
- 
- # Switches
- service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000