diff options
author | Tobias Scherbaum <dertobi123@gentoo.org> | 2007-09-29 09:31:07 +0000 |
---|---|---|
committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2007-09-29 09:31:07 +0000 |
commit | 8978b5a53ddb747c2304749302286552eeddc960 (patch) | |
tree | 169c3ab485e18d1d396e1c8b2cdb7d55973491c1 /net-analyzer | |
parent | sparc stable wrt security #192834 (diff) | |
download | gentoo-2-8978b5a53ddb747c2304749302286552eeddc960.tar.gz gentoo-2-8978b5a53ddb747c2304749302286552eeddc960.tar.bz2 gentoo-2-8978b5a53ddb747c2304749302286552eeddc960.zip |
Update noradius patch, more quotation fixes
(Portage version: 2.1.3.9)
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/nagios-plugins/ChangeLog | 6 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch | 30 | ||||
-rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild | 9 |
3 files changed, 40 insertions, 5 deletions
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog index fc808a6182df..0b8359bf0164 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.70 2007/09/29 09:10:59 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.71 2007/09/29 09:31:07 dertobi123 Exp $ + + 29 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> + +files/nagios-plugins-1.4.10-noradius.patch, nagios-plugins-1.4.10.ebuild: + Update noradius patch, more quotation fixes *nagios-plugins-1.4.10 (29 Sep 2007) diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch new file mode 100644 index 000000000000..6d51d7fe1ca9 --- /dev/null +++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-noradius.patch @@ -0,0 +1,30 @@ +diff -Naur nagios-plugins-1.4.10.orig/configure.in nagios-plugins-1.4.10/configure.in +--- nagios-plugins-1.4.10.orig/configure.in 2007-09-29 02:44:36.000000000 +0200 ++++ nagios-plugins-1.4.10/configure.in 2007-09-29 11:20:19.000000000 +0200 +@@ -210,26 +210,6 @@ + LIBS="$_SAVEDLIBS" + 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 +- 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" +- RADIUSLIBS="-lradiusclient-ng" +- AC_SUBST(RADIUSLIBS) +- else +- 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 + _SAVEDLIBS="$LIBS" + AC_CHECK_LIB(ldap,main,,,-llber) diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild index 82c7a5c58f14..9ab00414d97e 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.4.10.ebuild,v 1.1 2007/09/29 09:10:59 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.10.ebuild,v 1.2 2007/09/29 09:31:07 dertobi123 Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -48,12 +48,13 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" + if ! use radius; then - EPATCH_OPTS="-p0 -d ${S}" epatch \ - ${FILESDIR}/nagios-plugins-1.4-noradius.patch + EPATCH_OPTS="-p1 -d ${S}" epatch \ + "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch fi - epatch ${FILESDIR}/${PN}-1.4.10-contrib.patch + epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch AT_M4DIR="m4 gl/m4" eautoreconf } |