Attachment #89520 for bug #126476

View | Details | Raw Unified | Return to bug 126476
Collapse All | Expand All




#

PORTNAME=	nrpe2
PORTVERSION=	2.12
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	nagios

NAGIOSUSER?=	nagios
NAGIOSGROUP?=	nagios
NAGIOSDIR?=	/var/spool/nagios
RUNDIR=		/var/run/nrpe2
CONFFILE=	etc/nrpe.cfg

NAGIOSUID=	181
NAGIOSGID=	${NAGIOSUID}

CONFIGURE_ARGS+=	--bindir=${PREFIX}/sbin \
		--libexecdir=${PREFIX}/libexec/nagios \
		--sysconfdir=${PREFIX}/etc \
		--localstatedir=${RUNDIR} \
		--with-nrpe-user=${NAGIOSUSER} \
		--with-nrpe-group=${NAGIOSGROUP}

PLIST_FILES=	sbin/nrpe2 etc/nrpe.cfg-sample libexec/nagios/check_nrpe2

SUB_VARS=	NAGIOSDIR=${NAGIOSDIR} \
		NAGIOSUSER=${NAGIOSUSER} \
		NAGIOSGROUP=${NAGIOSGROUP} \
		NAGIOSUID=${NAGIOSUID} \
		NAGIOSGID=${NAGIOSGID} \
		RUNDIR=${RUNDIR} \
		CONFFILE=${CONFFILE}

SUB_FILES=	pkg-install \
		pkg-deinstall \

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin/nrpe2
	${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios/check_nrpe2
	${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${PREFIX}/${CONFFILE}-sample

post-install:
	@${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)nrpe2/distinfo (-3 / +3 lines)
1	MD5 (nrpe-2.11.tar.gz) = dcf3b7c5b7c94c0ba6cbb4999c1161f0	1	MD5 (nrpe-2.12.tar.gz) = b2d75e2962f1e3151ef58794d60c9e97
2	SHA256 (nrpe-2.11.tar.gz) = 4cedfc2588ba65ebfe4e3310c9fbda08c6f0912cfcc2c1ac96636b6f5c839e1d	2	SHA256 (nrpe-2.12.tar.gz) = 7e8d093abef7d7ffc7219ad334823bdb612121df40de2dbaec9c6d0adeb04cfc
3	SIZE (nrpe-2.11.tar.gz) = 405643	3	SIZE (nrpe-2.12.tar.gz) = 405725

Lines 20-28 Link Here

(-)nrpe2/files/nrpe2.in (-2 / +4 lines)
20	rcvar=`set_rcvar`	20	rcvar=`set_rcvar`
21		21
22	command="%%PREFIX%%/sbin/nrpe2"	22	command="%%PREFIX%%/sbin/nrpe2"
23	required_files=%%PREFIX%%/etc/nrpe.cfg	23	required_files=%%PREFIX%%/%%CONFFILE%%
24	command_args="-c ${required_files} -d"	24	command_args="-c ${required_files} -d"
25	pidfile=/var/run/${name}.pid	25	extra_commands="reload"
		26	sig_reload=HUP
		27	pidfile=%%RUNDIR%%/${name}.pid
26		28
27	# set defaults	29	# set defaults
28		30

Lines 5-11 Link Here

(-)nrpe2/files/patch-sample-config-nrpe.cfg.in (-1 / +1 lines)
5	# user and is running in standalone mode.	5	# user and is running in standalone mode.
6		6
7	-pid_file=/var/run/nrpe.pid	7	-pid_file=/var/run/nrpe.pid
8	+pid_file=/var/run/nrpe2/nrpe2.pid	8	+pid_file=@localstatedir@/nrpe2.pid
9		9
10		10
11		11




--- src/nrpe.c.orig	2007-12-27 05:55:05.000000000 +1030
+++ src/nrpe.c	2008-02-20 19:19:03.000000000 +1030
@@ -1458,8 +1458,10 @@
 		                }while(bytes_read==-1 && errno==EINTR);
 		        }
 
