diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-03-28 19:04:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-28 19:04:47 +0000 |
| commit | 44645423366cc07c3f85dcab3a7b4d0d7960e920 (patch) | |
| tree | e3102a8dede6a89512df48325b2384e7294fbd61 /sys-libs | |
| parent | Add a note to update wiki page when unmasking multilib packages. (diff) | |
| download | gentoo-2-44645423366cc07c3f85dcab3a7b4d0d7960e920.tar.gz gentoo-2-44645423366cc07c3f85dcab3a7b4d0d7960e920.tar.bz2 gentoo-2-44645423366cc07c3f85dcab3a7b4d0d7960e920.zip | |
Update multikey patch from upstream #504440#8 by Martin von Gagern.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/readline/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/readline/files/readline-6.3-dispatch-multikey.patch | 10 | ||||
| -rw-r--r-- | sys-libs/readline/readline-6.3-r4.ebuild (renamed from sys-libs/readline/readline-6.3-r3.ebuild) | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index c09a652d3629..dd096762998e 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,12 @@ # 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.197 2014/03/28 02:10:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.198 2014/03/28 19:04:47 vapier Exp $ + +*readline-6.3-r4 (28 Mar 2014) + + 28 Mar 2014; Mike Frysinger <vapier@gentoo.org> +readline-6.3-r4.ebuild, + -readline-6.3-r3.ebuild, files/readline-6.3-dispatch-multikey.patch: + Update multikey patch from upstream #504440#8 by Martin von Gagern. *readline-6.3-r3 (28 Mar 2014) diff --git a/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch b/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch index 347c33952f10..88995bfa21bd 100644 --- a/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch +++ b/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch @@ -1,8 +1,9 @@ https://bugs.gentoo.org/504440 -https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html +v1: https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html +v2: https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00034.html *** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400 ---- lib/readline/readline.c 2014-03-10 11:01:19.000000000 -0400 +--- lib/readline/readline.c 2014-03-10 14:15:02.000000000 -0400 *************** *** 745,749 **** @@ -10,9 +11,10 @@ https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html ! if (r == 0) /* success! */ { _rl_keyseq_chain_dispose (); ---- 745,749 ---- +--- 745,750 ---- RL_CHECK_SIGNALS (); -! if (r == 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ +! /* 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 (); diff --git a/sys-libs/readline/readline-6.3-r3.ebuild b/sys-libs/readline/readline-6.3-r4.ebuild index e5ee1b3189f0..780ba280cb4d 100644 --- a/sys-libs/readline/readline-6.3-r3.ebuild +++ b/sys-libs/readline/readline-6.3-r4.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-r3.ebuild,v 1.1 2014/03/28 02:10:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3-r4.ebuild,v 1.1 2014/03/28 19:04:47 vapier Exp $ EAPI=4 |