svn commit: r420608 - in head/net-mgmt/nagios4: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Aug 22 13:14:19 UTC 2016
Author: mat
Date: Mon Aug 22 13:14:17 2016
New Revision: 420608
URL: https://svnweb.freebsd.org/changeset/ports/420608
Log:
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
Added:
head/net-mgmt/nagios4/files/patch-html_Makefile.in (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-html__Makefile.in
head/net-mgmt/nagios4/files/patch-html_index.php (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-html__index.php
head/net-mgmt/nagios4/files/patch-html_main.php (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-html__main.php
head/net-mgmt/nagios4/files/patch-include_locations.h.in (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-include__locations.h.in
head/net-mgmt/nagios4/files/patch-lib_runcmd.c (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-lib__runcmd.c
head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (contents, props changed)
- copied, changed from r420606, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
Deleted:
head/net-mgmt/nagios4/files/patch-html__Makefile.in
head/net-mgmt/nagios4/files/patch-html__index.php
head/net-mgmt/nagios4/files/patch-html__main.php
head/net-mgmt/nagios4/files/patch-include__locations.h.in
head/net-mgmt/nagios4/files/patch-lib__runcmd.c
head/net-mgmt/nagios4/files/patch-lib_iobroker.c
head/net-mgmt/nagios4/files/patch-lib_nsock.c
head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
Modified:
head/net-mgmt/nagios4/Makefile (contents, props changed)
head/net-mgmt/nagios4/distinfo (contents, props changed)
head/net-mgmt/nagios4/files/patch-configure (contents, props changed)
head/net-mgmt/nagios4/pkg-plist (contents, props changed)
Modified: head/net-mgmt/nagios4/Makefile
==============================================================================
--- head/net-mgmt/nagios4/Makefile Mon Aug 22 13:12:19 2016 (r420607)
+++ head/net-mgmt/nagios4/Makefile Mon Aug 22 13:14:17 2016 (r420608)
@@ -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
Modified: head/net-mgmt/nagios4/distinfo
==============================================================================
--- head/net-mgmt/nagios4/distinfo Mon Aug 22 13:12:19 2016 (r420607)
+++ head/net-mgmt/nagios4/distinfo Mon Aug 22 13:14:17 2016 (r420608)
@@ -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
Modified: head/net-mgmt/nagios4/files/patch-configure
==============================================================================
--- head/net-mgmt/nagios4/files/patch-configure Mon Aug 22 13:12:19 2016 (r420607)
+++ head/net-mgmt/nagios4/files/patch-configure Mon Aug 22 13:14:17 2016 (r420608)
@@ -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"
;;
Copied and modified: head/net-mgmt/nagios4/files/patch-html_Makefile.in (from r420606, head/net-mgmt/nagios4/files/patch-html__Makefile.in)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-html__Makefile.in Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-html_Makefile.in Mon Aug 22 13:14:17 2016 (r420608)
@@ -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
Copied and modified: head/net-mgmt/nagios4/files/patch-html_index.php (from r420606, head/net-mgmt/nagios4/files/patch-html__index.php)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-html__index.php Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-html_index.php Mon Aug 22 13:14:17 2016 (r420608)
@@ -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...
Copied and modified: head/net-mgmt/nagios4/files/patch-html_main.php (from r420606, head/net-mgmt/nagios4/files/patch-html__main.php)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-html__main.php Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-html_main.php Mon Aug 22 13:14:17 2016 (r420608)
@@ -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;">®</span></sup> Core<sup><span style="font-size: small;">™</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; ?>&product=nagioscore" target="_blank">Check for updates</a></div>
-</div>
-
Copied and modified: head/net-mgmt/nagios4/files/patch-include_locations.h.in (from r420606, head/net-mgmt/nagios4/files/patch-include__locations.h.in)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-include__locations.h.in Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-include_locations.h.in Mon Aug 22 13:14:17 2016 (r420608)
@@ -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 @@
Copied and modified: head/net-mgmt/nagios4/files/patch-lib_runcmd.c (from r420606, head/net-mgmt/nagios4/files/patch-lib__runcmd.c)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-lib__runcmd.c Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-lib_runcmd.c Mon Aug 22 13:14:17 2016 (r420608)
@@ -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
Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (from r420606, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in Mon Aug 22 13:14:17 2016 (r420608)
@@ -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.
Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (from r420606, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in Mon Aug 22 13:14:17 2016 (r420608)
@@ -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
Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (from r420606, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in Mon Aug 22 13:14:17 2016 (r420608)
@@ -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 @@
#
Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (from r420606, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in)
==============================================================================
--- head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in Mon Aug 22 12:20:59 2016 (r420606, copy source)
+++ head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in Mon Aug 22 13:14:17 2016 (r420608)
@@ -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{
}
Modified: head/net-mgmt/nagios4/pkg-plist
==============================================================================
--- head/net-mgmt/nagios4/pkg-plist Mon Aug 22 13:12:19 2016 (r420607)
+++ head/net-mgmt/nagios4/pkg-plist Mon Aug 22 13:14:17 2016 (r420608)
@@ -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%%
- at 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
- at 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
+ at 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
+ at 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
More information about the svn-ports-all
mailing list