-		if(bytes_read==-1 && output!=NULL)
-			strcpy(output,"");
+			if(bytes_read==-1)
+				*output='\0';
+			else
+				output[bytes_read]='\0';
 
 		/* if there was a critical return code and no output AND the command time exceeded the timeout thresholds, assume a timeout */
 		if(result==STATE_CRITICAL && bytes_read==-1 && (end_time-start_time)>=timeout){

Lines 15-22 Link Here

(-)nrpe2/files/pkg-deinstall.in (-4 lines)
15	if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then	15	if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then
16	echo "You should manually remove the \"${NAGIOSUSER}\" user."	16	echo "You should manually remove the \"${NAGIOSUSER}\" user."
17	fi	17	fi
18
19	if [ -e "${NAGIOSDIR}" ]; then
20	echo "You should manually remove the \"${NAGIOSDIR}\" directory."
21	fi
22	fi	18	fi

Lines 8-13 Link Here

(-)nrpe2/files/pkg-install.in (+11 lines)
8	NAGIOSGROUP=%%NAGIOSGROUP%%	8	NAGIOSGROUP=%%NAGIOSGROUP%%
9	NAGIOSUID=%%NAGIOSUID%%	9	NAGIOSUID=%%NAGIOSUID%%
10	NAGIOSGID=%%NAGIOSGID%%	10	NAGIOSGID=%%NAGIOSGID%%
		11	RUNDIR=%%RUNDIR%%
		12	CONFFILE=%%PREFIX%%/%%CONFFILE%%
11		13
12	ask() {	14	ask() {
13	local question default answer	15	local question default answer
Lines 71-74 Link Here
71	exit 1	73	exit 1
72	fi	74	fi
73	fi	75	fi
		76	elif [ "$2" = "POST-INSTALL" ]; then
		77	if [ ! -e ${CONFFILE} ]; then
		78	/bin/cp ${CONFFILE}-sample ${CONFFILE}
		79	/bin/chmod 644 ${CONFFILE}
		80	fi
		81	if [ ! -e ${RUNDIR} ]; then
		82	/bin/mkdir -m 755 ${RUNDIR}
		83	/usr/sbin/chown ${NAGIOSUSER}:${NAGIOSGROUP} ${RUNDIR}
		84	fi
74	fi	85	fi

Line 0 Link Here

(-)nrpe2/pkg-plist (+6 lines)
	1	sbin/nrpe2
	2	libexec/nagios/check_nrpe2
	3	@unexec if cmp -s %D/%%CONFFILE%% %D/%%CONFFILE%%-sample; then rm -f %D/%%CONFFILE%%; fi
	4	%%CONFFILE%%-sample
	5	@exec [ -f %D/%%CONFFILE%% ] \|\| cp %F %D/%%CONFFILE%%
	6	@unexec rmdir %%RUNDIR%%

Return to bug 126476

Lines 6-13 Link Here

(-)nrpe2/Makefile (-6 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= nrpe2	8	PORTNAME= nrpe2
9	PORTVERSION= 2.11	9	PORTVERSION= 2.12
10	PORTREVISION= 1
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= nagios	12	MASTER_SITE_SUBDIR= nagios
Lines 29-34 Link Here
29	NAGIOSUSER?= nagios	28	NAGIOSUSER?= nagios
30	NAGIOSGROUP?= nagios	29	NAGIOSGROUP?= nagios
31	NAGIOSDIR?= /var/spool/nagios	30	NAGIOSDIR?= /var/spool/nagios
		31	RUNDIR= /var/run/nrpe2
		32	CONFFILE= etc/nrpe.cfg
32		33
33	NAGIOSUID= 181	34	NAGIOSUID= 181
34	NAGIOSGID= ${NAGIOSUID}	35	NAGIOSGID= ${NAGIOSUID}
Lines 36-51 Link Here
36	CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin \	37	CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin \
37	--libexecdir=${PREFIX}/libexec/nagios \	38	--libexecdir=${PREFIX}/libexec/nagios \
38	--sysconfdir=${PREFIX}/etc \	39	--sysconfdir=${PREFIX}/etc \
		40	--localstatedir=${RUNDIR} \
39	--with-nrpe-user=${NAGIOSUSER} \	41	--with-nrpe-user=${NAGIOSUSER} \
40	--with-nrpe-group=${NAGIOSGROUP}	42	--with-nrpe-group=${NAGIOSGROUP}
41		43
42	PLIST_FILES= sbin/nrpe2 etc/nrpe.cfg-sample libexec/nagios/check_nrpe2
43
44	SUB_VARS= NAGIOSDIR=${NAGIOSDIR} \	44	SUB_VARS= NAGIOSDIR=${NAGIOSDIR} \
45	NAGIOSUSER=${NAGIOSUSER} \	45	NAGIOSUSER=${NAGIOSUSER} \
46	NAGIOSGROUP=${NAGIOSGROUP} \	46	NAGIOSGROUP=${NAGIOSGROUP} \
47	NAGIOSUID=${NAGIOSUID} \	47	NAGIOSUID=${NAGIOSUID} \
48	NAGIOSGID=${NAGIOSGID}	48	NAGIOSGID=${NAGIOSGID} \
		49	RUNDIR=${RUNDIR} \
		50	CONFFILE=${CONFFILE}
49		51
50	SUB_FILES= pkg-install \	52	SUB_FILES= pkg-install \
51	pkg-deinstall \	53	pkg-deinstall \
Lines 79-87 Link Here
79	do-install:	81	do-install:
80	${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin/nrpe2	82	${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin/nrpe2
81	${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios/check_nrpe2	83	${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios/check_nrpe2
82	${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${PREFIX}/etc/nrpe.cfg-sample	84	${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${PREFIX}/${CONFFILE}-sample
83		85
84	post-install:	86	post-install:
		87	@${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL
85	@${CAT} ${PKGMESSAGE}	88	@${CAT} ${PKGMESSAGE}
86		89
87	.include <bsd.port.post.mk>	90	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)nrpe2/files/patch-src-nrpe.c (-15 lines)
1	--- src/nrpe.c.orig 2007-12-27 05:55:05.000000000 +1030
2	+++ src/nrpe.c 2008-02-20 19:19:03.000000000 +1030
3	@@ -1458,8 +1458,10 @@
4	}while(bytes_read==-1 && errno==EINTR);
5	}
6
7	- if(bytes_read==-1 && output!=NULL)
8	- strcpy(output,"");
9	+ if(bytes_read==-1)
10	+ *output='\0';
11	+ else
12	+ output[bytes_read]='\0';
13
14	/* if there was a critical return code and no output AND the command time exceeded the timeout thresholds, assume a timeout */
15	if(result==STATE_CRITICAL && bytes_read==-1 && (end_time-start_time)>=timeout){