diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-04-26 20:14:20 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-04-26 20:14:20 +0000 |
| commit | afd7ad8d6b9b984bc0c7ebb678027f47f2a8f7ac (patch) | |
| tree | b57630bc79f9f705bb556f41f45155e9bd05ceb9 /app-shells/bash | |
| parent | drop old (diff) | |
| download | gentoo-2-afd7ad8d6b9b984bc0c7ebb678027f47f2a8f7ac.tar.gz gentoo-2-afd7ad8d6b9b984bc0c7ebb678027f47f2a8f7ac.tar.bz2 gentoo-2-afd7ad8d6b9b984bc0c7ebb678027f47f2a8f7ac.zip | |
Added another upstream fix. Removed old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-shells/bash')
| -rw-r--r-- | app-shells/bash/ChangeLog | 8 | ||||
| -rw-r--r-- | app-shells/bash/bash-4.3_p11-r2.ebuild (renamed from app-shells/bash/bash-4.3_p11.ebuild) | 5 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-complete-dequoting.patch | 26 |
3 files changed, 37 insertions, 2 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 3e5b9e55617f..0ac1e6cf598f 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-shells/bash # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.365 2014/04/16 09:39:12 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.366 2014/04/26 20:14:20 polynomial-c Exp $ + +*bash-4.3_p11-r2 (26 Apr 2014) + + 26 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p11.ebuild, + +bash-4.3_p11-r2.ebuild, +files/bash-4.3-complete-dequoting.patch: + Added another upstream fix. Removed old. *bash-4.3_p11-r1 (16 Apr 2014) diff --git a/app-shells/bash/bash-4.3_p11.ebuild b/app-shells/bash/bash-4.3_p11-r2.ebuild index 3e373624a11a..ca5fe1d62ed1 100644 --- a/app-shells/bash/bash-4.3_p11.ebuild +++ b/app-shells/bash/bash-4.3_p11-r2.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/app-shells/bash/bash-4.3_p11.ebuild,v 1.2 2014/04/14 16:50:02 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p11-r2.ebuild,v 1.1 2014/04/26 20:14:20 polynomial-c Exp $ EAPI="4" @@ -83,6 +83,9 @@ src_prepare() { sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die touch -r . doc/* + epatch "${FILESDIR}"/${PN}-4.3-jobs-run-sigchld-trap.patch \ + "${FILESDIR}"/${PN}-4.3-complete-dequoting.patch + epatch_user } diff --git a/app-shells/bash/files/bash-4.3-complete-dequoting.patch b/app-shells/bash/files/bash-4.3-complete-dequoting.patch new file mode 100644 index 000000000000..498d9cfb48d2 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-complete-dequoting.patch @@ -0,0 +1,26 @@ +*** ../bash-4.3-patched/bashline.c 2014-02-09 19:56:58.000000000 -0500 +--- bashline.c 2014-04-25 14:57:52.000000000 -0400 +*************** +*** 4168,4174 **** + + qc = rl_dispatching ? rl_completion_quote_character : 0; +! dfn = bash_dequote_filename ((char *)text, qc); + m1 = rl_completion_matches (dfn, rl_filename_completion_function); +! free (dfn); + + if (m1 == 0 || m1[0] == 0) +--- 4209,4222 ---- + + qc = rl_dispatching ? rl_completion_quote_character : 0; +! /* If rl_completion_found_quote != 0, rl_completion_matches will call the +! filename dequoting function, causing the directory name to be dequoted +! twice. */ +! if (rl_dispatching && rl_completion_found_quote == 0) +! dfn = bash_dequote_filename ((char *)text, qc); +! else +! dfn = (char *)text; + m1 = rl_completion_matches (dfn, rl_filename_completion_function); +! if (dfn != text) +! free (dfn); + + if (m1 == 0 || m1[0] == 0) |