Date: Fri, 7 Mar 2003 00:06:11 +0100 (CET) From: Blaz Zupan <blaz@si.FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48987: MAINTAINER UPDATE: net/nagios-plugins Message-ID: <20030306230611.03D2E55412@titanic.medinet.si>
next in thread | raw e-mail | index | archive | help
>Number: 48987
>Category: ports
>Synopsis: MAINTAINER UPDATE: net/nagios-plugins
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 06 15:10:12 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Blaz Zupan
>Release: FreeBSD 4.7-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD titanic.medinet.si 4.7-RELEASE-p3 FreeBSD 4.7-RELEASE-p3 #0: Sun Feb 2 17:58:31 CET 2003 root@bigbrother.amis.net:/db/obj/usr/src/sys/TITANIC i386
>Description:
Update nagios-plugins to 1.3.0.
Remove unneeded patch files/patch-check_mysql.c
Move nagios workfile directory from /usr/local/var/nagios to
/var/spool/nagios. /usr/local is read-only on some NFS booted systems.
>How-To-Repeat:
>Fix:
diff -urN nagios-plugins.old/Makefile nagios-plugins/Makefile
--- nagios-plugins.old/Makefile Fri Feb 21 18:54:00 2003
+++ nagios-plugins/Makefile Thu Mar 6 22:30:37 2003
@@ -6,22 +6,21 @@
#
PORTNAME= nagios-plugins
-PORTVERSION= 1.3.0.b2
+PORTVERSION= 1.3.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagiosplug
-DISTNAME= nagios-plugins-1.3.0-beta2
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Plugins for nagios
USE_SUBMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/sbin \
+CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
--sysconfdir=${PREFIX}/etc/nagios \
- --localstatedir=${PREFIX}/var/nagios \
+ --localstatedir=/var/spool/nagios \
--with-df-command="/bin/df -Pkt noprocfs"
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
diff -urN nagios-plugins.old/distinfo nagios-plugins/distinfo
--- nagios-plugins.old/distinfo Sat Jan 4 00:51:51 2003
+++ nagios-plugins/distinfo Thu Mar 6 21:47:27 2003
@@ -1 +1 @@
-MD5 (nagios-plugins-1.3.0-beta2.tar.gz) = 7a6cce300f6a90c7587d4eced4271182
+MD5 (nagios-plugins-1.3.0.tar.gz) = 74ce3383cb39c85df78a1db7ac50838b
diff -urN nagios-plugins.old/files/patch-check_mysql.c nagios-plugins/files/patch-check_mysql.c
--- nagios-plugins.old/files/patch-check_mysql.c Fri Jan 3 20:08:00 2003
+++ nagios-plugins/files/patch-check_mysql.c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- plugins/check_mysql.c.orig Fri Nov 15 02:04:51 2002
-+++ plugins/check_mysql.c Tue Nov 26 15:12:58 2002
-@@ -207,7 +207,7 @@
- if (strlen(db) == 0 && argc > c)
- db = argv[c++];
-
-- if (is_intnonneg (argv[c]))
-+ if (argc > c && is_intnonneg (argv[c]))
- db_port = atoi (argv[c++]);
-
- return validate_arguments ();
diff -urN nagios-plugins.old/files/patch-configure.in nagios-plugins/files/patch-configure.in
--- nagios-plugins.old/files/patch-configure.in Sat Jan 4 00:51:52 2003
+++ nagios-plugins/files/patch-configure.in Thu Mar 6 22:04:50 2003
@@ -1,6 +1,6 @@
---- configure.in.orig Fri Nov 22 03:46:49 2002
-+++ configure.in Tue Nov 26 14:48:27 2002
-@@ -14,7 +14,7 @@
+--- configure.in.orig Sun Mar 2 05:58:12 2003
++++ configure.in Thu Mar 6 22:03:33 2003
+@@ -12,7 +12,7 @@
AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
@@ -9,7 +9,7 @@
dnl Figure out how to invoke "install" and what install options to use.
-@@ -56,7 +56,6 @@
+@@ -60,7 +60,6 @@
AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
AC_SUBST(nagios_usr)
AC_SUBST(nagios_grp)
@@ -17,18 +17,7 @@
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
-@@ -102,8 +101,8 @@
- AC_CHECK_HEADERS(postgresql/libpq-fe.h)
- AC_CHECK_HEADERS(libpq-fe.h)
- if test "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
-- PGLIBS="-lpq -lcrypt"
-- PGINCLUDE="-I/usr/include/pgsql"
-+ PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
-+ PGINCLUDE="-I$PGSQL/include/pgsql"
- elif test "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
- PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
- PGINCLUDE="-I/usr/include/postgresql"
-@@ -131,25 +130,37 @@
+@@ -143,25 +142,37 @@
LIBS="$_SAVEDLIBS"
CPPFLAGS="$_SAVEDCPPFLAGS"
@@ -48,11 +37,11 @@
if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
EXTRAS="$EXTRAS check_radius"
- RADIUSLIBS="-lradiusclient"
-+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"
++ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"
AC_SUBST(RADIUSLIBS)
else
AC_MSG_WARN([Skipping radius plugin])
- AC_MSG_WARN([install radius libs to compile this plugin (see Requirements).])
+ AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
+fi
@@ -72,8 +61,8 @@
AC_SUBST(LDAPLIBS)
AC_SUBST(LDAPINCLUDE)
EXTRAS="$EXTRAS check_ldap"
-@@ -158,7 +169,7 @@
- AC_MSG_WARN([install LDAP libs to compile this plugin (see Requirements).])
+@@ -170,7 +181,7 @@
+ AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
-
@@ -81,32 +70,7 @@
dnl Check for mysql libraries
_SAVEDLIBS="$LIBS"
-@@ -351,24 +362,6 @@
- LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a"
- fi
-
--dnl We used to not do long options unless a compatible lib was found
--dnl Now we provide code and make libgetopt if native is not suitable
--AC_MSG_CHECKING(for getopt_long)
--AC_TRY_COMPILE([#include <getopt.h>
-- #include <stdlib.h>],
-- [int option_index=0;
-- static struct option *long_options;
-- getopt_long(0,NULL,"+h",long_options,&option_index);],
-- [AC_DEFINE(HAVE_GETOPT_H,1,[Define if getopt headers are found])
-- AC_DEFINE(HAVE_GETOPT_LONG,1,[Define if getopt_long is found])
-- AC_MSG_RESULT(yes)],
-- [AC_DEFINE(HAVE_GETOPT_H,1,[Define if getopt headers are found])
-- AC_DEFINE(HAVE_GETOPT_LONG,1,[Define if getopt_long is found])
-- AC_MSG_RESULT(no)
-- import_sources=getopt
-- LIBS="$LIBS -lgetopt"
-- DEPLIBS="$DEPLIBS libgetopt.a"])
--
- AC_TRY_COMPILE([#include <sys/time.h>],
- [struct timeval *tv;
- struct timezone *tz;],
-@@ -775,6 +768,8 @@
+@@ -818,6 +829,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
fi
@@ -115,7 +79,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
if test -x "$PATH_TO_SNMPGET"
then
-@@ -797,7 +792,10 @@
+@@ -840,7 +853,10 @@
echo "** Tried $PERL - install Net::SNMP perl module if you want to"
echo " use the perl snmp plugins"
fi
@@ -126,7 +90,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
if test -x "$PATH_TO_QUAKESTAT"
-@@ -811,7 +809,10 @@
+@@ -854,7 +870,10 @@
else
echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
fi
@@ -137,7 +101,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
if test -x "$PATH_TO_FPING"
then
-@@ -819,6 +820,7 @@
+@@ -862,6 +881,7 @@
EXTRAS="$EXTRAS check_fping"
else
echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
diff -urN nagios-plugins.old/pkg-plist nagios-plugins/pkg-plist
--- nagios-plugins.old/pkg-plist Sat Jan 4 00:51:52 2003
+++ nagios-plugins/pkg-plist Thu Mar 6 22:34:28 2003
@@ -24,6 +24,7 @@
%%SUB_MYSQL%%libexec/nagios/check_mysql
libexec/nagios/check_nagios
libexec/nagios/check_nntp
+libexec/nagios/check_nt
libexec/nagios/check_ntp
libexec/nagios/check_nwstat
libexec/nagios/check_oracle
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030306230611.03D2E55412>