Attachment #50447 for bug #76854

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




#

PORTNAME=	nagios-plugins
PORTVERSION=	1.4.0.b1
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR=	nagiosplug
DISTNAME=	nagios-plugins-1.4-beta1

MAINTAINER=	blaz@si.FreeBSD.org
COMMENT=	Plugins for nagios

USE_AUTOCONF_VER=	259
USE_GMAKE=	yes
USE_PERL5=	yes
USE_REINPLACE=	yes

post-patch:
.for file in check_by_ssh.c check_disk.c check_http.c check_load.c \
	check_mrtgtraf.c check_nagios.c check_pgsql.c check_ping.c \
	check_procs.c check_snmp.c check_ssh.c check_swap.c check_time.c \
	check_users.c utils.c
	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
.endfor

pre-configure:
	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \

Lines 1-2 Link Here

(-)nagios-plugins/distinfo (-2 / +2 lines)
1	MD5 (nagios-plugins-1.4.0-alpha3.tar.gz) = 5e5eddaafc9a94164fcd71a5922bbcd3	1	MD5 (nagios-plugins-1.4-beta1.tar.gz) = 5364baf80b580d2e4fb2da524ffe390c
2	SIZE (nagios-plugins-1.4.0-alpha3.tar.gz) = 911373	2	SIZE (nagios-plugins-1.4-beta1.tar.gz) = 942359

Lines 1-11 Link Here

(-)nagios-plugins/files/patch-check_nagios.c (-11 lines)
1	--- plugins/check_nagios.c.orig Thu Mar 11 16:17:08 2004
2	+++ plugins/check_nagios.c Fri Dec 3 22:28:53 2004
3	@@ -132,7 +132,7 @@
4	}
5
6	/* May get empty procargs */
7	- if (!strstr(procargs, argv[0]) && strstr(procprog, process_string) && strcmp(procargs,"")) {
8	+ if (!strstr(procargs, argv[0]) && strcmp(procargs,"") && strstr(procargs, process_string)) {
9	proc_entries++;
10	if (verbose >= 2) {
11	printf (_("Found process: %s %s\n"), procprog, procargs);




--- configure.in.orig	Thu Dec 30 15:19:37 2004
+++ configure.in	Sun Jan 30 13:16:43 2005
@@ -10,7 +10,7 @@
 RELEASE=1
 AC_SUBST(RELEASE)

 
 
 dnl Check for mysql libraries
@@ -581,234 +588,11 @@
 
 AC_PATH_PROG(PATH_TO_PS,ps)
 
-AC_MSG_CHECKING(for ps syntax)
-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
-dnl Should also work for FreeBSD 5.2.1 and 5.3
-dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
-if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
-	egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'"

-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. 
-dnl Limitation: Only first 16 chars returned for ucomm field
-dnl Must come before ps -weo
-elif ps -axwo 'stat uid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
-	egrep -i ["^ *STAT +UID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu ucomm command'"
-	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
-elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null

 
 if test -n "$ac_cv_ps_varlist" ; then
 	AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
@@ -1161,6 +945,8 @@
 AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
 	[path and arguments for invoking 'who'])
 

 AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
 if test -x "$PATH_TO_SNMPGET"
 then
@@ -1183,7 +969,10 @@
 else
 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
 fi

 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 
@@ -1205,7 +994,10 @@
 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
 		[path to qstat/quakestat])
 fi

 AC_PATH_PROG(PATH_TO_FPING,fping)
 if test -x "$PATH_TO_FPING"
 then
@@ -1213,6 +1005,7 @@
 	EXTRAS="$EXTRAS check_fping"
 else
 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])

Return to bug 76854

Lines 6-17 Link Here

