Index: branches/2016Q3/net-mgmt/nagios4/Makefile =================================================================== --- branches/2016Q3/net-mgmt/nagios4/Makefile (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/Makefile (revision 420611) @@ -1,107 +1,107 @@ # Created by: Blaz Zupan # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.1.1 -PORTREVISION= 4 +PORTVERSION= 4.2.0 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 MAINTAINER= mat@FreeBSD.org COMMENT= Powerful network monitoring system LICENSE= GPLv2 BROKEN_powerpc64= Does not build LIB_DEPENDS= libltdl.so:devel/libltdl \ libgd.so:graphics/gd USES= cpe gmake perl5 USE_PERL5= build USE_PHP= xml USE_RC_SUBR= nagios CONFLICTS= nagios-[123].* nagios-devel-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-command-group=${WWWGRP} \ --with-nagios-user=${NAGIOSUSER} \ --with-nagios-group=${NAGIOSGROUP} \ --with-htmurl=${NAGIOSHTMURL} \ --with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${WWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${WWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ --with-httpd-conf=${PREFIX}/etc \ --with-checkresult-dir=${NAGIOSDIR}/checkresults \ --disable-statuswrl \ --enable-event-broker \ ac_cv_lib_iconv_main=no CONFIGURE_ENV= PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${CPPFLAGS} LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install install-commandmode install-config PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} \ WWWGRP=${WWWGRP} SUB_LIST= NAGIOSDIR=${NAGIOSDIR} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} \ NAGIOSHTMURL=${NAGIOSHTMURL} \ NAGIOSCGIURL=${NAGIOSCGIURL} SUB_FILES= pkg-message NAGIOSUSER?= nagios NAGIOSGROUP?= nagios NAGIOSDIR?= /var/spool/nagios .if defined(NAGIOSWWWDIR) WWWDIR= ${PREFIX}/${NAGIOSWWWDIR} .endif NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin USERS= ${NAGIOSUSER} GROUPS= ${NAGIOSGROUP} OPTIONS_DEFINE= NANOSLEEP UNHANDLED_HACK OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_DEFAULT= NAGPLUGINS NANOSLEEP_DESC= Use nanosleep in event timing UNHANDLED_HACK_DESC= Display passive checks in unhandled queries MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins OPTIONS_SUB= NANOSLEEP_CONFIGURE_ENABLE= nanosleep .if !defined(MAKING_PATCHES) # make clean patch makepatch MAKING_PATCHES= post-patch: ${REINPLACE_CMD} -e 's/\<77\([0-7]\)\>/75\1/g; s/\<66\([0-7]\)\>/64\1/; /chmod/d; \ /\.cfg$$/s/$$/-sample/' \ ${WRKSRC}/Makefile.in ${WRKSRC}/base/Makefile.in ${WRKSRC}/cgi/Makefile.in ${WRKSRC}/contrib/Makefile.in ${WRKSRC}/html/Makefile.in post-patch-UNHANDLED_HACK-on: ${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' -e \ 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php .endif post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/libexec/nagios @${MV} ${STAGEDIR}${WWWDIR}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample .include Index: branches/2016Q3/net-mgmt/nagios4/distinfo =================================================================== --- branches/2016Q3/net-mgmt/nagios4/distinfo (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/distinfo (revision 420611) @@ -1,2 +1,3 @@ -SHA256 (nagios-4.1.1.tar.gz) = 58218e5e66c8078fc578a60db33b5c3da10fc6a793e97d2b00780517e3efa0a7 -SIZE (nagios-4.1.1.tar.gz) = 11142182 +TIMESTAMP = 1471870658 +SHA256 (nagios-4.2.0.tar.gz) = 93be769854d7e64c526da29b79c92fb500a9795a82547a85ca0a9180a8f6725c +SIZE (nagios-4.2.0.tar.gz) = 11155104 Index: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c (nonexistent) @@ -1,16 +0,0 @@ ---- lib/iobroker.c.orig 2014-08-12 15:00:01 UTC -+++ lib/iobroker.c -@@ -415,11 +415,11 @@ int iobroker_poll(iobroker_set *iobs, in - iobs->pfd[p].events = POLLIN; - p++; - } -- nfds = poll(iobs->pfd, iobs->num_fds, timeout); -+ nfds = poll(iobs->pfd, p, timeout); - if (nfds < 0) { - return IOBROKER_ELIB; - } -- for (i = 0; i < iobs->num_fds; i++) { -+ for (i = 0; i < p; i++) { - iobroker_fd *s; - if ((iobs->pfd[i].revents & POLLIN) != POLLIN) { - continue; Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in (nonexistent) @@ -1,11 +0,0 @@ ---- sample-config/cgi.cfg.in.orig 2014-08-12 15:00:01 UTC -+++ sample-config/cgi.cfg.in -@@ -263,7 +263,7 @@ default_statuswrl_layout=4 - # 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$ - - - Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c (nonexistent) @@ -1,11 +0,0 @@ ---- lib/runcmd.c.orig 2014-08-12 15:00:01 UTC -+++ lib/runcmd.c -@@ -36,7 +36,7 @@ - #endif - - /* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */ --#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 -+#if defined(__DragonFly__) || __FreeBSD__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 - # define HAVE_SETENV - #endif - Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in (nonexistent) @@ -1,14 +0,0 @@ ---- html/Makefile.in.orig 2015-08-19 21:49:52 UTC -+++ html/Makefile.in -@@ -45,11 +45,8 @@ 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)/js - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php (nonexistent) @@ -1,34 +0,0 @@ ---- html/main.php.orig 2015-08-19 21:49:52 UTC -+++ html/main.php -@@ -130,31 +130,6 @@ $this_year = '2015'; -
Nagios® Core™
-
Version
-
August 19, 2015
--
Check for updates
-- -- -- --
-- --
--
Warning: Automatic Update Checks are Disabled!
--
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
--
-- --
--
A new version of Nagios Core is available!
--
Visit nagios.org to download Nagios .
--
-- -
- - Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in (nonexistent) @@ -1,40 +0,0 @@ ---- sample-config/template-object/localhost.cfg.in.orig 2014-08-12 15:00:01 UTC -+++ sample-config/template-object/localhost.cfg.in -@@ -4,7 +4,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. - # - ############################################################################### - -@@ -22,9 +22,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 -@@ -40,12 +40,12 @@ define host{ - ############################################################################### - ############################################################################### - --# 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 - } - - Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c (nonexistent) @@ -1,11 +0,0 @@ ---- lib/nsock.c.orig 2014-08-12 15:00:01 UTC -+++ lib/nsock.c -@@ -81,7 +81,7 @@ int nsock_unix(const char *path, unsigne - if(flags & NSOCK_UDP) - return sock; - -- if(listen(sock, 3) < 0) { -+ if(listen(sock, 48) < 0) { - close(sock); - return NSOCK_ELISTEN; - } Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in (nonexistent) @@ -1,11 +0,0 @@ ---- include/locations.h.in.orig 2014-08-12 15:00:01 UTC -+++ include/locations.h.in -@@ -19,7 +19,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/" Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in (nonexistent) @@ -1,11 +0,0 @@ ---- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01 UTC -+++ sample-config/nagios.cfg.in -@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c - 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 Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in (nonexistent) @@ -1,26 +0,0 @@ ---- sample-config/template-object/templates.cfg.in.orig 2014-08-12 15:00:01 UTC -+++ sample-config/template-object/templates.cfg.in -@@ -61,17 +61,17 @@ define host{ - } - - --# 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 Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php (nonexistent) @@ -1,11 +0,0 @@ ---- html/index.php.orig 2015-08-19 21:49:52 UTC -+++ html/index.php -@@ -1,6 +1,7 @@ - >confdefs.h <<_ACEOF +@@ -4721,7 +4721,6 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF -INSTALL_OPTS="-o $nagios_user -g $nagios_grp" -@@ -6037,7 +6036,6 @@ fi +@@ -4742,7 +4741,6 @@ fi -COMMAND_OPTS="-o $command_user -g $command_grp" MAIL_PROG=no -@@ -7768,7 +7766,7 @@ $as_echo_n "checking for linker flags fo +@@ -5643,7 +5641,7 @@ $as_echo_n "checking for linker flags fo MOD_LDFLAGS="-shared" MOD_CFLAGS="-fPIC" ;; - freebsd*) + dragonfly*|freebsd*) MOD_LDFLAGS="-shared" MOD_CFLAGS="-fPIC" ;; Index: branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in (revision 420611) @@ -0,0 +1,14 @@ +--- html/Makefile.in.orig 2016-08-01 15:46:23 UTC ++++ html/Makefile.in +@@ -45,11 +45,8 @@ 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)/js + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php (revision 420611) @@ -0,0 +1,11 @@ +--- html/index.php.orig 2016-08-01 15:46:23 UTC ++++ html/index.php +@@ -1,6 +1,7 @@ + Nagios® Core™ +
Version
+
August 01, 2016
+-
Check for updates
+- +- +- +-
+- +-
+-
Warning: Automatic Update Checks are Disabled!
+-
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
+-
+- +-
+-
A new version of Nagios Core is available!
+-
Visit nagios.org to download Nagios .
+-
+- +
+ + Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-html_main.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in (revision 420611) @@ -0,0 +1,11 @@ +--- include/locations.h.in.orig 2016-08-01 15:46:23 UTC ++++ include/locations.h.in +@@ -19,7 +19,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/" Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c (revision 420611) @@ -0,0 +1,11 @@ +--- lib/runcmd.c.orig 2016-08-01 15:46:23 UTC ++++ lib/runcmd.c +@@ -36,7 +36,7 @@ + #endif + + /* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */ +-#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 ++#if defined(__DragonFly__) || __FreeBSD__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 + # define HAVE_SETENV + #endif + Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (revision 420611) @@ -0,0 +1,11 @@ +--- sample-config/cgi.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/cgi.cfg.in +@@ -277,7 +277,7 @@ default_statuswrl_layout=4 + # 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$ + + + Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (revision 420611) @@ -0,0 +1,11 @@ +--- sample-config/nagios.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/nagios.cfg.in +@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c + 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 Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (revision 420611) @@ -0,0 +1,40 @@ +--- sample-config/template-object/localhost.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/template-object/localhost.cfg.in +@@ -4,7 +4,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. + # + ############################################################################### + +@@ -22,9 +22,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 +@@ -40,12 +40,12 @@ define host{ + ############################################################################### + ############################################################################### + +-# 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 + } + + Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in =================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (nonexistent) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (revision 420611) @@ -0,0 +1,26 @@ +--- sample-config/template-object/templates.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/template-object/templates.cfg.in +@@ -61,17 +61,17 @@ define host{ + } + + +-# 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 Property changes on: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/net-mgmt/nagios4/pkg-plist =================================================================== --- branches/2016Q3/net-mgmt/nagios4/pkg-plist (revision 420610) +++ branches/2016Q3/net-mgmt/nagios4/pkg-plist (revision 420611) @@ -1,433 +1,439 @@ @(,%%NAGIOSGROUP%%,755) bin/nagios @(,%%NAGIOSGROUP%%,755) bin/nagiostats %%ETCDIR%%/cgi.cfg-sample %%ETCDIR%%/nagios.cfg-sample %%ETCDIR%%/objects/commands.cfg-sample %%ETCDIR%%/objects/contacts.cfg-sample %%ETCDIR%%/objects/localhost.cfg-sample %%ETCDIR%%/objects/printer.cfg-sample %%ETCDIR%%/objects/switch.cfg-sample %%ETCDIR%%/objects/templates.cfg-sample %%ETCDIR%%/objects/timeperiods.cfg-sample %%ETCDIR%%/objects/windows.cfg-sample %%ETCDIR%%/resource.cfg-sample %%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js %%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js.map %%WWWDIR%%/angularjs/ui-bootstrap-tpls-0.12.0.min.js %%WWWDIR%%/angularjs/ui-utils-0.2.1/ui-utils.js %%WWWDIR%%/bootstrap-3.3.0/css/bootstrap-theme.min.css %%WWWDIR%%/bootstrap-3.3.0/css/bootstrap.min.css %%WWWDIR%%/cgi-bin/archivejson.cgi %%WWWDIR%%/cgi-bin/avail.cgi %%WWWDIR%%/cgi-bin/cmd.cgi %%WWWDIR%%/cgi-bin/config.cgi %%WWWDIR%%/cgi-bin/extinfo.cgi %%WWWDIR%%/cgi-bin/histogram.cgi %%WWWDIR%%/cgi-bin/history.cgi %%WWWDIR%%/cgi-bin/notifications.cgi %%WWWDIR%%/cgi-bin/objectjson.cgi %%WWWDIR%%/cgi-bin/outages.cgi %%WWWDIR%%/cgi-bin/showlog.cgi %%WWWDIR%%/cgi-bin/status.cgi %%WWWDIR%%/cgi-bin/statusjson.cgi %%WWWDIR%%/cgi-bin/statusmap.cgi %%WWWDIR%%/cgi-bin/statuswml.cgi %%WWWDIR%%/cgi-bin/summary.cgi %%WWWDIR%%/cgi-bin/tac.cgi %%WWWDIR%%/cgi-bin/trends.cgi @sample %%WWWDIR%%/config.inc.php.sample %%WWWDIR%%/contexthelp/A1.html %%WWWDIR%%/contexthelp/A2.html %%WWWDIR%%/contexthelp/A3.html %%WWWDIR%%/contexthelp/A4.html %%WWWDIR%%/contexthelp/A5.html %%WWWDIR%%/contexthelp/A6.html %%WWWDIR%%/contexthelp/A7.html %%WWWDIR%%/contexthelp/B1.html %%WWWDIR%%/contexthelp/C1.html %%WWWDIR%%/contexthelp/D1.html %%WWWDIR%%/contexthelp/E1.html %%WWWDIR%%/contexthelp/F1.html %%WWWDIR%%/contexthelp/G1.html %%WWWDIR%%/contexthelp/G2.html %%WWWDIR%%/contexthelp/G3.html %%WWWDIR%%/contexthelp/G4.html %%WWWDIR%%/contexthelp/G5.html %%WWWDIR%%/contexthelp/G6.html %%WWWDIR%%/contexthelp/H1.html %%WWWDIR%%/contexthelp/H2.html %%WWWDIR%%/contexthelp/H3.html %%WWWDIR%%/contexthelp/H4.html %%WWWDIR%%/contexthelp/H5.html %%WWWDIR%%/contexthelp/H6.html %%WWWDIR%%/contexthelp/H7.html %%WWWDIR%%/contexthelp/H8.html %%WWWDIR%%/contexthelp/I1.html %%WWWDIR%%/contexthelp/I2.html %%WWWDIR%%/contexthelp/I3.html %%WWWDIR%%/contexthelp/I4.html %%WWWDIR%%/contexthelp/I5.html %%WWWDIR%%/contexthelp/I6.html %%WWWDIR%%/contexthelp/I7.html %%WWWDIR%%/contexthelp/I8.html %%WWWDIR%%/contexthelp/I9.html %%WWWDIR%%/contexthelp/J1.html %%WWWDIR%%/contexthelp/K1.html %%WWWDIR%%/contexthelp/L1.html %%WWWDIR%%/contexthelp/L10.html %%WWWDIR%%/contexthelp/L11.html %%WWWDIR%%/contexthelp/L12.html %%WWWDIR%%/contexthelp/L13.html %%WWWDIR%%/contexthelp/L2.html %%WWWDIR%%/contexthelp/L3.html %%WWWDIR%%/contexthelp/L4.html %%WWWDIR%%/contexthelp/L5.html %%WWWDIR%%/contexthelp/L6.html %%WWWDIR%%/contexthelp/L7.html %%WWWDIR%%/contexthelp/L8.html %%WWWDIR%%/contexthelp/L9.html %%WWWDIR%%/contexthelp/M1.html %%WWWDIR%%/contexthelp/M2.html %%WWWDIR%%/contexthelp/M3.html %%WWWDIR%%/contexthelp/M4.html %%WWWDIR%%/contexthelp/M5.html %%WWWDIR%%/contexthelp/M6.html %%WWWDIR%%/contexthelp/N1.html %%WWWDIR%%/contexthelp/N2.html %%WWWDIR%%/contexthelp/N3.html %%WWWDIR%%/contexthelp/N4.html %%WWWDIR%%/contexthelp/N5.html %%WWWDIR%%/contexthelp/N6.html %%WWWDIR%%/contexthelp/N7.html %%WWWDIR%%/d3/d3.min.js %%WWWDIR%%/graph-header.html %%WWWDIR%%/histogram-form.html %%WWWDIR%%/histogram-graph.html %%WWWDIR%%/histogram-links.html %%WWWDIR%%/histogram.html %%WWWDIR%%/images/Nagios-clearbg.png %%WWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png %%WWWDIR%%/images/ack.gif %%WWWDIR%%/images/action-graph.gif %%WWWDIR%%/images/action-nagios.gif %%WWWDIR%%/images/action-orig.gif %%WWWDIR%%/images/action.gif %%WWWDIR%%/images/b_first2.png %%WWWDIR%%/images/b_last2.png %%WWWDIR%%/images/b_next2.png %%WWWDIR%%/images/b_prev2.png %%WWWDIR%%/images/command.png %%WWWDIR%%/images/comment.gif %%WWWDIR%%/images/contexthelp1.gif %%WWWDIR%%/images/contexthelp2.gif %%WWWDIR%%/images/critical.png %%WWWDIR%%/images/delay.gif %%WWWDIR%%/images/delete.gif %%WWWDIR%%/images/detail.gif %%WWWDIR%%/images/disabled.gif %%WWWDIR%%/images/down.gif %%WWWDIR%%/images/downtime.gif %%WWWDIR%%/images/empty.gif %%WWWDIR%%/images/enabled.gif %%WWWDIR%%/images/extinfo.gif %%WWWDIR%%/images/favicon.ico %%WWWDIR%%/images/flapping.gif %%WWWDIR%%/images/globe-support-150x150.png %%WWWDIR%%/images/graph.gif %%WWWDIR%%/images/greendot.gif %%WWWDIR%%/images/histogram.png %%WWWDIR%%/images/history.gif %%WWWDIR%%/images/hostevent.gif %%WWWDIR%%/images/info.png %%WWWDIR%%/images/left.gif %%WWWDIR%%/images/logofullsize.png %%WWWDIR%%/images/logos/aix.gd2 %%WWWDIR%%/images/logos/aix.gif %%WWWDIR%%/images/logos/aix.jpg %%WWWDIR%%/images/logos/aix.png %%WWWDIR%%/images/logos/amiga.gd2 %%WWWDIR%%/images/logos/amiga.gif %%WWWDIR%%/images/logos/amiga.jpg %%WWWDIR%%/images/logos/amiga.png %%WWWDIR%%/images/logos/apple.gd2 %%WWWDIR%%/images/logos/apple.gif %%WWWDIR%%/images/logos/apple.jpg %%WWWDIR%%/images/logos/apple.png %%WWWDIR%%/images/logos/beos.gd2 %%WWWDIR%%/images/logos/beos.gif %%WWWDIR%%/images/logos/beos.jpg %%WWWDIR%%/images/logos/beos.png %%WWWDIR%%/images/logos/bluetooth.png %%WWWDIR%%/images/logos/caldera.gd2 %%WWWDIR%%/images/logos/caldera.gif %%WWWDIR%%/images/logos/caldera.jpg %%WWWDIR%%/images/logos/caldera.png %%WWWDIR%%/images/logos/cat1900.gd2 %%WWWDIR%%/images/logos/cat2900.gd2 %%WWWDIR%%/images/logos/cat5000.gd2 %%WWWDIR%%/images/logos/database.gd2 %%WWWDIR%%/images/logos/database.gif %%WWWDIR%%/images/logos/debian.gd2 %%WWWDIR%%/images/logos/debian.gif %%WWWDIR%%/images/logos/debian.jpg %%WWWDIR%%/images/logos/debian.png %%WWWDIR%%/images/logos/desktop-server.gd2 %%WWWDIR%%/images/logos/desktop-server.gif %%WWWDIR%%/images/logos/ethernet_card.png %%WWWDIR%%/images/logos/fax.gd2 %%WWWDIR%%/images/logos/fax.gif %%WWWDIR%%/images/logos/firewall.gd2 %%WWWDIR%%/images/logos/firewall.gif %%WWWDIR%%/images/logos/freebsd40.gd2 %%WWWDIR%%/images/logos/freebsd40.gif %%WWWDIR%%/images/logos/freebsd40.jpg %%WWWDIR%%/images/logos/freebsd40.png %%WWWDIR%%/images/logos/globe.png %%WWWDIR%%/images/logos/graph.gif %%WWWDIR%%/images/logos/hp-printer40.gd2 %%WWWDIR%%/images/logos/hp-printer40.gif %%WWWDIR%%/images/logos/hp-printer40.jpg %%WWWDIR%%/images/logos/hp-printer40.png %%WWWDIR%%/images/logos/hpux.gd2 %%WWWDIR%%/images/logos/hpux.gif %%WWWDIR%%/images/logos/hpux.jpg %%WWWDIR%%/images/logos/hpux.png %%WWWDIR%%/images/logos/hub.gd2 %%WWWDIR%%/images/logos/hub.gif %%WWWDIR%%/images/logos/internet.gd2 %%WWWDIR%%/images/logos/internet.gif %%WWWDIR%%/images/logos/internet_device.png %%WWWDIR%%/images/logos/ip-pbx.gd2 %%WWWDIR%%/images/logos/ip-pbx.gif %%WWWDIR%%/images/logos/irix.gd2 %%WWWDIR%%/images/logos/irix.gif %%WWWDIR%%/images/logos/irix.jpg %%WWWDIR%%/images/logos/irix.png %%WWWDIR%%/images/logos/linux40.gd2 %%WWWDIR%%/images/logos/linux40.gif %%WWWDIR%%/images/logos/linux40.jpg %%WWWDIR%%/images/logos/linux40.png %%WWWDIR%%/images/logos/logo.gd2 %%WWWDIR%%/images/logos/mac40.gd2 %%WWWDIR%%/images/logos/mac40.gif %%WWWDIR%%/images/logos/mac40.jpg %%WWWDIR%%/images/logos/mac40.png %%WWWDIR%%/images/logos/mainframe.gd2 %%WWWDIR%%/images/logos/mainframe.gif %%WWWDIR%%/images/logos/mandrake.gd2 %%WWWDIR%%/images/logos/mandrake.gif %%WWWDIR%%/images/logos/mandrake.jpg %%WWWDIR%%/images/logos/mandrake.png %%WWWDIR%%/images/logos/monitor.png %%WWWDIR%%/images/logos/nagios.gd2 %%WWWDIR%%/images/logos/nagios.gif %%WWWDIR%%/images/logos/nagiosvrml.png +%%WWWDIR%%/images/logos/netbsd.gif +%%WWWDIR%%/images/logos/netbsd.jpg +%%WWWDIR%%/images/logos/netbsd.png %%WWWDIR%%/images/logos/next.gd2 %%WWWDIR%%/images/logos/next.gif %%WWWDIR%%/images/logos/next.jpg %%WWWDIR%%/images/logos/next.png %%WWWDIR%%/images/logos/ng-switch40.gd2 %%WWWDIR%%/images/logos/ng-switch40.gif %%WWWDIR%%/images/logos/ng-switch40.jpg %%WWWDIR%%/images/logos/ng-switch40.png %%WWWDIR%%/images/logos/notebook.gd2 %%WWWDIR%%/images/logos/notebook.gif %%WWWDIR%%/images/logos/novell40.gd2 %%WWWDIR%%/images/logos/novell40.gif %%WWWDIR%%/images/logos/novell40.jpg %%WWWDIR%%/images/logos/novell40.png %%WWWDIR%%/images/logos/openbsd.gd2 %%WWWDIR%%/images/logos/openbsd.gif %%WWWDIR%%/images/logos/openbsd.jpg %%WWWDIR%%/images/logos/openbsd.png %%WWWDIR%%/images/logos/printer.gd2 %%WWWDIR%%/images/logos/printer.gif %%WWWDIR%%/images/logos/rack-server.gd2 %%WWWDIR%%/images/logos/rack-server.gif %%WWWDIR%%/images/logos/redhat.gd2 %%WWWDIR%%/images/logos/redhat.gif %%WWWDIR%%/images/logos/redhat.jpg %%WWWDIR%%/images/logos/redhat.png %%WWWDIR%%/images/logos/router.gd2 %%WWWDIR%%/images/logos/router.gif %%WWWDIR%%/images/logos/router40.gd2 %%WWWDIR%%/images/logos/router40.gif %%WWWDIR%%/images/logos/router40.jpg %%WWWDIR%%/images/logos/router40.png %%WWWDIR%%/images/logos/san.gd2 %%WWWDIR%%/images/logos/san.gif %%WWWDIR%%/images/logos/satellite.png %%WWWDIR%%/images/logos/server.png %%WWWDIR%%/images/logos/signal.png %%WWWDIR%%/images/logos/slackware.gd2 %%WWWDIR%%/images/logos/slackware.gif %%WWWDIR%%/images/logos/slackware.jpg %%WWWDIR%%/images/logos/slackware.png %%WWWDIR%%/images/logos/stampede.gd2 %%WWWDIR%%/images/logos/stampede.gif %%WWWDIR%%/images/logos/stampede.jpg %%WWWDIR%%/images/logos/stampede.png %%WWWDIR%%/images/logos/station.gd2 %%WWWDIR%%/images/logos/storm.gd2 %%WWWDIR%%/images/logos/storm.gif %%WWWDIR%%/images/logos/storm.jpg %%WWWDIR%%/images/logos/storm.png %%WWWDIR%%/images/logos/sun40.gd2 %%WWWDIR%%/images/logos/sun40.gif %%WWWDIR%%/images/logos/sun40.jpg %%WWWDIR%%/images/logos/sun40.png %%WWWDIR%%/images/logos/sunlogo.gd2 %%WWWDIR%%/images/logos/sunlogo.gif %%WWWDIR%%/images/logos/sunlogo.jpg %%WWWDIR%%/images/logos/sunlogo.png +%%WWWDIR%%/images/logos/suse.gif +%%WWWDIR%%/images/logos/suse.jpg +%%WWWDIR%%/images/logos/suse.png %%WWWDIR%%/images/logos/switch.gd2 %%WWWDIR%%/images/logos/switch.gif %%WWWDIR%%/images/logos/switch40.gd2 %%WWWDIR%%/images/logos/switch40.gif %%WWWDIR%%/images/logos/switch40.jpg %%WWWDIR%%/images/logos/switch40.png %%WWWDIR%%/images/logos/thin-client.gd2 %%WWWDIR%%/images/logos/thin-client.gif %%WWWDIR%%/images/logos/turbolinux.gd2 %%WWWDIR%%/images/logos/turbolinux.gif %%WWWDIR%%/images/logos/turbolinux.jpg %%WWWDIR%%/images/logos/turbolinux.png %%WWWDIR%%/images/logos/ultrapenguin.gd2 %%WWWDIR%%/images/logos/ultrapenguin.gif %%WWWDIR%%/images/logos/ultrapenguin.jpg %%WWWDIR%%/images/logos/ultrapenguin.png %%WWWDIR%%/images/logos/unicos.gd2 %%WWWDIR%%/images/logos/unicos.gif %%WWWDIR%%/images/logos/unicos.jpg %%WWWDIR%%/images/logos/unicos.png %%WWWDIR%%/images/logos/unknown.gd2 %%WWWDIR%%/images/logos/unknown.gif %%WWWDIR%%/images/logos/webcamera.png %%WWWDIR%%/images/logos/wifi.gd2 %%WWWDIR%%/images/logos/wifi.gif %%WWWDIR%%/images/logos/wifi_modem.png %%WWWDIR%%/images/logos/win40.gd2 %%WWWDIR%%/images/logos/win40.gif %%WWWDIR%%/images/logos/win40.jpg %%WWWDIR%%/images/logos/win40.png %%WWWDIR%%/images/logos/workstation.gd2 %%WWWDIR%%/images/logos/workstation.gif %%WWWDIR%%/images/logos/workstation.png %%WWWDIR%%/images/logos/workstation_locked.png %%WWWDIR%%/images/logos/yellowdog.gd2 %%WWWDIR%%/images/logos/yellowdog.gif %%WWWDIR%%/images/logos/yellowdog.jpg %%WWWDIR%%/images/logos/yellowdog.png %%WWWDIR%%/images/logrotate.png %%WWWDIR%%/images/menu.png %%WWWDIR%%/images/ndisabled.gif %%WWWDIR%%/images/noack.gif %%WWWDIR%%/images/notes.gif %%WWWDIR%%/images/notify.gif %%WWWDIR%%/images/orangedot.gif %%WWWDIR%%/images/passiveonly.gif %%WWWDIR%%/images/recovery.png %%WWWDIR%%/images/redudancy.png %%WWWDIR%%/images/redundancy.png %%WWWDIR%%/images/restart.gif %%WWWDIR%%/images/right.gif %%WWWDIR%%/images/sblogo.png %%WWWDIR%%/images/serviceevent.gif %%WWWDIR%%/images/sflogo.png %%WWWDIR%%/images/splunk1.gif %%WWWDIR%%/images/splunk2.gif %%WWWDIR%%/images/start.gif %%WWWDIR%%/images/status.gif %%WWWDIR%%/images/status2.gif %%WWWDIR%%/images/status3.gif %%WWWDIR%%/images/status4.gif %%WWWDIR%%/images/stop.gif %%WWWDIR%%/images/tacdisabled.jpg %%WWWDIR%%/images/tacdisabled.png %%WWWDIR%%/images/tacenabled.jpg %%WWWDIR%%/images/tacenabled.png %%WWWDIR%%/images/thermcrit.png %%WWWDIR%%/images/thermok.png %%WWWDIR%%/images/thermwarn.png %%WWWDIR%%/images/trends.gif %%WWWDIR%%/images/trendshost.png %%WWWDIR%%/images/trendssvc.png %%WWWDIR%%/images/unknown.png %%WWWDIR%%/images/up.gif %%WWWDIR%%/images/warning.png %%WWWDIR%%/images/weblogo1.png %%WWWDIR%%/images/zoom1.gif %%WWWDIR%%/images/zoom2.gif %%WWWDIR%%/includes/jquery-1.7.1.min.js %%WWWDIR%%/includes/rss/extlib/Snoopy.class.inc %%WWWDIR%%/includes/rss/rss_cache.inc %%WWWDIR%%/includes/rss/rss_fetch.inc %%WWWDIR%%/includes/rss/rss_parse.inc %%WWWDIR%%/includes/rss/rss_utils.inc %%WWWDIR%%/includes/utils.inc.php %%WWWDIR%%/index.php %%WWWDIR%%/infobox.html %%WWWDIR%%/js/%%NAGIOSUSER%%-decorations.js %%WWWDIR%%/js/%%NAGIOSUSER%%-time.js %%WWWDIR%%/js/histogram-events.js %%WWWDIR%%/js/histogram-form.js %%WWWDIR%%/js/histogram-graph.js %%WWWDIR%%/js/histogram.js %%WWWDIR%%/js/jquery-1.7.1.min.js %%WWWDIR%%/js/jsonquery.js %%WWWDIR%%/js/map-directive.js %%WWWDIR%%/js/map-form.js %%WWWDIR%%/js/map.js %%WWWDIR%%/js/trends-form.js %%WWWDIR%%/js/trends-graph.js %%WWWDIR%%/js/trends.js %%WWWDIR%%/jsonquery.html %%WWWDIR%%/main.php %%WWWDIR%%/map-directive.html %%WWWDIR%%/map-form.html %%WWWDIR%%/map-links.html %%WWWDIR%%/map-popup.html -%%WWWDIR%%/map.html +%%WWWDIR%%/map.php %%WWWDIR%%/robots.txt %%WWWDIR%%/rss-corebanner.php %%WWWDIR%%/rss-corefeed.html %%WWWDIR%%/rss-corefeed.php %%WWWDIR%%/rss-newsfeed.html %%WWWDIR%%/rss-newsfeed.php %%WWWDIR%%/side.php %%WWWDIR%%/spin/spin.min.js %%WWWDIR%%/stylesheets/avail.css %%WWWDIR%%/stylesheets/checksanity.css %%WWWDIR%%/stylesheets/cmd.css %%WWWDIR%%/stylesheets/common.css %%WWWDIR%%/stylesheets/config.css %%WWWDIR%%/stylesheets/extinfo.css %%WWWDIR%%/stylesheets/histogram.css %%WWWDIR%%/stylesheets/histogramgraph.css %%WWWDIR%%/stylesheets/history.css %%WWWDIR%%/stylesheets/jsonquery.css %%WWWDIR%%/stylesheets/map-directive.css %%WWWDIR%%/stylesheets/map.css %%WWWDIR%%/stylesheets/ministatus.css %%WWWDIR%%/stylesheets/notifications.css %%WWWDIR%%/stylesheets/outages.css %%WWWDIR%%/stylesheets/showlog.css %%WWWDIR%%/stylesheets/status.css %%WWWDIR%%/stylesheets/statusmap.css %%WWWDIR%%/stylesheets/summary.css %%WWWDIR%%/stylesheets/tac.css %%WWWDIR%%/stylesheets/trends.css %%WWWDIR%%/stylesheets/trendsgraph.css %%WWWDIR%%/trends-form.html %%WWWDIR%%/trends-graph.html %%WWWDIR%%/trends-host-yaxis.html %%WWWDIR%%/trends-links.html %%WWWDIR%%/trends-service-yaxis.html %%WWWDIR%%/trends.html @dir %%WWWDIR%%/ssi @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%% -@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi -@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi +@postunexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi +@postunexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 420610) +++ branches/2016Q3 (revision 420611) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r420608