From owner-svn-ports-head@freebsd.org Sun May 22 16:28:41 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDC7DB450B9; Sun, 22 May 2016 16:28:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 952921D66; Sun, 22 May 2016 16:28:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4MGSeGJ043910; Sun, 22 May 2016 16:28:40 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4MGSelc043908; Sun, 22 May 2016 16:28:40 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201605221628.u4MGSelc043908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 22 May 2016 16:28:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415640 - in head/sysutils/ldapvi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 May 2016 16:28:42 -0000 Author: bapt Date: Sun May 22 16:28:40 2016 New Revision: 415640 URL: https://svnweb.freebsd.org/changeset/ports/415640 Log: Prevent collision with getline(3) Obtained from: Upstream Added: head/sysutils/ldapvi/files/0010-renamed-getline.patch (contents, props changed) Modified: head/sysutils/ldapvi/Makefile Modified: head/sysutils/ldapvi/Makefile ============================================================================== --- head/sysutils/ldapvi/Makefile Sun May 22 16:25:33 2016 (r415639) +++ head/sysutils/ldapvi/Makefile Sun May 22 16:28:40 2016 (r415640) @@ -21,6 +21,8 @@ USE_GNOME= glib20 GNU_CONFIGURE= yes MAKEFILE= GNUmakefile +EXTRA_PATCHES= ${FILESDIR}/0010-renamed-getline.patch:-p2 + CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib Added: head/sysutils/ldapvi/files/0010-renamed-getline.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/ldapvi/files/0010-renamed-getline.patch Sun May 22 16:28:40 2016 (r415640) @@ -0,0 +1,53 @@ +From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001 +From: David Lichteblau +Date: Thu, 18 Jun 2009 20:07:42 +0200 +Subject: [PATCH 10/15] renamed getline + +--- + ldapvi/common.h | 2 +- + ldapvi/ldapvi.c | 2 +- + ldapvi/misc.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ldapvi/common.h b/ldapvi/common.h +index 4c264e8..f731e62 100644 +--- a/ldapvi/common.h ++++ b/ldapvi/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); +diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c +index 9d7d77c..7b312f8 100644 +--- a/ldapvi/ldapvi.c ++++ b/ldapvi/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 +diff --git a/ldapvi/misc.c b/ldapvi/misc.c +index 0a9dba9..3b6896e 100644 +--- a/ldapvi/misc.c ++++ b/ldapvi/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); +-- +2.8.1 +