rpms/nagios-plugins/devel nagios-plugins-1.4.6-radius-ng.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 nagios-plugins.spec, 1.21, 1.22 sources, 1.6, 1.7 nagios-plugins-1.4.3.radius-ng.patch, 1.1, NONE
Michael Patrick McGrath (mmcgrath)
fedora-extras-commits at redhat.com
Fri Feb 23 20:39:42 UTC 2007
Author: mmcgrath
Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3628
Modified Files:
.cvsignore nagios-plugins.spec sources
Added Files:
nagios-plugins-1.4.6-radius-ng.patch
Removed Files:
nagios-plugins-1.4.3.radius-ng.patch
Log Message:
upstream released new version
nagios-plugins-1.4.6-radius-ng.patch:
--- NEW FILE nagios-plugins-1.4.6-radius-ng.patch ---
--- plugins/check_radius.c.orig 2007-02-23 14:25:25.000000000 -0600
+++ plugins/check_radius.c 2007-02-23 14:26:50.000000000 -0600
@@ -43,7 +43,7 @@
#include "utils.h"
#include "netutils.h"
-#include <radiusclient.h>
+#include <radiusclient-ng.h>
int process_arguments (int, char **);
void print_help (void);
@@ -124,6 +124,7 @@
int result = STATE_UNKNOWN;
UINT4 client_id;
char *str;
+ rc_handle *rh;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
@@ -133,33 +134,32 @@
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;
memset (&data, 0, sizeof(data));
- 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))))
- 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);
--- configure.orig 2007-02-23 14:24:52.000000000 -0600
+++ configure 2007-02-23 14:26:21.000000000 -0600
@@ -20983,13 +20983,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
@@ -21051,13 +21051,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
--- configure.in.orig 2007-02-23 14:25:00.000000000 -0600
+++ configure.in 2007-02-23 14:26:31.000000000 -0600
@@ -199,7 +199,7 @@
AC_CHECK_LIB(radiusclient,rc_read_config)
if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
EXTRAS="$EXTRAS check_radius"
- RADIUSLIBS="-lradiusclient"
+ RADIUSLIBS="-lradiusclient-ng"
AC_SUBST(RADIUSLIBS)
else
AC_MSG_WARN([Skipping radius plugin])
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 18 Dec 2006 02:47:27 -0000 1.6
+++ .cvsignore 23 Feb 2007 20:39:10 -0000 1.7
@@ -1 +1 @@
-nagios-plugins-1.4.5.tar.gz
+nagios-plugins-1.4.6.tar.gz
Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nagios-plugins.spec 18 Dec 2006 02:47:27 -0000 1.21
+++ nagios-plugins.spec 23 Feb 2007 20:39:10 -0000 1.22
@@ -1,5 +1,5 @@
Name: nagios-plugins
-Version: 1.4.5
+Version: 1.4.6
Release: 1%{?dist}
Summary: Host/service/network monitoring program plugins for Nagios
@@ -9,7 +9,7 @@
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
+Patch1: nagios-plugins-1.4.6-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
@@ -503,7 +503,7 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1 -b .radiusclient
+%patch1 -p0
%patch2 -p0
%patch3 -p1
%patch4 -p0
@@ -525,6 +525,7 @@
cp %{SOURCE1} ./README.Fedora
%install
+sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS = ../mkinstalldirs,' po/Makefile
%{__rm} -rf %{buildroot}
%{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
%{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
@@ -777,6 +778,9 @@
%{_libdir}/nagios/plugins/utils.sh
%changelog
+* Fri Feb 23 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.6-1
+- Upstream released new version
+
* Sun Dec 17 2006 Mike McGrath <imlinux at gmail.com> 1.4.5-1
- Upstream released new version
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Dec 2006 02:47:27 -0000 1.6
+++ sources 23 Feb 2007 20:39:10 -0000 1.7
@@ -1 +1 @@
-359afddaf6a8e3228a5130b60bed0f67 nagios-plugins-1.4.5.tar.gz
+ea79fa91092d709aa6b2e732b1d55541 nagios-plugins-1.4.6.tar.gz
--- nagios-plugins-1.4.3.radius-ng.patch DELETED ---
More information about the scm-commits
mailing list