rpms/nagios-plugins/FC-5 nagios-plugins-1.4.3-ntpd.patch, NONE, 1.1 nagios-plugins-1.4.3.radius-ng.patch, NONE, 1.1 nagios-plugins.spec, 1.10, 1.11
Michael Patrick McGrath (mmcgrath)
fedora-extras-commits at redhat.com
Thu Aug 10 15:18:07 UTC 2006
Author: mmcgrath
Update of /cvs/extras/rpms/nagios-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30565
Modified Files:
nagios-plugins.spec
Added Files:
nagios-plugins-1.4.3-ntpd.patch
nagios-plugins-1.4.3.radius-ng.patch
Log Message:
Added patch for check_ntp
Added patch for radiusclient-ng
Added check_radius
Added check_game
Fixed permissions bug in check_dhcpd
nagios-plugins-1.4.3-ntpd.patch:
--- NEW FILE nagios-plugins-1.4.3-ntpd.patch ---
--- plugins-scripts/check_ntp.pl.orig 2006-07-23 20:57:10.000000000 +0200
+++ plugins-scripts/check_ntp.pl 2006-07-23 20:57:46.000000000 +0200
@@ -314,7 +314,6 @@
}
} else {
print "No match!\n" if $verbose;
- $jitter = '(not parsed)';
}
}
nagios-plugins-1.4.3.radius-ng.patch:
--- NEW FILE nagios-plugins-1.4.3.radius-ng.patch ---
--- nagios-plugins-1.4.3/plugins/check_radius.c.radiusclient 2004-12-26 01:17:44.000000000 +0200
+++ nagios-plugins-1.4.3/plugins/check_radius.c 2006-07-19 15:50:20.657859088 +0300
@@ -27,7 +27,7 @@ const char *email = "nagiosplug-devel at li
#include "utils.h"
#include "netutils.h"
-#include <radiusclient.h>
+#include <radiusclient-ng.h>
int process_arguments (int, char **);
void print_help (void);
@@ -108,6 +108,7 @@ main (int argc, char **argv)
int result = STATE_UNKNOWN;
UINT4 client_id;
char *str;
+ rc_handle *rh;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
@@ -117,32 +118,41 @@ main (int argc, char **argv)
usage4 (_("Could not parse arguments"));
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)) == NULL)) {
die (STATE_UNKNOWN, _("Config file error"));
+ }
+
+ if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary")) != 0) {
+ die (STATE_UNKNOWN, _("Config file error"));
+ }
service = PW_AUTHENTICATE_ONLY;
+ data.send_pairs = NULL;
+ data.receive_pairs = NULL;
- 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) &&
- (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
+ if (!(rc_avpair_add (rh, &data.send_pairs, PW_SERVICE_TYPE, &service, 0, 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) &&
+ (nasid==NULL || rc_avpair_add (rh, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -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, 0, 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);
--- nagios-plugins-1.4.3/configure.in.radiusclient 2006-04-19 06:42:33.000000000 +0300
+++ nagios-plugins-1.4.3/configure.in 2006-07-19 13:50:20.000000000 +0300
@@ -227,10 +227,10 @@ CPPFLAGS="$_SAVEDCPPFLAGS"
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
+AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
EXTRAS="$EXTRAS check_radius"
- RADIUSLIBS="-lradiusclient"
+ RADIUSLIBS="-lradiusclient-ng"
AC_SUBST(RADIUSLIBS)
else
AC_MSG_WARN([Skipping radius plugin])
--- nagios-plugins-1.4.3/configure.orig 2006-08-09 22:23:01.000000000 -0500
+++ nagios-plugins-1.4.3/configure 2006-08-09 22:23:46.000000000 -0500
@@ -24967,13 +24967,13 @@
_SAVEDLIBS="$LIBS"
-echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient" >&5
-echo $ECHO_N "checking for rc_read_config in -lradiusclient... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5
+echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6
if test "${ac_cv_lib_radiusclient_rc_read_config+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lradiusclient $LIBS"
+LIBS="-lradiusclient-ng $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -25036,13 +25036,13 @@
#define HAVE_LIBRADIUSCLIENT 1
_ACEOF
- LIBS="-lradiusclient $LIBS"
+ LIBS="-lradiusclient-ng $LIBS"
fi
if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
EXTRAS="$EXTRAS check_radius"
- RADIUSLIBS="-lradiusclient"
+ RADIUSLIBS="-lradiusclient-ng"
else
{ echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5
Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-5/nagios-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nagios-plugins.spec 24 Jul 2006 02:43:43 -0000 1.10
+++ nagios-plugins.spec 10 Aug 2006 15:18:07 -0000 1.11
@@ -1,6 +1,6 @@
Name: nagios-plugins
Version: 1.4.3
-Release: 14%{?dist}
+Release: 16%{?dist}
Summary: Host/service/network monitoring program plugins for Nagios
Group: Applications/System
@@ -9,6 +9,8 @@
Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openldap-devel
@@ -24,6 +26,8 @@
BuildRequires: %{_bindir}/mailq
BuildRequires: %{_sbindir}/fping
BuildRequires: perl(Net::SNMP)
+BuildRequires: radiusclient-ng-devel
+BuildRequires: %{_bindir}/qstat
%description
@@ -38,7 +42,7 @@
%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-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-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
@@ -333,6 +337,22 @@
%description procs
Provides check_procs support for Nagios.
+%package game
+Summary: Nagios Plugin - check_game
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description game
+Provides check_game support for Nagios.
+
+%package radius
+Summary: Nagios Plugin - check_radius
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description radius
+Provides check_radius support for Nagios.
+
%package real
Summary: Nagios Plugin - check_real
Group: Applications/System
@@ -450,11 +470,14 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -b .radiusclient
+%patch2 -p0
%build
%configure \
--libexecdir=%{_libdir}/nagios/plugins \
--with-mysql \
+ PATH_TO_QSTAT=%{_bindir}/qstat \
PATH_TO_FPING=%{_sbindir}/fping \
PATH_TO_NTPQ=%{_sbindir}/ntpq \
PATH_TO_NTPDC=%{_sbindir}/ntpdc \
@@ -473,9 +496,6 @@
%{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
-# qstat is not provided by Fedora yet
-%{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_game
-
%ifarch ppc ppc64 sparc sparc64
%{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
%endif
@@ -498,7 +518,7 @@
%{_libdir}/nagios/plugins/check_by_ssh
%files dhcp
-%defattr(-,root,root,-)
+%defattr(4750,root,nagios,-)
%{_libdir}/nagios/plugins/check_dhcp
%files dig
@@ -627,6 +647,14 @@
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_procs
+%files game
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_game
+
+%files radius
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_radius
+
%files real
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_real
@@ -702,6 +730,15 @@
%{_libdir}/nagios/plugins/utils.*
%changelog
+* Thu Aug 03 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-16
+- Providing path to qstat
+
+* Thu Aug 03 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-15
+- Fixed permissions on check_dhcp
+- Added check_game
+- Added check_radius
+- Added patch for ntp
+
* Sun Jul 23 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-14
- Patched upstream issue: 196356
More information about the fedora-extras-commits
mailing list