[packages/nagios-plugins] up to 1.5, contrub stuff has been dropped upstream
glen
glen at pld-linux.org
Tue Jan 28 13:51:41 CET 2014
commit 502567e8d5bf1ae24ae350047ef700cc3ef22a58
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Jan 28 14:48:46 2014 +0200
up to 1.5, contrub stuff has been dropped upstream
check_rbl.patch | 13 --
nagios-plugins-check_snmp_disk_monitor-bulk.patch | 11 -
nagios-plugins-check_snmp_disk_monitor-opts.patch | 21 --
nagios-plugins-check_snmp_procs-fix.patch | 28 ---
nagios-plugins-contrib-API.patch | 93 ---------
nagios-plugins-gets.patch | 16 --
nagios-plugins-implicit-basename.patch | 18 --
nagios-plugins-path.patch | 9 -
nagios-plugins-paths.patch | 27 ---
nagios-plugins-perlautodep.patch | 11 -
nagios-plugins-radiusclient-ng.patch | 23 ---
nagios-plugins.spec | 237 ++++------------------
12 files changed, 40 insertions(+), 467 deletions(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 9d85c3a..654e29f 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,9 +1,9 @@
-# NOTE TO PLD LINUX DEVELOPERS:
-# - if you use any plugin from -contrib package, move it to subpackage or main
-# package so we can support it better!
# TODO:
# - package requisites for unifished packages -nwstat
# REQUIREMENTS explains the dependencies.
+# - handle --without-dbi (new package)
+# - add --without-radius bcond
+# - check_ide_smart deps
# Conditional build:
%bcond_without ldap # build without ldap
@@ -12,39 +12,29 @@
Summary: Host/service/network monitoring program plugins for Nagios
Summary(pl.UTF-8): Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
Name: nagios-plugins
-Version: 1.4.16
-Release: 2
+Version: 1.5
+Release: 1
License: GPL v3
Group: Networking
-Source0: http://downloads.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
-# Source0-md5: 862f5e44fb5bc65ce7e5d86d654d4da0
+Source0: http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
+# Source0-md5: 730ac30df4a5e88fed8a766a2311d209
Source1: %{name}-config-20100219.tar.bz2
# Source1-md5: 7914664eee7d77be9b8f05347a276e0f
Source2: nagios-utils.php
#Patch: %{name}-shared.patch # needs finishing
Patch0: %{name}-tainted.patch
-Patch1: %{name}-contrib-API.patch
Patch3: %{name}-subst.patch
Patch4: %{name}-noroot.patch
Patch5: %{name}-check_ping-socket-filter-warning.patch
-Patch6: %{name}-path.patch
Patch7: %{name}-pgsql.patch
Patch9: %{name}-check_log_paths.patch
-Patch12: %{name}-implicit-basename.patch
Patch13: %{name}-check_radius_segfault.patch
Patch18: %{name}-configure.patch
-Patch19: %{name}-perlautodep.patch
Patch20: %{name}-cosmetic.patch
Patch21: %{name}-check_hpjd-no-paper-out.patch
-Patch22: %{name}-check_snmp_procs-fix.patch
Patch23: %{name}-check_disk_smb-zero-cap.patch
Patch24: %{name}-paths.patch
-Patch25: %{name}-check_snmp_disk_monitor-bulk.patch
-Patch26: %{name}-check_snmp_disk_monitor-opts.patch
Patch27: %{name}-ping.patch
-Patch28: check_rbl.patch
-Patch29: %{name}-gets.patch
-Patch31: %{name}-radiusclient-ng.patch
URL: http://www.nagiosplugins.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -62,6 +52,7 @@ BuildRequires: postgresql-devel
BuildRequires: radiusclient-devel
%else
BuildRequires: radiusclient-ng-devel
+BuildConflicts: radiusclient-devel
%endif
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-perlprov >= 4.1-13
@@ -441,6 +432,20 @@ This plugin checks hardware status using the lm_sensors package.
%description -n nagios-plugin-check_sensors -l pl.UTF-8
Ta wtyczka sprawdza stan sprzętu przy użyciu pakietu lm_sensors.
+%package -n nagios-plugin-check_dbi
+Summary: Nagios plugin to check database with libdbi
+Group: Networking
+Requires: nagios-common
+Suggests: libdbi-drivers-firebird
+Suggests: libdbi-drivers-freetds
+Suggests: libdbi-drivers-mysql
+Suggests: libdbi-drivers-pgsql
+Suggests: libdbi-drivers-sqlite
+Suggests: libdbi-drivers-sqlite3
+
+%description -n nagios-plugin-check_dbi
+Nagios plugin to check database with libdbi.
+
# requisite not packaged in PLD
%package nwstat
Summary: Nagios plugin nwstat
@@ -500,75 +505,20 @@ Wtyczki przekazane do projektu Nagios. Część z nich działa, część nie.
%setup -q -a1
mv nagios-plugins-config-*/* .
%patch0 -p1
-%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
-%patch12 -p1
%patch13 -p1
%patch18 -p1
-%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch22 -p0
%patch23 -p1
%patch24 -p1
-%patch25 -p0
-%patch26 -p0
%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%if "%{pld_release}" != "ac"
-%patch31 -p1
-%endif
-
-# bring contribs into shape...
-cd contrib
-mv check_compaq_insight.{pl,msg}
-sed -ne '/--- cut ---/,/--- cut ---/{/--- cut ---/!p}' < \
- check_compaq_insight.msg > check_compaq_insight.pl
-
-sed -i -e '1s,#!.*/bin/perl,#!%{__perl},' \
- check_{oracle_tbs,{snmp_{{disk,process}_monitor,printer},nagios_db,flexlm}.pl}
-
-sed -i -e '1s,#!.*/bin/env,#!%{__python},' \
- check_pcpmetric.py
-
-sed -i -e '1s,#!.*/bin/bash,#!/bin/sh,' \
- check_smb.sh
-mv check_appletalk.{pl,orig}
-sed -ne '/---/!p;/---/q' < check_appletalk.orig > check_appletalk.pl
-
-chmod a+x check_*.{pl,sh,py}
-chmod a+x check_{fan_{cpq,fsc}_present,frontpage,oracle_tbs,pfstate,temp_{cpq,fsc}}
-
-# exists in main
-rm check_{breeze,wave}.pl
-rm check_flexlm.pl
-
-# more appropriate name
-mv check_nagios{,_mysql}.pl
-
-sed -i -e "
- s,use lib '.*/nagios/libexec/?',use lib '%{_pluginlibdir}',
- s,use lib \".*/nagios/libexec/?\",use lib '%{_pluginlibdir}',
- s,require '/usr/libexec/nagios/plugins,require '%{_pluginlibdir},
- s,use lib utils.pm,use lib '%{_pluginlibdir}', # subst not applied to contrib/ dir
- s,/usr/libexec/nagios/plugins,%{_pluginlibdir},
- s,/usr/local/nagios/libexec,%{_pluginlibdir},
- s,/opt/nagios/libexec,%{_pluginlibdir},
- s,/some/path/libexec,%{_pluginlibdir},
- s,/usr/local/libexec/nagios,%{_pluginlibdir},
- s,/usr/local/netsaint/libexec,%{_pluginlibdir},
- s,/usr/local/libexec,%{_pluginlibdir},
-" check_* *.pl
-
-cd ..
# remove libtool m4 macro copies, breaks when system libtool is older
-rm -rf gl/m4/libtool.m4 gl/m4/lt*.m4
+%{__rm} gl/m4/libtool.m4 gl/m4/lt*.m4
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -608,6 +558,7 @@ fi
--with-smbclient-command=/usr/bin/smbclient \
--with-dig-command=/usr/bin/dig \
--with-fping-command=/usr/sbin/fping \
+ --with-fping6-command=/usr/sbin/fping6 \
--with-qstat-command=/usr/bin/qstat \
--with-ssh-command=/usr/bin/ssh \
--with-snmpget-command=/usr/bin/snmpget \
@@ -620,19 +571,6 @@ fi
%{__make}
-# contrib. mostly useless. but you'll never know
-cd contrib
-
-%{__cc} %{rpmcflags} check_cluster2.c -o check_cluster2
-
-%{__cc} %{rpmcflags} -I../plugins -I.. -I../gl -I../lib -c check_rbl.c
-%{__cc} %{rpmcflags} check_rbl.o -o check_rbl ../plugins/popen.o ../plugins/utils.o ../plugins/netutils.o ../lib/utils_base.o ../gl/libgnu.a
-
-%{__cc} %{rpmcflags} check_timeout.c -o check_timeout
-
-%{__cc} %{rpmcflags} -I../plugins -I.. -I../gl -I../lib -c check_uptime.c
-%{__cc} %{rpmcflags} check_uptime.o -o check_uptime ../plugins/popen.o ../plugins/utils.o ../lib/utils_base.o ../gl/libgnu.a
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -642,39 +580,26 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install-root -C plugins-root \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} $RPM_BUILD_ROOT%{_pluginarchdir}/check_nwstat
+
# for nagios-plugin-check_mysql_perf (at least)
-cp -a lib/libnagiosplug.a $RPM_BUILD_ROOT%{_libdir}
-cp -a gl/libgnu.a $RPM_BUILD_ROOT%{_libdir}
-cp -a plugins/utils.o $RPM_BUILD_ROOT%{_libdir}
-cp -a plugins/netutils.o $RPM_BUILD_ROOT%{_libdir}
+cp -p lib/libnagiosplug.a $RPM_BUILD_ROOT%{_libdir}
+cp -p gl/libgnu.a $RPM_BUILD_ROOT%{_libdir}
+cp -p plugins/utils.o $RPM_BUILD_ROOT%{_libdir}
+cp -p plugins/netutils.o $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}/nagiosplug/{plugins,gl,lib}
-cp -a *.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug
-cp -a plugins/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/plugins
-cp -a gl/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/gl
-cp -a lib/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/lib
+cp -p *.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug
+cp -p plugins/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/plugins
+cp -p gl/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/gl
+cp -p lib/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/lib
install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a commands/*.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p commands/*.cfg $RPM_BUILD_ROOT%{_sysconfdir}
%find_lang %{name}
-# all files with exec permissions are plugins.
-install -d $RPM_BUILD_ROOT%{_pluginarchdir}
-find contrib -name 'check_*' -type f -perm +1 | while read a; do
- s=$RPM_BUILD_ROOT%{_pluginarchdir}/${a##*/}
- # strip without extensions, if eventually merged to main wouldn't need to rename plugins
- s=${s%.pl}
- s=${s%.sh}
- if [ -f $s ]; then
- # we don't want file from contrib overwrite one from main
- : Duplicate file from contrib: $s
- exit 1
- fi
- install $a $s
-done
-
%if "%{_pluginarchdir}" != "%{_pluginlibdir}"
-# move arch independat files to _pluginlibdir
+# move arch independant files to _pluginlibdir
install -d $RPM_BUILD_ROOT%{_pluginlibdir}
mv $(find $RPM_BUILD_ROOT%{_pluginarchdir} -type f | xargs file | awk -F: '!/ELF/{print $1}') $RPM_BUILD_ROOT%{_pluginlibdir}
%{__sed} -i -e 's,use lib "%{_pluginarchdir}",use lib "%{_pluginlibdir}",' $RPM_BUILD_ROOT%{_pluginlibdir}/check_*
@@ -686,12 +611,9 @@ for plugin in $plugins; do
sed -i -e "s,\\\$USER1\\\$/$plugin ,$libdir/$plugin ," $RPM_BUILD_ROOT%{_sysconfdir}/*.cfg
done
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php
-cp -a contrib/utils.py $RPM_BUILD_ROOT%{_pluginlibdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php
chmod a-x $RPM_BUILD_ROOT%{_pluginlibdir}/utils.*
-rm -f $RPM_BUILD_ROOT%{_libdir}/libnagiosplug.la
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -701,26 +623,14 @@ rm -rf $RPM_BUILD_ROOT
%postun libs -p /sbin/ldconfig
%endif
-%triggerun -- %{name} < 1.4-0.35
-%banner -e %{name} <<EOF
-Several Nagios plugins have been separated to multiple packages to cut
-down unneccessary deps on main package.
-
-Please install %{name}-PACKAGE if you need these plugins.
-To revert to previous state just run:
-poldek -u nagios-plugins-{snmp,samba,sensors,mysql,pgsql,radius,qstat,ldap,ntp,dns,ssh,procps,fping}
-
-EOF
-
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc ACKNOWLEDGEMENTS AUTHORS BUGS CODING ChangeLog
+%doc ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog
%doc FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS
# plugins
%attr(755,root,root) %{_pluginarchdir}/check_apt
%attr(755,root,root) %{_pluginarchdir}/check_cluster
-%attr(755,root,root) %{_pluginarchdir}/check_cluster2
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_disk.cfg
%attr(755,root,root) %{_pluginarchdir}/check_disk
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_dummy.cfg
@@ -788,7 +698,6 @@ EOF
%{_pluginlibdir}/utils.pm
%{_pluginlibdir}/utils.php
%{_pluginlibdir}/utils.sh
-%{_pluginlibdir}/utils.py
%files devel
%defattr(644,root,root,755)
@@ -900,72 +809,6 @@ EOF
%defattr(644,root,root,755)
%attr(755,root,root) %{_pluginlibdir}/check_sensors
-%files contrib
+%files -n nagios-plugin-check_dbi
%defattr(644,root,root,755)
-%attr(755,root,root) %{_pluginarchdir}/check_nwstat
-%attr(755,root,root) %{_pluginarchdir}/check_rbl
-%attr(755,root,root) %{_pluginarchdir}/check_timeout
-%attr(755,root,root) %{_pluginarchdir}/check_uptime
-
-%attr(755,root,root) %{_pluginlibdir}/check_adptraid
-%attr(755,root,root) %{_pluginlibdir}/check_apache
-%attr(755,root,root) %{_pluginlibdir}/check_apc_ups
-%attr(755,root,root) %{_pluginlibdir}/check_appletalk
-%attr(755,root,root) %{_pluginlibdir}/check_arping
-%attr(755,root,root) %{_pluginlibdir}/check_asterisk
-%attr(755,root,root) %{_pluginlibdir}/check_axis
-%attr(755,root,root) %{_pluginlibdir}/check_backup
-%attr(755,root,root) %{_pluginlibdir}/check_bgpstate
-%attr(755,root,root) %{_pluginlibdir}/check_compaq_insight
-%attr(755,root,root) %{_pluginlibdir}/check_digitemp
-%attr(755,root,root) %{_pluginlibdir}/check_dlswcircuit
-%attr(755,root,root) %{_pluginlibdir}/check_dns_random
-%attr(755,root,root) %{_pluginlibdir}/check_email_loop
-%attr(755,root,root) %{_pluginlibdir}/check_fan_cpq_present
-%attr(755,root,root) %{_pluginlibdir}/check_fan_fsc_present
-%attr(755,root,root) %{_pluginlibdir}/check_frontpage
-%attr(755,root,root) %{_pluginlibdir}/check_hprsc
-%attr(755,root,root) %{_pluginlibdir}/check_hw
-%attr(755,root,root) %{_pluginlibdir}/check_ica_master_browser
-%attr(755,root,root) %{_pluginlibdir}/check_ica_metaframe_pub_apps
-%attr(755,root,root) %{_pluginlibdir}/check_ica_program_neigbourhood
-%attr(755,root,root) %{_pluginlibdir}/check_inodes-freebsd
-%attr(755,root,root) %{_pluginlibdir}/check_inodes
-%attr(755,root,root) %{_pluginlibdir}/check_javaproc
-%attr(755,root,root) %{_pluginlibdir}/check_joy
-%attr(755,root,root) %{_pluginlibdir}/check_linux_raid
-%attr(755,root,root) %{_pluginlibdir}/check_lmmon
-%attr(755,root,root) %{_pluginlibdir}/check_log2
-%attr(755,root,root) %{_pluginlibdir}/check_lotus
-%attr(755,root,root) %{_pluginlibdir}/check_maxchannels
-%attr(755,root,root) %{_pluginlibdir}/check_maxwanstate
-%attr(755,root,root) %{_pluginlibdir}/check_mem
-%attr(755,root,root) %{_pluginlibdir}/check_ms_spooler
-%attr(755,root,root) %{_pluginlibdir}/check_mssql
-%attr(755,root,root) %{_pluginlibdir}/check_nagios_db
-%attr(755,root,root) %{_pluginlibdir}/check_nagios_db_pg
-%attr(755,root,root) %{_pluginlibdir}/check_nagios_mysql
-%attr(755,root,root) %{_pluginlibdir}/check_netapp
-%attr(755,root,root) %{_pluginlibdir}/check_nmap.py
-%attr(755,root,root) %{_pluginlibdir}/check_ora_table_space
-%attr(755,root,root) %{_pluginlibdir}/check_oracle_instance
-%attr(755,root,root) %{_pluginlibdir}/check_oracle_tbs
-%attr(755,root,root) %{_pluginlibdir}/check_pcpmetric.py
-%attr(755,root,root) %{_pluginlibdir}/check_pfstate
-%attr(755,root,root) %{_pluginlibdir}/check_qmailq
-%attr(755,root,root) %{_pluginlibdir}/check_remote_nagios_status
-%attr(755,root,root) %{_pluginlibdir}/check_rrd_data
-%attr(755,root,root) %{_pluginlibdir}/check_sap
-%attr(755,root,root) %{_pluginlibdir}/check_smart
-%attr(755,root,root) %{_pluginlibdir}/check_smb
-%attr(755,root,root) %{_pluginlibdir}/check_snmp_disk_monitor
-%attr(755,root,root) %{_pluginlibdir}/check_snmp_printer
-%attr(755,root,root) %{_pluginlibdir}/check_snmp_process_monitor
-%attr(755,root,root) %{_pluginlibdir}/check_snmp_procs
-%attr(755,root,root) %{_pluginlibdir}/check_sockets
-%attr(755,root,root) %{_pluginlibdir}/check_temp_cpq
-%attr(755,root,root) %{_pluginlibdir}/check_temp_fsc
-%attr(755,root,root) %{_pluginlibdir}/check_traceroute-pure_perl
-%attr(755,root,root) %{_pluginlibdir}/check_traceroute
-%attr(755,root,root) %{_pluginlibdir}/check_vcs
-%attr(755,root,root) %{_pluginlibdir}/check_wins
+%attr(755,root,root) %{_pluginarchdir}/check_dbi
diff --git a/check_rbl.patch b/check_rbl.patch
deleted file mode 100644
index 4e9b9f6..0000000
--- a/check_rbl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- nagios-plugins-1.4.14/contrib/check_rbl.c~ 2009-09-17 11:33:40.000000000 +0300
-+++ nagios-plugins-1.4.14/contrib/check_rbl.c 2009-09-17 11:33:41.629634485 +0300
-@@ -39,6 +39,10 @@
- char *dns_server=NULL;
- char *rbl_name=NULL;
- int verbose=FALSE;
-+#ifndef LOCAL_TIMEOUT_ALARM_HANDLER
-+unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
-+unsigned int socket_timeout_state = STATE_CRITICAL;
-+#endif
-
- int main(int argc, char **argv){
- char input_buffer[MAX_INPUT_BUFFER];
diff --git a/nagios-plugins-check_snmp_disk_monitor-bulk.patch b/nagios-plugins-check_snmp_disk_monitor-bulk.patch
deleted file mode 100644
index de04b2c..0000000
--- a/nagios-plugins-check_snmp_disk_monitor-bulk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/check_snmp_disk_monitor.pl.orig 2008-04-24 13:28:09.277695884 +0000
-+++ contrib/check_snmp_disk_monitor.pl 2008-04-24 13:28:21.135459424 +0000
-@@ -111,7 +111,7 @@
- );
-
- # retrieve the data from the remote host
--my( $mps, $alloc, $size, $used ) = $snmp_session->bulkwalk( 0, 4, [['hrStorageDescr'],['hrStorageAllocationUnits'],['hrStorageSize'],['hrStorageUsed']] );
-+my( $mps, $alloc, $size, $used ) = $snmp_session->bulkwalk( 0, 2, [['hrStorageDescr'],['hrStorageAllocationUnits'],['hrStorageSize'],['hrStorageUsed']] );
- check_for_errors();
-
- alarm( 0 ); # all done with the network connection
diff --git a/nagios-plugins-check_snmp_disk_monitor-opts.patch b/nagios-plugins-check_snmp_disk_monitor-opts.patch
deleted file mode 100644
index 7237cb2..0000000
--- a/nagios-plugins-check_snmp_disk_monitor-opts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- contrib/check_snmp_disk_monitor.pl 2009-04-03 15:44:39.000000000 +0200
-+++ contrib/check_snmp_disk_monitor.pl.new 2009-07-18 10:28:04.835758511 +0200
-@@ -27,7 +27,6 @@
- %mounts = ();
-
- sub process_options {
-- my( $opt_crit, $opt_warn ) = ();
- Getopt::Long::Configure( 'bundling' );
- GetOptions(
- 'V' => \$opt_version, 'version' => \$opt_version,
-@@ -37,8 +36,8 @@
- 'H:s' => \$opt_host, 'hostname:s' => \$opt_host,
- 'p:i' => \$opt_port, 'port:i' => \$opt_port,
- 'C:s' => \$opt_community, 'community:s' => \$opt_community,
-- 'c:i' => \$opt_crit, 'critical:i' => \$opt_crit,
-- 'w:i' => \$opt_warn, 'warning:i' => \$opt_warn,
-+ 'c:i' => \$opt_critical, 'critical:i' => \$opt_critical,
-+ 'w:i' => \$opt_warning, 'warning:i' => \$opt_warning,
- 't:i' => \$TIMEOUT, 'timeout:i' => \$TIMEOUT,
- 'm:s' => \$opt_mountpoint, 'mountpoint:s'=> \$opt_mountpoint
- );
diff --git a/nagios-plugins-check_snmp_procs-fix.patch b/nagios-plugins-check_snmp_procs-fix.patch
deleted file mode 100644
index b66d0a7..0000000
--- a/nagios-plugins-check_snmp_procs-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- contrib/check_snmp_procs.pl.orig 2008-04-23 12:13:17.833685899 +0000
-+++ contrib/check_snmp_procs.pl 2008-04-23 12:15:18.456846167 +0000
-@@ -59,6 +59,7 @@
- my $opt_version;
- my $opt_wanted_procs;
- my $opt_warning;
-+my $opt_password;
-
- #
- my $max_no_processes = 999999;
-@@ -123,6 +124,8 @@
- exit $ERRORS{'UNKNOWN'};
- }
-
-+my ($longest_wanted, $longest_current);
-+
- ($longest_wanted, @wanted_procs) = parse_wanted_procs($opt_verbose, $opt_wanted_procs, $opt_warning, $opt_critical);
-
- $SIG{'ALRM'} = sub {
-@@ -240,7 +243,7 @@
-
- my($verbose, $host, $username, $privpassword, $authprotocol, $authpassword, $community, $port, $oidname, $snmp_version) = @_;
- my(%process_list, %process_pid_list, $result);
-- my $process_list_longest = 1, $not_done = 1;
-+ my ($process_list_longest, $not_done) = (1, 1);
- my(@args, @oids, $oid, $name);
-
- ($session, $error) = Net::SNMP->session(
diff --git a/nagios-plugins-contrib-API.patch b/nagios-plugins-contrib-API.patch
deleted file mode 100644
index 11c6c17..0000000
--- a/nagios-plugins-contrib-API.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -dur nagios-plugins-1.4.15.orig/contrib/check_rbl.c nagios-plugins-1.4.15/contrib/check_rbl.c
---- nagios-plugins-1.4.15.orig/contrib/check_rbl.c 2010-07-27 22:47:15.000000000 +0200
-+++ nagios-plugins-1.4.15/contrib/check_rbl.c 2012-11-23 19:25:32.088842066 +0100
-@@ -21,7 +21,7 @@
- #include "popen.h"
- #include "string.h"
-
--const char progname = "check_rbl";
-+const char *progname = "check_rbl";
- const char *revision = "$Revision: 970 $";
- //const char *copyright = "2000-2003";
- //const char *email = "nagiosplug-devel at lists.sourceforge.net";
-@@ -58,11 +58,11 @@
-
- /* build the command to run */
- if (dns_server) {
-- command_line=ssprintf(command_line,"%s @%s %s.%s",
-+ command_line=asprintf(&command_line,"%s @%s %s.%s",
- PATH_TO_DIG,dns_server,
- query_address_rev, rbl_name);
- } else {
-- command_line=ssprintf(command_line,"%s %s.%s",
-+ command_line=asprintf(&command_line,"%s %s.%s",
- PATH_TO_DIG,
- query_address_rev, rbl_name);
- }
-@@ -118,7 +118,7 @@
-
- while (fgets(input_buffer,MAX_INPUT_BUFFER-1,child_stderr)) {
- /* If we get anything on STDERR, at least set warning */
-- result=error_set(result,STATE_WARNING);
-+ result=max_state(result,STATE_WARNING);
- printf("%s",input_buffer);
- if (!strcmp(output,""))
- strcpy(output,1+index(input_buffer,':'));
-@@ -128,7 +128,7 @@
-
- /* close the pipe */
- if (spclose(child_process)) {
-- result=error_set(result,STATE_WARNING);
-+ result=max_state(result,STATE_WARNING);
- if (!strcmp(output,""))
- strcpy(output,"nslookup returned an error status");
- }
-@@ -313,7 +313,7 @@
- " -V, --version\n"
- " Print version information\n\n",
- DEFAULT_SOCKET_TIMEOUT);
-- support();
-+ printf (_(UT_SUPPORT));
- }
-
-
-diff -dur nagios-plugins-1.4.15.orig/contrib/check_uptime.c nagios-plugins-1.4.15/contrib/check_uptime.c
---- nagios-plugins-1.4.15.orig/contrib/check_uptime.c 2010-07-27 22:47:15.000000000 +0200
-+++ nagios-plugins-1.4.15/contrib/check_uptime.c 2012-11-23 19:25:57.915687571 +0100
-@@ -26,6 +26,9 @@
- #include "utils.h"
- #include "popen.h"
-
-+const char *progname = "check_uptime";
-+void print_usage(void);
-+
- int main(int argc, char **argv)
- {
-
-@@ -43,12 +46,7 @@
-
- if(argc != 2){
- printf("Incorrect number of arguments supplied\n");
-- printf("\n");
-- print_revision(argv[0],"$Revision: 6 $");
-- printf("Copyright (c) 2000 Teresa Ramanan (tlr at redowl.org)\n");
-- printf("\n");
-- printf("Usage: %s <host_address>\n",argv[0]);
-- printf("\n");
-+ print_usage();
- return STATE_UNKNOWN;
- }
-
-@@ -97,3 +95,12 @@
- printf("%s%s%s\n",(daytok == NULL)?"":daytok,(daytok == NULL)?"":",",hrmintok);
- return STATE_OK;
- }
-+
-+void print_usage(void)
-+{
-+ print_revision(progname,"$Revision$");
-+ printf("Copyright (c) 2000 Teresa Ramanan (tlr at redowl.org)\n");
-+ printf("\n");
-+ printf("Usage: %s <host_address>\n",progname);
-+ printf("\n");
-+}
diff --git a/nagios-plugins-gets.patch b/nagios-plugins-gets.patch
deleted file mode 100644
index 16d6253..0000000
--- a/nagios-plugins-gets.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -dur nagios-plugins-1.4.15.orig/gl/stdio.in.h nagios-plugins-1.4.15/gl/stdio.in.h
---- nagios-plugins-1.4.15.orig/gl/stdio.in.h 2010-07-27 22:47:15.000000000 +0200
-+++ nagios-plugins-1.4.15/gl/stdio.in.h 2012-11-23 19:31:19.064578037 +0100
-@@ -137,12 +137,6 @@
- "use gnulib module fflush for portable POSIX compliance");
- #endif
-
--/* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
--#undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/nagios-plugins-implicit-basename.patch b/nagios-plugins-implicit-basename.patch
deleted file mode 100644
index 814bb02..0000000
--- a/nagios-plugins-implicit-basename.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 26-implicit-basename.dpatch by <seanius at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad nagios-plugins-1.4.4~/plugins/check_procs.c nagios-plugins-1.4.4/plugins/check_procs.c
---- nagios-plugins-1.4.4~/plugins/check_procs.c 2006-10-19 02:25:16.000000000 +0200
-+++ nagios-plugins-1.4.4/plugins/check_procs.c 2006-11-17 09:26:57.000000000 +0100
-@@ -45,6 +45,7 @@
- #include "utils.h"
-
- #include <pwd.h>
-+#include <dirname.h>
-
- int process_arguments (int, char **);
- int validate_arguments (void);
diff --git a/nagios-plugins-path.patch b/nagios-plugins-path.patch
deleted file mode 100644
index 9324700..0000000
--- a/nagios-plugins-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- nagios-plugins-1.4.6.orig/contrib/check_dns_random.pl 2003-01-29 05:27:20.000000000 +0000
-+++ nagios-plugins-1.4.6/contrib/check_dns_random.pl 2007-03-15 11:58:46.000000000 +0000
-@@ -33,5 +33,5 @@
-
- my $host = shift || &usage;
-
--my $domainfile = "/usr/local/nagios/etc/domains.list";
-+my $domainfile = "/etc/nagios/domains.list";
- my $wc = `/usr/bin/wc -l $domainfile`;
diff --git a/nagios-plugins-paths.patch b/nagios-plugins-paths.patch
index eac1779..4cbac0c 100644
--- a/nagios-plugins-paths.patch
+++ b/nagios-plugins-paths.patch
@@ -1,30 +1,3 @@
---- ./contrib/check_snmp_disk_monitor.pl 2008-04-23 14:27:47.390299906 +0000
-+++ ./contrib/check_snmp_disk_monitor.pl~ 2008-04-23 13:27:18.000000000 +0000
-@@ -7,7 +7,7 @@
-
- use strict;
- require 5.6.0;
--use lib qw( /opt/nagios/libexec );
-+use lib qw( /usr/lib/nagios/plugins );
- use utils qw(%ERRORS $TIMEOUT &print_revision &support &usage);
- use SNMP 5.0;
- use Getopt::Long;
---- ./contrib/check_snmp_procs.pl.orig 2008-04-23 12:13:17.833685899 +0000
-+++ ./contrib/check_snmp_procs.pl 2008-04-23 12:15:18.456846167 +0000
-@@ -32,10 +32,10 @@
- # make it work with snmp version 3
- # Suggestions???
- #
--#use strict;
-+use strict;
- use Getopt::Long;
- use Net::SNMP qw (oid_lex_sort oid_base_match SNMP_VERSION_1);
--use lib "/usr/local/nagios/libexec";
-+use lib "/usr/lib/nagios/plugins";
- use utils qw(%ERRORS &print_revision &support &usage);
-
- my $PROGNAME="check_snmp_procs";
-
--- nagios-plugins-1.4.13/plugins-scripts/check_flexlm.pl 2003-02-04 08:16:16.000000000 +0200
+++ nagios-plugins-1.4.13-pp/plugins-scripts/check_flexlm.pl 2009-02-16 12:28:04.993531068 +0200
@@ -17,7 +17,7 @@
diff --git a/nagios-plugins-perlautodep.patch b/nagios-plugins-perlautodep.patch
deleted file mode 100644
index 95e575c..0000000
--- a/nagios-plugins-perlautodep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nagios-plugins-1.4.13/contrib/check_snmp_process_monitor.pl~ 2008-10-11 14:43:23.000000000 +0300
-+++ nagios-plugins-1.4.13/contrib/check_snmp_process_monitor.pl 2008-10-11 14:47:46.319041094 +0300
-@@ -115,7 +115,7 @@
- -e, --command=COMMAND NAME (ps -e style)
- what command should be monitored?
- -r, --regex=Perl RE
-- use a perl regular expression to find your process
-+ a Perl regular expression to find your process
- -w, --warning=INTEGER[,INTEGER]
- minimum and maximum number of processes before a warning is issued (Default 1,-1)
- -c, --critical=INTEGER[,INTEGER]
diff --git a/nagios-plugins-radiusclient-ng.patch b/nagios-plugins-radiusclient-ng.patch
deleted file mode 100644
index 6ece7e6..0000000
--- a/nagios-plugins-radiusclient-ng.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- nagios-plugins-1.4.15.orig/configure.in 2012-11-23 19:30:28.000000000 +0100
-+++ nagios-plugins-1.4.15/configure.in 2012-11-23 19:53:42.847216408 +0100
-@@ -254,12 +254,6 @@
-
- dnl Check for radius libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(radiusclient,rc_read_config)
--if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-- EXTRAS="$EXTRAS check_radius"
-- RADIUSLIBS="-lradiusclient"
-- AC_SUBST(RADIUSLIBS)
--else
- AC_CHECK_LIB(radiusclient-ng,rc_read_config)
- if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
- EXTRAS="$EXTRAS check_radius"
-@@ -269,7 +263,6 @@
- AC_MSG_WARN([Skipping radius plugin])
- AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
- fi
--fi
- LIBS="$_SAVEDLIBS"
-
- dnl Check for LDAP libraries
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugins.git/commitdiff/502567e8d5bf1ae24ae350047ef700cc3ef22a58
More information about the pld-cvs-commit
mailing list