1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Update to nagios-2.0.r2 includes:

- Added SHA256 checksum to distinfo
- Added reload argument to nagios.sh script
- PERL_SYS_INIT3 fix now committed to Nagios CVS, patch redundant
- Removed duplicated etc/rc.d/nagios.sh from pkg-plist

PR:		91892
Submitted by:	Jarrod Sayers <jarrod@netleader.com.au> (maintainer)
This commit is contained in:
Tim Bishop 2006-01-17 10:39:58 +00:00
parent 3933d258d0
commit e9fc35504f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=153719
10 changed files with 14 additions and 32 deletions

View File

@ -6,8 +6,8 @@
# #
PORTNAME= nagios PORTNAME= nagios
PORTVERSION= 2.0.r1 PORTVERSION= 2.0.r2
DISTVERSION= 2.0rc1 DISTVERSION= 2.0rc2
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagios MASTER_SITE_SUBDIR= nagios

View File

@ -1,2 +1,3 @@
MD5 (nagios-2.0rc1.tar.gz) = 5807fc2f1cf5355a2eadc6f4d51f6711 MD5 (nagios-2.0rc2.tar.gz) = 373124639093919dc8858a243d760f84
SIZE (nagios-2.0rc1.tar.gz) = 1731687 SHA256 (nagios-2.0rc2.tar.gz) = 1f771155606910a13bb84c1e18d22df99579e48ee26e1301fd08ac4645b93b16
SIZE (nagios-2.0rc2.tar.gz) = 1732073

View File

@ -18,12 +18,14 @@ rcvar=`set_rcvar`
command="%%PREFIX%%/bin/nagios" command="%%PREFIX%%/bin/nagios"
command_args="-d" command_args="-d"
extra_commands="reload"
pidfile="%%NAGIOSDIR%%/nagios.lock" pidfile="%%NAGIOSDIR%%/nagios.lock"
nagios_user="%%NAGIOSUSER%%" nagios_user="%%NAGIOSUSER%%"
start_precmd="start_precmd" start_precmd="start_precmd"
stop_postcmd="stop_postcmd" stop_postcmd="stop_postcmd"
restart_precmd="nagios_checkconfig" restart_precmd="nagios_checkconfig"
sig_reload=HUP
[ -z "${nagios_enable}" ] && nagios_enable="NO" [ -z "${nagios_enable}" ] && nagios_enable="NO"
[ -z "${nagios_flags}" ] && nagios_flags="" [ -z "${nagios_flags}" ] && nagios_flags=""

View File

@ -1,11 +0,0 @@
--- base/utils.c.orig Sat Dec 24 06:01:36 2005
+++ base/utils.c Wed Dec 28 17:53:36 2005
@@ -4546,7 +4546,7 @@
use_embedded_perl=TRUE;
- PERL_SYS_INIT3(&argc,embedding,&env);
+ PERL_SYS_INIT3(&argc,&embedding,&env);
if((my_perl=perl_alloc())==NULL){
use_embedded_perl=FALSE;

View File

@ -14,7 +14,6 @@ etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample etc/nagios/resource.cfg-sample
etc/rc.d/nagios.sh
%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi %%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi %%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
%%NAGIOSWWWDIR%%/cgi-bin/config.cgi %%NAGIOSWWWDIR%%/cgi-bin/config.cgi

View File

@ -6,8 +6,8 @@
# #
PORTNAME= nagios PORTNAME= nagios
PORTVERSION= 2.0.r1 PORTVERSION= 2.0.r2
DISTVERSION= 2.0rc1 DISTVERSION= 2.0rc2
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagios MASTER_SITE_SUBDIR= nagios

View File

@ -1,2 +1,3 @@
MD5 (nagios-2.0rc1.tar.gz) = 5807fc2f1cf5355a2eadc6f4d51f6711 MD5 (nagios-2.0rc2.tar.gz) = 373124639093919dc8858a243d760f84
SIZE (nagios-2.0rc1.tar.gz) = 1731687 SHA256 (nagios-2.0rc2.tar.gz) = 1f771155606910a13bb84c1e18d22df99579e48ee26e1301fd08ac4645b93b16
SIZE (nagios-2.0rc2.tar.gz) = 1732073

View File

@ -18,12 +18,14 @@ rcvar=`set_rcvar`
command="%%PREFIX%%/bin/nagios" command="%%PREFIX%%/bin/nagios"
command_args="-d" command_args="-d"
extra_commands="reload"
pidfile="%%NAGIOSDIR%%/nagios.lock" pidfile="%%NAGIOSDIR%%/nagios.lock"
nagios_user="%%NAGIOSUSER%%" nagios_user="%%NAGIOSUSER%%"
start_precmd="start_precmd" start_precmd="start_precmd"
stop_postcmd="stop_postcmd" stop_postcmd="stop_postcmd"
restart_precmd="nagios_checkconfig" restart_precmd="nagios_checkconfig"
sig_reload=HUP
[ -z "${nagios_enable}" ] && nagios_enable="NO" [ -z "${nagios_enable}" ] && nagios_enable="NO"
[ -z "${nagios_flags}" ] && nagios_flags="" [ -z "${nagios_flags}" ] && nagios_flags=""

View File

@ -1,11 +0,0 @@
--- base/utils.c.orig Sat Dec 24 06:01:36 2005
+++ base/utils.c Wed Dec 28 17:53:36 2005
@@ -4546,7 +4546,7 @@
use_embedded_perl=TRUE;
- PERL_SYS_INIT3(&argc,embedding,&env);
+ PERL_SYS_INIT3(&argc,&embedding,&env);
if((my_perl=perl_alloc())==NULL){
use_embedded_perl=FALSE;

View File

@ -14,7 +14,6 @@ etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample etc/nagios/resource.cfg-sample
etc/rc.d/nagios.sh
%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi %%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi %%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
%%NAGIOSWWWDIR%%/cgi-bin/config.cgi %%NAGIOSWWWDIR%%/cgi-bin/config.cgi