(-)nagios-plugins/Makefile (-3 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= nagios-plugins	8	PORTNAME= nagios-plugins
9	PORTVERSION= 1.4.0.a3	9	PORTVERSION= 1.4.0.b1
10	PORTREVISION= 1
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
13	MASTER_SITE_SUBDIR= nagiosplug	12	MASTER_SITE_SUBDIR= nagiosplug
14	DISTNAME= nagios-plugins-1.4.0-alpha3	13	DISTNAME= nagios-plugins-1.4-beta1
15		14
16	MAINTAINER= blaz@si.FreeBSD.org	15	MAINTAINER= blaz@si.FreeBSD.org
17	COMMENT= Plugins for nagios	16	COMMENT= Plugins for nagios
Lines 102-107 Link Here
102	USE_AUTOCONF_VER= 259	101	USE_AUTOCONF_VER= 259
103	USE_GMAKE= yes	102	USE_GMAKE= yes
104	USE_PERL5= yes	103	USE_PERL5= yes
		104	USE_REINPLACE= yes
		105
		106	post-patch:
		107	.for file in check_by_ssh.c check_disk.c check_http.c check_load.c \
		108	check_mrtgtraf.c check_nagios.c check_pgsql.c check_ping.c \
		109	check_procs.c check_snmp.c check_ssh.c check_swap.c check_time.c \
		110	check_users.c utils.c
		111	@${REINPLACE_CMD} -e 's\|setlocale (LC_ALL, "");\|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");\|g' ${WRKSRC}/plugins/${file}
		112	.endfor
105		113
106	pre-configure:	114	pre-configure:
107	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \	115	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \

Lines 1-5 Link Here

(-)nagios-plugins/files/patch-configure.in (-8 / +21 lines)
1	--- configure.in.orig Wed Dec 15 21:54:37 2004	1	--- configure.in.orig Thu Dec 30 15:19:37 2004
2	+++ configure.in Fri Dec 17 12:31:43 2004	2	+++ configure.in Sun Jan 30 13:16:43 2005
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4	RELEASE=1	4	RELEASE=1
5	AC_SUBST(RELEASE)	5	AC_SUBST(RELEASE)
Lines 68-82 Link Here
68		68
69		69
70	dnl Check for mysql libraries	70	dnl Check for mysql libraries
71	@@ -644,221 +651,11 @@	71	@@ -581,234 +588,11 @@
72		72
73	AC_PATH_PROG(PATH_TO_PS,ps)	73	AC_PATH_PROG(PATH_TO_PS,ps)
74		74
75	-AC_MSG_CHECKING(for ps syntax)	75	-AC_MSG_CHECKING(for ps syntax)
76	-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo	76	-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
		77	-dnl Should also work for FreeBSD 5.2.1 and 5.3
77	-dnl STAT UCOMM VSZ RSS USER PPID COMMAND	78	-dnl STAT UCOMM VSZ RSS USER PPID COMMAND
78	-if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null \| \	79	-if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null \| \
79	- egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null	80	- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
80	-then	81	-then
81	- ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"	82	- ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
82	- ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'"	83	- ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu comm args'"
Lines 84-89 Link Here
84	- ac_cv_ps_cols=8	85	- ac_cv_ps_cols=8
85	- AC_MSG_RESULT([$ac_cv_ps_command])	86	- AC_MSG_RESULT([$ac_cv_ps_command])
86	-	87	-
		88	-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
		89	-dnl Limitation: Only first 16 chars returned for ucomm field
		90	-dnl Must come before ps -weo
		91	-elif ps -axwo 'stat uid ppid vsz rss pcpu ucomm command' 2>/dev/null \| \
		92	- egrep -i ["^ *STAT +UID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
		93	-then
		94	- ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
		95	- ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu ucomm command'"
		96	- ac_cv_ps_format="%s %d %d %d %d %f %s %n"
		97	- ac_cv_ps_cols=8
		98	- AC_MSG_RESULT([$ac_cv_ps_command])
		99	-
87	-dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND	100	-dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
88	-elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null \| \	101	-elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null \| \
89	- egrep -i ["^ S[TAUES] +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null	102	- egrep -i ["^ S[TAUES] +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
Lines 295-301 Link Here
295		308
296	if test -n "$ac_cv_ps_varlist" ; then	309	if test -n "$ac_cv_ps_varlist" ; then
297	AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,	310	AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
298	@@ -1211,6 +1008,8 @@	311	@@ -1161,6 +945,8 @@
299	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",	312	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
300	[path and arguments for invoking 'who'])	313	[path and arguments for invoking 'who'])
301		314
Lines 304-310 Link Here
304	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)	317	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
305	if test -x "$PATH_TO_SNMPGET"	318	if test -x "$PATH_TO_SNMPGET"
306	then	319	then
307	@@ -1233,7 +1032,10 @@	320	@@ -1183,7 +969,10 @@
308	else	321	else
309	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])	322	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
310	fi	323	fi
Lines 315-321 Link Here
315	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)	328	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
316	AC_PATH_PROG(PATH_TO_QSTAT,qstat)	329	AC_PATH_PROG(PATH_TO_QSTAT,qstat)
317		330
318	@@ -1255,7 +1057,10 @@	331	@@ -1205,7 +994,10 @@
319	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",	332	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
320	[path to qstat/quakestat])	333	[path to qstat/quakestat])
321	fi	334	fi
Lines 326-332 Link Here
326	AC_PATH_PROG(PATH_TO_FPING,fping)	339	AC_PATH_PROG(PATH_TO_FPING,fping)
327	if test -x "$PATH_TO_FPING"	340	if test -x "$PATH_TO_FPING"
328	then	341	then
329	@@ -1263,6 +1068,7 @@	342	@@ -1213,6 +1005,7 @@
330	EXTRAS="$EXTRAS check_fping"	343	EXTRAS="$EXTRAS check_fping"
331	else	344	else
332	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])	345	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])