svn commit: r353482 - in head/net-mgmt: . monitoring-plugins monitoring-plugins/files
Mathieu Arnold
mat at FreeBSD.org
Fri May 9 17:53:41 UTC 2014
Author: mat
Date: Fri May 9 17:53:39 2014
New Revision: 353482
URL: http://svnweb.freebsd.org/changeset/ports/353482
QAT: https://qat.redports.org/buildarchive/r353482/
Log:
Add monitoring-plugins, a fork of nagios-plugins.
For now, use a snapshot from github until they release 1.6.
Sponsored by: Absolight
Added:
head/net-mgmt/monitoring-plugins/
- copied from r353479, head/net-mgmt/nagios-plugins/
Deleted:
head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__subst.in
head/net-mgmt/monitoring-plugins/files/patch-plugins__check_pgsql.c
Modified:
head/net-mgmt/Makefile
head/net-mgmt/monitoring-plugins/Makefile
head/net-mgmt/monitoring-plugins/distinfo
head/net-mgmt/monitoring-plugins/files/patch-configure.ac
head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am
head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
head/net-mgmt/monitoring-plugins/pkg-plist
Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile Fri May 9 17:51:27 2014 (r353481)
+++ head/net-mgmt/Makefile Fri May 9 17:53:39 2014 (r353482)
@@ -107,6 +107,7 @@
SUBDIR += macroscope
SUBDIR += mbrowse
SUBDIR += mk-livestatus
+ SUBDIR += monitoring-plugins
SUBDIR += mrtg
SUBDIR += mrtg-ping-probe
SUBDIR += mtrace
Modified: head/net-mgmt/monitoring-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/Makefile Fri May 9 17:53:39 2014 (r353482)
@@ -1,24 +1,29 @@
# Created by: Blaz Zupan <blaz at si.FreeBSD.org>
# $FreeBSD$
-PORTNAME= nagios-plugins
-PORTVERSION= 2.0.1
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTNAME= monitoring-plugins
+PORTVERSION= 1.5.99.20140427
CATEGORIES= net-mgmt
-MASTER_SITES= https://www.nagios-plugins.org/download/ \
+MASTER_SITES= GH GHC \
LOCAL/mat/${PORTNAME}
MAINTAINER= mat at FreeBSD.org
-COMMENT= Plugins for Nagios
+COMMENT= Monitoring Plugins for Nagios
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
+USE_GITHUB= yes
+GH_ACCOUNT= monitoring-plugins
+GH_COMMIT= 1b38905
+GH_TAGNAME= ${GH_COMMIT}
+
+CONFLICTS_INSTALL= nagios-plugins-*
+
USES= charsetfix gmake perl5 libtool
CHARSETFIX_MAKEFILEIN=Makefile.am
USE_SUBMAKE= yes
-USE_AUTOTOOLS= aclocal autoconf automake
+USE_AUTOTOOLS= aclocal autoconf automake autoheader
ACLOCAL_ARGS= -I m4 -I gl/m4
AUTOMAKE_ARGS= --add-missing
@@ -158,8 +163,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
.endfor
@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.am
- # add a fake PATH so that it gets set to a correct value during build.
- @${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|" ${WRKSRC}/plugins-scripts/*.pl
.if ${PORT_OPTIONS:MJAIL}
@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac
@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac
Modified: head/net-mgmt/monitoring-plugins/distinfo
==============================================================================
--- head/net-mgmt/nagios-plugins/distinfo Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/distinfo Fri May 9 17:53:39 2014 (r353482)
@@ -1,2 +1,2 @@
-SHA256 (nagios-plugins-2.0.1.tar.gz) = 1fb63cf8e917397c745f9a30b3eac6178d832df80f914e2498e8171408c9172a
-SIZE (nagios-plugins-2.0.1.tar.gz) = 2651400
+SHA256 (monitoring-plugins-1.5.99.20140427.tar.gz) = 28b72733346df96ba7561328a5daf068c16149c3fd33d17b11934e70a8eac368
+SIZE (monitoring-plugins-1.5.99.20140427.tar.gz) = 2046687
Modified: head/net-mgmt/monitoring-plugins/files/patch-configure.ac
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-configure.ac Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/files/patch-configure.ac Fri May 9 17:53:39 2014 (r353482)
@@ -1,15 +1,6 @@
---- ./configure.ac.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./configure.ac 2014-04-14 10:22:50.000000000 +0200
-@@ -13,8 +13,6 @@
- RELEASE=1
- AC_SUBST(RELEASE)
-
--AC_PREFIX_DEFAULT(/usr/local/nagios)
--
- dnl Deprecated configure options
-
-
-@@ -45,6 +43,7 @@
+--- ./configure.ac.orig 2014-04-27 19:59:06.000000000 +0200
++++ ./configure.ac 2014-05-09 18:45:30.000000000 +0200
+@@ -44,6 +44,7 @@
gl_EARLY
AC_PROG_GCC_TRADITIONAL
AC_PROG_LIBTOOL
@@ -17,7 +8,7 @@
AM_PROG_CC_C_O
-@@ -215,8 +214,8 @@
+@@ -212,8 +213,8 @@
AC_CHECK_LIB(crypt,main)
if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
if test -n "$PGSQL"; then
@@ -28,38 +19,38 @@
fi
AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
-@@ -260,10 +259,10 @@
+@@ -257,10 +258,10 @@
dnl Check for DBI libraries
AS_IF([test "x$with_dbi" != "xno"], [
_SAVEDLIBS="$LIBS"
- AC_CHECK_LIB(dbi,dbi_initialize)
+ AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib)
if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
- EXTRAS="$EXTRAS check_dbi"
+ EXTRAS="$EXTRAS check_dbi\$(EXEEXT)"
- DBILIBS="-ldbi"
+ DBILIBS="-L${LOCALBASE}/lib -ldbi"
AC_SUBST(DBILIBS)
else
AC_MSG_WARN([Skipping dbi plugin])
-@@ -277,22 +276,17 @@
+@@ -274,22 +275,17 @@
dnl Check for radius libraries
AS_IF([test "x$with_radius" != "xno"], [
_SAVEDLIBS="$LIBS"
- AC_CHECK_LIB(radiusclient,rc_read_config)
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-- EXTRAS="$EXTRAS check_radius"
+- EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
- RADIUSLIBS="-lradiusclient"
- AC_SUBST(RADIUSLIBS)
- else
- AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib)
if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
- EXTRAS="$EXTRAS check_radius"
+ EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
- RADIUSLIBS="-lradiusclient-ng"
+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"
+ RADIUSINCLUDE="-I${LOCALBSE}/include"
- AC_SUBST(RADIUSLIBS)
+ AC_SUBST(RADIUSINCLUDE)
+ AC_SUBST(RADIUSLIBS)
else
AC_MSG_WARN([Skipping radius plugin])
AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
@@ -68,7 +59,7 @@
LIBS="$_SAVEDLIBS"
])
-@@ -301,12 +295,13 @@
+@@ -298,12 +294,13 @@
dnl Check for LDAP libraries
AS_IF([test "x$with_ldap" != "xno"], [
_SAVEDLIBS="$LIBS"
@@ -84,9 +75,9 @@
AC_SUBST(LDAPINCLUDE)
+ LIBS="-L${LOCALBASE}/lib $LIBS"
AC_CHECK_FUNCS(ldap_set_option)
- EXTRAS="$EXTRAS check_ldap"
+ EXTRAS="$EXTRAS check_ldap\$(EXEEXT)"
AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-@@ -746,22 +741,10 @@
+@@ -735,22 +732,10 @@
dnl ac_cv_ps_cols=8
dnl AC_MSG_RESULT([$ac_cv_ps_command])
@@ -112,7 +103,7 @@
then
ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
-@@ -769,9 +752,8 @@
+@@ -758,9 +743,8 @@
ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
@@ -124,7 +115,7 @@
elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
then
-@@ -781,209 +763,6 @@
+@@ -770,209 +754,6 @@
ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
@@ -334,7 +325,7 @@
else
AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
fi
-@@ -1371,6 +1150,8 @@
+@@ -1371,6 +1152,8 @@
AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
fi
@@ -343,7 +334,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
AC_ARG_WITH(snmpget_command,
ACX_HELP_STRING([--with-snmpget-command=PATH],
-@@ -1401,7 +1182,10 @@
+@@ -1401,7 +1184,10 @@
else
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
fi
@@ -354,7 +345,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
AC_ARG_WITH(qstat_command,
-@@ -1426,7 +1210,10 @@
+@@ -1426,7 +1212,10 @@
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
[path to qstat/quakestat])
fi
@@ -365,7 +356,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
AC_PATH_PROG(PATH_TO_FPING6,fping6)
-@@ -1447,6 +1234,7 @@
+@@ -1447,6 +1236,7 @@
else
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
fi
@@ -373,7 +364,7 @@
AC_PATH_PROG(PATH_TO_SSH,ssh)
AC_ARG_WITH(ssh_command,
-@@ -1517,32 +1305,12 @@
+@@ -1514,32 +1304,12 @@
dnl end if for PATH_TO_SWAP
fi
Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl Fri May 9 17:53:39 2014 (r353482)
@@ -1,14 +1,14 @@
---- ./plugins-scripts/check_ircd.pl.orig 2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins-scripts/check_ircd.pl 2014-04-14 10:22:50.000000000 +0200
-@@ -66,6 +66,7 @@
- $ENV{PATH} = "";
- $ENV{ENV} = "";
- $ENV{BASH_ENV} = "";
+--- ./plugins-scripts/check_ircd.pl.orig 2014-04-27 19:59:06.000000000 +0200
++++ ./plugins-scripts/check_ircd.pl 2014-05-09 18:45:31.000000000 +0200
+@@ -65,6 +65,7 @@
+ $ENV{'PATH'}='@TRUSTED_PATH@';
+ $ENV{'BASH_ENV'}='';
+ $ENV{'ENV'}='';
+$ENV{CDPATH} = "";
# -----------------------------------------------------------------[ Global ]--
-@@ -153,7 +154,7 @@
+@@ -152,7 +153,7 @@
print "IRCD UNKNOWN: Could not start socket ($!)\n";
exit $ERRORS{"UNKNOWN"};
}
Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am Fri May 9 17:53:39 2014 (r353482)
@@ -1,5 +1,5 @@
---- ./plugins/Makefile.am.orig 2014-04-16 00:19:03.000000000 +0200
-+++ ./plugins/Makefile.am 2014-04-16 11:38:18.000000000 +0200
+--- ./plugins/Makefile.am.orig 2014-04-27 19:59:06.000000000 +0200
++++ ./plugins/Makefile.am 2014-05-09 18:45:30.000000000 +0200
@@ -14,7 +14,7 @@
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c Fri May 9 17:53:39 2014 (r353482)
@@ -1,6 +1,6 @@
---- plugins/check_ssh.c.orig 2012-06-27 21:32:47.000000000 +0400
-+++ plugins/check_ssh.c 2013-09-25 17:03:01.000000000 +0400
-@@ -250,6 +250,7 @@ ssh_connect (char *haddr, int hport, cha
+--- ./plugins/check_ssh.c.orig 2014-04-27 19:59:06.000000000 +0200
++++ ./plugins/check_ssh.c 2014-05-09 18:45:31.000000000 +0200
+@@ -250,6 +250,7 @@
printf
(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
ssh_server, ssh_proto, remote_version);
@@ -8,7 +8,7 @@
close(sd);
exit (STATE_WARNING);
}
-@@ -260,6 +261,7 @@ ssh_connect (char *haddr, int hport, cha
+@@ -260,6 +261,7 @@
(_("SSH OK - %s (protocol %s) | %s\n"),
ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
Modified: head/net-mgmt/monitoring-plugins/pkg-plist
==============================================================================
--- head/net-mgmt/nagios-plugins/pkg-plist Fri May 9 16:59:29 2014 (r353479)
+++ head/net-mgmt/monitoring-plugins/pkg-plist Fri May 9 17:53:39 2014 (r353482)
@@ -67,6 +67,6 @@ libexec/nagios/negate
libexec/nagios/urlize
libexec/nagios/utils.pm
libexec/nagios/utils.sh
-%%NLS%%share/locale/fr/LC_MESSAGES/nagios-plugins.mo
-%%NLS%%share/locale/de/LC_MESSAGES/nagios-plugins.mo
+%%NLS%%share/locale/de/LC_MESSAGES/monitoring-plugins.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/monitoring-plugins.mo
@dirrmtry libexec/nagios
More information about the svn-ports-all
mailing list