diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-05-07 15:28:11 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-05-07 15:28:11 +0000 |
| commit | 78f848dd54bf2a1b0e8b735f84cfa862f86b4a18 (patch) | |
| tree | 385d67d649a82fd5caa45b934b693277df33646e /app-shells | |
| parent | Stable for x86, wrt bug #509134 (diff) | |
| download | gentoo-2-78f848dd54bf2a1b0e8b735f84cfa862f86b4a18.tar.gz gentoo-2-78f848dd54bf2a1b0e8b735f84cfa862f86b4a18.tar.bz2 gentoo-2-78f848dd54bf2a1b0e8b735f84cfa862f86b4a18.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')
| -rw-r--r-- | app-shells/bash/ChangeLog | 8 | ||||
| -rw-r--r-- | app-shells/bash/bash-4.3_p11-r4.ebuild (renamed from app-shells/bash/bash-4.3_p11-r3.ebuild) | 5 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-localvar-invisible.patch | 18 |
3 files changed, 28 insertions, 3 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index ca4661f8fd43..d6e9df3c4182 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.367 2014/05/07 08:23:12 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.368 2014/05/07 15:28:10 polynomial-c Exp $ + +*bash-4.3_p11-r4 (07 May 2014) + + 07 May 2014; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p11-r3.ebuild, + +bash-4.3_p11-r4.ebuild, +files/bash-4.3-localvar-invisible.patch: + Added another upstream fix. Removed old. *bash-4.3_p11-r3 (07 May 2014) diff --git a/app-shells/bash/bash-4.3_p11-r3.ebuild b/app-shells/bash/bash-4.3_p11-r4.ebuild index 1eb6a8d6ce51..b5a0d9f8e52c 100644 --- a/app-shells/bash/bash-4.3_p11-r3.ebuild +++ b/app-shells/bash/bash-4.3_p11-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/app-shells/bash/bash-4.3_p11-r3.ebuild,v 1.1 2014/05/07 08:23:12 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p11-r4.ebuild,v 1.1 2014/05/07 15:28:10 polynomial-c Exp $ EAPI="4" @@ -85,7 +85,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-4.3-jobs-run-sigchld-trap.patch \ "${FILESDIR}"/${PN}-4.3-complete-dequoting.patch \ - "${FILESDIR}"/${PN}-4.3-extglob-directory.patch + "${FILESDIR}"/${PN}-4.3-extglob-directory.patch \ + "${FILESDIR}"/${PN}-4.3-localvar-invisible.patch epatch_user } diff --git a/app-shells/bash/files/bash-4.3-localvar-invisible.patch b/app-shells/bash/files/bash-4.3-localvar-invisible.patch new file mode 100644 index 000000000000..dbfffbbf4cf5 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-localvar-invisible.patch @@ -0,0 +1,18 @@ +*** ../bash-4.3-patched/variables.c 2014-02-14 11:55:12.000000000 -0500 +--- variables.c 2014-05-07 10:53:57.000000000 -0400 +*************** +*** 2198,2205 **** + old_var = find_variable (name); + if (old_var && local_p (old_var) && old_var->context == variable_context) +! { +! VUNSETATTR (old_var, att_invisible); /* XXX */ +! return (old_var); +! } + + was_tmpvar = old_var && tempvar_p (old_var); +--- 2260,2264 ---- + old_var = find_variable (name); + if (old_var && local_p (old_var) && old_var->context == variable_context) +! return (old_var); + + was_tmpvar = old_var && tempvar_p (old_var); |