Date: Sat, 27 Nov 2004 15:00:51 +0100 (CET) From: Blaz Zupan <blaz@si.FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74446: MAINTAINER-UPDATE: net-mgmt/nagios-plugins to 1.4.0.a1 Message-ID: <20041127140051.7DEB655475@titanic.medinet.si> Resent-Message-ID: <200411271410.iAREAQ8E098651@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74446
>Category: ports
>Synopsis: MAINTAINER-UPDATE: net-mgmt/nagios-plugins to 1.4.0.a1
>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 Nov 27 14:10:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Blaz Zupan
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD titanic.medinet.si 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sun Jun 27 16:39:26 CEST 2004 root@bigbrother.amis.net:/usr/obj/usr/src/sys/TITANIC i386
>Description:
Update nagios-plugins port to 1.4.0.alpha1.
Fix compilation with radiusclient 0.4.7.
>How-To-Repeat:
>Fix:
diff -urN nagios-plugins.old/Makefile nagios-plugins/Makefile
--- nagios-plugins.old/Makefile Sun Nov 21 01:40:27 2004
+++ nagios-plugins/Makefile Sat Nov 27 13:15:02 2004
@@ -6,11 +6,11 @@
#
PORTNAME= nagios-plugins
-PORTVERSION= 1.3.1
-PORTREVISION= 6
+PORTVERSION= 1.4.0.a1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= nagiosplug
+DISTNAME= nagios-plugins-1.4.0alpha1
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Plugins for nagios
@@ -97,13 +97,13 @@
.endif
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-USE_AUTOMAKE_VER= 14
-USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 18
+USE_AUTOCONF_VER= 259
USE_GMAKE= yes
USE_PERL5= yes
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
- --acdir=${ACLOCAL_DIR})
+ --acdir=${ACLOCAL_DIR} -I lib)
.include <bsd.port.post.mk>
diff -urN nagios-plugins.old/distinfo nagios-plugins/distinfo
--- nagios-plugins.old/distinfo Wed Mar 31 05:10:28 2004
+++ nagios-plugins/distinfo Sat Nov 27 12:23:55 2004
@@ -1,2 +1,2 @@
-MD5 (nagios-plugins-1.3.1.tar.gz) = 0078c9c8137694181a4cdf596fdbd74f
-SIZE (nagios-plugins-1.3.1.tar.gz) = 532516
+MD5 (nagios-plugins-1.4.0alpha1.tar.gz) = 96f8fc532943bada48ca677d12f5a5a7
+SIZE (nagios-plugins-1.4.0alpha1.tar.gz) = 811705
diff -urN nagios-plugins.old/files/patch-check_breeze.pl nagios-plugins/files/patch-check_breeze.pl
--- nagios-plugins.old/files/patch-check_breeze.pl Mon Jul 22 03:03:42 2002
+++ nagios-plugins/files/patch-check_breeze.pl Thu Jan 1 01:00:00 1970
@@ -1,23 +0,0 @@
---- plugins-scripts/check_breeze.pl.orig Tue May 7 07:35:49 2002
-+++ plugins-scripts/check_breeze.pl Fri Jul 19 20:46:00 2002
-@@ -1,9 +1,9 @@
--#! /usr/bin/perl -wT
-+#! /usr/bin/perl -w
-
-
- use strict;
- use Getopt::Long;
--use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $PROGNAME);
-+use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_C $PROGNAME);
- use lib utils.pm ;
- use utils qw(%ERRORS &print_revision &support &usage);
-
-@@ -47,7 +47,7 @@
- ($opt_C) || ($opt_C = "public") ;
-
- my $sig=0;
--$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
-+$sig = `/usr/bin/snmpget -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
- my @test=split(/ /,$sig);
- $sig=$test[2];
- $sig=int($sig);
diff -urN nagios-plugins.old/files/patch-check_by_ssh.c nagios-plugins/files/patch-check_by_ssh.c
--- nagios-plugins.old/files/patch-check_by_ssh.c Fri Jan 3 20:08:00 2003
+++ nagios-plugins/files/patch-check_by_ssh.c Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- plugins/check_by_ssh.c.orig Wed Nov 20 02:19:07 2002
-+++ plugins/check_by_ssh.c Tue Nov 26 14:20:28 2002
-@@ -361,6 +361,8 @@
- " list of nagios service names, separated by ':' [optional]\n"
- "-n, --name=NAME\n"
- " short name of host in nagios configuration [optional]\n"
-+ "-v, --verbose\n"
-+ " display command being executed\n"
- "-4, --use-ipv4\n"
- " tell ssh to use IPv4\n"
- "-6, --use-ipv6\n"
-@@ -388,7 +390,7 @@
- {
- printf
- ("Usage:\n"
-- "check_by_ssh [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
-+ "check_by_ssh [-fv46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
- " [-n name] [-s servicelist] [-O outputfile] [-p port]\n"
- "check_by_ssh -V prints version info\n"
- "check_by_ssh -h prints more detailed help\n");
diff -urN nagios-plugins.old/files/patch-check_http.c nagios-plugins/files/patch-check_http.c
--- nagios-plugins.old/files/patch-check_http.c Mon Jul 26 20:15:21 2004
+++ nagios-plugins/files/patch-check_http.c Sat Nov 27 12:32:27 2004
@@ -1,12 +1,20 @@
---- plugins/check_http.c.orig Mon Jun 30 11:56:08 2003
-+++ plugins/check_http.c Fri Dec 19 23:03:52 2003
-@@ -198,3 +198,3 @@
+--- plugins/check_http.c.orig Mon Sep 15 07:03:47 2003
++++ plugins/check_http.c Sat Nov 27 12:32:09 2004
+@@ -83,7 +83,7 @@
+ #define HTTP_URL "/"
+ #define CRLF "\r\n"
-char timestamp[17] = "";
+char timestamp[256] = "";
int specify_port = FALSE;
-@@ -975,3 +975,3 @@
+ int server_port = HTTP_PORT;
+ char server_port_text[6] = "";
+@@ -1010,7 +1010,7 @@
+
+ days_left = (mktime (&stamp) - time (NULL)) / 86400;
snprintf
-- (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
+- (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+ (timestamp, sizeof(timestamp), "%02d/%02d/%04d %02d:%02d",
stamp.tm_mon + 1,
+ stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+
diff -urN nagios-plugins.old/files/patch-check_radius.c nagios-plugins/files/patch-check_radius.c
--- nagios-plugins.old/files/patch-check_radius.c Thu Jan 1 01:00:00 1970
+++ nagios-plugins/files/patch-check_radius.c Sat Nov 27 13:25:38 2004
@@ -0,0 +1,54 @@
+--- plugins/check_radius.c.orig Fri Aug 22 08:22:38 2003
++++ plugins/check_radius.c Sat Nov 27 13:25:35 2004
+@@ -102,6 +102,7 @@
+ int result;
+ UINT4 client_id;
+ char *str;
++ rc_handle *rh;
+
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -111,31 +112,34 @@
+ usage (_("Could not parse arguments\n"));
+
+ str = strdup ("dictionary");
+- if ((config_file && rc_read_config (config_file)) ||
+- rc_read_dictionary (rc_conf_str (str)))
++ if (config_file)
++ rh = rc_read_config (config_file);
++ else
++ rh = NULL;
++ if (!rh || rc_read_dictionary (rh, rc_conf_str (rh, str)))
+ die (STATE_UNKNOWN, _("Config file error"));
+
+ service = PW_AUTHENTICATE_ONLY;
+
+- 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)))
++ if (!(rc_avpair_add (rh, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) &&
++ rc_avpair_add (rh, &data.send_pairs, PW_USER_NAME, username, -1, 0) &&
++ rc_avpair_add (rh, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0)))
+ die (STATE_UNKNOWN, _("Out of Memory?"));
+
+ /*
+ * Fill in NAS-IP-Address
+ */
+
+- if ((client_id = rc_own_ipaddress ()) == 0)
++ if ((client_id = rc_own_ipaddress (rh)) == 0)
+ return (ERROR_RC);
+
+- if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
++ if (rc_avpair_add (rh, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, -1, 0) ==
+ NULL) return (ERROR_RC);
+
+- rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
++ rc_buildreq (rh, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+ retries);
+
+- result = rc_send_server (&data, msg);
++ result = rc_send_server (rh, &data, msg);
+ rc_avpair_free (data.send_pairs);
+ if (data.receive_pairs)
+ rc_avpair_free (data.receive_pairs);
diff -urN nagios-plugins.old/files/patch-configure.in nagios-plugins/files/patch-configure.in
--- nagios-plugins.old/files/patch-configure.in Sun Apr 18 00:24:55 2004
+++ nagios-plugins/files/patch-configure.in Sat Nov 27 13:52:17 2004
@@ -1,35 +1,29 @@
---- configure.in.orig Fri Jul 11 08:12:23 2003
-+++ configure.in Sun Apr 4 01:03:13 2004
-@@ -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)
+--- configure.in.orig Mon Dec 1 03:55:32 2003
++++ configure.in Sat Nov 27 13:52:10 2004
+@@ -10,7 +10,7 @@
+ RELEASE=1
+ AC_SUBST(RELEASE)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
dnl Figure out how to invoke "install" and what install options to use.
-
-@@ -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)
--INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"
- 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)
-@@ -143,25 +142,37 @@
+ AC_PROG_INSTALL
+@@ -71,8 +71,6 @@
+ with_nagios_group=nagios)
+ AC_SUBST(with_nagios_user)
+ AC_SUBST(with_nagios_group)
+-INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
+-AC_SUBST(INSTALL_OPTS)
+
+ AC_ARG_WITH(trusted_path,
+ ACX_HELP_STRING([--with-trusted-path=PATH],
+@@ -181,25 +179,32 @@
LIBS="$_SAVEDLIBS"
CPPFLAGS="$_SAVEDCPPFLAGS"
+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
+if test x$enable_radius = xyes; then
-+dnl Check for radiusclient header file
-+_SAVEDCPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-I${LOCALBASE}/include"
-+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include")
-+AC_SUBST(RADIUSINCLUDE)
-+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE"
-+
dnl Check for radius libraries
_SAVEDLIBS="$LIBS"
-AC_CHECK_LIB(radiusclient,rc_read_config)
@@ -37,8 +31,10 @@
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"\
++ RADIUSINCLUDE="-I${LOCALBASE}/include"
AC_SUBST(RADIUSLIBS)
++ AC_SUBST(RADIUSINCLUDE)
else
AC_MSG_WARN([Skipping radius plugin])
AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
@@ -60,17 +56,16 @@
+ LDAPINCLUDE="-I${LOCALBASE}/include"
AC_SUBST(LDAPLIBS)
AC_SUBST(LDAPINCLUDE)
- EXTRAS="$EXTRAS check_ldap"
-@@ -170,7 +181,7 @@
+ AC_CHECK_FUNCS(ldap_set_option)
+@@ -209,6 +214,7 @@
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
--
+fi
+
dnl Check for mysql libraries
- _SAVEDLIBS="$LIBS"
-@@ -209,7 +220,7 @@
+@@ -251,7 +257,7 @@
AC_MSG_WARN([Skipping mysql plugin])
AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
fi
@@ -79,44 +74,27 @@
LIBS="$_SAVEDLIBS"
dnl Check for OpenSSL location
-@@ -418,9 +429,24 @@
- fi
-
- AC_PATH_PROG(PATH_TO_PS,ps)
-+dnl For FreeBSD
-+dnl STAT UCOMM VSZ RSS USER PPID COMMAND
-+if ps -axwo 'stat ucomm vsz rss user uid ppid command' 2>/dev/null | egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
-+then
-+ AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
-+ AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
-+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axwo 'stat uid ppid command'",[Verbatim command to execute for ps in check_netsaint])
-+ EXTRAS="$EXTRAS check_nagios"
-+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axwo 'stat uid ppid ucomm command'",[Verbatim command to execute for ps in check_procs])
-+ AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
-+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axwo 'vsz ucomm'",[Verbatim command to execute for ps in check_vsz])
-+ AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[Format string for scanning ps output in check_vsz])
-+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axwo 'rss ucomm'",[Verbatim command to execute for ps in check_rss])
-+ AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
-+ echo " ps syntax... $PATH_TO_PS -axwo 'stat uid ppid ucomm command'"
- dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
- 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 +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
-+elif ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
+@@ -658,7 +664,7 @@
+ egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
then
- AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
- AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
-@@ -841,6 +867,8 @@
- AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
- fi
+ ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'"
++ ac_cv_ps_command="$PATH_TO_PS -axwo 'state uid ppid vsz rss pcpu command 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])
+@@ -1184,6 +1190,8 @@
+ AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
+ [path and arguments for invoking 'who'])
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
+if test x$enable_snmp = xyes; then
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
if test -x "$PATH_TO_SNMPGET"
then
-@@ -863,7 +891,10 @@
- echo "** Tried $PERL - install Net::SNMP perl module if you want to"
- echo " use the perl snmp plugins"
+@@ -1206,7 +1214,10 @@
+ else
+ AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
fi
+fi
@@ -124,10 +102,10 @@
+if test x$enable_qstat = xyes; then
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
- if test -x "$PATH_TO_QUAKESTAT"
-@@ -877,7 +908,10 @@
- else
- echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
+
+@@ -1228,7 +1239,10 @@
+ AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
+ [path to qstat/quakestat])
fi
+fi
@@ -136,10 +114,10 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
if test -x "$PATH_TO_FPING"
then
-@@ -885,6 +919,7 @@
+@@ -1236,6 +1250,7 @@
EXTRAS="$EXTRAS check_fping"
else
- echo "** Get fping from http://www.fping.com in order to make check_fping plugin"
+ AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
+fi
fi
diff -urN nagios-plugins.old/files/patch-netutils.c nagios-plugins/files/patch-netutils.c
--- nagios-plugins.old/files/patch-netutils.c Thu Jan 1 01:00:00 1970
+++ nagios-plugins/files/patch-netutils.c Sat Nov 27 13:11:00 2004
@@ -0,0 +1,47 @@
+--- plugins/netutils.c.orig Sun Aug 10 08:31:02 2003
++++ plugins/netutils.c Sat Nov 27 13:10:43 2004
+@@ -97,7 +97,7 @@
+ fd_set readfds;
+ int recv_length = 0;
+
+- result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
++ result = nagios_my_connect (server_address, server_port, &sd, IPPROTO_TCP);
+ if (result != STATE_OK)
+ return STATE_CRITICAL;
+
+@@ -175,7 +175,7 @@
+
+ result = STATE_OK;
+
+- result = my_connect (server_address, server_port, &sd, proto);
++ result = nagios_my_connect (server_address, server_port, &sd, proto);
+ if (result != STATE_OK)
+ return STATE_CRITICAL;
+
+@@ -227,7 +227,7 @@
+ {
+ int result;
+
+- result = my_connect (host_name, port, sd, IPPROTO_TCP);
++ result = nagios_my_connect (host_name, port, sd, IPPROTO_TCP);
+
+ return result;
+ }
+@@ -239,7 +239,7 @@
+ {
+ int result;
+
+- result = my_connect (host_name, port, sd, IPPROTO_UDP);
++ result = nagios_my_connect (host_name, port, sd, IPPROTO_UDP);
+
+ return result;
+ }
+@@ -247,7 +247,7 @@
+
+ /* opens a tcp or udp connection to a remote host */
+ int
+-my_connect (const char *host_name, int port, int *sd, int proto)
++nagios_my_connect (const char *host_name, int port, int *sd, int proto)
+ {
+ struct addrinfo hints;
+ struct addrinfo *res;
diff -urN nagios-plugins.old/files/patch-netutils.h nagios-plugins/files/patch-netutils.h
--- nagios-plugins.old/files/patch-netutils.h Thu Jan 1 01:00:00 1970
+++ nagios-plugins/files/patch-netutils.h Sat Nov 27 13:11:26 2004
@@ -0,0 +1,11 @@
+--- plugins/netutils.h.orig Sat Aug 9 01:05:17 2003
++++ plugins/netutils.h Sat Nov 27 13:10:26 2004
+@@ -47,7 +47,7 @@
+
+ int my_tcp_connect (const char *address, int port, int *sd);
+ int my_udp_connect (const char *address, int port, int *sd);
+-int my_connect (const char *address, int port, int *sd, int proto);
++int nagios_my_connect (const char *address, int port, int *sd, int proto);
+
+ int is_host (const char *);
+ int is_addr (const char *);
diff -urN nagios-plugins.old/files/patch-subst.in nagios-plugins/files/patch-subst.in
--- nagios-plugins.old/files/patch-subst.in Mon Jul 22 03:03:42 2002
+++ nagios-plugins/files/patch-subst.in Thu Jan 1 01:00:00 1970
@@ -1,36 +0,0 @@
---- plugins-scripts/subst.in.orig Thu Jun 6 06:16:56 2002
-+++ plugins-scripts/subst.in Sun Jul 14 13:38:22 2002
-@@ -37,6 +37,16 @@
-
- }
-
-+# Specific programs
-+
-+#
-+/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-+ match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-+ start=RSTART+RLENGTH;
-+ c=substr($0,RSTART,RLENGTH);
-+ sub(c,which(c,path));
-+}
-+
- # scripting language (first line)
-
- /^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
-@@ -56,16 +66,6 @@
-
- /^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
- sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
--}
--
--# Specific programs
--
--#
--/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-- start=RSTART+RLENGTH;
-- c=substr($0,RSTART,RLENGTH);
-- sub(c,which(c,path));
- }
-
- {
diff -urN nagios-plugins.old/pkg-plist nagios-plugins/pkg-plist
--- nagios-plugins.old/pkg-plist Mon Jul 26 20:15:21 2004
+++ nagios-plugins/pkg-plist Sat Nov 27 12:23:55 2004
@@ -5,6 +5,7 @@
libexec/nagios/check_disk_smb
libexec/nagios/check_dns
libexec/nagios/check_dummy
+libexec/nagios/check_file_age
libexec/nagios/check_flexlm
%%SUB_FPING%%libexec/nagios/check_fping
libexec/nagios/check_ftp
@@ -46,12 +47,20 @@
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_vsz
libexec/nagios/check_wave
libexec/nagios/negate
libexec/nagios/urlize
libexec/nagios/utils.pm
libexec/nagios/utils.sh
@unexec rmdir %D/libexec/nagios 2>/dev/null || true
+share/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo
+share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
+@dirrm share/nagios/locale/de/LC_MESSAGES
+@dirrm share/nagios/locale/fr/LC_MESSAGES
+@dirrm share/nagios/locale/de
+@dirrm share/nagios/locale/fr
+@dirrm share/nagios/locale
+@unexec rmdir %D/share/nagios 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041127140051.7DEB655475>