mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-08 06:48:28 +00:00
Code Issues Releases Activity

Update to 4.0.8.

Browse Source 
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-09-22 20:58:41 +00:00
parent af1ec3bd95
commit 843095fac5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=368997
18 changed files with 50 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net-mgmt/nagios4/Makefile
View File

@ -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}/devel/libltdl \
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=${NAGIOSUSER} \
--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

4
net-mgmt/nagios4/distinfo
View File

@ -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

4
net-mgmt/nagios4/files/extra-patch-html__side.php
View File

@ -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&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Problems</a>

4
net-mgmt/nagios4/files/patch-Makefile.in
View File

@ -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

4
net-mgmt/nagios4/files/patch-base__Makefile.in
View File

@ -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

6
net-mgmt/nagios4/files/patch-cgi__Makefile.in
View File

@ -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:

27
net-mgmt/nagios4/files/patch-configure.in
View File

@ -1,27 +0,0 @@
--- ./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)
AC_CONFIG_HEADER(include/config.h lib/snprintf.h lib/iobroker.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
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])
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios])
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS=""
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user)
AC_ARG_WITH(command_group,AC_HELP_STRING([--with-command-group=<grp>],[sets group name for command access]),command_grp=$withval,command_grp=$nagios_grp)
AC_SUBST(command_user)
AC_SUBST(command_grp)
-COMMAND_OPTS="-o $command_user -g $command_grp"
+COMMAND_OPTS=""
AC_SUBST(COMMAND_OPTS)
dnl Check for location of mail program

4
net-mgmt/nagios4/files/patch-contrib__Makefile.in
View File

@ -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

4
net-mgmt/nagios4/files/patch-html__Makefile.in
View File

@ -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

4
net-mgmt/nagios4/files/patch-html__index.php
View File

@ -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');

6
net-mgmt/nagios4/files/patch-html__main.php
View File

@ -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;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</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; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
-</div>
-

4
net-mgmt/nagios4/files/patch-include__locations.h.in
View File

@ -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"

11
net-mgmt/nagios4/files/patch-lib__runcmd.c Normal file
View File

@ -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

4
net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
View File

@ -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.

4
net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
View File

@ -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

4
net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
View File

@ -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

4
net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
View File

@ -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 @@
}

30
net-mgmt/nagios4/pkg-plist
View File

@ -1,7 +1,3 @@
@exec install -d %D/%%NAGIOSWWWDIR%%/ssi
@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
%%ETCDIR%%/cgi.cfg-sample
@ -385,26 +381,10 @@ bin/nagiostats
%%NAGIOSWWWDIR%%/stylesheets/summary.css
%%NAGIOSWWWDIR%%/stylesheets/tac.css
%%NAGIOSWWWDIR%%/stylesheets/trends.css
@dirrmtry %%ETCDIR%%/objects
@dirrmtry %%ETCDIR%%
@dirrmtry libexec/nagios
@dirrm %%NAGIOSWWWDIR%%/cgi-bin
@dirrm %%NAGIOSWWWDIR%%/contexthelp
@dirrm %%NAGIOSWWWDIR%%/docs/images
@dirrm %%NAGIOSWWWDIR%%/docs
@dirrm %%NAGIOSWWWDIR%%/images/logos
@dirrm %%NAGIOSWWWDIR%%/images
@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
@dirrm %%NAGIOSWWWDIR%%/includes/rss
@dirrm %%NAGIOSWWWDIR%%/includes
@dirrm %%NAGIOSWWWDIR%%/js
@dirrm %%NAGIOSWWWDIR%%/media
@dirrm %%NAGIOSWWWDIR%%/ssi
@dirrm %%NAGIOSWWWDIR%%/stylesheets
@dirrmtry %%NAGIOSWWWDIR%%
@dirrmtry %%NAGIOSDIR%%/archives
@dirrmtry %%NAGIOSDIR%%/checkresults
@dirrmtry %%NAGIOSDIR%%/rw
@dirrmtry %%NAGIOSDIR%%
@dir %%NAGIOSWWWDIR%%/ssi
@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives
@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults
@dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw
@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