diff --git a/Readline-7.0-patch-4.patch b/Readline-7.0-patch-4.patch new file mode 100644 index 0000000..526d9cf --- /dev/null +++ b/Readline-7.0-patch-4.patch @@ -0,0 +1,37 @@ +From 457e4fbeb977ffe065dc2ba05a0ebc4000b32065 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Fri, 1 Jun 2018 10:17:06 -0400 +Subject: [PATCH] readline-7.0 patch 4 + +--- + display.c | 4 +++- + patchlevel | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/display.c b/display.c +index 41fb053..2d2e768 100644 +--- a/display.c ++++ b/display.c +@@ -771,7 +771,9 @@ rl_redisplay () + appear in the first and last lines of the prompt */ + wadjust = (newlines == 0) + ? prompt_invis_chars_first_line +- : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); ++ : ((newlines == prompt_lines_estimate) ++ ? (wrap_offset - prompt_invis_chars_first_line) ++ : 0); + + /* fix from Darin Johnson for prompt string with + invisible characters that is longer than the screen width. The +diff --git a/patchlevel b/patchlevel +index ce3e355..626a945 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-3 ++4 +-- +2.14.4 + diff --git a/Readline-7.0-patch-5.patch b/Readline-7.0-patch-5.patch new file mode 100644 index 0000000..e1b225b --- /dev/null +++ b/Readline-7.0-patch-5.patch @@ -0,0 +1,44 @@ +From 57ea39840aebbb34571df1586acc66783b3368d0 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Fri, 1 Jun 2018 10:17:53 -0400 +Subject: [PATCH] readline-7.0 patch 5 + +--- + patchlevel | 2 +- + readline.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/patchlevel b/patchlevel +index 626a945..e0ba09d 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-4 ++5 +diff --git a/readline.c b/readline.c +index e51df4f..a05b35e 100644 +--- a/readline.c ++++ b/readline.c +@@ -1057,7 +1057,7 @@ _rl_subseq_result (r, map, key, got_subseq) + /* We probably shadowed a keymap, so keep going. */ + r = _rl_dispatch (ANYOTHERKEY, m); + } +- else if (r && map[ANYOTHERKEY].function) ++ else if (r < 0 && map[ANYOTHERKEY].function) + { + /* We didn't match (r is probably -1), so return something to + tell the caller that it should try ANYOTHERKEY for an +@@ -1069,7 +1069,7 @@ _rl_subseq_result (r, map, key, got_subseq) + _rl_dispatching_keymap = map; + return -2; + } +- else if (r && got_subseq) ++ else if (r < 0 && got_subseq) /* XXX */ + { + /* OK, back up the chain. */ + if (RL_ISSTATE (RL_STATE_MACROINPUT)) +-- +2.14.4 + diff --git a/readline.spec b/readline.spec index f3ca638..7a00a66 100644 --- a/readline.spec +++ b/readline.spec @@ -1,7 +1,7 @@ Summary: A library for editing typed command lines Name: readline Version: 7.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz @@ -11,6 +11,8 @@ Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz Patch1: Readline-7.0-patch-1.patch Patch2: Readline-7.0-patch-2.patch Patch3: Readline-7.0-patch-3.patch +Patch4: Readline-7.0-patch-4.patch +Patch5: Readline-7.0-patch-5.patch # Other patches # fix file permissions, remove RPATH, use CFLAGS @@ -108,6 +110,10 @@ fi %{_libdir}/libhistory.a %changelog +* Tue Jun 12 2018 Siteshwar Vashisht - 7.0-11 +- Update to readline-7.0 patchlevel 5 + Resolves: #1590316 + * Tue Apr 3 2018 Peter Robinson 7.0-10 - Move USAGE to %%license as it describes usage in a licensing context