svn commit: r368997 - in head/net-mgmt/nagios4: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Sep 22 20:58:47 UTC 2014
Author: mat
Date: Mon Sep 22 20:58:41 2014
New Revision: 368997
URL: http://svnweb.freebsd.org/changeset/ports/368997
QAT: https://qat.redports.org/buildarchive/r368997/
Log:
Update to 4.0.8.
Sponsored by: Absolight
Added:
head/net-mgmt/nagios4/files/patch-lib__runcmd.c (contents, props changed)
Deleted:
head/net-mgmt/nagios4/files/patch-configure.in
Modified:
head/net-mgmt/nagios4/Makefile
head/net-mgmt/nagios4/distinfo
head/net-mgmt/nagios4/files/extra-patch-html__side.php
head/net-mgmt/nagios4/files/patch-Makefile.in
head/net-mgmt/nagios4/files/patch-base__Makefile.in
head/net-mgmt/nagios4/files/patch-cgi__Makefile.in
head/net-mgmt/nagios4/files/patch-contrib__Makefile.in
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-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
head/net-mgmt/nagios4/pkg-plist
Modified: head/net-mgmt/nagios4/Makefile
==============================================================================
--- head/net-mgmt/nagios4/Makefile Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/Makefile Mon Sep 22 20:58:41 2014 (r368997)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= nagios
-PORTVERSION= 4.0.7
-PORTREVISION= 1
+PORTVERSION= 4.0.8
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= 4
@@ -18,7 +17,6 @@ LIB_DEPENDS= libltdl.so:${PORTSDIR}/deve
USES= gmake iconv perl5 uidfix
USE_PERL5= build
-USE_AUTOTOOLS= autoconf
USE_PHP= xml
USE_RC_SUBR= nagios
@@ -33,7 +31,6 @@ CONFIGURE_ARGS= --with-command-user=${NA
--with-cgiurl=${NAGIOSCGIURL} \
--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
- --datarootdir=${PREFIX}/${NAGIOSWWWDIR} \
--datadir=${PREFIX}/${NAGIOSWWWDIR} \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${NAGIOSDIR} \
@@ -91,6 +88,9 @@ NANOSLEEP_CONFIGURE_ENABLE= nanosleep
# 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
UNHANDLED_HACK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-html__side.php
+post-patch:
+ @${REINPLACE_CMD} '/^INSTALL_OPTS=/d;/COMMAND_OPTS=/d' ${WRKSRC}/configure
+
post-install:
@${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample
Modified: head/net-mgmt/nagios4/distinfo
==============================================================================
--- head/net-mgmt/nagios4/distinfo Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/distinfo Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.0.7.tar.gz) = ef1de1d106f6572a88547f3ed37a744c5d4fa778859ce44fc9043da597c50799
-SIZE (nagios-4.0.7.tar.gz) = 1798034
+SHA256 (nagios-4.0.8.tar.gz) = 8b268d250c97851775abe162f46f64724f95f367d752ae4630280cc5d368ca4b
+SIZE (nagios-4.0.8.tar.gz) = 1805059
Modified: head/net-mgmt/nagios4/files/extra-patch-html__side.php
==============================================================================
--- head/net-mgmt/nagios4/files/extra-patch-html__side.php Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/extra-patch-html__side.php Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./html/side.php.orig 2014-06-03 16:41:42.000000000 +0200
-+++ ./html/side.php 2014-06-09 12:08:47.000000000 +0200
+--- html/side.php.orig 2014-08-12 15:00:01 UTC
++++ html/side.php
@@ -56,8 +56,8 @@
<li>
<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&servicestatustypes=28" target="<?php echo $link_target;?>">Problems</a>
Modified: head/net-mgmt/nagios4/files/patch-Makefile.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-Makefile.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-Makefile.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./Makefile.in.orig 2014-06-03 16:41:42.000000000 +0200
-+++ ./Makefile.in 2014-06-05 16:54:17.000000000 +0200
+--- Makefile.in.orig 2014-08-12 15:00:01 UTC
++++ Makefile.in
@@ -245,11 +245,10 @@
$(MAKE) install-basic
Modified: head/net-mgmt/nagios4/files/patch-base__Makefile.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-base__Makefile.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-base__Makefile.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./base/Makefile.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./base/Makefile.in 2014-01-24 22:43:21.000000000 +0000
+--- base/Makefile.in.orig 2014-08-12 15:00:01 UTC
++++ base/Makefile.in
@@ -180,9 +180,9 @@
$(MAKE) install-basic
Modified: head/net-mgmt/nagios4/files/patch-cgi__Makefile.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-cgi__Makefile.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-cgi__Makefile.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,6 +1,6 @@
---- ./cgi/Makefile.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./cgi/Makefile.in 2014-01-24 22:43:36.000000000 +0000
-@@ -182,9 +182,9 @@
+--- cgi/Makefile.in.orig 2014-08-12 15:00:01 UTC
++++ cgi/Makefile.in
+@@ -201,9 +201,9 @@
$(MAKE) install-basic
install-basic:
Modified: head/net-mgmt/nagios4/files/patch-contrib__Makefile.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-contrib__Makefile.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-contrib__Makefile.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./contrib/Makefile.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./contrib/Makefile.in 2014-01-24 22:44:01.000000000 +0000
+--- contrib/Makefile.in.orig 2014-08-12 15:00:01 UTC
++++ contrib/Makefile.in
@@ -52,10 +52,10 @@
devclean: distclean
Modified: head/net-mgmt/nagios4/files/patch-html__Makefile.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-html__Makefile.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-html__Makefile.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./html/Makefile.in.orig 2014-04-29 17:55:49.000000000 +0200
-+++ ./html/Makefile.in 2014-05-06 15:38:27.000000000 +0200
+--- html/Makefile.in.orig 2014-08-12 15:00:01 UTC
++++ html/Makefile.in
@@ -35,58 +35,58 @@
devclean: distclean
Modified: head/net-mgmt/nagios4/files/patch-html__index.php
==============================================================================
--- head/net-mgmt/nagios4/files/patch-html__index.php Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-html__index.php Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./html/index.php.orig 2014-06-03 16:41:42.000000000 +0200
-+++ ./html/index.php 2014-06-05 12:49:28.000000000 +0200
+--- html/index.php.orig 2014-08-12 15:00:01 UTC
++++ html/index.php
@@ -1,6 +1,7 @@
<?php
+include_once(dirname(__FILE__).'/includes/utils.inc.php');
Modified: head/net-mgmt/nagios4/files/patch-html__main.php
==============================================================================
--- head/net-mgmt/nagios4/files/patch-html__main.php Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-html__main.php Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,9 +1,9 @@
---- ./html/main.php.orig 2014-06-03 16:41:42.000000000 +0200
-+++ ./html/main.php 2014-06-05 12:49:28.000000000 +0200
+--- html/main.php.orig 2014-08-12 15:00:01 UTC
++++ html/main.php
@@ -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 <?php echo $this_version; ?></div>
- <div class="releasedate">June 03, 2014</div>
+ <div class="releasedate">August 12, 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/files/patch-include__locations.h.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-include__locations.h.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-include__locations.h.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./include/locations.h.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./include/locations.h.in 2014-01-24 22:40:43.000000000 +0000
+--- include/locations.h.in.orig 2014-08-12 15:00:01 UTC
++++ include/locations.h.in
@@ -19,7 +19,7 @@
#define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"
Added: head/net-mgmt/nagios4/files/patch-lib__runcmd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/nagios4/files/patch-lib__runcmd.c Mon Sep 22 20:58:41 2014 (r368997)
@@ -0,0 +1,11 @@
+--- lib/runcmd.c.orig 2014-08-12 15:00:01 UTC
++++ lib/runcmd.c
+@@ -36,7 +36,7 @@
+ #endif
+
+ /* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */
+-#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
++#if __FreeBSD__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
+ # define HAVE_SETENV
+ #endif
+
Modified: head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./sample-config/cgi.cfg.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./sample-config/cgi.cfg.in 2014-01-24 22:40:43.000000000 +0000
+--- sample-config/cgi.cfg.in.orig 2014-08-12 15:00:01 UTC
++++ sample-config/cgi.cfg.in
@@ -263,7 +263,7 @@
# OS and distribution, so you may have to tweak this to
# work on your system.
Modified: head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
==============================================================================
--- head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./sample-config/nagios.cfg.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./sample-config/nagios.cfg.in 2014-01-24 22:40:43.000000000 +0000
+--- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01 UTC
++++ sample-config/nagios.cfg.in
@@ -31,7 +31,7 @@
cfg_file=@sysconfdir@/objects/timeperiods.cfg
cfg_file=@sysconfdir@/objects/templates.cfg
Modified: 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 Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./sample-config/template-object/localhost.cfg.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./sample-config/template-object/localhost.cfg.in 2014-01-24 22:40:43.000000000 +0000
+--- sample-config/template-object/localhost.cfg.in.orig 2014-08-12 15:00:01 UTC
++++ sample-config/template-object/localhost.cfg.in
@@ -4,7 +4,7 @@
#
# NOTE: This config file is intended to serve as an *extremely* simple
Modified: 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 Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,5 +1,5 @@
---- ./sample-config/template-object/templates.cfg.in.orig 2013-11-25 14:16:25.000000000 +0000
-+++ ./sample-config/template-object/templates.cfg.in 2014-01-24 22:40:43.000000000 +0000
+--- sample-config/template-object/templates.cfg.in.orig 2014-08-12 15:00:01 UTC
++++ sample-config/template-object/templates.cfg.in
@@ -61,17 +61,17 @@
}
Modified: head/net-mgmt/nagios4/pkg-plist
==============================================================================
--- head/net-mgmt/nagios4/pkg-plist Mon Sep 22 20:20:20 2014 (r368996)
+++ head/net-mgmt/nagios4/pkg-plist Mon Sep 22 20:58:41 2014 (r368997)
@@ -1,7 +1,3 @@
- at exec install -d %D/%%NAGIOSWWWDIR%%/ssi
- at exec install -d -m 775 -o %%NAGIOSUSER%% -g %%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives
- at exec install -d -m 2775 -o %%NAGIOSUSER%% -g %%NAGIOSGROUP%% %%NAGIOSDIR%%/checkresults
- at exec install -d -m 775 -o %%NAGIOSUSER%% -g %%WWWGRP%% %%NAGIOSDIR%%/rw
bin/nagios
bin/nagiostats
%%ETCDIR%%/cgi.cfg-sample
@@ -385,26 +381,10 @@ bin/nagiostats
%%NAGIOSWWWDIR%%/stylesheets/summary.css
%%NAGIOSWWWDIR%%/stylesheets/tac.css
%%NAGIOSWWWDIR%%/stylesheets/trends.css
- at dirrmtry %%ETCDIR%%/objects
- at dirrmtry %%ETCDIR%%
- at dirrmtry libexec/nagios
- at dirrm %%NAGIOSWWWDIR%%/cgi-bin
- at dirrm %%NAGIOSWWWDIR%%/contexthelp
- at dirrm %%NAGIOSWWWDIR%%/docs/images
- at dirrm %%NAGIOSWWWDIR%%/docs
- at dirrm %%NAGIOSWWWDIR%%/images/logos
- at dirrm %%NAGIOSWWWDIR%%/images
- at dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
- at dirrm %%NAGIOSWWWDIR%%/includes/rss
- at dirrm %%NAGIOSWWWDIR%%/includes
- at dirrm %%NAGIOSWWWDIR%%/js
- at dirrm %%NAGIOSWWWDIR%%/media
- at dirrm %%NAGIOSWWWDIR%%/ssi
- at dirrm %%NAGIOSWWWDIR%%/stylesheets
- at dirrmtry %%NAGIOSWWWDIR%%
- at dirrmtry %%NAGIOSDIR%%/archives
- at dirrmtry %%NAGIOSDIR%%/checkresults
- at dirrmtry %%NAGIOSDIR%%/rw
- at dirrmtry %%NAGIOSDIR%%
+ at dir %%NAGIOSWWWDIR%%/ssi
+ at dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives
+ at dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults
+ at dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw
+ at 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
More information about the svn-ports-head
mailing list