diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-07-08 09:03:08 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-07-08 09:03:08 +0000 |
| commit | 1ea7280812c64ecfbd09af53bd244582195678bf (patch) | |
| tree | 2737a3cd938bd603b34d507d34e3584f535e123a /sys-libs/readline | |
| parent | Version bump, drop old (diff) | |
| download | gentoo-2-1ea7280812c64ecfbd09af53bd244582195678bf.tar.gz gentoo-2-1ea7280812c64ecfbd09af53bd244582195678bf.tar.bz2 gentoo-2-1ea7280812c64ecfbd09af53bd244582195678bf.zip | |
Revbump to fix a segfault with revert-all-at-newline. Removed old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-libs/readline')
| -rw-r--r-- | sys-libs/readline/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-libs/readline/files/readline-6.3-revert-all-at-newline-history-segfault.patch | 19 | ||||
| -rw-r--r-- | sys-libs/readline/readline-6.3_p6-r1.ebuild (renamed from sys-libs/readline/readline-6.3_p5-r1.ebuild) | 4 |
3 files changed, 29 insertions, 3 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index 1271f1483b0a..f8ff76506e8d 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.206 2014/07/06 12:31:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.207 2014/07/08 09:03:08 polynomial-c Exp $ + +*readline-6.3_p6-r1 (08 Jul 2014) + + 08 Jul 2014; Lars Wendler <polynomial-c@gentoo.org> + -readline-6.3_p5-r1.ebuild, +readline-6.3_p6-r1.ebuild, + +files/readline-6.3-revert-all-at-newline-history-segfault.patch: + Revbump to fix a segfault with revert-all-at-newline. Removed old. 06 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> readline-6.2_p5-r1.ebuild: amd64 stable wrt bug #513802 diff --git a/sys-libs/readline/files/readline-6.3-revert-all-at-newline-history-segfault.patch b/sys-libs/readline/files/readline-6.3-revert-all-at-newline-history-segfault.patch new file mode 100644 index 000000000000..7c60b208ef6f --- /dev/null +++ b/sys-libs/readline/files/readline-6.3-revert-all-at-newline-history-segfault.patch @@ -0,0 +1,19 @@ +https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html + +--- readline-6.3/misc.c ++++ readline-6.3/misc.c +@@ -462,13 +462,13 @@ + /* Set up rl_line_buffer and other variables from history entry */ + rl_replace_from_history (entry, 0); /* entry->line is now current */ + /* Undo all changes to this history entry */ ++ entry->data = 0; + while (rl_undo_list) + rl_do_undo (); + /* And copy the reverted line back to the history entry, preserving + the timestamp. */ + FREE (entry->line); + entry->line = savestring (rl_line_buffer); +- entry->data = 0; + } + entry = previous_history (); + } diff --git a/sys-libs/readline/readline-6.3_p5-r1.ebuild b/sys-libs/readline/readline-6.3_p6-r1.ebuild index 7ad72ea1e361..899183692802 100644 --- a/sys-libs/readline/readline-6.3_p5-r1.ebuild +++ b/sys-libs/readline/readline-6.3_p6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p5-r1.ebuild,v 1.3 2014/06/18 20:52:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p6-r1.ebuild,v 1.1 2014/07/08 09:03:08 polynomial-c Exp $ EAPI=4 @@ -55,7 +55,7 @@ src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 - epatch "${FILESDIR}"/${PN}-6.3-horizontal-redisplay.patch + epatch "${FILESDIR}"/${PN}-6.3-revert-all-at-newline-history-segfault.patch # Force ncurses linking. #71420 # Use pkg-config to get the right values. #457558 |