+++ /dev/null
-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);
+++ /dev/null
-From https://bugzilla.redhat.com/show_bug.cgi?id=691958
-
---- ldapvi-1.7/ldapvi.c
-+++ ldapvi-1.7/ldapvi.c
-@@ -1414,7 +1414,7 @@ write_file_header(FILE *s, cmdline *cmdline)
- int nlines = 0;
-
- if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
-- fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
-+ fputs("# -*- coding: utf-8 -*- \n", s);
- nlines++;
- }
- if (cmdline->ldif) {
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Manage LDAP entries with a text editor"
-HOMEPAGE="http://www.lichteblau.com/ldapvi/"
-SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
-IUSE="ssl"
-
-RDEPEND="sys-libs/ncurses
- >=net-nds/openldap-2.2
- dev-libs/popt
- >=dev-libs/glib-2
- sys-libs/readline
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}+glibc-2.10.patch"
- epatch "${FILESDIR}/${P}-vim-encoding.patch"
-}
-
-src_configure() {
- econf $(use_with ssl libcrypto openssl) || die
-}
-
-src_install() {
- dobin ldapvi || die
- doman ldapvi.1 || die
- dodoc NEWS manual/{bg.png,html.xsl,manual.{css,xml}} || die
-}