Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Aug 2016 14:43:27 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r420685 - in branches/2016Q3/net-mgmt/nagios4: . files
Message-ID:  <201608231443.u7NEhRMe016303@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Aug 23 14:43:27 2016
New Revision: 420685
URL: https://svnweb.freebsd.org/changeset/ports/420685

Log:
  MFH: r420683
  
  Revert the update to 4.2.
  
  It currently exits with a bus error, which is, not good.
  
  Reported by:	many
  Sponsored by:	Absolight

Added:
  branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-html__Makefile.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-html__index.php
  branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-html__main.php
  branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-include__locations.h.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-lib__runcmd.c
  branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-lib_iobroker.c
  branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-lib_nsock.c
  branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
     - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
Deleted:
  branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php
  branches/2016Q3/net-mgmt/nagios4/files/patch-html_main.php
  branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c
  branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in
  branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in
  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_templates.cfg.in
Modified:
  branches/2016Q3/net-mgmt/nagios4/Makefile
  branches/2016Q3/net-mgmt/nagios4/distinfo
  branches/2016Q3/net-mgmt/nagios4/files/patch-configure
  branches/2016Q3/net-mgmt/nagios4/pkg-plist
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/net-mgmt/nagios4/Makefile
==============================================================================
--- branches/2016Q3/net-mgmt/nagios4/Makefile	Tue Aug 23 14:42:02 2016	(r420684)
+++ branches/2016Q3/net-mgmt/nagios4/Makefile	Tue Aug 23 14:43:27 2016	(r420685)
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	nagios
-PORTVERSION=	4.2.0
-PORTREVISION=	0
+PORTVERSION=	4.1.1
+PORTREVISION=	4
+PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	4

Modified: branches/2016Q3/net-mgmt/nagios4/distinfo
==============================================================================
--- branches/2016Q3/net-mgmt/nagios4/distinfo	Tue Aug 23 14:42:02 2016	(r420684)
+++ branches/2016Q3/net-mgmt/nagios4/distinfo	Tue Aug 23 14:43:27 2016	(r420685)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471870658
-SHA256 (nagios-4.2.0.tar.gz) = 93be769854d7e64c526da29b79c92fb500a9795a82547a85ca0a9180a8f6725c
-SIZE (nagios-4.2.0.tar.gz) = 11155104
+TIMESTAMP = 1471962949
+SHA256 (nagios-4.1.1.tar.gz) = 58218e5e66c8078fc578a60db33b5c3da10fc6a793e97d2b00780517e3efa0a7
+SIZE (nagios-4.1.1.tar.gz) = 11142182

Modified: branches/2016Q3/net-mgmt/nagios4/files/patch-configure
==============================================================================
--- branches/2016Q3/net-mgmt/nagios4/files/patch-configure	Tue Aug 23 14:42:02 2016	(r420684)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-configure	Tue Aug 23 14:43:27 2016	(r420685)
@@ -1,6 +1,6 @@
---- configure.orig	2016-08-01 15:46:23 UTC
+--- configure.orig	2015-08-19 21:49:52 UTC
 +++ configure
-@@ -4721,7 +4721,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -6016,7 +6016,6 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
  
@@ -8,7 +8,7 @@
  
  
  
-@@ -4742,7 +4741,6 @@ fi
+@@ -6037,7 +6036,6 @@ fi
  
  
  
@@ -16,7 +16,7 @@
  
  
  MAIL_PROG=no
-@@ -5643,7 +5641,7 @@ $as_echo_n "checking for linker flags fo
+@@ -7768,7 +7766,7 @@ $as_echo_n "checking for linker flags fo
  			MOD_LDFLAGS="-shared"
  			MOD_CFLAGS="-fPIC"
  		;;

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in (from r420683, head/net-mgmt/nagios4/files/patch-html__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-html__Makefile.in)
@@ -0,0 +1,14 @@
+--- 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

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php (from r420683, head/net-mgmt/nagios4/files/patch-html__index.php)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-html__index.php)
@@ -0,0 +1,11 @@
+--- html/index.php.orig	2015-08-19 21:49:52 UTC
++++ html/index.php
+@@ -1,6 +1,7 @@
+ <?php
++include_once(dirname(__FILE__).'/includes/utils.inc.php');
+ // Allow specifying main window URL for permalinks, etc.
+-$url = 'main.php';
++$url = $cfg['cgi_base_url'].'/tac.cgi';
+ if (isset($_GET['corewindow'])) {
+ 
+ 	// The default window url may have been overridden with a permalink...

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php (from r420683, head/net-mgmt/nagios4/files/patch-html__main.php)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-html__main.php)
@@ -0,0 +1,34 @@
+--- html/main.php.orig	2015-08-19 21:49:52 UTC
++++ html/main.php
+@@ -130,31 +130,6 @@ $this_year = '2015';
+ 	<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
+ 	<div class="version">Version <?php echo $this_version; ?></div>
+ 	<div class="releasedate">August 19, 2015</div>
+-	<div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
+-</div>
+-
+-
+-<div id="updateversioninfo">
+-<?php
+-	$updateinfo = get_update_information();
+-	if (!$updateinfo['update_checks_enabled']) {
+-?>
+-		<div class="updatechecksdisabled">
+-			<div class="warningmessage">Warning: Automatic Update Checks are Disabled!</div>
+-			<div class="submessage">Disabling update checks presents a possible security risk.  Visit <a href="https://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
+-		</div>
+-<?php
+-	} else if (
+-		$updateinfo['update_available'] && $this_version < $updateinfo['update_version']
+-	) {
+-?>
+-		<div class="updateavailable">
+-			<div class="updatemessage">A new version of Nagios Core is available!</div>
+-			<div class="submessage">Visit <a href="https://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>
+-		</div>
+-<?php
+-	}
+-?>
+ </div>
+ 
+ 

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in (from r420683, head/net-mgmt/nagios4/files/patch-include__locations.h.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-include__locations.h.in)
@@ -0,0 +1,11 @@
+--- 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/"

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c (from r420683, head/net-mgmt/nagios4/files/patch-lib__runcmd.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-lib__runcmd.c)
@@ -0,0 +1,11 @@
+--- 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
+ 

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c (from r420683, head/net-mgmt/nagios4/files/patch-lib_iobroker.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-lib_iobroker.c)
@@ -0,0 +1,16 @@
+--- 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;

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c (from r420683, head/net-mgmt/nagios4/files/patch-lib_nsock.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-lib_nsock.c)
@@ -0,0 +1,11 @@
+--- 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;
+ 	}

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in)
@@ -0,0 +1,11 @@
+--- 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$
+ 
+ 
+ 

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in)
@@ -0,0 +1,11 @@
+--- 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

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in)
@@ -0,0 +1,40 @@
+--- 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
+         }
+ 
+ 

Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in	Tue Aug 23 14:43:27 2016	(r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in)
@@ -0,0 +1,26 @@
+--- 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

Modified: branches/2016Q3/net-mgmt/nagios4/pkg-plist
==============================================================================
--- branches/2016Q3/net-mgmt/nagios4/pkg-plist	Tue Aug 23 14:42:02 2016	(r420684)
+++ branches/2016Q3/net-mgmt/nagios4/pkg-plist	Tue Aug 23 14:43:27 2016	(r420685)
@@ -222,9 +222,6 @@
 %%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
@@ -283,9 +280,6 @@
 %%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
@@ -393,7 +387,7 @@
 %%WWWDIR%%/map-form.html
 %%WWWDIR%%/map-links.html
 %%WWWDIR%%/map-popup.html
-%%WWWDIR%%/map.php
+%%WWWDIR%%/map.html
 %%WWWDIR%%/robots.txt
 %%WWWDIR%%/rss-corebanner.php
 %%WWWDIR%%/rss-corefeed.html
@@ -435,5 +429,5 @@
 @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults
 @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw
 @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%
-@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
+@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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608231443.u7NEhRMe016303>