Date: Thu, 5 Jun 2014 15:24:51 +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: r356644 - in head/net-mgmt/nagios4: . files Message-ID: <201406051524.s55FOp90024060@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Jun 5 15:24:51 2014 New Revision: 356644 URL: http://svnweb.freebsd.org/changeset/ports/356644 QAT: https://qat.redports.org/buildarchive/r356644/ Log: Update to 4.0.7 Changelog: http://www.nagios.org/projects/nagioscore/history/nagios-4-version-history Sponsored by: Absolight Modified: head/net-mgmt/nagios4/Makefile head/net-mgmt/nagios4/distinfo head/net-mgmt/nagios4/files/patch-Makefile.in head/net-mgmt/nagios4/files/patch-configure.in head/net-mgmt/nagios4/files/patch-html__index.php head/net-mgmt/nagios4/files/patch-html__main.php head/net-mgmt/nagios4/pkg-plist Modified: head/net-mgmt/nagios4/Makefile ============================================================================== --- head/net-mgmt/nagios4/Makefile Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/Makefile Thu Jun 5 15:24:51 2014 (r356644) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.0.6 +PORTVERSION= 4.0.7 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 Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/distinfo Thu Jun 5 15:24:51 2014 (r356644) @@ -1,2 +1,2 @@ -SHA256 (nagios-4.0.6.tar.gz) = d400190c771eb90e0ba16351f6358fa7e22e42a7be986f2066db63518a14397b -SIZE (nagios-4.0.6.tar.gz) = 1796012 +SHA256 (nagios-4.0.7.tar.gz) = ef1de1d106f6572a88547f3ed37a744c5d4fa778859ce44fc9043da597c50799 +SIZE (nagios-4.0.7.tar.gz) = 1798034 Modified: head/net-mgmt/nagios4/files/patch-Makefile.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-Makefile.in Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/files/patch-Makefile.in Thu Jun 5 15:24:51 2014 (r356644) @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2013-11-25 14:16:25.000000000 +0000 -+++ ./Makefile.in 2014-01-24 22:43:01.000000000 +0000 -@@ -245,7 +245,7 @@ +--- ./Makefile.in.orig 2014-06-03 16:41:42.000000000 +0200 ++++ ./Makefile.in 2014-06-05 16:54:17.000000000 +0200 +@@ -245,11 +245,10 @@ $(MAKE) install-basic install-basic: @@ -8,8 +8,12 @@ + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) -@@ -269,19 +269,18 @@ + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) +- chmod g+s $(DESTDIR)$(CHECKRESULTDIR) + + @echo "" + @echo "*** Main program, CGIs and HTML files installed ***" +@@ -270,19 +269,18 @@ install-config: @@ -41,7 +45,7 @@ @echo "" @echo "*** Config files installed ***" -@@ -329,7 +328,6 @@ +@@ -330,7 +328,6 @@ install-commandmode: $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw Modified: head/net-mgmt/nagios4/files/patch-configure.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-configure.in Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/files/patch-configure.in Thu Jun 5 15:24:51 2014 (r356644) @@ -1,5 +1,5 @@ ---- ./configure.in.orig 2014-04-29 17:55:49.000000000 +0200 -+++ ./configure.in 2014-05-06 15:38:27.000000000 +0200 +--- ./configure.in.orig 2014-06-03 16:41:42.000000000 +0200 ++++ ./configure.in 2014-06-05 12:49:28.000000000 +0200 @@ -6,7 +6,6 @@ AC_INIT(base/nagios.c) @@ -7,7 +7,7 @@ -AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios - PKG_VERSION="4.0.6" + PKG_VERSION="4.0.7" @@ -134,14 +133,14 @@ AC_SUBST(nagios_grp) AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios]) Modified: head/net-mgmt/nagios4/files/patch-html__index.php ============================================================================== --- head/net-mgmt/nagios4/files/patch-html__index.php Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/files/patch-html__index.php Thu Jun 5 15:24:51 2014 (r356644) @@ -1,13 +1,11 @@ ---- ./html/index.php.orig 2013-11-25 14:16:25.000000000 +0000 -+++ ./html/index.php 2014-01-24 22:40:43.000000000 +0000 -@@ -8,8 +8,9 @@ - </head> - +--- ./html/index.php.orig 2014-06-03 16:41:42.000000000 +0200 ++++ ./html/index.php 2014-06-05 12:49:28.000000000 +0200 +@@ -1,6 +1,7 @@ <?php +include_once(dirname(__FILE__).'/includes/utils.inc.php'); - // allow specifying main window URL for permalinks, etc. --$corewindow="main.php"; -+$corewindow=$cfg["cgi_base_url"]."/tac.cgi"; - if(isset($_GET['corewindow'])){ - - // default window url may have been overridden with a permalink... + // 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... Modified: head/net-mgmt/nagios4/files/patch-html__main.php ============================================================================== --- head/net-mgmt/nagios4/files/patch-html__main.php Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/files/patch-html__main.php Thu Jun 5 15:24:51 2014 (r356644) @@ -1,10 +1,10 @@ ---- ./html/main.php.orig 2014-04-29 17:55:49.000000000 +0200 -+++ ./html/main.php 2014-05-06 15:39:05.000000000 +0200 +--- ./html/main.php.orig 2014-06-03 16:41:42.000000000 +0200 ++++ ./html/main.php 2014-06-05 12:49:28.000000000 +0200 @@ -130,31 +130,6 @@ <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 4.0.6</div> - <div class="releasedate">April 29, 2014</div> -- <div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.6&product=nagioscore" target="_blank">Check for updates</a></div> + <div class="version">Version <?php echo $this_version; ?></div> + <div class="releasedate">June 03, 2014</div> +- <div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&product=nagioscore" target="_blank">Check for updates</a></div> -</div> - - Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Thu Jun 5 15:21:07 2014 (r356643) +++ head/net-mgmt/nagios4/pkg-plist Thu Jun 5 15:24:51 2014 (r356644) @@ -1,5 +1,6 @@ @exec install -d %D/%%NAGIOSWWWDIR%%/ssi -@exec install -d -m 775 -o %%NAGIOSUSER%% -g %%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults +@exec install -d -m 775 -o %%NAGIOSUSER%% -g %%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives +@exec install -d -m 2775 -o %%NAGIOSUSER%% -g %%NAGIOSGROUP%% %%NAGIOSDIR%%/checkresults @exec install -d -m 775 -o %%NAGIOSUSER%% -g %%WWWGRP%% %%NAGIOSDIR%%/rw bin/nagios bin/nagiostats
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406051524.s55FOp90024060>