Date: Wed, 21 Dec 2016 11:12:59 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429068 - in head/net-mgmt/nagios4: . files Message-ID: <201612211112.uBLBCxr7012424@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Dec 21 11:12:59 2016 New Revision: 429068 URL: https://svnweb.freebsd.org/changeset/ports/429068 Log: Update to 4.2.4. Reported by: portscout Sponsored by: Absolight Added: head/net-mgmt/nagios4/files/patch-html_Makefile.in (contents, props changed) - copied, changed from r429067, head/net-mgmt/nagios4/files/patch-html__Makefile.in head/net-mgmt/nagios4/files/patch-html_index.php (contents, props changed) - copied, changed from r429067, head/net-mgmt/nagios4/files/patch-html__index.php head/net-mgmt/nagios4/files/patch-html_main.php (contents, props changed) - copied, changed from r429067, 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 r429067, 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 r429067, 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 r429067, 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 r429067, 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 r429067, 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 r429067, 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 Wed Dec 21 11:12:54 2016 (r429067) +++ head/net-mgmt/nagios4/Makefile Wed Dec 21 11:12:59 2016 (r429068) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.1.1 -PORTREVISION= 5 +PORTVERSION= 4.2.4 PORTEPOCH= 1 CATEGORIES= net-mgmt -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} +MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/ \ + SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 MAINTAINER= mat@FreeBSD.org Modified: head/net-mgmt/nagios4/distinfo ============================================================================== --- head/net-mgmt/nagios4/distinfo Wed Dec 21 11:12:54 2016 (r429067) +++ head/net-mgmt/nagios4/distinfo Wed Dec 21 11:12:59 2016 (r429068) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471962949 -SHA256 (nagios-4.1.1.tar.gz) = 58218e5e66c8078fc578a60db33b5c3da10fc6a793e97d2b00780517e3efa0a7 -SIZE (nagios-4.1.1.tar.gz) = 11142182 +TIMESTAMP = 1482317499 +SHA256 (nagios-4.2.4.tar.gz) = b0055c475683ce50d77b1536ff0cec9abf89139adecf771601fa021ef9a20b70 +SIZE (nagios-4.2.4.tar.gz) = 11088206 Modified: head/net-mgmt/nagios4/files/patch-configure ============================================================================== --- head/net-mgmt/nagios4/files/patch-configure Wed Dec 21 11:12:54 2016 (r429067) +++ head/net-mgmt/nagios4/files/patch-configure Wed Dec 21 11:12:59 2016 (r429068) @@ -1,6 +1,6 @@ ---- configure.orig 2015-08-19 21:49:52 UTC +--- configure.orig 2016-12-07 16:31:10 UTC +++ configure -@@ -6016,7 +6016,6 @@ cat >>confdefs.h <<_ACEOF +@@ -4769,7 +4769,6 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -8,7 +8,7 @@ -@@ -6037,7 +6036,6 @@ fi +@@ -4790,7 +4789,6 @@ fi @@ -16,12 +16,3 @@ MAIL_PROG=no -@@ -7768,7 +7766,7 @@ $as_echo_n "checking for linker flags fo - MOD_LDFLAGS="-shared" - MOD_CFLAGS="-fPIC" - ;; -- freebsd*) -+ dragonfly*|freebsd*) - MOD_LDFLAGS="-shared" - MOD_CFLAGS="-fPIC" - ;; Copied and modified: head/net-mgmt/nagios4/files/patch-html_Makefile.in (from r429067, head/net-mgmt/nagios4/files/patch-html__Makefile.in) ============================================================================== --- head/net-mgmt/nagios4/files/patch-html__Makefile.in Wed Dec 21 11:12:54 2016 (r429067, copy source) +++ head/net-mgmt/nagios4/files/patch-html_Makefile.in Wed Dec 21 11:12:59 2016 (r429068) @@ -1,4 +1,4 @@ ---- html/Makefile.in.orig 2015-08-19 21:49:52 UTC +--- html/Makefile.in.orig 2016-12-07 16:31:10 UTC +++ html/Makefile.in @@ -45,11 +45,8 @@ devclean: distclean Copied and modified: head/net-mgmt/nagios4/files/patch-html_index.php (from r429067, head/net-mgmt/nagios4/files/patch-html__index.php) ============================================================================== --- head/net-mgmt/nagios4/files/patch-html__index.php Wed Dec 21 11:12:54 2016 (r429067, copy source) +++ head/net-mgmt/nagios4/files/patch-html_index.php Wed Dec 21 11:12:59 2016 (r429068) @@ -1,4 +1,4 @@ ---- html/index.php.orig 2015-08-19 21:49:52 UTC +--- html/index.php.orig 2016-12-07 16:31:10 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 r429067, head/net-mgmt/nagios4/files/patch-html__main.php) ============================================================================== --- head/net-mgmt/nagios4/files/patch-html__main.php Wed Dec 21 11:12:54 2016 (r429067, copy source) +++ head/net-mgmt/nagios4/files/patch-html_main.php Wed Dec 21 11:12:59 2016 (r429068) @@ -1,9 +1,9 @@ ---- html/main.php.orig 2015-08-19 21:49:52 UTC +--- html/main.php.orig 2016-12-07 16:31:10 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">December 07, 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 r429067, head/net-mgmt/nagios4/files/patch-include__locations.h.in) ============================================================================== Copied and modified: head/net-mgmt/nagios4/files/patch-lib_runcmd.c (from r429067, head/net-mgmt/nagios4/files/patch-lib__runcmd.c) ============================================================================== Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (from r429067, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in) ============================================================================== --- head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in Wed Dec 21 11:12:54 2016 (r429067, copy source) +++ head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in Wed Dec 21 11:12:59 2016 (r429068) @@ -1,6 +1,6 @@ ---- sample-config/cgi.cfg.in.orig 2014-08-12 15:00:01 UTC +--- sample-config/cgi.cfg.in.orig 2016-12-07 16:31:10 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 r429067, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in) ============================================================================== Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (from r429067, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in) ============================================================================== Copied and modified: head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (from r429067, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in) ============================================================================== Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Wed Dec 21 11:12:54 2016 (r429067) +++ head/net-mgmt/nagios4/pkg-plist Wed Dec 21 11:12:59 2016 (r429068) @@ -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 @@ -358,17 +364,9 @@ %%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 @@ -378,6 +376,8 @@ %%WWWDIR%%/js/map-directive.js %%WWWDIR%%/js/map-form.js %%WWWDIR%%/js/map.js +%%WWWDIR%%/js/nagios-decorations.js +%%WWWDIR%%/js/nagios-time.js %%WWWDIR%%/js/trends-form.js %%WWWDIR%%/js/trends-graph.js %%WWWDIR%%/js/trends.js @@ -387,13 +387,8 @@ %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612211112.uBLBCxr7012424>