pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/readline Updated readline to 7.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/41d4bcff745e
branches: trunk
changeset: 352809:41d4bcff745e
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Sep 19 09:04:29 2016 +0000
description:
Updated readline to 7.0.
This is a terse description of the new features added to readline-7.0 since
the release of readline-6.3.
New Features in Readline
a. The history truncation code now uses the same error recovery mechansim as
the history writing code, and restores the old version of the history file
on error. The error recovery mechanism handles symlinked history files.
b. There is a new bindable variable, `enable-bracketed-paste', which enables
support for a terminal's bracketed paste mode.
c. The editing mode indicators can now be strings and are user-settable
(new `emacs-mode-string', `vi-cmd-mode-string' and `vi-ins-mode-string'
variables). Mode strings can contain invisible character sequences.
Setting mode strings to null strings restores the defaults.
d. Prompt expansion adds the mode string to the last line of a multi-line
prompt (one with embedded newlines).
e. There is a new bindable variable, `colored-completion-prefix', which, if
set, causes the common prefix of a set of possible completions to be
displayed in color.
f. There is a new bindable command `vi-yank-pop', a vi-mode version of emacs-
mode yank-pop.
g. The redisplay code underwent several efficiency improvements for multibyte
locales.
h. The insert-char function attempts to batch-insert all pending typeahead
that maps to self-insert, as long as it is coming from the terminal.
i. rl_callback_sigcleanup: a new application function that can clean up and
unset any state set by readline's callback mode. Intended to be used
after a signal.
j. If an incremental search string has its last character removed with DEL, the
resulting empty search string no longer matches the previous line.
k. If readline reads a history file that begins with `#' (or the value of
the history comment character) and has enabled history timestamps, the history
entries are assumed to be delimited by timestamps. This allows multi-line
history entries.
l. Readline now throws an error if it parses a key binding without a terminating
`:' or whitespace.
diffstat:
devel/readline/Makefile | 5 +-
devel/readline/distinfo | 19 ++----
devel/readline/patches/patch-colors.c | 8 +-
devel/readline/patches/patch-display.c | 49 -----------------
devel/readline/patches/patch-examples_Makefile.in | 66 ++++------------------
devel/readline/patches/patch-patchlevel | 11 ---
devel/readline/patches/patch-posixjmp.h | 23 --------
devel/readline/patches/patch-readline.c | 33 -----------
devel/readline/patches/patch-util.c | 26 ---------
9 files changed, 26 insertions(+), 214 deletions(-)
diffs (truncated from 303 to 300 lines):
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/Makefile
--- a/devel/readline/Makefile Mon Sep 19 09:02:14 2016 +0000
+++ b/devel/readline/Makefile Mon Sep 19 09:04:29 2016 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2016/02/25 12:12:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.63 2016/09/19 09:04:29 wiz Exp $
-READLINE_VERSION= 6.3
+READLINE_VERSION= 7.0
DISTNAME= readline-${READLINE_VERSION}
-PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=readline/}
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/distinfo
--- a/devel/readline/distinfo Mon Sep 19 09:02:14 2016 +0000
+++ b/devel/readline/distinfo Mon Sep 19 09:04:29 2016 +0000
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 03:29:19 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/09/19 09:04:29 wiz Exp $
-SHA1 (readline-6.3.tar.gz) = 017b92dc7fd4e636a2b5c9265a77ccc05798c9e1
-RMD160 (readline-6.3.tar.gz) = 986262d811d9dbe1e38bc9d714853272967dca7e
-SHA512 (readline-6.3.tar.gz) = f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
-Size (readline-6.3.tar.gz) = 2468560 bytes
+SHA1 (readline-7.0.tar.gz) = d9095fa14a812495052357e1d678b3f2ac635463
+RMD160 (readline-7.0.tar.gz) = 745bfdddd989fe46c55eea1b41cae7848c3bf2e0
+SHA512 (readline-7.0.tar.gz) = 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
+Size (readline-7.0.tar.gz) = 2910016 bytes
SHA1 (patch-ae) = 98ef48c55111de4a9cc9b19fb44b7d139f6de40f
SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
-SHA1 (patch-colors.c) = 42ffd2766a808a670a445a8ac34740cf4bdf02d5
-SHA1 (patch-display.c) = 8dc455e5cb3ad4208834518f55f93d1d60f52087
-SHA1 (patch-examples_Makefile.in) = d8268b7de6d548f673b23eb0718394245e56ab1f
-SHA1 (patch-patchlevel) = 04d5af0e90455d7dcbc1917c07b30656afc725a5
-SHA1 (patch-posixjmp.h) = e2be68635c49a85d03417904338ce6376d8a9a99
-SHA1 (patch-readline.c) = ad9aef8a3e9a199d2b9a1a32fc3f715784136c89
-SHA1 (patch-util.c) = b7c22aa43cbd1d0225099e2ee1d4d1772d402b5f
+SHA1 (patch-colors.c) = beb4cdb33e1b361804a7d8d3b36dbd137e7502fd
+SHA1 (patch-examples_Makefile.in) = f9fce95533ee578c5323d3dbf5eb95fa344dd4ef
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-colors.c
--- a/devel/readline/patches/patch-colors.c Mon Sep 19 09:02:14 2016 +0000
+++ b/devel/readline/patches/patch-colors.c Mon Sep 19 09:04:29 2016 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-colors.c,v 1.1 2014/07/18 13:02:06 ryoon Exp $
+$NetBSD: patch-colors.c,v 1.2 2016/09/19 09:04:29 wiz Exp $
---- colors.c.orig 2013-03-20 15:19:08.000000000 +0000
+--- colors.c.orig 2016-01-25 15:38:00.000000000 +0000
+++ colors.c
-@@ -187,8 +187,10 @@ _rl_print_color_indicator (char *f)
- ? C_ORPHAN : C_LINK);
+@@ -215,8 +215,10 @@ _rl_print_color_indicator (const char *f
+ colored_filetype = C_LINK;
else if (S_ISFIFO (mode))
colored_filetype = C_FIFO;
+#if defined(S_ISSOCK)
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-display.c
--- a/devel/readline/patches/patch-display.c Mon Sep 19 09:02:14 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-display.c,v 1.1 2014/08/11 21:29:00 markd Exp $
-
-Readline-6.3 Official Patch 4
-
-The signal handling changes to bash and readline (to avoid running any code
-in a signal handler context) cause the cursor to be placed on the wrong
-line of a multi-line command after a ^C interrupts editing.
-
-Readline-6.3 Official Patch 6
-
-Using reverse-i-search when horizontal scrolling is enabled does not redisplay
-the entire line containing the successful search results.
-
---- display.c.orig 2013-12-27 18:10:56.000000000 +0000
-+++ display.c
-@@ -1637,7 +1637,7 @@ update_line (old, new, current_line, oma
- /* If we are changing the number of invisible characters in a line, and
- the spot of first difference is before the end of the invisible chars,
- lendiff needs to be adjusted. */
-- if (current_line == 0 && !_rl_horizontal_scroll_mode &&
-+ if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
- current_invis_chars != visible_wrap_offset)
- {
- if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1825,8 +1825,13 @@ update_line (old, new, current_line, oma
- else
- _rl_last_c_pos += bytes_to_insert;
-
-+ /* XXX - we only want to do this if we are at the end of the line
-+ so we move there with _rl_move_cursor_relative */
- if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-- goto clear_rest_of_line;
-+ {
-+ _rl_move_cursor_relative (ne-new, new);
-+ goto clear_rest_of_line;
-+ }
- }
- }
- /* Otherwise, print over the existing material. */
-@@ -2677,7 +2682,8 @@ _rl_clean_up_for_exit ()
- {
- if (_rl_echoing_p)
- {
-- _rl_move_vert (_rl_vis_botlin);
-+ if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
-+ _rl_move_vert (_rl_vis_botlin);
- _rl_vis_botlin = 0;
- fflush (rl_outstream);
- rl_restart_output (1, 0);
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-examples_Makefile.in
--- a/devel/readline/patches/patch-examples_Makefile.in Mon Sep 19 09:02:14 2016 +0000
+++ b/devel/readline/patches/patch-examples_Makefile.in Mon Sep 19 09:04:29 2016 +0000
@@ -1,12 +1,21 @@
-$NetBSD: patch-examples_Makefile.in,v 1.2 2014/03/12 10:04:50 wiz Exp $
+$NetBSD: patch-examples_Makefile.in,v 1.3 2016/09/19 09:04:29 wiz Exp $
Patch to link correctly against libtool built libs.
---- examples/Makefile.in.orig 2013-10-03 16:57:31.000000000 +0000
+--- examples/Makefile.in.orig 2016-04-26 13:50:18.000000000 +0000
+++ examples/Makefile.in
-@@ -58,8 +58,8 @@ LDFLAGS = -g -L.. @LDFLAGS@
+@@ -46,7 +46,7 @@ OBJEXT = @OBJEXT@
+ DESTDIR =
- PURIFY = @PURIFY@
+ DEFS = @DEFS@
+-CC = @CC@
++CC = $(LIBTOOL) --mode=link @CC@
+ CFLAGS = @CFLAGS@
+ LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DREADLINE_LIBRARY -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
+ CPPFLAGS = @CPPFLAGS@
+@@ -56,8 +56,8 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -
+ CCFLAGS = $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LDFLAGS = -g -L.. @LDFLAGS@
-READLINE_LIB = ../libreadline.a
-HISTORY_LIB = ../libhistory.a
@@ -15,52 +24,3 @@
TERMCAP_LIB = @TERMCAP_LIB@
-@@ -104,37 +104,37 @@ uninstall:
- -rmdir $(DESTDIR)$(installdir)
-
- rl$(EXEEXT): rl.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- rlcat$(EXEEXT): rlcat.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlcat.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlcat.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- rlevent$(EXEEXT): rlevent.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlevent.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlevent.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- fileman$(EXEEXT): fileman.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ fileman.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ fileman.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- rltest$(EXEEXT): rltest.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ rltest.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rltest.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- rl-callbacktest$(EXEEXT): rl-callbacktest.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl-callbacktest.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl-callbacktest.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- rlptytest$(EXEEXT): rlptytest.o $(READLINE_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlptytest.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlptytest.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- rlversion$(EXEEXT): rlversion.o $(READLINE_LIB)
-- $(CC) $(LDFLAGS) -o $@ rlversion.o $(READLINE_LIB) $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ rlversion.o $(READLINE_LIB) $(TERMCAP_LIB)
-
- histexamp$(EXEEXT): histexamp.o $(HISTORY_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
-
- hist_erasedups$(EXEEXT): hist_erasedups.o $(HISTORY_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_erasedups.o -lhistory $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_erasedups.o -lhistory $(TERMCAP_LIB)
-
- hist_purgecmd$(EXEEXT): hist_purgecmd.o $(HISTORY_LIB)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_purgecmd.o -lhistory $(TERMCAP_LIB)
-+ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_purgecmd.o -lhistory $(TERMCAP_LIB)
-
- clean mostlyclean:
- $(RM) $(OBJECTS) $(OTHEROBJ)
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-patchlevel
--- a/devel/readline/patches/patch-patchlevel Mon Sep 19 09:02:14 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-patchlevel,v 1.1 2014/08/11 21:29:00 markd Exp $
-
-Apply Readline-6.3 Official Patches 1 - 6
-
---- patchlevel.orig 2013-11-15 13:11:11.000000000 +0000
-+++ patchlevel
-@@ -1,3 +1,3 @@
- # Do not edit -- exists only for use by patch
-
--5
-+6
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-posixjmp.h
--- a/devel/readline/patches/patch-posixjmp.h Mon Sep 19 09:02:14 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-posixjmp.h,v 1.1 2015/03/20 14:46:47 ryoon Exp $
-
-* Fix link under Cygwin.
- From readline-3.8,8-1.src.patch from Cygwin.
-
---- posixjmp.h.orig 2012-12-24 03:20:50.000000000 +0000
-+++ posixjmp.h
-@@ -27,13 +27,13 @@
-
- #if defined (HAVE_POSIX_SIGSETJMP)
- # define procenv_t sigjmp_buf
--# if !defined (__OPENNT)
-+# if !defined (__OPENNT) && !defined (__CYGWIN__)
- # undef setjmp
- # define setjmp(x) sigsetjmp((x), 1)
- # define setjmp_nosigs(x) sigsetjmp((x), 0)
- # undef longjmp
- # define longjmp(x, n) siglongjmp((x), (n))
--# endif /* !__OPENNT */
-+# endif /* !__OPENNT && !__CYGWIN__ */
- #else
- # define procenv_t jmp_buf
- # define setjmp_nosigs setjmp
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-readline.c
--- a/devel/readline/patches/patch-readline.c Mon Sep 19 09:02:14 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-readline.c,v 1.1 2014/08/11 21:29:00 markd Exp $
-
-Readline-6.3 Official Patch 1
-
-The `.' command in vi mode cannot undo multi-key commands beginning with
-`c', `d', and `y' (command plus motion specifier).
-
-Readline-6.3 Official Patch 2
-
-When in callback mode, some readline commands can cause readline to seg
-fault by passing invalid contexts to callback functions.
-
---- readline.c.orig 2013-10-28 18:58:06.000000000 +0000
-+++ readline.c
-@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt)
- r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
-
- RL_CHECK_SIGNALS ();
-- if (r == 0) /* success! */
-+ /* We only treat values < 0 specially to simulate recursion. */
-+ if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */
- {
- _rl_keyseq_chain_dispose ();
- RL_UNSETSTATE (RL_STATE_MULTIKEY);
-@@ -964,7 +965,7 @@ _rl_dispatch_subseq (key, map, got_subse
- #if defined (VI_MODE)
- if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
- key != ANYOTHERKEY &&
-- rl_key_sequence_length == 1 && /* XXX */
-+ _rl_dispatching_keymap == vi_movement_keymap &&
- _rl_vi_textmod_command (key))
- _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
- #endif
diff -r 6ffa11afd1f6 -r 41d4bcff745e devel/readline/patches/patch-util.c
--- a/devel/readline/patches/patch-util.c Mon Sep 19 09:02:14 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-util.c,v 1.1 2014/08/11 21:29:00 markd Exp $
-
-Readline-6.3 Official Patch 3
-
-There are debugging functions in the readline release that are theoretically
-exploitable as security problems. They are not public functions, but have
-global linkage.
-
---- util.c.orig 2013-09-02 17:36:12.000000000 +0000
-+++ util.c
-@@ -476,6 +476,7 @@ _rl_savestring (s)
- return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
- }
-
-+#if defined (DEBUG)
- #if defined (USE_VARARGS)
- static FILE *_rl_tracefp;
-
-@@ -538,6 +539,7 @@ _rl_settracefp (fp)
- _rl_tracefp = fp;
- }
- #endif
-+#endif /* DEBUG */
Home |
Main Index |
Thread Index |
Old Index