Update to 4.2.0.

MFH:		2016Q3
Security:	CVE-2008-4796
Security:	CVE-2013-4214
Changes:	https://github.com/NagiosEnterprises/nagioscore/blob/nagios-4.2.0/Changelog
Sponsored by:	Absolight

15 files changed, 31 insertions, 51 deletions

diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index 0273aea98478..1304cb5f5593 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,8 +2,8 @@
 # $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
diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo
index 6f8e9581f61e..fd59e2d967bb 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -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
diff --git a/net-mgmt/nagios4/files/patch-configure b/net-mgmt/nagios4/files/patch-configure
index 0c47ef81c0ff..a1fa27212641 100644
--- a/net-mgmt/nagios4/files/patch-configure
+++ b/net-mgmt/nagios4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-08-19 21:49:52 UTC
+--- configure.orig	2016-08-01 15:46:23 UTC
 +++ configure
-@@ -6016,7 +6016,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -4721,7 +4721,6 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
  
@@ -8,7 +8,7 @@
  
  
  
-@@ -6037,7 +6036,6 @@ fi
+@@ -4742,7 +4741,6 @@ fi
  
  
  
@@ -16,7 +16,7 @@
  
  
  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"
  		;;
diff --git a/net-mgmt/nagios4/files/patch-html__Makefile.in b/net-mgmt/nagios4/files/patch-html_Makefile.in
index 33f0176ed81f..9a2ce82d5c77 100644
--- a/net-mgmt/nagios4/files/patch-html__Makefile.in
+++ b/net-mgmt/nagios4/files/patch-html_Makefile.in
@@ -1,4 +1,4 @@
---- html/Makefile.in.orig	2015-08-19 21:49:52 UTC
+--- html/Makefile.in.orig	2016-08-01 15:46:23 UTC
 +++ html/Makefile.in
 @@ -45,11 +45,8 @@ devclean: distclean
  
diff --git a/net-mgmt/nagios4/files/patch-html__index.php b/net-mgmt/nagios4/files/patch-html_index.php
index 17d13bb30a26..a88115cd7c4c 100644
--- a/net-mgmt/nagios4/files/patch-html__index.php
+++ b/net-mgmt/nagios4/files/patch-html_index.php
@@ -1,4 +1,4 @@
---- html/index.php.orig	2015-08-19 21:49:52 UTC
+--- html/index.php.orig	2016-08-01 15:46:23 UTC
 +++ html/index.php
 @@ -1,6 +1,7 @@
  <?php
@@ -6,6 +6,6 @@
  // 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...
diff --git a/net-mgmt/nagios4/files/patch-html__main.php b/net-mgmt/nagios4/files/patch-html_main.php
index 5a538519f102..7133032bc3ac 100644
--- a/net-mgmt/nagios4/files/patch-html__main.php
+++ b/net-mgmt/nagios4/files/patch-html_main.php
@@ -1,9 +1,9 @@
---- html/main.php.orig	2015-08-19 21:49:52 UTC
+--- html/main.php.orig	2016-08-01 15:46:23 UTC
 +++ html/main.php
-@@ -130,31 +130,6 @@ $this_year = '2015';
+@@ -130,31 +130,6 @@ $this_year = '2016';
  	<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="releasedate">August 01, 2016</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>
 -
diff --git a/net-mgmt/nagios4/files/patch-include__locations.h.in b/net-mgmt/nagios4/files/patch-include_locations.h.in
index 424ab23adc63..e458c6287370 100644
--- a/net-mgmt/nagios4/files/patch-include__locations.h.in
+++ b/net-mgmt/nagios4/files/patch-include_locations.h.in
@@ -1,4 +1,4 @@
---- include/locations.h.in.orig	2014-08-12 15:00:01 UTC
+--- include/locations.h.in.orig	2016-08-01 15:46:23 UTC
 +++ include/locations.h.in
 @@ -19,7 +19,7 @@
  
diff --git a/net-mgmt/nagios4/files/patch-lib_iobroker.c b/net-mgmt/nagios4/files/patch-lib_iobroker.c
deleted file mode 100644
index 9c63a5050062..000000000000
--- a/net-mgmt/nagios4/files/patch-lib_iobroker.c
+++ /dev/null
@@ -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;
diff --git a/net-mgmt/nagios4/files/patch-lib_nsock.c b/net-mgmt/nagios4/files/patch-lib_nsock.c
deleted file mode 100644
index 24d0532373c7..000000000000
--- a/net-mgmt/nagios4/files/patch-lib_nsock.c
+++ /dev/null
@@ -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;
- 	}
diff --git a/net-mgmt/nagios4/files/patch-lib__runcmd.c b/net-mgmt/nagios4/files/patch-lib_runcmd.c
index 359d68b47c9b..9ed448ec265a 100644
--- a/net-mgmt/nagios4/files/patch-lib__runcmd.c
+++ b/net-mgmt/nagios4/files/patch-lib_runcmd.c
@@ -1,4 +1,4 @@
---- lib/runcmd.c.orig	2014-08-12 15:00:01 UTC
+--- lib/runcmd.c.orig	2016-08-01 15:46:23 UTC
 +++ lib/runcmd.c
 @@ -36,7 +36,7 @@
  #endif
diff --git a/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in b/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in
index 03a6dc83d6a9..b80f86760130 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in
@@ -1,6 +1,6 @@
---- sample-config/cgi.cfg.in.orig	2014-08-12 15:00:01 UTC
+--- sample-config/cgi.cfg.in.orig	2016-08-01 15:46:23 UTC
 +++ sample-config/cgi.cfg.in
-@@ -263,7 +263,7 @@ default_statuswrl_layout=4
+@@ -277,7 +277,7 @@ default_statuswrl_layout=4
  # OS and distribution, so you may have to tweak this to
  # work on your system.
  
diff --git a/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in b/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in
index 368a8cf19d40..8f310df0db56 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in
@@ -1,4 +1,4 @@
---- sample-config/nagios.cfg.in.orig	2014-08-12 15:00:01 UTC
+--- 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
diff --git a/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in b/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in
index 9fc52359ee4b..0f7c5ddb23c4 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in
@@ -1,4 +1,4 @@
---- sample-config/template-object/localhost.cfg.in.orig	2014-08-12 15:00:01 UTC
+--- 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 @@
  #
diff --git a/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in b/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in
index 99ec2be29418..89b0fe7d1dcc 100644
--- a/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
+++ b/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in
@@ -1,4 +1,4 @@
---- sample-config/template-object/templates.cfg.in.orig	2014-08-12 15:00:01 UTC
+--- 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{
          }
diff --git a/net-mgmt/nagios4/pkg-plist b/net-mgmt/nagios4/pkg-plist
index 2b443a5dbf0d..e32e89660d4c 100644
--- a/net-mgmt/nagios4/pkg-plist
+++ b/net-mgmt/nagios4/pkg-plist
@@ -222,6 +222,9 @@
 %%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
@@ -280,6 +283,9 @@
 %%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
@@ -387,7 +393,7 @@
 %%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
@@ -429,5 +435,5 @@
 @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