Date: Fri, 2 Mar 2007 07:46:42 +1030 (CST) From: Jarrod Sayers <jarrod@netleader.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109731: [maintainer-update] net-mgmt/nagios-plugins: Update to 1.4.6 Message-ID: <200703012116.l21LGgJ3081634@wallace.netleader.com.au> Resent-Message-ID: <200703012120.l21LK7TP065524@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109731 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios-plugins: Update to 1.4.6 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 01 21:20:06 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 6.2-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD wallace.netleader.com.au 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #69: Tue Feb 13 19:59:38 CST 2007 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386 >Description: Update of Nagios Plugins to 1.4.6. Files changed: - ports/net-mgmt/nagios-plugins/Makefile - ports/net-mgmt/nagios-plugins/distinfo - ports/net-mgmt/nagios-plugins/files/patch-configure.in - ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am - ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c Files removed: - ports/net-mgmt/nagios-plugins/files/patch-lib__regex_internal.h - ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c >How-To-Repeat: >Fix: Downloadable diff from: http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-plugins-1.4.6.diff --- net-mgmt-nagios-plugins-1.4.6.diff begins here --- diff -ruN ports/net-mgmt/nagios-plugins.orig/Makefile ports/net-mgmt/nagios-plugins/Makefile --- ports/net-mgmt/nagios-plugins.orig/Makefile Mon Nov 6 05:51:58 2006 +++ ports/net-mgmt/nagios-plugins/Makefile Thu Mar 1 21:25:50 2007 @@ -6,7 +6,7 @@ # PORTNAME= nagios-plugins -PORTVERSION= 1.4.5 +PORTVERSION= 1.4.6 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} @@ -21,7 +21,7 @@ USE_GETTEXT= yes USE_PERL5= yes USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:259 -ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I m4 +ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I gl/m4 OPTIONS= QSTAT "Game server query support (check_game)" OFF \ FPING "Support for non-flooding fast ping (check_fping)" OFF \ @@ -55,6 +55,8 @@ LDFLAGS="${LDFLAGS}" \ LIBS="-L${LOCALBASE}/lib" \ PERL=${PERL} + +MAKE_ARGS= MKINSTALLDIRS=../mkinstalldirs .if defined(WITH_QSTAT) BUILD_DEPENDS+= qstat:${PORTSDIR}/games/qstat diff -ruN ports/net-mgmt/nagios-plugins.orig/distinfo ports/net-mgmt/nagios-plugins/distinfo --- ports/net-mgmt/nagios-plugins.orig/distinfo Mon Nov 6 05:51:58 2006 +++ ports/net-mgmt/nagios-plugins/distinfo Thu Feb 22 19:08:52 2007 @@ -1,3 +1,3 @@ -MD5 (nagios-plugins-1.4.5.tar.gz) = 359afddaf6a8e3228a5130b60bed0f67 -SHA256 (nagios-plugins-1.4.5.tar.gz) = 2bf4a629f1217be0621fe280ed835b2497111ba2022e715bcdd01307c0ce52f6 -SIZE (nagios-plugins-1.4.5.tar.gz) = 1285997 +MD5 (nagios-plugins-1.4.6.tar.gz) = ea79fa91092d709aa6b2e732b1d55541 +SHA256 (nagios-plugins-1.4.6.tar.gz) = 892adc5bde75c711dc63d6bde9caf9c5f93d7a6e6df8df24c160b427bb1d51ca +SIZE (nagios-plugins-1.4.6.tar.gz) = 1349110 diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-configure.in ports/net-mgmt/nagios-plugins/files/patch-configure.in --- ports/net-mgmt/nagios-plugins.orig/files/patch-configure.in Wed Nov 1 21:09:08 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-configure.in Thu Feb 22 19:14:56 2007 @@ -1,6 +1,6 @@ ---- configure.in.orig Fri Oct 20 05:34:23 2006 -+++ configure.in Sat Oct 28 09:57:25 2006 -@@ -10,8 +10,6 @@ +--- configure.in.orig Mon Feb 5 23:43:05 2007 ++++ configure.in Thu Feb 22 19:10:56 2007 +@@ -12,8 +12,6 @@ RELEASE=1 AC_SUBST(RELEASE) @@ -9,16 +9,16 @@ dnl Deprecated configure options AC_ARG_WITH(nagios_user,, AC_MSG_ERROR([--with-nagios-user is a deprecated option])) -@@ -29,7 +27,7 @@ +@@ -27,7 +25,7 @@ AC_PROG_CC - AC_PROG_CPP + gl_EARLY AC_PROG_GCC_TRADITIONAL -AC_PROG_LIBTOOL +AC_PROG_RANLIB - AC_PROG_MAKE_SET - AC_PROG_AWK -@@ -167,11 +165,12 @@ + AM_PROG_CC_C_O + +@@ -150,11 +148,12 @@ ACX_HELP_STRING([--with-pgsql=DIR], [sets path to pgsql installation]), PGSQL=$withval,) @@ -33,7 +33,7 @@ fi AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then -@@ -208,30 +207,42 @@ +@@ -191,30 +190,42 @@ AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).]) fi @@ -83,7 +83,7 @@ AC_CHECK_FUNCS(ldap_set_option) EXTRAS="$EXTRAS check_ldap" AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) -@@ -240,6 +251,7 @@ +@@ -223,6 +234,7 @@ AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).]) fi LIBS="$_SAVEDLIBS" @@ -91,7 +91,7 @@ dnl Check for mysql libraries dnl Default is to search path for mysql_config -@@ -654,47 +666,10 @@ +@@ -485,47 +497,10 @@ ac_cv_ps_cols="$PS_COLS" AC_MSG_RESULT([(command-line) $ac_cv_ps_command]) @@ -142,7 +142,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'" -@@ -702,9 +677,8 @@ +@@ -533,9 +508,8 @@ ac_cv_ps_cols=9 AC_MSG_RESULT([$ac_cv_ps_command]) @@ -154,7 +154,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 -@@ -714,209 +688,6 @@ +@@ -545,209 +519,6 @@ ac_cv_ps_cols=9 AC_MSG_RESULT([$ac_cv_ps_command]) @@ -364,7 +364,7 @@ else AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled]) fi -@@ -1286,6 +1057,8 @@ +@@ -1117,6 +888,8 @@ AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", [path and arguments for invoking 'who']) @@ -373,7 +373,7 @@ AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) AC_ARG_WITH(snmpget_command, ACX_HELP_STRING([--with-snmpget-command=PATH], -@@ -1316,7 +1089,10 @@ +@@ -1147,7 +920,10 @@ else AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) fi @@ -384,7 +384,7 @@ AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) AC_PATH_PROG(PATH_TO_QSTAT,qstat) AC_ARG_WITH(qstat_command, -@@ -1341,7 +1117,10 @@ +@@ -1172,7 +948,10 @@ AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", [path to qstat/quakestat]) fi @@ -395,7 +395,7 @@ AC_PATH_PROG(PATH_TO_FPING,fping) AC_ARG_WITH(fping_command, ACX_HELP_STRING([--with-fping-command=PATH], -@@ -1353,6 +1132,7 @@ +@@ -1184,6 +963,7 @@ else AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) fi @@ -403,7 +403,7 @@ AC_PATH_PROG(PATH_TO_SSH,ssh) AC_ARG_WITH(ssh_command, -@@ -1420,32 +1200,12 @@ +@@ -1251,32 +1031,12 @@ dnl end if for PATH_TO_SWAP fi @@ -426,7 +426,7 @@ -elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null] -then - ac_cv_have_swap=yes -- ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM", +- ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" - ac_cv_swap_format=["%*s %f %*d %f"] - ac_cv_swap_conv=1024 - AC_MSG_RESULT([using HP-UX format swapinfo]) diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-lib__regex_internal.h ports/net-mgmt/nagios-plugins/files/patch-lib__regex_internal.h --- ports/net-mgmt/nagios-plugins.orig/files/patch-lib__regex_internal.h Wed Nov 1 21:09:08 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-lib__regex_internal.h Thu Jan 1 09:30:00 1970 @@ -1,11 +0,0 @@ ---- lib/regex_internal.h.orig Thu May 25 22:03:24 2006 -+++ lib/regex_internal.h Sat Oct 28 10:04:21 2006 -@@ -455,8 +455,6 @@ - #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) - #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) - --#include <alloca.h> -- - #ifndef _LIBC - # if HAVE_ALLOCA - /* The OS usually guarantees only one guard page at the bottom of the stack, diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__Makefile.am ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am --- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__Makefile.am Mon May 15 22:37:20 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am Thu Feb 22 19:32:55 2007 @@ -1,11 +1,11 @@ ---- plugins/Makefile.am.orig Tue Mar 21 22:12:59 2006 -+++ plugins/Makefile.am Fri May 12 23:37:04 2006 -@@ -4,7 +4,7 @@ +--- plugins/Makefile.am.orig Thu Jan 25 09:48:05 2007 ++++ plugins/Makefile.am Thu Feb 22 19:32:15 2007 +@@ -2,7 +2,7 @@ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t --INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ -+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@ +-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ ++INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@ datadir = @datadir@ localedir = $(datadir)/locale diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_radius.c ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c --- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_radius.c Wed Nov 1 21:09:08 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c Tue Feb 27 21:36:51 2007 @@ -1,6 +1,6 @@ ---- plugins/check_radius.c.orig Tue Jun 20 20:47:02 2006 -+++ plugins/check_radius.c Sat Oct 28 09:57:25 2006 -@@ -40,7 +40,7 @@ +--- plugins/check_radius.c.orig Mon Jan 29 08:16:40 2007 ++++ plugins/check_radius.c Tue Feb 27 21:36:09 2007 +@@ -43,7 +43,7 @@ #include "utils.h" #include "netutils.h" @@ -9,7 +9,7 @@ int process_arguments (int, char **); void print_help (void); -@@ -121,6 +121,7 @@ +@@ -124,6 +124,7 @@ int result = STATE_UNKNOWN; UINT4 client_id; char *str; @@ -17,7 +17,7 @@ setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); -@@ -130,32 +131,35 @@ +@@ -133,33 +134,36 @@ usage4 (_("Could not parse arguments")); str = strdup ("dictionary"); @@ -32,6 +32,7 @@ service = PW_AUTHENTICATE_ONLY; + memset (&data, 0, sizeof(data)); - if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) && - rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) && - rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) && diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_tcp.c ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c --- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_tcp.c Mon May 15 22:37:20 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c Thu Jan 1 09:30:00 1970 @@ -1,11 +0,0 @@ ---- plugins/check_tcp.c.orig Thu Mar 30 02:03:36 2006 -+++ plugins/check_tcp.c Fri May 12 23:27:44 2006 -@@ -155,7 +155,7 @@ - SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n"; - EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'"; - QUIT = "</stream:stream>\n"; -- flags |= FLAG_SSL | FLAG_HIDE_OUTPUT; -+ flags |= FLAG_HIDE_OUTPUT; - PORT = 5222; - } - else if (!strncmp (SERVICE, "NNTPS", 5)) { --- net-mgmt-nagios-plugins-1.4.6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703012116.l21LGgJ3081634>