Hello community,
here is the log from the commit of package nagios-plugins for openSUSE:Factory
checked in at Mon Dec 21 14:22:22 CET 2009.
--------
--- nagios-plugins/nagios-plugins.changes 2009-07-08 13:42:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/nagios-plugins/nagios-plugins.changes 2009-12-20 19:07:30.000000000 +0100
@@ -1,0 +2,50 @@
+Sun Dec 20 18:07:17 UTC 2009 - coolo@novell.com
+
+- add nagios-plugins-1.4.14-implicit_decl.patch to spec file
+
+-------------------------------------------------------------------
+Tue Dec 15 11:50:05 UTC 2009 - lars@linux-schulserver.de
+
+- enhanced the documentation in the example permissions file
+
+-------------------------------------------------------------------
+Sun Dec 13 17:18:22 UTC 2009 - lars@linux-schulserver.de
+
+- added run_permissions in post in case somebody uses the delivered
+ example file
+
+-------------------------------------------------------------------
+Sun Dec 6 12:58:46 CET 2009 - lars@linux-schulserver.de
+
+- enabled extra-opts
+- fix pathnames to ntp commands
+- remove check_sensors on archs with no support for it
+- added the following patches:
+ + nagios-plugins-1.4.14-ntpd.patch (remove wrong comment)
+ + nagios-plugins-1.4.14-check_log.patch (fix pathnames)
+ + nagios-plugins-1.4.14-command_cfg.patch (fix pathnames)
+ + nagios-plugins-1.4.14-nmap.patch (fix tempdir)
+ + nagios-plugins-1.4.14-check_inodes.patch (initialize vars)
+ + nagios-plugins-1.4.14-implicit_decl.patch (fix implicit decl.)
+ + nagios-plugins-1.4.14-check_ircd.patch (Make it working on
+ multihomed host - thanks to ultrotter@debian.org)
+
+-------------------------------------------------------------------
+Tue Nov 24 22:11:14 UTC 2009 - crrodriguez@opensuse.org
+
+- refresh patches wit fuzz=0
+
+-------------------------------------------------------------------
+Wed Sep 16 12:25:32 CEST 2009 - cschneemann@suse.de
+
+- update to 1.4.14
+ for a full list of changes have a look at
+ /usr/share/doc/packages/nagios-plugins/ChangeLog
+
+-------------------------------------------------------------------
+Sat Jul 25 10:40:23 CEST 2009 - cschneemann@suse.de
+
+- moved example file command.cfg to doc directory, the nagios package
+ brings its own configuration files, this command.cfg confuses
+
+-------------------------------------------------------------------
@@ -7,0 +58,14 @@
+Fri Jun 5 09:24:33 CEST 2009 - chris@computersalat.de
+
+- added contrib to doc
+- spec mods
+ * cleanup specfile
+ o RPM Tags
+ * fixed deps on sub-pkg extras
+ * use of rpm macros
+ * add S:11, S:12 in prep
+ * simplify filelist for libexecdir
+ o checks for extras pkg are excluded in main pkg
+ * reworked files for doc
+
+-------------------------------------------------------------------
@@ -10 +74 @@
-- fixed buffer overflow in check_ntp_peer bnc#498669
+- fixed buffer overflow in check_ntp_peer (bnc#498669)
calling whatdependson for head-i586
Old:
----
check_ntp_peer-buffer-overflow.patch
nagios-plugins-1.4.13.tar.bz2
New:
----
nagios-plugins-1.4.14-check_inodes.patch
nagios-plugins-1.4.14-check_ircd.patch
nagios-plugins-1.4.14-check_log.patch
nagios-plugins-1.4.14-command_cfg.patch
nagios-plugins-1.4.14-implicit_decl.patch
nagios-plugins-1.4.14-nmap.patch
nagios-plugins-1.4.14-ntpd.patch
nagios-plugins-1.4.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios-plugins.spec ++++++
--- /var/tmp/diff_new_pack.zcStfA/_old 2009-12-21 14:22:00.000000000 +0100
+++ /var/tmp/diff_new_pack.zcStfA/_new 2009-12-21 14:22:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package nagios-plugins (Version 1.4.13)
+# spec file for package nagios-plugins (Version 1.4.14)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,36 +17,25 @@
# norootforbuild
+%define libexecdir %_prefix/lib/nagios/plugins
Name: nagios-plugins
Summary: The Nagios Plug-Ins
-Version: 1.4.13
-Release: 4
-Url: http://nagiosplug.sourceforge.net/
-License: GPL v2 or later
+Version: 1.4.14
+Release: 1
+License: GPLv2+
Group: System/Monitoring
-BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient-devel
-BuildRequires: mysql-devel net-snmp-devel openldap2-devel openssh perl-Net-SNMP
-BuildRequires: gnutls-devel postfix postgresql-devel procps python-devel samba-client
-BuildRequires: nagios-devel
-%if 0%{?suse_version}
-%if 0%{?suse_version} > 1020
-BuildRequires: freeradius-client-devel
-%else
-BuildRequires: freeradius-devel
-%endif
-%if 0%{?suse_version} < 1010
-BuildRequires: heimdal-devel
-%else
-BuildRequires: krb5-devel syslog-ng
-%endif
-%else
-BuildRequires: krb5-devel
-%endif
+Url: http://nagiosplugins.org/
+PreReq: permissions
Source0: nagios-plugins-%{version}.tar.bz2
Source10: nagios-plugins.check_xenvm.sh
Source11: nagios-plugins-permissions
Source12: nagios-plugins-README.SuSE
+Patch1: nagios-plugins-1.4.14-ntpd.patch
+Patch2: nagios-plugins-1.4.14-check_log.patch
+Patch3: nagios-plugins-1.4.14-command_cfg.patch
+Patch4: nagios-plugins-1.4.14-nmap.patch
+Patch5: nagios-plugins-1.4.14-check_inodes.patch
Patch6: nagios-plugins-1.4.6-no_chown.patch
Patch8: nagios-plugins.ctypes.patch
Patch9: nagios-plugins.check_dhcp-char.patch
@@ -54,10 +43,33 @@
Patch11: nagios-plugins.check_snmp.arrayaddress.patch
Patch12: nagios-plugins-postgresql.patch
Patch13: nagios-plugins.negate.validate_arguments.patch
-Patch14: check_ntp_peer-buffer-overflow.patch
+Patch14: nagios-plugins-1.4.14-check_ircd.patch
+Patch15: nagios-plugins-1.4.14-implicit_decl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: bind-utils fping iputils procps samba-client
+BuildRequires: dhcp-devel gnutls-devel libsmbclient-devel
+BuildRequires: mysql-devel
+BuildRequires: nagios-devel
+BuildRequires: net-snmp-devel openldap2-devel openssh
+BuildRequires: openssl-devel perl-Net-SNMP postfix postgresql-devel
+BuildRequires: python-devel
+%if 0%{?suse_version}
+%if 0%{?suse_version} > 1020
+BuildRequires: freeradius-client-devel
+%else
+BuildRequires: radiusclient
+%endif
+%if 0%{?suse_version} > 910
+BuildRequires: krb5-devel syslog-ng
+%else
+BuildRequires: heimdal-devel
+%endif
+%else
+BuildRequires: krb5-devel
+%endif
+Requires: perl
Requires: perl-Net-SNMP
-%define libexecdir %_prefix/lib/nagios/plugins
+Requires: zlib
%description
Nagios is a program that will monitor hosts and services on your
@@ -78,10 +90,16 @@
and others
%package extras
-License: GPL v2 or later
Summary: Nagios Plug-Ins which depend on additional packages
+License: GPLv2+
Group: System/Monitoring
-Requires: %name net-snmp fping
+Requires: %{name} = %{version}
+Requires: openssl net-snmp fping
+%if 0%{?suse_version} > 1020
+Requires: freeradius-client
+%else
+Requires: radiusclient
+%endif
%description extras
These are additional plug-ins for Nagios.
@@ -96,31 +114,44 @@
and others
%prep
-%setup -q
-#%patch2
-#%patch3
-#%patch4
+%setup -q -n %{name}-%{version}
+%{__mkdir_p} example/permissions.d
+%{__cp} %{S:11} example/permissions.d/%{name}
+%{__cp} %{S:12} ./README.SuSE
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
%patch6
-%patch8 -p1
-#%patch7
-%patch9 -p1
-%patch10 -p1
+%patch8
+%patch9
+%patch10
%patch11
%patch12
-%patch13 -p1
-%patch14
+%patch13
+%patch14 -p0
+%patch15 -p0
+pushd contrib
+%{__rm} -r aix
+find -type f -exec %{__chmod} 644 {} \;
+popd
%build
export CFLAGS="%optflags -fno-strict-aliasing -DLDAP_DEPRECATED"
%configure \
- --libexecdir=%libexecdir \
+ --libexecdir=%{libexecdir} \
--with-cgiurl=/nagios/cgi-bin \
- --sysconfdir=%_sysconfdir/nagios \
+ --sysconfdir=%{_sysconfdir}/nagios \
--enable-static=no \
- --with-fping-command=%_sbindir/fping \
- --with-apt-get-command=%_bindir/apt-get \
- --with-qstat-command=%_bindir/qstat \
- --with-rpcinfo-command=%_sbindir/rpcinfo \
+ --enable-extra-opts \
+ --with-fping-command=%{_sbindir}/fping \
+ --with-apt-get-command=%{_bindir}/apt-get \
+ --with-qstat-command=%{_bindir}/qstat \
+ --with-rpcinfo-command=%{_sbindir}/rpcinfo \
+ --with-ntpq-command=%{_sbindir}/ntpq \
+ --with-ntpdc-command=%{_sbindir}/ntpdc \
+ --with-ntpdate-command=%{_sbindir}/ntpdate \
--with-ps-command="/bin/ps axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" \
--with-ps-format='%s %d %d %d %d %d %f %s %s %n' \
--with-ps-cols=10 \
@@ -132,109 +163,77 @@
%install
sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS = ../mkinstalldirs,' po/Makefile
%makeinstall
-install -D -m 664 command.cfg %buildroot/%_sysconfdir/nagios/command.cfg
-cp -avL %{S:10} $RPM_BUILD_ROOT%{libexecdir}/check_xenvm
-%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}%libexecdir/
-%{__install} -m 0755 contrib/check_netapp.pl %{buildroot}%libexecdir/
-pushd %buildroot/%libexecdir
+%{__install} -m 0755 %{S:10} $RPM_BUILD_ROOT%{libexecdir}/check_xenvm
+%{__install} -m 0755 contrib/check_linux_raid.pl $RPM_BUILD_ROOT%{libexecdir}/
+%{__install} -m 0755 contrib/check_netapp.pl $RPM_BUILD_ROOT%{libexecdir}/
+# fix "use lib" on installed perl checks
+pushd $RPM_BUILD_ROOT%{libexecdir}
for file in $(find -maxdepth 1 -type f); do
- sed -i 's|use lib "nagios/plugins".*;|use lib "%libexecdir";|g;
- s|use lib "/usr/local/nagios/libexec".*;|use lib "%libexecdir";|g' $file
+ sed -i 's|use lib "nagios/plugins".*;|use lib "%{libexecdir}";|g;
+ s|use lib "/usr/local/nagios/libexec".*;|use lib "%{libexecdir}";|g' $file
done
popd
-mkdir -p %buildroot/%_defaultdocdir/%{name}
-install -Dm644 %{SOURCE11} %buildroot/%_defaultdocdir/%{name}/example/permissions.d/nagios-plugins
-install -m644 ACKNOWLEDGEMENTS AUTHORS BUGS CODING COPYING ChangeLog NEWS README FAQ SUPPORT REQUIREMENTS THANKS LEGAL %buildroot/%_defaultdocdir/%{name}/
-install -m644 %{SOURCE12} %buildroot/%_defaultdocdir/%{name}/
-%find_lang %name
+# check_sensors makes no sense on some archs
+%ifarch ppc ppc64 sparc sparc64
+%{__rm} -f %{buildroot}%{libexecdir}/check_sensors
+%endif
+%find_lang %{name}
%clean
-rm -rf %buildroot
+%{__rm} -rf $RPM_BUILD_ROOT
-%files -f %name.lang
+%post
+# in case somebody uses the permissions file we provide
+# in docdir, run permission here
+%run_permissions
+
+%files -f %{name}.lang
%defattr(-,root,root)
-%doc %_defaultdocdir/%{name}
-%dir %_sysconfdir/nagios
-%dir %_prefix/lib/nagios
-%dir %libexecdir
-%config(missingok,noreplace) %_sysconfdir/nagios/command.cfg
+%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS ChangeLog CODING COPYING FAQ LEGAL
+%doc NEWS README REQUIREMENTS SUPPORT THANKS
+%doc example README.SuSE
+%doc contrib
+%doc command.cfg
+%dir %{_prefix}/lib/nagios
+%dir %{libexecdir}
+#
%defattr(0755,root,root)
-%libexecdir/check_breeze
-%libexecdir/check_by_ssh
-%libexecdir/check_clamd
-%libexecdir/check_cluster
-# FIXME: add to /etc/permissins - check_dhcp seems to need this
-# %attr(4755,root,root) %libexecdir/check_dhcp
-%libexecdir/check_dhcp
-%libexecdir/check_dig
-%libexecdir/check_disk
-%libexecdir/check_disk_smb
-%libexecdir/check_dns
-%libexecdir/check_dummy
-%libexecdir/check_file_age
-%libexecdir/check_flexlm
-%libexecdir/check_ftp
-%libexecdir/check_http
-%libexecdir/check_icmp
-%libexecdir/check_ide_smart
-%libexecdir/check_ifoperstatus
-%libexecdir/check_ifstatus
-%libexecdir/check_imap
-%libexecdir/check_ircd
-%libexecdir/check_linux_raid.pl
-%libexecdir/check_load
-%libexecdir/check_log
-%libexecdir/check_mailq
-%libexecdir/check_mrtg
-%libexecdir/check_mrtgtraf
-%libexecdir/check_nagios
-%libexecdir/check_netapp.pl
-%libexecdir/check_nntp
-%libexecdir/check_nt
-%libexecdir/check_ntp
-%libexecdir/check_ntp_peer
-%libexecdir/check_ntp_time
-%libexecdir/check_nwstat
-%libexecdir/check_oracle
-%libexecdir/check_overcr
-%libexecdir/check_ping
-%libexecdir/check_pop
-%libexecdir/check_procs
-%libexecdir/check_real
-%libexecdir/check_rpc
-%libexecdir/check_sensors
-%libexecdir/check_smtp
-%libexecdir/check_ssh
-%libexecdir/check_swap
-%libexecdir/check_tcp
-%libexecdir/check_time
-%libexecdir/check_udp
-%libexecdir/check_ups
-%libexecdir/check_users
-%libexecdir/check_wave
-%attr(0755,root,root) %libexecdir/check_xenvm
-%libexecdir/negate
-%libexecdir/urlize
-%libexecdir/utils.sh
-%attr(0644,root,root) %libexecdir/utils.pm
+%{libexecdir}/*
+%exclude %{libexecdir}/check_fping
+%exclude %{libexecdir}/check_hpjd
+%exclude %{libexecdir}/check_ldap
+%exclude %{libexecdir}/check_ldaps
+%exclude %{libexecdir}/check_mysql
+%exclude %{libexecdir}/check_mysql_query
+%exclude %{libexecdir}/check_pgsql
+#%exclude %{libexecdir}/check_radius
+%exclude %{libexecdir}/check_snmp
+%exclude %{libexecdir}/check_jabber
+%exclude %{libexecdir}/check_nntps
+%exclude %{libexecdir}/check_simap
+%exclude %{libexecdir}/check_spop
+%exclude %{libexecdir}/check_ssmtp
+%exclude %{libexecdir}/check_apt
+%exclude %{libexecdir}/check_game
+%attr(0644,root,root) %{libexecdir}/utils.pm
%files extras
%defattr(0755,root,root)
-%libexecdir/check_fping
-%libexecdir/check_hpjd
-%libexecdir/check_ldap
-%libexecdir/check_ldaps
-%libexecdir/check_mysql
-%libexecdir/check_mysql_query
-%libexecdir/check_pgsql
-#%libexecdir/check_radius
-%libexecdir/check_snmp
-%libexecdir/check_jabber
-%libexecdir/check_nntps
-%libexecdir/check_simap
-%libexecdir/check_spop
-%libexecdir/check_ssmtp
-%libexecdir/check_apt
-%libexecdir/check_game
+%{libexecdir}/check_fping
+%{libexecdir}/check_hpjd
+%{libexecdir}/check_ldap
+%{libexecdir}/check_ldaps
+%{libexecdir}/check_mysql
+%{libexecdir}/check_mysql_query
+%{libexecdir}/check_pgsql
+#%{libexecdir}/check_radius
+%{libexecdir}/check_snmp
+%{libexecdir}/check_jabber
+%{libexecdir}/check_nntps
+%{libexecdir}/check_simap
+%{libexecdir}/check_spop
+%{libexecdir}/check_ssmtp
+%{libexecdir}/check_apt
+%{libexecdir}/check_game
%changelog
++++++ nagios-plugins-1.4.14-check_inodes.patch ++++++
http://osdir.com/ml/network.nagios.devel/2005-12/msg00015.html
--- contrib/check_inodes.pl 2008-01-05 16:42:26.000000000 +0100
+++ contrib/check_inodes.pl.oden 2008-01-05 17:45:28.000000000 +0100
@@ -8,12 +8,12 @@
# #
##############################################################################
-$filesystem = $ARGV[0];
-$warnpercent = $ARGV[1];
-$critpercent = $ARGV[2];
+my $filesystem = $ARGV[0];
+my $warnpercent = $ARGV[1];
+my $critpercent = $ARGV[2];
#------Find out what kind of syntax to expect
-$systype=`uname`;
+my $systype=`uname`;
chomp($systype);
#------Make sure we got called with the right number of arguments
@@ -26,7 +26,7 @@
}#end if
#------This gets the data from the df command
-$inputline = `df -i $filesystem|grep -v "Filesystem"`;
+my $inputline = `df -i $filesystem|grep -v "Filesystem"`;
#------replaces all spaces with a single :, that way we can use split
$inputline =~ y/ /:/s;
@@ -35,13 +35,14 @@
#------(at least mine do). This way I can use this plugin on all my hosts
#------if neither of these work, add your own in, or if you've got one that
#------just flat out reports something different...well...perl is your friend.
+my $ipercent;
SWITCH: {
if ($systype eq "Linux") {
- ($fs,$inodes,$iused,$ifree,$ipercent,$mntpt) = split(/:/,$inputline);
+ $ipercent = (split(/:/,$inputline))[4];
last SWITCH;
}#end if
if ($systype eq "AIX") {
- ($fs,$blks,$free,$percentused,$iused,$ipercent,$mntpt) = split(/:/,$inputline);
+ $ipercent = (split(/:/,$inputline))[5];
last SWITCH;
}#end if
}#end switch
++++++ nagios-plugins-1.4.14-check_ircd.patch ++++++
Index: plugins-scripts/check_ircd.pl
===================================================================
--- plugins-scripts/check_ircd.pl.orig
+++ plugins-scripts/check_ircd.pl
@@ -147,7 +147,6 @@
my $proto = getprotobyname('tcp');
my $sockaddr;
my $this;
- my $thisaddr = gethostbyname($in_hostname);
my $that;
my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
# ($name,$aliases,$type,$len,$thisaddr) = gethostbyname($in_hostname);
@@ -157,7 +156,7 @@
exit $ERRORS{"UNKNOWN"};
}
$sockaddr = 'S n a4 x8';
- $this = pack($sockaddr, AF_INET, 0, $thisaddr);
+ $this = pack($sockaddr, AF_INET, 0, INADDR_ANY);
$that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
if (!bind(ClientSocket, $this)) {
print "IRCD UNKNOWN: Could not bind socket ($!)\n";
++++++ nagios-plugins-1.4.14-check_log.patch ++++++
Index: plugins-scripts/check_log.sh
===================================================================
--- plugins-scripts/check_log.sh.orig
+++ plugins-scripts/check_log.sh
@@ -61,15 +61,16 @@
#PATH=""
ECHO="/bin/echo"
-GREP="/bin/egrep"
-DIFF="/bin/diff"
-TAIL="/bin/tail"
+GREP="/usr/bin/egrep"
+DIFF="/usr/bin/diff"
+TAIL="/usr/bin/tail"
CAT="/bin/cat"
RM="/bin/rm"
CHMOD="/bin/chmod"
-TOUCH="/bin/touch"
+TOUCH="/usr/bin/touch"
+MKTEMP="/bin/mktemp"
-PROGNAME=`/bin/basename $0`
+PROGNAME=`/usr/bin/basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
REVISION="@NP_VERSION@"
@@ -166,10 +167,10 @@
# If the source log file doesn't exist, exit
-if [ ! -e $logfile ]; then
+if [ ! -e "$logfile" ]; then
$ECHO "Log check error: Log file $logfile does not exist!\n"
exit $STATE_UNKNOWN
-elif [ ! -r $logfile ] ; then
+elif [ ! -r "$logfile" ] ; then
$ECHO "Log check error: Log file $logfile is not readable!\n"
exit $STATE_UNKNOWN
fi
@@ -178,8 +179,8 @@
# we're running this test, so copy the original log file over to
# the old diff file and exit
-if [ ! -e $oldlog ]; then
- $CAT $logfile > $oldlog
+if [ ! -e "$oldlog" ]; then
+ $CAT "$logfile" > "$oldlog"
$ECHO "Log check data initialized...\n"
exit $STATE_OK
fi
@@ -188,25 +189,25 @@
# The temporary file that the script should use while
# processing the log file.
-if [ -x /bin/mktemp ]; then
- tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX`
+if [ -x "$MKTEMP" ]; then
+ tempdiff=`$MKTEMP /tmp/check_log.XXXXXXXXXX`
else
tempdiff=`/bin/date '+%H%M%S'`
tempdiff="/tmp/check_log.${tempdiff}"
- $TOUCH $tempdiff
- $CHMOD 600 $tempdiff
+ $TOUCH "$tempdiff"
+ $CHMOD 600 "$tempdiff"
fi
-$DIFF $logfile $oldlog | $GREP -v "^>" > $tempdiff
+$DIFF "$logfile" "$oldlog" | $GREP -v "^>" > "$tempdiff"
# Count the number of matching log entries we have
-count=`$GREP -c "$query" $tempdiff`
+count=`$GREP -c "$query" "$tempdiff"`
# Get the last matching entry in the diff file
-lastentry=`$GREP "$query" $tempdiff | $TAIL -1`
+lastentry=`$GREP "$query" "$tempdiff" | $TAIL -1`
-$RM -f $tempdiff
-$CAT $logfile > $oldlog
+$RM -f "$tempdiff"
+$CAT "$logfile" > "$oldlog"
if [ "$count" = "0" ]; then # no matches, exit with no error
$ECHO "Log check ok - 0 pattern matches found\n"
++++++ nagios-plugins-1.4.14-command_cfg.patch ++++++
Index: command.cfg.in
===================================================================
--- command.cfg.in.orig
+++ command.cfg.in
@@ -28,7 +28,7 @@
# Service notification command - send email with problem summary
-command[notify-by-email]=/bin/printf "$OUTPUT$" | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTEMAIL$
+command[notify-by-email]=@bindir@/printf "$OUTPUT$" | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTEMAIL$
# Service notification command - send email to alphanumeric pager
# gateway The notify-by-epager command assumes that each contact has a
@@ -48,13 +48,13 @@
## Send notifications to a pager using modem with Qpage (www.qpage.com)
-command[notify-by-qpage]=/usr/bin/printf "Service: %s\nHost: %s\nAddress: %s\nState: %s\nInfo: %s\nDate: %s" '$SERVICEDESC$' '$HOSTNAME$' '$HOSTADDRESS$' '$SERVICESTATE$' '$OUTPUT$' '$DATETIME' | /usr/local/bin/qpage -l 0 -p $CONTACTPAGER$
+command[notify-by-qpage]=@bindir@/printf "Service: %s\nHost: %s\nAddress: %s\nState: %s\nInfo: %s\nDate: %s" '$SERVICEDESC$' '$HOSTNAME$' '$HOSTADDRESS$' '$SERVICESTATE$' '$OUTPUT$' '$DATETIME' | /usr/local/bin/qpage -l 0 -p $CONTACTPAGER$
-command[host-notify-by-qpage]=/usr/bin/printf "Host: %s is %s\nInfo: %s\nDate: %s" '$HOSTALIAS$' '$HOSTSTATES$' '$OUTPUT$' '$DATETIME' | /usr/local/bin/qpage -l 0 -p $CONTACTPAGER$
+command[host-notify-by-qpage]=@bindir@/printf "Host: %s is %s\nInfo: %s\nDate: %s" '$HOSTALIAS$' '$HOSTSTATES$' '$OUTPUT$' '$DATETIME' | /usr/local/bin/qpage -l 0 -p $CONTACTPAGER$
## Send notifications using SMSclient (www.smsclient.org)
-command[notify-by-smsclient]=/usr/bin/sms_client -q $CONTACTPAGER$ "$NOTIFICATIONTYPE$: $HOSTADDRESS$ $HOSTALIAS$: $SERVICEDESC$ is $SERVICESTATE$"
-command[host-notify-by-smsclient]=/usr/bin/sms_client -q $CONTACTPAGER$ "Host $HOSTALIAS$ is $HOSTSTATE$; $OUTPUT$; $DATETIME$"
+command[notify-by-smsclient]=@bindir@/sms_client -q $CONTACTPAGER$ "$NOTIFICATIONTYPE$: $HOSTADDRESS$ $HOSTALIAS$: $SERVICEDESC$ is $SERVICESTATE$"
+command[host-notify-by-smsclient]=@bindir@/sms_client -q $CONTACTPAGER$ "Host $HOSTALIAS$ is $HOSTSTATE$; $OUTPUT$; $DATETIME$"
@@ -163,7 +163,7 @@
#
# the following 4 return the following codes: other=1, ok=2, degraded=3, failed=4
#
-#command[check_compaq_thermalCondition]=@libexec@/check_snmp -H $HOSTADDRESS$ -C public -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status "
+#command[check_compaq_thermalCondition]=@libexecdir@/check_snmp -H $HOSTADDRESS$ -C public -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status "
#
#
++++++ nagios-plugins-1.4.14-implicit_decl.patch ++++++
Index: lib/utils_base.c
===================================================================
--- lib/utils_base.c.orig
+++ lib/utils_base.c
@@ -27,6 +27,10 @@
#include "common.h"
#include