Author: baggins Date: Mon Jul 13 15:12:34 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 4 - solve getline() conflict with glibc
---- Files affected: packages/ldapvi: ldapvi.spec (1.18 -> 1.19) , ldapvi-getline.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ldapvi/ldapvi.spec diff -u packages/ldapvi/ldapvi.spec:1.18 packages/ldapvi/ldapvi.spec:1.19 --- packages/ldapvi/ldapvi.spec:1.18 Mon Feb 23 23:06:24 2009 +++ packages/ldapvi/ldapvi.spec Mon Jul 13 17:12:29 2009 @@ -5,9 +5,10 @@ Group: Networking/Utilities License: GPL v2 Version: 1.7 -Release: 3 +Release: 4 Source0: http://www.lichteblau.com/download/%{name}-%{version}.tar.gz # Source0-md5: 6dc2f5441ac5f1e2b5b036e3521012cc +Patch0: %{name}-getline.patch URL: http://www.lichteblau.com/ldapvi/ BuildRequires: autoconf BuildRequires: automake @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 sed -i -e 's#curses ncurses#tinfo curses ncurses#g' configure.in %build @@ -61,6 +63,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2009/07/13 15:12:29 baggins +- rel 4 +- solve getline() conflict with glibc + Revision 1.18 2009/02/23 22:06:24 arekm - release 3 ================================================================ Index: packages/ldapvi/ldapvi-getline.patch diff -u /dev/null packages/ldapvi/ldapvi-getline.patch:1.1 --- /dev/null Mon Jul 13 17:12:34 2009 +++ packages/ldapvi/ldapvi-getline.patch Mon Jul 13 17:12:29 2009 @@ -0,0 +1,36 @@ +diff -ur ldapvi-1.7/common.h ldapvi-1.7-getline/common.h +--- ldapvi-1.7/common.h 2007-05-05 12:17:26.000000000 +0200 ++++ ldapvi-1.7-getline/common.h 2009-07-13 17:09:48.675201066 +0200 +@@ -273,7 +273,7 @@ + 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 -ur ldapvi-1.7/ldapvi.c ldapvi-1.7-getline/ldapvi.c +--- ldapvi-1.7/ldapvi.c 2007-05-05 12:17:26.000000000 +0200 ++++ ldapvi-1.7-getline/ldapvi.c 2009-07-13 17:09:58.331867241 +0200 +@@ -470,7 +470,7 @@ + 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 -ur ldapvi-1.7/misc.c ldapvi-1.7-getline/misc.c +--- ldapvi-1.7/misc.c 2007-05-05 12:17:26.000000000 +0200 ++++ ldapvi-1.7-getline/misc.c 2009-07-13 17:10:14.351865593 +0200 +@@ -315,7 +315,7 @@ + } + + char * +-getline(char *prompt, char *value) ++ldapvi_getline(char *prompt, char *value) + { + tdialog d; + init_dialog(&d, DIALOG_DEFAULT, prompt, value); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ldapvi/ldapvi.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
