# HG changeset patch # User Alexander Medvedev # Date 1423767397 0 # Node ID 2507157b054d34e33e2054db8d50c6f60f9c30a4 # Parent 385863fbe39cb0476f2d5cc7d806e8e7e2f51c62 Up: readline 6.3 diff -r 385863fbe39c -r 2507157b054d readline-dev/receipt --- a/readline-dev/receipt Thu Feb 12 18:16:49 2015 +0200 +++ b/readline-dev/receipt Thu Feb 12 18:56:37 2015 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="readline-dev" -VERSION="6.2" +VERSION="6.3" CATEGORY="development" SHORT_DESC="GNU readline devel files." MAINTAINER="pankso@slitaz.org" diff -r 385863fbe39c -r 2507157b054d readline/receipt --- a/readline/receipt Thu Feb 12 18:16:49 2015 +0200 +++ b/readline/receipt Thu Feb 12 18:56:37 2015 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="readline" -VERSION="6.2" +VERSION="6.3" CATEGORY="system-tools" SHORT_DESC="GNU readline." MAINTAINER="pankso@slitaz.org" @@ -18,6 +18,7 @@ compile_rules() { cd $src + patch -Np1 -i $stuff/readline-6.3-upstream_fixes-3.patch sed -i '/(MV)/d' Makefile* ./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install diff -r 385863fbe39c -r 2507157b054d readline/stuff/readline-6.3-upstream_fixes-3.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/readline/stuff/readline-6.3-upstream_fixes-3.patch Thu Feb 12 18:56:37 2015 +0000 @@ -0,0 +1,155 @@ +Submitted By: Bruce Dubbs +Updated By: Armin K. +Date: 2014-10-04 +Initial Package Version: 6.3 +Upstream Status: Already in upstream patch repo +Origin: Upstream +Description: This patch contains upstream patch numbers 001 through 008. + +--- a/display.c 2013-12-27 19:10:56.000000000 +0100 ++++ b/display.c 2014-10-04 21:30:27.039621661 +0200 +@@ -1637,7 +1637,7 @@ + /* 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 @@ + 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 @@ + { + 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); +--- a/input.c 2014-01-10 21:07:08.000000000 +0100 ++++ b/input.c 2014-10-04 21:30:27.347630462 +0200 +@@ -534,8 +534,16 @@ + return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); + else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) + return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); ++ /* keyboard-generated signals of interest */ + else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) + RL_CHECK_SIGNALS (); ++ /* non-keyboard-generated signals of interest */ ++ else if (_rl_caught_signal == SIGALRM ++#if defined (SIGVTALRM) ++ || _rl_caught_signal == SIGVTALRM ++#endif ++ ) ++ RL_CHECK_SIGNALS (); + + if (rl_signal_event_hook) + (*rl_signal_event_hook) (); +--- a/misc.c 2012-09-02 00:03:11.000000000 +0200 ++++ b/misc.c 2014-10-04 21:30:27.625638402 +0200 +@@ -461,6 +461,7 @@ + saved_undo_list = 0; + /* Set up rl_line_buffer and other variables from history entry */ + rl_replace_from_history (entry, 0); /* entry->line is now current */ ++ entry->data = 0; /* entry->data is now current undo list */ + /* Undo all changes to this history entry */ + while (rl_undo_list) + rl_do_undo (); +@@ -468,7 +469,6 @@ + the timestamp. */ + FREE (entry->line); + entry->line = savestring (rl_line_buffer); +- entry->data = 0; + } + entry = previous_history (); + } +--- a/patchlevel 2013-11-15 14:11:11.000000000 +0100 ++++ b/patchlevel 2014-10-04 21:30:27.625638402 +0200 +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-5 ++8 +--- a/readline.c 2013-10-28 19:58:06.000000000 +0100 ++++ b/readline.c 2014-10-04 21:30:25.951590557 +0200 +@@ -744,7 +744,8 @@ + 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 @@ + #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 +--- a/rltypedefs.h 2011-03-26 19:53:31.000000000 +0100 ++++ b/rltypedefs.h 2014-10-04 21:30:26.747613312 +0200 +@@ -26,6 +26,25 @@ + extern "C" { + #endif + ++/* Old-style, attempt to mark as deprecated in some way people will notice. */ ++ ++#if !defined (_FUNCTION_DEF) ++# define _FUNCTION_DEF ++ ++#if defined(__GNUC__) || defined(__clang__) ++typedef int Function () __attribute__ ((deprecated)); ++typedef void VFunction () __attribute__ ((deprecated)); ++typedef char *CPFunction () __attribute__ ((deprecated)); ++typedef char **CPPFunction () __attribute__ ((deprecated)); ++#else ++typedef int Function (); ++typedef void VFunction (); ++typedef char *CPFunction (); ++typedef char **CPPFunction (); ++#endif ++ ++#endif /* _FUNCTION_DEF */ ++ + /* New style. */ + + #if !defined (_RL_FUNCTION_TYPEDEF) +--- a/util.c 2013-09-02 19:36:12.000000000 +0200 ++++ b/util.c 2014-10-04 21:30:26.206597848 +0200 +@@ -476,6 +476,7 @@ + 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_tracefp = fp; + } + #endif ++#endif /* DEBUG */ + + + #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT)