Update noradius patch, more quotation fixes

Package-Manager: portage-2.1.3.9

4 files changed, 52 insertions, 13 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/Manifest b/net-analyzer/nagios-plugins/Manifest
index f03f9857c28b..ae3778e96d5f 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -10,24 +10,28 @@ AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca2872251
 MD5 d5a111b2c5cff8f253cb1003afc52b71 files/nagios-plugins-1.4.10-contrib.patch 1610
 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 files/nagios-plugins-1.4.10-contrib.patch 1610
 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 files/nagios-plugins-1.4.10-contrib.patch 1610
+AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229
+MD5 03db813b6ec458ef463fac07546ca497 files/nagios-plugins-1.4.10-noradius.patch 1029
+RMD160 e1e449d93966d822eca21782968e24fce4547a95 files/nagios-plugins-1.4.10-noradius.patch 1029
+SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 files/nagios-plugins-1.4.10-noradius.patch 1029
 AUX nagios-plugins-1.4.8-mysql.patch 588 RMD160 79282c1f6e988ec1ff8e34f356277425fdeb85f6 SHA1 01febafe9465cc90f324b55bc5e2d4a0bd994fca SHA256 ba6940889d5352b28cf40180975f262d2db84014e73ca3b425a19fd93f295539
 MD5 4763f9482afd9e2bbf0e8fd8589d7d21 files/nagios-plugins-1.4.8-mysql.patch 588
 RMD160 79282c1f6e988ec1ff8e34f356277425fdeb85f6 files/nagios-plugins-1.4.8-mysql.patch 588
 SHA256 ba6940889d5352b28cf40180975f262d2db84014e73ca3b425a19fd93f295539 files/nagios-plugins-1.4.8-mysql.patch 588
 DIST nagios-plugins-1.4.10.tar.gz 1693979 RMD160 8f8167f07d6162165d7cb38c9c09ebff418151bd SHA1 8b41a69a90f9c656afb56b861f4505e5ad1aa5a4 SHA256 193ef480cd2b98d63de9183a83e277d6ef3b55032f44bd76616ef5e7a3d4a76e
 DIST nagios-plugins-1.4.8.tar.gz 1356563 RMD160 28754b5e09ef0617530fdc6f54c62f5f94c0bd03 SHA1 24446531e4f9647b0a633f1782ee34031d85fd1c SHA256 ce59972199049e587f2ee078888beb3824a6612d75a8efc9feaafe64d6ee83ef
-EBUILD nagios-plugins-1.4.10.ebuild 3658 RMD160 ea2b5d9bc0435afb253829524e3dc05f66c33260 SHA1 e561b57ad6f6863b11077bcd1fb3d4dc51ab5f57 SHA256 b6e34401c664e0ac4d97bfd0fd6bca7db39d3f3724decde04974e68d9ec898ed
-MD5 7e6ac13d9e635e21ef2f8845aa8152ff nagios-plugins-1.4.10.ebuild 3658
-RMD160 ea2b5d9bc0435afb253829524e3dc05f66c33260 nagios-plugins-1.4.10.ebuild 3658
-SHA256 b6e34401c664e0ac4d97bfd0fd6bca7db39d3f3724decde04974e68d9ec898ed nagios-plugins-1.4.10.ebuild 3658
+EBUILD nagios-plugins-1.4.10.ebuild 3665 RMD160 7a5f37b9c6e1af9ef8d984f3fcfae4bf8f99ab9c SHA1 5b30742eb2e2d616ca1c20ee6668ed0d040f99a5 SHA256 c4eac091437d3a415879bfddb9c38fda89a469a73e2012aaea4acc926028e2c0
+MD5 6ae6b6273110f153310f80086a9b36f5 nagios-plugins-1.4.10.ebuild 3665
+RMD160 7a5f37b9c6e1af9ef8d984f3fcfae4bf8f99ab9c nagios-plugins-1.4.10.ebuild 3665
+SHA256 c4eac091437d3a415879bfddb9c38fda89a469a73e2012aaea4acc926028e2c0 nagios-plugins-1.4.10.ebuild 3665
 EBUILD nagios-plugins-1.4.8-r1.ebuild 3657 RMD160 2edf4dae735a2399ec3b09c2679c373fbd972cca SHA1 04f49e37aca50f44d8a53cd5feb00c02bf09e9de SHA256 aef7f8b293d5181d36b0e3a4303230e4703cc9e5a1e523c018a5d9f89b64351c
 MD5 e23c2e379e3fba2abdd3d4264e59a76f nagios-plugins-1.4.8-r1.ebuild 3657
 RMD160 2edf4dae735a2399ec3b09c2679c373fbd972cca nagios-plugins-1.4.8-r1.ebuild 3657
 SHA256 aef7f8b293d5181d36b0e3a4303230e4703cc9e5a1e523c018a5d9f89b64351c nagios-plugins-1.4.8-r1.ebuild 3657
-MISC ChangeLog 12588 RMD160 53b5c996c9f0730d26233e54c741211f69d0dbf0 SHA1 7a1583dad099a3fbd95aaab1a8d62a05b8321b6c SHA256 4243f7a0121e5b72f1bc53d88710f70b7fa1cf4fd0152ec781179b4fe6336fbe
-MD5 fcda9cffa3ea19e2e3f856f2aef764b0 ChangeLog 12588
-RMD160 53b5c996c9f0730d26233e54c741211f69d0dbf0 ChangeLog 12588
-SHA256 4243f7a0121e5b72f1bc53d88710f70b7fa1cf4fd0152ec781179b4fe6336fbe ChangeLog 12588
+MISC ChangeLog 12768 RMD160 4f695e7e6bd5858e86e4ee6599feb3fdc2924997 SHA1 b3f7f5f596dcf4122ab78566ee73c41f02f9a7d0 SHA256 1cab746c66bacc5ce130e13e5e8f41c7bd53da53421e6829c67fc640f763c034
+MD5 6895e1e92eb7c6dad6441920998f2859 ChangeLog 12768
+RMD160 4f695e7e6bd5858e86e4ee6599feb3fdc2924997 ChangeLog 12768
+SHA256 1cab746c66bacc5ce130e13e5e8f41c7bd53da53421e6829c67fc640f763c034 ChangeLog 12768
 MISC metadata.xml 374 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 SHA1 88da42b8cc7c08339067720081f61c110e00acb5 SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59
 MD5 afd013450a188e41979f4d528607d692 metadata.xml 374
 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 metadata.xml 374
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
 }