Fix openldap automagic dependency. Bug #336973

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

5 files changed, 86 insertions, 15 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 96fbf6dde56e..820d49b168c5 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-plugins
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.138 2010/10/14 18:33:30 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.139 2011/02/22 23:30:40 hwoarang Exp $
+
+  22 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  nagios-plugins-1.4.14-r2.ebuild, nagios-plugins-1.4.15.ebuild,
+  +files/nagios-plugins-1.4.15-openldap.patch:
+  Fix openldap automagic dependency. Bug #336973
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org>
   nagios-plugins-1.4.14-r2.ebuild:
@@ -14,7 +19,7 @@
   nagios-plugins-1.4.14-r2.ebuild:
   Stable for HPPA (bug #330519).
 
-  18 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  18 Sep 2010; Raúl Porcel <armin76@gentoo.org>
   nagios-plugins-1.4.14-r2.ebuild:
   alpha/sparc stable wrt #330519
 
@@ -56,7 +61,7 @@
   Add fix for indefinitely hang while checking ping on Linux VServer
   (#44382), patch by Norbert Klein and Ivan Chavero
 
-  31 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  31 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   nagios-plugins-1.4.14.ebuild:
   sparc stable wrt #298088
 
@@ -164,7 +169,7 @@
   nagios-plugins-1.4.13.ebuild:
   x86 stable, bug #252669
 
-  02 Jan 2009; Dawid Węgliński <cla@gentoo.org>
+  02 Jan 2009; Dawid Węgliński <cla@gentoo.org>
   nagios-plugins-1.4.12-r101.ebuild, nagios-plugins-1.4.13.ebuild:
   Stable on amd64 (bug #252669)
 
@@ -224,7 +229,7 @@
   +nagios-plugins-1.4.12-r100.ebuild:
   Version bump
 
-  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   nagios-plugins-1.4.11-r102.ebuild:
   Changed dependency for postgresql from dev-db/postgresql to
   virtual/postgresql-server
@@ -235,7 +240,7 @@
   USE=postgres should set --with-pgsql, reported by Krzysztof Tomczyk
   (#222317)
 
-  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   nagios-plugins-1.4.11.ebuild, nagios-plugins-1.4.11-r1.ebuild:
   Changed dependency for postgresql to virtual/postgresql-base
 
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 906382dbdb77..f13502375f65 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -3,11 +3,12 @@ AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968
 AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 RMD160 6090168654e888ce9b5bb1c5c6b493f3a019472d SHA1 db41a7f6b57f1119045fb90707a7a8182225d9b8 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455
 AUX nagios-plugins-1.4.14-implicit-pointer-conversion.patch 486 RMD160 193b213ea168a7b25d16380918a3d82e85d86ce3 SHA1 130256ff58f01ac9cae08edbb2f86a2b90c89247 SHA256 65c06471f1b5085371dac7edf55004924745d342c08c03abe9d39116b6b0c10c
 AUX nagios-plugins-1.4.14-vserver.patch 3509 RMD160 49a84ccf016a707872af94306570d7ff173499b8 SHA1 45c255a947adb07cef9f3f18bf9eb0e511c82937 SHA256 7302c26729d02b00c5b5ac4857136773f348ea0a2b7fbddb8ef701784020c3c8
+AUX nagios-plugins-1.4.15-openldap.patch 2065 RMD160 749547cf0f4a591690b6d6739cb2a4286378817c SHA1 f90f943bb7b99be56f8d36e38834b88d6493dfb1 SHA256 829c9a76c7546cbdfa054c971d3b899aea6e1f6438bdb60f2d8cf46282b3c531
 AUX nagios-plugins-1.4.15-vserver.patch 3492 RMD160 3676fe7b9e9aaefa48662d9a7e4569bee25282de SHA1 ba07ac251f9827be1952999b67c01ab41b2ca910 SHA256 06d34d4a5f75757782ece8074c366eb630b25be01428e8337ea6874cd3636d85
 DIST nagios-plugins-1.4.14.tar.gz 1950729 RMD160 f4e1768d84474fc4fa2b59a52efe320c7cbefb3a SHA1 b9998231f992c92b9370b62f15ac80323042f22c SHA256 b1f0f2c01bab2a320cc7c041106500acfd6a5262ff811a2c31b62608ac6c3352
 DIST nagios-plugins-1.4.15.tar.gz 2095419 RMD160 c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736 SHA1 1faab309c06d37e559490fd852ecb0dc8a8ab610 SHA256 51136e5210e3664e1351550de3aff4a766d9d9fea9a24d09e37b3428ef96fa5b
-EBUILD nagios-plugins-1.4.14-r2.ebuild 4504 RMD160 fd8eb0eb5c4ac0c4a392fc3f6b3a342f45203d64 SHA1 46d888976732f958971bd445c757193e3b12baa9 SHA256 e4d8508130f1704d824cbd1ea6cbedc04471100e12c7dac3fa1cd54e4015c34a
+EBUILD nagios-plugins-1.4.14-r2.ebuild 4578 RMD160 109b13d3c864a473766cd1dd7fd9a95c0dd14e74 SHA1 80f2916799745c91139d9094de3ae55c53dbd825 SHA256 af5b45e163d63bafff4149d9a4f9e20391ac0865501bde71996c0626a0fe0f65
 EBUILD nagios-plugins-1.4.14.ebuild 4265 RMD160 e790298a3d94a4b2a8da93aca9adcfdae1d43d0d SHA1 a555a731b70a6328e6e6de7b5345ebff7ed16691 SHA256 12166c6ed5c3b36663631aaa9f00041e10b60c96b4d662c051830de9b77ba807
-EBUILD nagios-plugins-1.4.15.ebuild 4452 RMD160 20da51c023df4781fc6d257a59197e02e50683a0 SHA1 da5dd761a0e54a382884512e43c8b80d750af3df SHA256 b79edc4ba9d65721461e3caaaac50168b3a05311cc3e86466007e372a354c896
-MISC ChangeLog 8873 RMD160 d93067ea74747af655b518bebdf9aa5249f8a9f6 SHA1 66a636adbd7e15ae76ace670b4fb8063f4449d79 SHA256 9a9ea92f855eb2eb7a2a97d510800fc92e349e1341fe899af1818330ca91c94a
+EBUILD nagios-plugins-1.4.15.ebuild 4512 RMD160 d03eae948aa716444855d78fb8bc68b1a941cc8c SHA1 c42223709faae7fcaa519dbedfdb777eadf3c6f5 SHA256 bb41a265100110c403df85b09a45eff73ca0f033c19ad2d387913a8a1ae46d69
+MISC ChangeLog 9102 RMD160 1111b75617ad08741fd2b64f7b088699ac4327e6 SHA1 4bfc2a4aa9fb7e6ff8f345d32e72150e1c038758 SHA256 8fde2f5489745b39b5ab9ea3e61bcb6ac69b5440d34d0b758ce86137da03fa66
 MISC metadata.xml 846 RMD160 c586646ae8e50e5530570a9e7dbdc3bfef074d89 SHA1 4a58e0ba3dde6f44a5227c0c232a0f2d2f06ed1d SHA256 ca1e7a175629f4ce6866ca6408744e222216e12c4ce37c6075bf2ded87916ff7
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch
new file mode 100644
index 000000000000..ea5113c0c3b9
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch
@@ -0,0 +1,62 @@
+Index: nagios-plugins-1.4.15/configure.in
+===================================================================
+--- nagios-plugins-1.4.15.orig/configure.in
++++ nagios-plugins-1.4.15/configure.in
+@@ -257,23 +257,6 @@ fi
+ LIBS="$_SAVEDLIBS"
+ CPPFLAGS="$_SAVEDCPPFLAGS"
+ 
+-dnl Check for LDAP libraries
+-_SAVEDLIBS="$LIBS"
+-AC_CHECK_LIB(ldap,main,,,-llber)
+-if test "$ac_cv_lib_ldap_main" = "yes"; then
+-  LDAPLIBS="-lldap -llber"\
+-  LDAPINCLUDE="-I/usr/include/ldap"
+-  AC_SUBST(LDAPLIBS)
+-  AC_SUBST(LDAPINCLUDE)
+-  AC_CHECK_FUNCS(ldap_set_option)
+-  EXTRAS="$EXTRAS check_ldap"
+-	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
+-else
+-  AC_MSG_WARN([Skipping LDAP plugin])
+-  AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
+-fi
+-LIBS="$_SAVEDLIBS"
+-
+ dnl Check for headers used by check_ide_smart
+ AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
+ if test "$FOUNDINCLUDE" = "yes" ; then
+@@ -305,6 +288,8 @@ fi
+ AC_ARG_WITH([ipv6],
+ 	[AS_HELP_STRING([--with-ipv6], [support IPv6 @<:@default=check@:>@])],
+ 	[], [with_ipv6=check])
++AC_ARG_WITH([ldap],[AS_HELP_STRING([--with-ldap], [support Openldap @<:@default=check@:>@])],
++	[], [with_ldap=check])
+ 
+ dnl Check for AF_INET6 support - unistd.h required for Darwin
+ if test "$with_ipv6" != "no"; then
+@@ -333,6 +318,24 @@ if test "$with_ipv6" != "no"; then
+ 	with_ipv6="$np_cv_sys_ipv6"
+ fi
+ 
++dnl Check for LDAP libraries
++if test "$with_ldap" != "no"; then
++
++	_SAVEDLIBS="$LIBS"
++	AC_CHECK_LIB(ldap,main,[:],,-llber)
++	if test "$ac_cv_lib_ldap_main" = "yes"; then
++		LDAPLIBS="-lldap -llber"\
++		LDAPINCLUDE="-I/usr/include/ldap"
++		AC_SUBST(LDAPLIBS)
++		AC_SUBST(LDAPINCLUDE)
++		AC_CHECK_FUNCS(ldap_set_option)
++		EXTRAS="$EXTRAS check_ldap"
++		AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
++	else
++		AC_MSG_ERROR([Cannot find openldap libraries.])
++	fi
++fi
++LIBS="$_SAVEDLIBS"
+ 
+ dnl Checks for Kerberos. Must come before openssl checks for Redhat EL 3
+ AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no)
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
index 0aa43963487c..0096d7fcc88d 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.14-r2.ebuild,v 1.9 2010/10/14 18:33:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.14-r2.ebuild,v 1.10 2011/02/22 23:30:40 hwoarang Exp $
 
 EAPI=1
 
@@ -57,6 +57,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
 	epatch "${FILESDIR}"/${P}-vserver.patch
 	epatch "${FILESDIR}"/${P}-implicit-pointer-conversion.patch
+	epatch "${FILESDIR}"/${PN}-1.4.15-openldap.patch
 	eautoreconf
 }
 
@@ -76,6 +77,7 @@ src_compile() {
 	econf \
 		$(use_with mysql) \
 		$(use_with ipv6) \
+		$(use_with ldap) \
 		${conf} \
 		--host=${CHOST} \
 		--prefix=/usr \
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild
index 541ae4e4deba..0e1ff7252a76 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.15.ebuild,v 1.1 2010/07/30 14:34:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild,v 1.2 2011/02/22 23:30:40 hwoarang Exp $
 
 EAPI=1
 
@@ -56,7 +56,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
 	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
 	epatch "${FILESDIR}"/${P}-vserver.patch
-
+	epatch "${FILESDIR}"/${P}-openldap.patch
 	eautoreconf
 }
 
@@ -76,6 +76,7 @@ src_compile() {
 	econf \
 		$(use_with mysql) \
 		$(use_with ipv6) \
+		$(use_with ldap) \
 		${conf} \
 		--host=${CHOST} \
 		--prefix=/usr \