Date: Thu, 12 Feb 2009 14:12:33 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jarrod@netleader.com.au Subject: ports/131605: [UPDATE] net-mgmt/nagios-devel to 3.1.0 Message-ID: <20090212131233.BF5DD4AE6B@mail.vx.sk> Resent-Message-ID: <200902121320.n1CDK20v081169@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 131605
>Category: ports
>Synopsis: [UPDATE] net-mgmt/nagios-devel to 3.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 12 13:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 7.1-RELEASE-p2 i386/amd64
>Organization:
>Environment:
>Description:
Update port to 3.1.0
Import new features from net-mgmt/nagios
Rename patches to new names (as in net-mgmt/nagios)
Added file(s):
- files/nagios.in
- files/patch-base-Makefile.in
- files/patch-cgi-Makefile.in
- files/patch-contrib-Makefile.in
- files/patch-html-Makefile.in
- files/patch-html-docs-configcgi.html
- files/patch-include-locations.h.in
- files/patch-sample-config-cgi.cfg.in
- files/patch-sample-config-nagios.cfg.in
- files/patch-sample-config-template-object-localhost.cfg.in
- files/patch-sample-config-template-object-templates.cfg.in
Removed file(s):
- files/nagios.sh.in
- files/patch-base__Makefile.in
- files/patch-cgi__Makefile.in
- files/patch-contrib__Makefile.in
- files/patch-html__Makefile.in
- files/patch-include__locations.h.in
- files/patch-sample-config__nagios.cfg.in
- files/patch-sample-config__template-object__localhost.cfg.in
- files/patch-sample-config__template-object__templates.cfg.in
Port maintainer (jarrod@netleader.com.au) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- nagios-devel-3.1.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-devel/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile 3 Sep 2008 03:30:37 -0000 1.18
+++ Makefile 12 Feb 2009 13:08:45 -0000
@@ -6,10 +6,9 @@
#
PORTNAME= nagios
-DISTVERSION= 3.0.3
+DISTVERSION= 3.1.0
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nagios
+MASTER_SITES= SF
PKGNAMESUFFIX= -devel
MAINTAINER= jarrod@netleader.com.au
@@ -22,13 +21,15 @@
USE_ICONV= yes
USE_PERL5_BUILD= yes
+USE_PHP= yes
USE_AUTOTOOLS= autoconf:262 libltdl:15
-USE_RC_SUBR= nagios.sh
+USE_RC_SUBR= nagios
-CONFLICTS= nagios-[12].*
+CONFLICTS= nagios-[123].*
-OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" off \
- NANOSLEEP "Use nanosleep in event timing" off
+OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \
+ NANOSLEEP "Use nanosleep in event timing" off \
+ EVENT_BROKER "Enable event broker functionality" off
GNU_CONFIGURE= yes
@@ -84,17 +85,14 @@
pkg-deinstall \
pkg-message
+### XXX: Subtle bug with removing PREFIX from here
SUB_LIST= PREFIX=${PREFIX} \
- ${PLIST_SUB}
+ ${PLIST_SUB}
.if defined(WITH_EMBEDDED_PERL)
-.if ${PERL_LEVEL} >= 500800
-USE_PERL5= yes
+USE_PERL5= 5.8.0+
CONFIGURE_ARGS+= --enable-embedded-perl \
--with-perlcache
-.else
-IGNORE= embedded Perl requires Perl 5.8 or higher (see lang/perl5.8)
-.endif
PLIST_SUB+= EMBEDDED_PERL=""
.else
PLIST_SUB+= EMBEDDED_PERL="@comment "
@@ -104,6 +102,12 @@
CONFIGURE_ARGS+= --enable-nanosleep
.endif
+.if defined(WITH_EVENT_BROKER)
+CONFIGURE_ARGS+= --enable-event-broker
+.else
+CONFIGURE_ARGS+= --disable-event-broker
+.endif
+
pre-install:
@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-devel/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 5 Jul 2008 05:34:56 -0000 1.12
+++ distinfo 12 Feb 2009 13:08:45 -0000
@@ -1,3 +1,3 @@
-MD5 (nagios-3.0.3.tar.gz) = 151df7bf19b696f7498410fb76fb7caf
-SHA256 (nagios-3.0.3.tar.gz) = 65e96d7da182b40d4f9a8c63da1ef861fdfb9502be36a983f8a2e803f711d53c
-SIZE (nagios-3.0.3.tar.gz) = 2759396
+MD5 (nagios-3.1.0.tar.gz) = 02d3b0e13f772481d0ac9e00bdc3e979
+SHA256 (nagios-3.1.0.tar.gz) = 30b81eb7943805b129d1db18bb67386feb998f9e6464cb2efbea0756499b2651
+SIZE (nagios-3.1.0.tar.gz) = 2724545
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-devel/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 2 Feb 2008 10:20:45 -0000 1.2
+++ pkg-plist 12 Feb 2009 13:08:46 -0000
@@ -34,6 +34,7 @@
%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
+%%NAGIOSWWWDIR%%/config.inc.php
%%NAGIOSWWWDIR%%/contexthelp/A1.html
%%NAGIOSWWWDIR%%/contexthelp/A2.html
%%NAGIOSWWWDIR%%/contexthelp/A3.html
@@ -106,6 +107,7 @@
%%NAGIOSWWWDIR%%/docs/cgiauth.html
%%NAGIOSWWWDIR%%/docs/cgiincludes.html
%%NAGIOSWWWDIR%%/docs/cgis.html
+%%NAGIOSWWWDIR%%/docs/cgisecurity.html
%%NAGIOSWWWDIR%%/docs/checkscheduling.html
%%NAGIOSWWWDIR%%/docs/clusters.html
%%NAGIOSWWWDIR%%/docs/config.html
@@ -318,7 +320,7 @@
%%NAGIOSWWWDIR%%/images/redundancy.png
%%NAGIOSWWWDIR%%/images/restart.gif
%%NAGIOSWWWDIR%%/images/right.gif
-%%NAGIOSWWWDIR%%/images/sblogo.jpg
+%%NAGIOSWWWDIR%%/images/sblogo.png
%%NAGIOSWWWDIR%%/images/serviceevent.gif
%%NAGIOSWWWDIR%%/images/splunk1.gif
%%NAGIOSWWWDIR%%/images/splunk2.gif
@@ -344,13 +346,11 @@
%%NAGIOSWWWDIR%%/images/weblogo1.png
%%NAGIOSWWWDIR%%/images/zoom1.gif
%%NAGIOSWWWDIR%%/images/zoom2.gif
-%%NAGIOSWWWDIR%%/index.html
-%%NAGIOSWWWDIR%%/main.html
-%%NAGIOSWWWDIR%%/media/critical.wav
-%%NAGIOSWWWDIR%%/media/hostdown.wav
-%%NAGIOSWWWDIR%%/media/warning.wav
+%%NAGIOSWWWDIR%%/includes/utils.inc.php
+%%NAGIOSWWWDIR%%/index.php
+%%NAGIOSWWWDIR%%/main.php
%%NAGIOSWWWDIR%%/robots.txt
-%%NAGIOSWWWDIR%%/side.html
+%%NAGIOSWWWDIR%%/side.php
%%NAGIOSWWWDIR%%/stylesheets/avail.css
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
%%NAGIOSWWWDIR%%/stylesheets/cmd.css
@@ -376,6 +376,7 @@
@dirrm %%NAGIOSWWWDIR%%/docs
@dirrm %%NAGIOSWWWDIR%%/images/logos
@dirrm %%NAGIOSWWWDIR%%/images
+@dirrm %%NAGIOSWWWDIR%%/includes
@dirrm %%NAGIOSWWWDIR%%/media
@dirrm %%NAGIOSWWWDIR%%/ssi
@dirrm %%NAGIOSWWWDIR%%/stylesheets
Index: files/nagios.in
===================================================================
RCS file: files/nagios.in
diff -N files/nagios.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/nagios.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net-mgmt/nagios/files/nagios.in,v 1.1 2008/09/03 00:30:55 pgollucci Exp $
+#
+
+# PROVIDE: nagios
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable nagios:
+# nagios_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable nagios.
+# nagios_flags (str): Set to "" by default.
+# nagios_configfile (str): Set to "%%PREFIX%%/etc/nagios/nagios.cfg" by default.
+#
+
+. %%RC_SUBR%%
+
+name="nagios"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/nagios"
+command_args="-d"
+extra_commands="reload"
+pidfile="%%NAGIOSDIR%%/nagios.lock"
+nagios_user="%%NAGIOSUSER%%"
+
+start_precmd="start_precmd"
+stop_postcmd="stop_postcmd"
+restart_precmd="nagios_checkconfig"
+reload_precmd="nagios_checkconfig"
+sig_reload=HUP
+
+[ -z "${nagios_enable}" ] && nagios_enable="NO"
+[ -z "${nagios_flags}" ] && nagios_flags=""
+[ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg"
+
+load_rc_config "${name}"
+
+required_files="${nagios_configfile}"
+command_args="${command_args} ${nagios_configfile}"
+
+nagios_checkconfig() {
+ echo -n "Performing sanity check of nagios configuration: "
+ ${command} -v ${nagios_configfile} 2>&1 >/dev/null
+ if [ $? != 0 ]; then
+ echo "FAILED"
+ ${command} -v ${nagios_configfile}
+ return 1
+ else
+ echo "OK"
+ fi
+}
+
+start_precmd() {
+ if ! nagios_checkconfig; then
+ return 1
+ fi
+
+ su -m "${nagios_user}" -c "touch \"%%NAGIOSDIR%%/nagios.log\" \"%%NAGIOSDIR%%/status.sav\""
+ rm -f "%%NAGIOSDIR%%/rw/nagios.cmd"
+}
+
+stop_postcmd() {
+ rm -f "%%NAGIOSDIR%%/nagios.tmp" "%%NAGIOSDIR%%/rw/nagios.cmd"
+}
+
+run_rc_command "$1"
Index: files/nagios.sh.in
===================================================================
RCS file: files/nagios.sh.in
diff -N files/nagios.sh.in
--- files/nagios.sh.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net-mgmt/nagios-devel/files/nagios.sh.in,v 1.1 2007/08/30 14:54:59 sem Exp $
-#
-
-# PROVIDE: nagios
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable nagios:
-# nagios_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable nagios.
-# nagios_flags (str): Set to "" by default.
-# nagios_configfile (str): Set to "%%PREFIX%%/etc/nagios/nagios.cfg" by default.
-#
-
-. %%RC_SUBR%%
-
-name="nagios"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/nagios"
-command_args="-d"
-extra_commands="reload"
-pidfile="%%NAGIOSDIR%%/nagios.lock"
-nagios_user="%%NAGIOSUSER%%"
-
-start_precmd="start_precmd"
-stop_postcmd="stop_postcmd"
-restart_precmd="nagios_checkconfig"
-reload_precmd="nagios_checkconfig"
-sig_reload=HUP
-
-[ -z "${nagios_enable}" ] && nagios_enable="NO"
-[ -z "${nagios_flags}" ] && nagios_flags=""
-[ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg"
-
-load_rc_config "${name}"
-
-required_files="${nagios_configfile}"
-command_args="${command_args} ${nagios_configfile}"
-
-nagios_checkconfig() {
- echo -n "Performing sanity check of nagios configuration: "
- ${command} -v ${nagios_configfile} 2>&1 >/dev/null
- if [ $? != 0 ]; then
- echo "FAILED"
- ${command} -v ${nagios_configfile}
- return 1
- else
- echo "OK"
- fi
-}
-
-start_precmd() {
- if ! nagios_checkconfig; then
- return 1
- fi
-
- su -m "${nagios_user}" -c "touch \"%%NAGIOSDIR%%/nagios.log\" \"%%NAGIOSDIR%%/status.sav\""
- rm -f "%%NAGIOSDIR%%/rw/nagios.cmd"
-}
-
-stop_postcmd() {
- rm -f "%%NAGIOSDIR%%/nagios.tmp" "%%NAGIOSDIR%%/rw/nagios.cmd"
-}
-
-run_rc_command "$1"
Index: files/patch-base-Makefile.in
===================================================================
RCS file: files/patch-base-Makefile.in
diff -N files/patch-base-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-base-Makefile.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,15 @@
+--- base/Makefile.in.orig Wed Jan 24 04:58:34 2007
++++ base/Makefile.in Fri Jul 20 13:34:45 2007
+@@ -193,9 +193,9 @@
+ $(MAKE) install-basic
+
+ install-basic:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+
+ strip-post-install:
+ $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
Index: files/patch-base__Makefile.in
===================================================================
RCS file: files/patch-base__Makefile.in
diff -N files/patch-base__Makefile.in
--- files/patch-base__Makefile.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- base/Makefile.in.orig Wed Jan 24 04:58:34 2007
-+++ base/Makefile.in Fri Jul 20 13:34:45 2007
-@@ -193,9 +193,9 @@
- $(MAKE) install-basic
-
- install-basic:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-
- strip-post-install:
- $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
Index: files/patch-cgi-Makefile.in
===================================================================
RCS file: files/patch-cgi-Makefile.in
diff -N files/patch-cgi-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-cgi-Makefile.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,14 @@
+--- cgi/Makefile.in.orig Wed Dec 13 02:57:57 2006
++++ cgi/Makefile.in Fri Jul 20 13:35:18 2007
+@@ -190,9 +190,9 @@
+ $(MAKE) install-basic
+
+ install-basic:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ for file in *.cgi; do \
+- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
++ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ done
+
+ strip-post-install:
Index: files/patch-cgi__Makefile.in
===================================================================
RCS file: files/patch-cgi__Makefile.in
diff -N files/patch-cgi__Makefile.in
--- files/patch-cgi__Makefile.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- cgi/Makefile.in.orig Wed Dec 13 02:57:57 2006
-+++ cgi/Makefile.in Fri Jul 20 13:35:18 2007
-@@ -190,9 +190,9 @@
- $(MAKE) install-basic
-
- install-basic:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
- for file in *.cgi; do \
-- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
- done
-
- strip-post-install:
Index: files/patch-contrib-Makefile.in
===================================================================
RCS file: files/patch-contrib-Makefile.in
diff -N files/patch-contrib-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-contrib-Makefile.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,17 @@
+--- contrib/Makefile.in.orig Tue Nov 15 12:19:36 2005
++++ contrib/Makefile.in Wed Dec 28 17:49:25 2005
+@@ -46,10 +46,10 @@
+ devclean: distclean
+
+ install:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
+- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
++ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
++ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
+
+ ##############################################################################
+ # rules and dependencies for actual target programs
Index: files/patch-contrib__Makefile.in
===================================================================
RCS file: files/patch-contrib__Makefile.in
diff -N files/patch-contrib__Makefile.in
--- files/patch-contrib__Makefile.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- contrib/Makefile.in.orig Tue Nov 15 12:19:36 2005
-+++ contrib/Makefile.in Fri Jul 20 13:35:47 2007
-@@ -46,10 +46,10 @@
- devclean: distclean
-
- install:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
-- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
-+ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
-
- ##############################################################################
- # rules and dependencies for actual target programs
Index: files/patch-html-Makefile.in
===================================================================
RCS file: files/patch-html-Makefile.in
diff -N files/patch-html-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-html-Makefile.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,69 @@
+--- html/Makefile.in.orig 2008-12-14 19:00:46.000000000 +0100
++++ html/Makefile.in 2009-02-12 13:27:00.000000000 +0100
+@@ -33,42 +33,42 @@
+ devclean: distclean
+
+ 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)/contexthelp
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
++ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
++ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ for file in *.php; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ # for file in media/*.wav; \
+-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
++# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ for file in stylesheets/*.css; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ for file in contexthelp/*.html; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ for file in docs/*.html; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ for file in docs/images/*.*; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ for file in images/*.gif; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ for file in images/*.jpg; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ for file in images/*.png; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ for file in images/*.ico; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ for file in images/logos/*.*; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ for file in includes/*.*; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
++ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+
+ install-unstripped:
+ $(MAKE) install
Index: files/patch-html-docs-configcgi.html
===================================================================
RCS file: files/patch-html-docs-configcgi.html
diff -N files/patch-html-docs-configcgi.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-html-docs-configcgi.html 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,11 @@
+--- html/docs/configcgi.html.orig 2008-11-08 17:49:55.000000000 +0100
++++ html/docs/configcgi.html 2008-11-08 17:50:33.000000000 +0100
+@@ -616,7 +616,7 @@
+ </tr>
+ <tr>
+ <td valign=top>Example:</td>
+-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
++<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td>
+ </tr>
+ </table>
+
Index: files/patch-html__Makefile.in
===================================================================
RCS file: files/patch-html__Makefile.in
diff -N files/patch-html__Makefile.in
--- files/patch-html__Makefile.in 2 Feb 2008 10:20:45 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
---- html/Makefile.in.orig 2008-01-10 04:21:25.000000000 +1030
-+++ html/Makefile.in 2008-01-30 23:02:38.000000000 +1030
-@@ -33,39 +33,39 @@
- devclean: distclean
-
- 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)/contexthelp
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
-- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- for file in *.html; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
- for file in media/*.wav; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
- for file in stylesheets/*.css; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- for file in contexthelp/*.html; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
- for file in docs/*.html; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
- for file in docs/images/*.*; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
- for file in images/*.gif; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/*.jpg; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/*.png; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/*.ico; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/logos/*.*; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
-
- install-unstripped:
- $(MAKE) install
Index: files/patch-include-locations.h.in
===================================================================
RCS file: files/patch-include-locations.h.in
diff -N files/patch-include-locations.h.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-include-locations.h.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,11 @@
+--- include/locations.h.in.orig Tue May 1 08:15:57 2007
++++ include/locations.h.in Fri Jul 20 15:52:49 2007
+@@ -20,7 +20,7 @@
+
+ #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"
+ #define DEFAULT_TEMP_PATH "/tmp"
+-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"
++#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults"
+ #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"
+ #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log"
+ #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/"
Index: files/patch-include__locations.h.in
===================================================================
RCS file: files/patch-include__locations.h.in
diff -N files/patch-include__locations.h.in
--- files/patch-include__locations.h.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- include/locations.h.in.orig Tue May 1 08:15:57 2007
-+++ include/locations.h.in Fri Jul 20 15:52:49 2007
-@@ -20,7 +20,7 @@
-
- #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"
- #define DEFAULT_TEMP_PATH "/tmp"
--#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"
-+#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults"
- #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"
- #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log"
- #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/"
Index: files/patch-sample-config-cgi.cfg.in
===================================================================
RCS file: files/patch-sample-config-cgi.cfg.in
diff -N files/patch-sample-config-cgi.cfg.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sample-config-cgi.cfg.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,11 @@
+--- sample-config/cgi.cfg.in.orig 2007-10-08 05:12:52.000000000 +0930
++++ sample-config/cgi.cfg.in 2008-10-23 10:31:31.000000000 +1030
+@@ -229,7 +229,7 @@
+ # OS and distribution, so you may have to tweak this to
+ # work on your system.
+
+-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
++ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$
+
+
+
Index: files/patch-sample-config-nagios.cfg.in
===================================================================
RCS file: files/patch-sample-config-nagios.cfg.in
diff -N files/patch-sample-config-nagios.cfg.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sample-config-nagios.cfg.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,11 @@
+--- sample-config/nagios.cfg.in.orig 2008-11-03 05:21:30.000000000 +1030
++++ sample-config/nagios.cfg.in 2008-11-05 15:17:25.000000000 +1030
+@@ -32,7 +32,7 @@
+ cfg_file=@sysconfdir@/objects/timeperiods.cfg
+ cfg_file=@sysconfdir@/objects/templates.cfg
+
+-# Definitions for monitoring the local (Linux) host
++# Definitions for monitoring the local (FreeBSD) host
+ cfg_file=@sysconfdir@/objects/localhost.cfg
+
+ # Definitions for monitoring a Windows machine
Index: files/patch-sample-config-template-object-localhost.cfg.in
===================================================================
RCS file: files/patch-sample-config-template-object-localhost.cfg.in
diff -N files/patch-sample-config-template-object-localhost.cfg.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sample-config-template-object-localhost.cfg.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,40 @@
+--- sample-config/template-object/localhost.cfg.in.orig Sun Jun 10 02:13:05 2007
++++ sample-config/template-object/localhost.cfg.in Fri Jul 20 13:46:46 2007
+@@ -5,7 +5,7 @@
+ #
+ # NOTE: This config file is intended to serve as an *extremely* simple
+ # example of how you can create configuration entries to monitor
+-# the local (Linux) machine.
++# the local (FreeBSD) machine.
+ #
+ ###############################################################################
+
+@@ -23,9 +23,9 @@
+ # Define a host for the local machine
+
+ define host{
+- use linux-server ; Name of host template to use
++ use freebsd-server ; Name of host template to use
+ ; This host definition will inherit all variables that are defined
+- ; in (or inherited by) the linux-server host template definition.
++ ; in (or inherited by) the freebsd-server host template definition.
+ host_name localhost
+ alias localhost
+ address 127.0.0.1
+@@ -41,12 +41,12 @@
+ ###############################################################################
+ ###############################################################################
+
+-# Define an optional hostgroup for Linux machines
++# Define an optional hostgroup for FreeBSD machines
+
+ define hostgroup{
+- hostgroup_name linux-servers ; The name of the hostgroup
+- alias Linux Servers ; Long name of the group
+- members localhost ; Comma separated list of hosts that belong to this group
++ hostgroup_name freebsd-servers ; The name of the hostgroup
++ alias FreeBSD Servers ; Long name of the group
++ members localhost ; Comma separated list of hosts that belong to this group
+ }
+
+
Index: files/patch-sample-config-template-object-templates.cfg.in
===================================================================
RCS file: files/patch-sample-config-template-object-templates.cfg.in
diff -N files/patch-sample-config-template-object-templates.cfg.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sample-config-template-object-templates.cfg.in 12 Feb 2009 13:08:46 -0000
@@ -0,0 +1,26 @@
+--- sample-config/template-object/templates.cfg.in.orig Fri Jul 20 13:46:57 2007
++++ sample-config/template-object/templates.cfg.in Fri Jul 20 13:47:52 2007
+@@ -63,17 +63,17 @@
+ }
+
+
+-# Linux host definition template - This is NOT a real host, just a template!
++# FreeBSD host definition template - This is NOT a real host, just a template!
+
+ define host{
+- name linux-server ; The name of this host template
++ name freebsd-server ; The name of this host template
+ use generic-host ; This template inherits other values from the generic-host template
+- check_period 24x7 ; By default, Linux hosts are checked round the clock
++ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock
+ check_interval 5 ; Actively check the host every 5 minutes
+ retry_interval 1 ; Schedule host check retries at 1 minute intervals
+- max_check_attempts 10 ; Check each Linux host 10 times (max)
+- check_command check-host-alive ; Default command to check Linux hosts
+- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day
++ max_check_attempts 10 ; Check each FreeBSD host 10 times (max)
++ check_command check-host-alive ; Default command to check FreeBSD hosts
++ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day
+ ; Note that the notification_period variable is being overridden from
+ ; the value that is inherited from the generic-host template!
+ notification_interval 120 ; Resend notifications every 2 hours
Index: files/patch-sample-config__nagios.cfg.in
===================================================================
RCS file: files/patch-sample-config__nagios.cfg.in
diff -N files/patch-sample-config__nagios.cfg.in
--- files/patch-sample-config__nagios.cfg.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- sample-config/nagios.cfg.in.orig Tue Jun 19 02:26:33 2007
-+++ sample-config/nagios.cfg.in Fri Jul 20 13:45:09 2007
-@@ -32,7 +32,7 @@
- cfg_file=@sysconfdir@/objects/timeperiods.cfg
- cfg_file=@sysconfdir@/objects/templates.cfg
-
--# Definitions for monitoring the local (Linux) host
-+# Definitions for monitoring the local (FreeBSD) host
- cfg_file=@sysconfdir@/objects/localhost.cfg
-
- # Definitions for monitoring a Windows machine
Index: files/patch-sample-config__template-object__localhost.cfg.in
===================================================================
RCS file: files/patch-sample-config__template-object__localhost.cfg.in
diff -N files/patch-sample-config__template-object__localhost.cfg.in
--- files/patch-sample-config__template-object__localhost.cfg.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
---- sample-config/template-object/localhost.cfg.in.orig Sun Jun 10 02:13:05 2007
-+++ sample-config/template-object/localhost.cfg.in Fri Jul 20 13:46:46 2007
-@@ -5,7 +5,7 @@
- #
- # NOTE: This config file is intended to serve as an *extremely* simple
- # example of how you can create configuration entries to monitor
--# the local (Linux) machine.
-+# the local (FreeBSD) machine.
- #
- ###############################################################################
-
-@@ -23,9 +23,9 @@
- # Define a host for the local machine
-
- define host{
-- use linux-server ; Name of host template to use
-+ use freebsd-server ; Name of host template to use
- ; This host definition will inherit all variables that are defined
-- ; in (or inherited by) the linux-server host template definition.
-+ ; in (or inherited by) the freebsd-server host template definition.
- host_name localhost
- alias localhost
- address 127.0.0.1
-@@ -41,12 +41,12 @@
- ###############################################################################
- ###############################################################################
-
--# Define an optional hostgroup for Linux machines
-+# Define an optional hostgroup for FreeBSD machines
-
- define hostgroup{
-- hostgroup_name linux-servers ; The name of the hostgroup
-- alias Linux Servers ; Long name of the group
-- members localhost ; Comma separated list of hosts that belong to this group
-+ hostgroup_name freebsd-servers ; The name of the hostgroup
-+ alias FreeBSD Servers ; Long name of the group
-+ members localhost ; Comma separated list of hosts that belong to this group
- }
-
-
Index: files/patch-sample-config__template-object__templates.cfg.in
===================================================================
RCS file: files/patch-sample-config__template-object__templates.cfg.in
diff -N files/patch-sample-config__template-object__templates.cfg.in
--- files/patch-sample-config__template-object__templates.cfg.in 30 Aug 2007 14:54:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
---- sample-config/template-object/templates.cfg.in.orig Fri Jul 20 13:46:57 2007
-+++ sample-config/template-object/templates.cfg.in Fri Jul 20 13:47:52 2007
-@@ -63,17 +63,17 @@
- }
-
-
--# Linux host definition template - This is NOT a real host, just a template!
-+# FreeBSD host definition template - This is NOT a real host, just a template!
-
- define host{
-- name linux-server ; The name of this host template
-+ name freebsd-server ; The name of this host template
- use generic-host ; This template inherits other values from the generic-host template
-- check_period 24x7 ; By default, Linux hosts are checked round the clock
-+ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock
- check_interval 5 ; Actively check the host every 5 minutes
- retry_interval 1 ; Schedule host check retries at 1 minute intervals
-- max_check_attempts 10 ; Check each Linux host 10 times (max)
-- check_command check-host-alive ; Default command to check Linux hosts
-- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day
-+ max_check_attempts 10 ; Check each FreeBSD host 10 times (max)
-+ check_command check-host-alive ; Default command to check FreeBSD hosts
-+ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day
- ; Note that the notification_period variable is being overridden from
- ; the value that is inherited from the generic-host template!
- notification_interval 120 ; Resend notifications every 2 hours
Index: files/pkg-deinstall.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-devel/files/pkg-deinstall.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall.in
--- files/pkg-deinstall.in 30 Aug 2007 14:54:59 -0000 1.1
+++ files/pkg-deinstall.in 12 Feb 2009 13:08:46 -0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/net-mgmt/nagios-devel/files/pkg-deinstall.in,v 1.1 2007/08/30 14:54:59 sem Exp $
+# $FreeBSD: ports/net-mgmt/nagios/files/pkg-deinstall.in,v 1.1 2006/01/09 00:54:01 edwin Exp $
#
NAGIOSDIR=%%NAGIOSDIR%%
Index: files/pkg-install.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-devel/files/pkg-install.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.in
--- files/pkg-install.in 30 Aug 2007 14:54:59 -0000 1.1
+++ files/pkg-install.in 12 Feb 2009 13:08:46 -0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/net-mgmt/nagios-devel/files/pkg-install.in,v 1.1 2007/08/30 14:54:59 sem Exp $
+# $FreeBSD: ports/net-mgmt/nagios/files/pkg-install.in,v 1.2 2007/04/07 14:25:48 rafan Exp $
#
NAGIOSDIR=%%NAGIOSDIR%%
--- nagios-devel-3.1.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090212131233.BF5DD4AE6B>