Date: Sun, 19 Jun 2016 19:55:49 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417132 - in head/devel/libedit: . files Message-ID: <201606191955.u5JJtnei041639@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Jun 19 19:55:49 2016 New Revision: 417132 URL: https://svnweb.freebsd.org/changeset/ports/417132 Log: backout libedit update it breaks all mysql clients Reported by: antoine Added: head/devel/libedit/files/patch-netbsd-pr-50863 - copied unchanged from r417128, head/devel/libedit/files/patch-netbsd-pr-50863 head/devel/libedit/files/patch-src_eln.c - copied unchanged from r417128, head/devel/libedit/files/patch-src_eln.c Modified: head/devel/libedit/Makefile head/devel/libedit/distinfo head/devel/libedit/files/patch-src__chartype.h head/devel/libedit/pkg-plist Modified: head/devel/libedit/Makefile ============================================================================== --- head/devel/libedit/Makefile Sun Jun 19 19:10:12 2016 (r417131) +++ head/devel/libedit/Makefile Sun Jun 19 19:55:49 2016 (r417132) @@ -4,6 +4,8 @@ PORTNAME= libedit PORTVERSION= ${EDITVERSION}.${EDITDATE} DISTVERSION= ${EDITDATE}-${EDITVERSION} +PORTREVISION= 2 +PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://thrysoee.dk/editline/ @@ -14,11 +16,12 @@ LICENSE= BSD2CLAUSE USES= libtool ncurses pathfix EDITVERSION= 3.1 -EDITDATE= 20160618 +EDITDATE= 20150325 WRKSRC= ${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip +CONFIGURE_ARGS= --enable-widec MAKE_ENV= LC_ALL=C LDFLAGS+= -L${LOCALBASE}/lib Modified: head/devel/libedit/distinfo ============================================================================== --- head/devel/libedit/distinfo Sun Jun 19 19:10:12 2016 (r417131) +++ head/devel/libedit/distinfo Sun Jun 19 19:55:49 2016 (r417132) @@ -1,3 +1,2 @@ -TIMESTAMP = 1466362845 -SHA256 (libedit-20160618-3.1.tar.gz) = b6b159c0c6ec8a7f349ea2a75d8b960efa346c462c1ac4921f1ac0de85a9f5d6 -SIZE (libedit-20160618-3.1.tar.gz) = 508615 +SHA256 (libedit-20150325-3.1.tar.gz) = c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5 +SIZE (libedit-20150325-3.1.tar.gz) = 502792 Copied: head/devel/libedit/files/patch-netbsd-pr-50863 (from r417128, head/devel/libedit/files/patch-netbsd-pr-50863) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libedit/files/patch-netbsd-pr-50863 Sun Jun 19 19:55:49 2016 (r417132, copy of r417128, head/devel/libedit/files/patch-netbsd-pr-50863) @@ -0,0 +1,53 @@ +http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=50863 + +--- src/tty.c.orig 2014-06-18 19:07:45 UTC ++++ src/tty.c +@@ -499,6 +499,9 @@ tty_setup(EditLine *el) + if (el->el_flags & EDIT_DISABLED) + return 0; + ++ if (el->el_tty.t_initialized) ++ return -1; ++ + if (!isatty(el->el_outfd)) { + #ifdef DEBUG_TTY + (void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__, +@@ -558,6 +561,7 @@ tty_setup(EditLine *el) + + tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]); + tty_bind_char(el, 1); ++ el->el_tty.t_initialized = 1; + return 0; + } + +@@ -567,6 +571,7 @@ tty_init(EditLine *el) + + el->el_tty.t_mode = EX_IO; + el->el_tty.t_vdisable = _POSIX_VDISABLE; ++ el->el_tty.t_initialized = 0; + (void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t)); + (void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t)); + return tty_setup(el); +@@ -580,6 +585,9 @@ protected void + /*ARGSUSED*/ + tty_end(EditLine *el) + { ++ if (!el->el_tty.t_initialized) ++ return; ++ + if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) { + #ifdef DEBUG_TTY + (void) fprintf(el->el_errfile, +--- src/tty.h.orig 2014-06-18 16:05:56 UTC ++++ src/tty.h +@@ -474,8 +474,9 @@ typedef struct { + int t_tabs; + int t_eight; + speed_t t_speed; +- int t_mode; ++ unsigned char t_mode; + unsigned char t_vdisable; ++ unsigned char t_initialized; + } el_tty_t; + + Modified: head/devel/libedit/files/patch-src__chartype.h ============================================================================== --- head/devel/libedit/files/patch-src__chartype.h Sun Jun 19 19:10:12 2016 (r417131) +++ head/devel/libedit/files/patch-src__chartype.h Sun Jun 19 19:55:49 2016 (r417132) @@ -1,11 +1,11 @@ ---- src/chartype.h.orig 2016-06-10 20:04:58 UTC -+++ src/chartype.h -@@ -33,7 +33,7 @@ +--- src/chartype.h.orig 2015-03-25 21:02:28.000000000 +0100 ++++ src/chartype.h 2015-03-28 11:37:42.072100000 +0100 +@@ -44,7 +44,7 @@ * supports non-BMP code points without requiring UTF-16, but nothing * seems to actually advertise this properly, despite Unicode 3.1 having * been around since 2001... */ --#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) -+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) +-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) ++#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Copied: head/devel/libedit/files/patch-src_eln.c (from r417128, head/devel/libedit/files/patch-src_eln.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libedit/files/patch-src_eln.c Sun Jun 19 19:55:49 2016 (r417132, copy of r417128, head/devel/libedit/files/patch-src_eln.c) @@ -0,0 +1,21 @@ +--- src/eln.c.orig 2015-03-25 21:02:28.000000000 +0100 ++++ src/eln.c 2015-03-28 11:42:29.913925000 +0100 +@@ -75,12 +75,17 @@ public const char * + el_gets(EditLine *el, int *nread) + { + const wchar_t *tmp; ++ int nwread; ++ ++ *nread = 0; + + if (!(el->el_flags & CHARSET_IS_UTF8)) + el->el_flags |= IGNORE_EXTCHARS; +- tmp = el_wgets(el, nread); ++ tmp = el_wgets(el, &nwread); + if (!(el->el_flags & CHARSET_IS_UTF8)) + el->el_flags &= ~IGNORE_EXTCHARS; ++ for (int i = 0; i < nwread; i++) ++ *nread += ct_enc_width(tmp[i]); + return ct_encode_string(tmp, &el->el_lgcyconv); + } + Modified: head/devel/libedit/pkg-plist ============================================================================== --- head/devel/libedit/pkg-plist Sun Jun 19 19:10:12 2016 (r417131) +++ head/devel/libedit/pkg-plist Sun Jun 19 19:55:49 2016 (r417132) @@ -3,7 +3,7 @@ include/histedit.h lib/libedit.a lib/libedit.so lib/libedit.so.0 -lib/libedit.so.0.0.54 +lib/libedit.so.0.0.53 libdata/pkgconfig/libedit.pc man/man3/editline.3.gz man/man3/el_deletestr.3.gz @@ -11,8 +11,10 @@ man/man3/el_end.3.gz man/man3/el_get.3.gz man/man3/el_getc.3.gz man/man3/el_gets.3.gz +man/man3/el_history.3.gz +man/man3/el_history_end.3.gz +man/man3/el_history_init.3.gz man/man3/el_init.3.gz -man/man3/el_init_fd.3.gz man/man3/el_insertstr.3.gz man/man3/el_line.3.gz man/man3/el_parse.3.gz @@ -21,30 +23,9 @@ man/man3/el_reset.3.gz man/man3/el_resize.3.gz man/man3/el_set.3.gz man/man3/el_source.3.gz -man/man3/el_wdeletestr.3.gz -man/man3/el_wget.3.gz -man/man3/el_wgetc.3.gz -man/man3/el_wgets.3.gz -man/man3/el_winsertstr.3.gz -man/man3/el_wline.3.gz -man/man3/el_wparse.3.gz -man/man3/el_wpush.3.gz -man/man3/el_wset.3.gz -man/man3/history.3.gz -man/man3/history_end.3.gz -man/man3/history_init.3.gz -man/man3/history_w.3.gz -man/man3/history_wend.3.gz -man/man3/history_winit.3.gz -man/man3/tok_end.3.gz -man/man3/tok_init.3.gz -man/man3/tok_line.3.gz -man/man3/tok_reset.3.gz -man/man3/tok_str.3.gz -man/man3/tok_wend.3.gz -man/man3/tok_winit.3.gz -man/man3/tok_wline.3.gz -man/man3/tok_wreset.3.gz -man/man3/tok_wstr.3.gz +man/man3/el_tok_end.3.gz +man/man3/el_tok_init.3.gz +man/man3/el_tok_line.3.gz +man/man3/el_tok_reset.3.gz +man/man3/el_tok_str.3.gz man/man5/editrc.5.gz -man/man7/editline.7.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606191955.u5JJtnei041639>