From 9df78b47d8f90df5100eff088c3cc81425edfa3c Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath@fedoraproject.org>
Date: Oct 27 2006 14:17:12 +0000
Subject: Fixed bug 208232


---

diff --git a/nagios-plugins-1.4.4-check_ide_smart.patch b/nagios-plugins-1.4.4-check_ide_smart.patch
new file mode 100644
index 0000000..e8ddec0
--- /dev/null
+++ b/nagios-plugins-1.4.4-check_ide_smart.patch
@@ -0,0 +1,21 @@
+--- nagios-plugins-1.4.4/plugins/check_ide_smart.c.orig	2006-10-19 03:25:16.000000000 +0300
++++ nagios-plugins-1.4.4/plugins/check_ide_smart.c	2006-10-26 11:28:53.000000000 +0300
+@@ -439,7 +439,7 @@ print_values (values_t * p, thresholds_t
+ 
+ 
+ void
+-print_thresholds (thresholds_t * p) 
++smart_print_thresholds (thresholds_t * p) 
+ {
+ 	threshold_t * threshold = p->thresholds;
+ 	int i;
+@@ -541,7 +541,7 @@ print_help (void)
+ void
+ print_usage (void)
+ {
+-	printf (_("Usage:");
++  printf (_("Usage:"));
+   printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
+-  pritnf (" [-O <auto-off>] [-n <nagios>]\n");
++  printf (" %s\n", "[-O <auto-off>] [-n <nagios>]");
+ }
diff --git a/nagios-plugins-1.4.4-linux_raid.patch b/nagios-plugins-1.4.4-linux_raid.patch
new file mode 100644
index 0000000..b3a0c64
--- /dev/null
+++ b/nagios-plugins-1.4.4-linux_raid.patch
@@ -0,0 +1,10 @@
+--- contrib/check_linux_raid.pl     2006-10-27 15:25:54.000000000 +0200
++++ contrib/check_linux_raid.pl 2006-10-27 15:24:02.000000000 +0200
+@@ -23,7 +23,7 @@
+ #        WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
+
+ use strict;
+-use lib utils.pm;
++use lib '/usr/lib/nagios/plugins';
+ use utils qw(%ERRORS);
+
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 2daba27..d7fc897 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -11,6 +11,8 @@ Source1: nagios-plugins.README.Fedora
 Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3.radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -47,7 +49,7 @@ contains those plugins.
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -182,13 +184,13 @@ Requires: nagios-plugins = %{version}-%{release}
 %description icmp
 Provides check_icmp support for Nagios.
 
-#%package ide_smart
-#Summary: Nagios Plugin - check_ide_smart
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package ide_smart
+Summary: Nagios Plugin - check_ide_smart
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description ide_smart
-#Provides check_ide_smart support for Nagios.
+%description ide_smart
+Provides check_ide_smart support for Nagios.
 
 %package ifoperstatus
 Summary: Nagios Plugin - check_ifoperstatus
@@ -503,6 +505,8 @@ Provides check_wave support for Nagios.
 %patch0 -p1
 %patch1 -p1 -b .radiusclient
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %configure \
@@ -515,9 +519,9 @@ Provides check_wave support for Nagios.
 	PATH_TO_NTPDATE=%{_sbindir}/ntpdate \
 	PATH_TO_RPCINFO=%{_sbindir}/rpcinfo
 make %{?_smp_mflags}
-#cd plugins
-#make check_ide_smart
-#cd ..
+cd plugins
+make check_ide_smart
+cd ..
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -526,7 +530,7 @@ cp %{SOURCE1} ./README.Fedora
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
-#%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -597,13 +601,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_http
 
-#%files ide_smart
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_ide_smart
+%files ide_smart
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_icmp
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_icmp
 
 %files ifoperstatus
 %defattr(-,root,root,-)
@@ -773,11 +777,15 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Fri Oct 27 2006 Mike McGrath <imlinux@gmail.com> 1.4.4-2
+- Enabled check_smart_ide
+- Added patch for linux_raid
+- Fixed permissions on check_icmp
+
 * Tue Oct 24 2006 Mike McGrath <imlinux@gmail.com> 1.4.4-1
 - Upstream new version
 - Disabled check_ide_smart (does not compile cleanly/too lazy to fix right now)
 - Added check_apt
-- Added check_linux_raid
 
 * Sun Aug 27 2006 Mike McGrath <imlinux@gmail.com> 1.4.3-18
 - Removed utils.pm from the base nagios-plugins package into its own package