Disabled building of check_radius. See bug #45139.

4 files changed, 97 insertions, 2 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index d3341c756001..eb6454239c5a 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.23 2004/08/04 22:04:13 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.24 2004/08/20 15:08:50 eldad Exp $
+
+  20 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  +files/nagios-plugins-noradius.patch, nagios-plugins-1.3.1-r1.ebuild:
+  Disabled building of check_radius. See bug #45139.
 
   04 Aug 2004; Jon Hood <squinky86@gentoo.org> nagios-plugins-1.3.1-r1.ebuild,
   nagios-plugins-1.3.1.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index ca504f7af9e6..58581a9e1e8a 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,7 +1,10 @@
+MD5 b22faf2815609da052a87430a3b7e624 nagios-plugins-1.3.1-r2.ebuild 2571
 MD5 08ba8fa81157946ea31f575b5dec013f nagios-plugins-1.3.1-r1.ebuild 2499
 MD5 9464c6962c4ada68de832d01a8fb9bb9 nagios-plugins-1.3.1.ebuild 1730
 MD5 0a8107c4c5ce5ef4953a575811a2653c ChangeLog 3726
 MD5 a3aa02d9b004cdb8629496aa61024fb7 metadata.xml 256
 MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1 72
 MD5 acb0b2b914b27b67b9a33807b1e6838e files/install-opts-fix.diff 3168
+MD5 ee71da291efd7427bd9786591a98df34 files/nagios-plugins-noradius.patch 2661
 MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r1 72
+MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r2 72
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-noradius.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-noradius.patch
new file mode 100644
index 000000000000..8c0b85594b91
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-noradius.patch
@@ -0,0 +1,86 @@
+--- configure.orig	2004-08-20 17:21:50.447958256 +0300
++++ configure	2004-08-20 17:22:30.045938448 +0300
+@@ -6629,83 +6629,6 @@
+ 
+ _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
+-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"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char rc_read_config ();
+-int
+-main ()
+-{
+-rc_read_config ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_radiusclient_rc_read_config=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_radiusclient_rc_read_config=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_radiusclient_rc_read_config" >&5
+-echo "${ECHO_T}$ac_cv_lib_radiusclient_rc_read_config" >&6
+-if test $ac_cv_lib_radiusclient_rc_read_config = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRADIUSCLIENT 1
+-_ACEOF
+-
+-  LIBS="-lradiusclient $LIBS"
+-
+-fi
+-
+-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+-  EXTRAS="$EXTRAS check_radius"
+-	RADIUSLIBS="-lradiusclient"
+-
+-else
+-  { echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5
+-echo "$as_me: WARNING: Skipping radius plugin" >&2;}
+-  { echo "$as_me:$LINENO: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5
+-echo "$as_me: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&2;}
+-fi
+-LIBS="$_SAVEDLIBS"
+-
+-_SAVEDLIBS="$LIBS"
+-
+ echo "$as_me:$LINENO: checking for main in -lldap" >&5
+ echo $ECHO_N "checking for main in -lldap... $ECHO_C" >&6
+ if test "${ac_cv_lib_ldap_main+set}" = set; then
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
index 3008ba676c0b..7880e163ecb5 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.7 2004/08/04 22:18:17 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.8 2004/08/20 15:08:50 eldad Exp $
 
 inherit eutils
 
@@ -41,6 +41,8 @@ src_compile() {
 	use postgres && myconf="${myconf} --with-pgsql" || myconf="${myconf} --without-pgsql"
 	use ssl && myconf="${myconf} --with-openssl" || myconf="${myconf} --without-openssl"
 
+	epatch ${FILESDIR}/nagios-plugins-noradius.patch
+
 	./configure ${myconf} \
 		--host=${CHOST} \
 		--prefix=/usr/nagios \