diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-08-22 13:14:17 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-08-22 13:14:17 +0000 |
commit | 679e730233dbc33aa52fb219153b93af4cdab9dd (patch) | |
tree | edb2c611dcf6e0a1ba120a4289f0e7029ff77ca5 /net-mgmt/nagios4/files | |
parent | www/py-splinter: update to 0.7.4 (diff) |
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
Diffstat (limited to 'net-mgmt/nagios4/files')
-rw-r--r-- | net-mgmt/nagios4/files/patch-configure | 8 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-html_Makefile.in (renamed from net-mgmt/nagios4/files/patch-html__Makefile.in) | 2 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-html_index.php (renamed from net-mgmt/nagios4/files/patch-html__index.php) | 4 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-html_main.php (renamed from net-mgmt/nagios4/files/patch-html__main.php) | 6 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-include_locations.h.in (renamed from net-mgmt/nagios4/files/patch-include__locations.h.in) | 2 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-lib_iobroker.c | 16 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-lib_nsock.c | 11 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-lib_runcmd.c (renamed from net-mgmt/nagios4/files/patch-lib__runcmd.c) | 2 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (renamed from net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in) | 4 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (renamed from net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in) | 2 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (renamed from net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in) | 2 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (renamed from net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in) | 2 |
12 files changed, 17 insertions, 44 deletions
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;">®</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> - 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{ } |