Date: Sat, 28 Oct 2006 11:37:34 +0930 (CST) From: Jarrod Sayers <jarrod@netleader.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104872: [maintainer-update] net-mgmt/nagios-plugins: Update to 1.4.4 Message-ID: <200610280207.k9S27Ynn035063@manhattan.netleader.com.au> Resent-Message-ID: <200610280210.k9S2A8Pw075736@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104872 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios-plugins: Update to 1.4.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 28 02:10:07 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 6.1-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD manhattan.netleader.com.au 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #30: Mon Aug 28 20:44:19 CST 2006 root@manhattan.netleader.com.au:/usr/obj/usr/src/sys/MANHATTAN i386 >Description: Update to nagios-plugins 1.4.4. 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__check_radius.c - ports/net-mgmt/nagios-plugins/pkg-plist Files added: - ports/net-mgmt/nagios-plugins/files/patch-lib__regex_internal.h Files removed: - ports/net-mgmt/nagios-plugins/files/patch-plugins__check_snmp.c >How-To-Repeat: >Fix: Downloadable diff from http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-plugins-1.4.4.diff --- net-mgmt-nagios-plugins-1.4.4.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 Sat Oct 28 00:26:39 2006 +++ ports/net-mgmt/nagios-plugins/Makefile Sat Oct 28 10:59:07 2006 @@ -6,7 +6,7 @@ # PORTNAME= nagios-plugins -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.4 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} @@ -34,8 +34,6 @@ GNU_CONFIGURE= yes -NAGIOSUSER?= nagios -NAGIOSGROUP?= nagios NAGIOSDIR?= /var/spool/nagios NAGIOSWWWDIR?= www/nagios @@ -44,9 +42,7 @@ .include <bsd.port.pre.mk> -CONFIGURE_ARGS= --with-nagios-user=${NAGIOSUSER} \ - --with-nagios-group=${NAGIOSGROUP} \ - --with-cgiurl=${NAGIOSCGIURL} \ +CONFIGURE_ARGS= --with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ @@ -108,6 +104,7 @@ CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} PLIST_SUB+= SUB_MYSQL="" .else +CONFIGURE_ARGS+= --without-mysql PLIST_SUB+= SUB_MYSQL="@comment " .endif diff -ruN ports/net-mgmt/nagios-plugins.orig/distinfo ports/net-mgmt/nagios-plugins/distinfo --- ports/net-mgmt/nagios-plugins.orig/distinfo Sat Oct 28 00:26:40 2006 +++ ports/net-mgmt/nagios-plugins/distinfo Sat Oct 28 09:50:28 2006 @@ -1,3 +1,3 @@ -MD5 (nagios-plugins-1.4.3.tar.gz) = 2c40fc69d51cc979e85150870a1daa93 -SHA256 (nagios-plugins-1.4.3.tar.gz) = e1178d639bef1b45a7bddb61899217122840382ee180594f0262fb4a1e6a8c70 -SIZE (nagios-plugins-1.4.3.tar.gz) = 1257775 +MD5 (nagios-plugins-1.4.4.tar.gz) = e27849f268ab04014bfbbd19d9af1333 +SHA256 (nagios-plugins-1.4.4.tar.gz) = 81f2347c2b30125527bca69500879ae22b20fcb8642a197cfc456048361b37c4 +SIZE (nagios-plugins-1.4.4.tar.gz) = 1296190 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 Sat Oct 28 00:26:40 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-configure.in Sat Oct 28 10:05:41 2006 @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 19 13:12:33 2006 -+++ configure.in Fri May 12 23:42:58 2006 +--- configure.in.orig Fri Oct 20 05:34:23 2006 ++++ configure.in Sat Oct 28 09:57:25 2006 @@ -10,8 +10,6 @@ RELEASE=1 AC_SUBST(RELEASE) @@ -7,26 +7,18 @@ -AC_PREFIX_DEFAULT(/usr/local/nagios) - dnl Deprecated configure options - - dnl Figure out how to invoke "install" and what install options to use. -@@ -25,7 +23,6 @@ + AC_ARG_WITH(nagios_user,, + AC_MSG_ERROR([--with-nagios-user is a deprecated option])) +@@ -29,7 +27,7 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_GCC_TRADITIONAL -AC_PROG_LIBTOOL ++AC_PROG_RANLIB AC_PROG_MAKE_SET AC_PROG_AWK -@@ -73,7 +70,7 @@ - with_nagios_group=nagios) - AC_SUBST(with_nagios_user) - AC_SUBST(with_nagios_group) --INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group" -+INSTALL_OPTS="-o root -g wheel" - AC_SUBST(INSTALL_OPTS) - - AC_ARG_WITH(trusted_path, -@@ -181,11 +178,12 @@ +@@ -167,11 +165,12 @@ ACX_HELP_STRING([--with-pgsql=DIR], [sets path to pgsql installation]), PGSQL=$withval,) @@ -41,7 +33,7 @@ fi AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then -@@ -222,30 +220,42 @@ +@@ -208,30 +207,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 @@ -91,15 +83,15 @@ 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) -@@ -254,6 +264,7 @@ +@@ -240,6 +251,7 @@ AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).]) fi LIBS="$_SAVEDLIBS" +fi dnl Check for mysql libraries - AC_ARG_WITH(mysql, -@@ -664,47 +675,10 @@ + dnl Default is to search path for mysql_config +@@ -654,47 +666,10 @@ ac_cv_ps_cols="$PS_COLS" AC_MSG_RESULT([(command-line) $ac_cv_ps_command]) @@ -126,7 +118,7 @@ - ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" - ac_cv_ps_cols=8 - AC_MSG_RESULT([using nagios-plugins internal ps for solaris]) -- AM_CONDITIONAL(WANT_PST3, true) +- EXTRAS_ROOT="$EXTRAS_ROOT pst3" - -dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. -dnl so test for this first... @@ -150,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'" -@@ -712,9 +686,8 @@ +@@ -702,9 +677,8 @@ ac_cv_ps_cols=9 AC_MSG_RESULT([$ac_cv_ps_command]) @@ -162,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 -@@ -724,209 +697,6 @@ +@@ -714,209 +688,6 @@ ac_cv_ps_cols=9 AC_MSG_RESULT([$ac_cv_ps_command]) @@ -372,7 +364,7 @@ else AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled]) fi -@@ -1310,6 +1080,8 @@ +@@ -1286,6 +1057,8 @@ AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", [path and arguments for invoking 'who']) @@ -381,7 +373,7 @@ AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) AC_ARG_WITH(snmpget_command, ACX_HELP_STRING([--with-snmpget-command=PATH], -@@ -1340,7 +1112,10 @@ +@@ -1316,7 +1089,10 @@ else AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) fi @@ -392,7 +384,7 @@ AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) AC_PATH_PROG(PATH_TO_QSTAT,qstat) AC_ARG_WITH(qstat_command, -@@ -1365,7 +1140,10 @@ +@@ -1341,7 +1117,10 @@ AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", [path to qstat/quakestat]) fi @@ -403,7 +395,7 @@ AC_PATH_PROG(PATH_TO_FPING,fping) AC_ARG_WITH(fping_command, ACX_HELP_STRING([--with-fping-command=PATH], -@@ -1377,6 +1155,7 @@ +@@ -1353,6 +1132,7 @@ else AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) fi @@ -411,7 +403,7 @@ AC_PATH_PROG(PATH_TO_SSH,ssh) AC_ARG_WITH(ssh_command, -@@ -1444,32 +1223,12 @@ +@@ -1420,32 +1200,12 @@ dnl end if for PATH_TO_SWAP fi 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 Thu Jan 1 09:30:00 1970 +++ ports/net-mgmt/nagios-plugins/files/patch-lib__regex_internal.h Sat Oct 28 10:05:44 2006 @@ -0,0 +1,11 @@ +--- 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__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 Mon May 15 22:37:20 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c Sat Oct 28 10:06:04 2006 @@ -1,6 +1,6 @@ ---- plugins/check_radius.c.orig Sun Dec 26 09:47:44 2004 -+++ plugins/check_radius.c Fri May 12 23:35:17 2006 -@@ -27,7 +27,7 @@ +--- 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 @@ #include "utils.h" #include "netutils.h" @@ -9,7 +9,7 @@ int process_arguments (int, char **); void print_help (void); -@@ -108,6 +108,7 @@ +@@ -121,6 +121,7 @@ int result = STATE_UNKNOWN; UINT4 client_id; char *str; @@ -17,7 +17,7 @@ setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); -@@ -117,32 +118,35 @@ +@@ -130,32 +131,35 @@ usage4 (_("Could not parse arguments")); str = strdup ("dictionary"); diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_snmp.c ports/net-mgmt/nagios-plugins/files/patch-plugins__check_snmp.c --- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_snmp.c Mon May 15 22:37:20 2006 +++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_snmp.c Thu Jan 1 09:30:00 1970 @@ -1,18 +0,0 @@ ---- plugins/check_snmp.c.orig Tue Nov 1 06:33:19 2005 -+++ plugins/check_snmp.c Fri May 12 23:29:24 2006 -@@ -206,6 +206,7 @@ - strcat(perfstr, "| "); - while (ptr) { - char *foo; -+ char *str[MAX_INPUT_BUFFER]; - - foo = strstr (ptr, delimiter); - strncat(perfstr, ptr, foo-ptr); -@@ -338,7 +339,6 @@ - - i++; - -- char *str[MAX_INPUT_BUFFER]; - asprintf(str, "=%s%s;;;; ", show, type ? type : ""); - strcat(perfstr, *str); - diff -ruN ports/net-mgmt/nagios-plugins.orig/pkg-plist ports/net-mgmt/nagios-plugins/pkg-plist --- ports/net-mgmt/nagios-plugins.orig/pkg-plist Sat Oct 28 00:26:41 2006 +++ ports/net-mgmt/nagios-plugins/pkg-plist Sat Oct 28 10:15:39 2006 @@ -1,3 +1,4 @@ +libexec/nagios/check_apt libexec/nagios/check_breeze libexec/nagios/check_by_ssh libexec/nagios/check_clamd @@ -55,7 +56,6 @@ libexec/nagios/check_tcp libexec/nagios/check_time libexec/nagios/check_udp -libexec/nagios/check_udp2 libexec/nagios/check_ups libexec/nagios/check_users libexec/nagios/check_wave --- net-mgmt-nagios-plugins-1.4.4.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?200610280207.k9S27Ynn035063>