Add patch to fix build with glibc-2.10. Closes bug #270642.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 56 insertions, 6 deletions

diff --git a/net-nds/ldapvi/ChangeLog b/net-nds/ldapvi/ChangeLog
index ce50bcc42319..cd9a6021f66a 100644
--- a/net-nds/ldapvi/ChangeLog
+++ b/net-nds/ldapvi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/ldapvi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.21 2008/11/12 13:11:44 fmccor Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.22 2009/05/22 15:46:53 flameeyes Exp $
+
+  22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> ldapvi-1.7.ebuild,
+  +files/ldapvi-1.7+glibc-2.10.patch:
+  Add patch to fix build with glibc-2.10. Closes bug #270642.
 
   12 Nov 2008; Ferris McCormick <fmccor@gentoo.org> ldapvi-1.7.ebuild:
   Keyword ~sparc at user request (gustavo panizzo <gfa>), Bug #246453 ---
diff --git a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch b/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
new file mode 100644
index 000000000000..df2a20c71245
--- /dev/null
+++ b/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
@@ -0,0 +1,39 @@
+Index: ldapvi-1.7/common.h
+===================================================================
+--- ldapvi-1.7.orig/common.h
++++ ldapvi-1.7/common.h
+@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
+ char *home_filename(char *name);
+ void read_ldapvi_history(void);
+ void write_ldapvi_history(void);
+-char *getline(char *prompt, char *value);
++char *ldapvi_getline(char *prompt, char *value);
+ char *get_password();
+ char *append(char *a, char *b);
+ void *xalloc(size_t size);
+Index: ldapvi-1.7/ldapvi.c
+===================================================================
+--- ldapvi-1.7.orig/ldapvi.c
++++ ldapvi-1.7/ldapvi.c
+@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
+ 		bo->authmethod = LDAP_AUTH_SASL;
+ 		puts("Switching to SASL authentication.");
+ 	}
+-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
++	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
+ }
+ 
+ static int
+Index: ldapvi-1.7/misc.c
+===================================================================
+--- ldapvi-1.7.orig/misc.c
++++ ldapvi-1.7/misc.c
+@@ -315,7 +315,7 @@ write_ldapvi_history()
+ }
+ 
+ char *
+-getline(char *prompt, char *value)
++ldapvi_getline(char *prompt, char *value)
+ {
+ 	tdialog d;
+ 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);
diff --git a/net-nds/ldapvi/ldapvi-1.7.ebuild b/net-nds/ldapvi/ldapvi-1.7.ebuild
index e217f64a8d93..7b9c85f3b779 100644
--- a/net-nds/ldapvi/ldapvi-1.7.ebuild
+++ b/net-nds/ldapvi/ldapvi-1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.7.ebuild,v 1.6 2008/11/12 13:11:44 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.7.ebuild,v 1.7 2009/05/22 15:46:53 flameeyes Exp $
 
 inherit eutils
 
@@ -21,12 +21,19 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
+}
+
 src_compile() {
 	econf $(use_with ssl libcrypto openssl) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	dobin ldapvi || die "dobin failed"
-	doman ldapvi.1
+	dobin ldapvi || die
+	doman ldapvi.1 || die
 }