diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-06-17 03:58:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-06-17 03:58:19 +0000 |
| commit | 3fcdc42f20591ec19a637dbd10073e9b805f02e5 (patch) | |
| tree | 5bfb27490b61574b07097553eb5916a94ec66d9f /app-shells/bash/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3fcdc42f20591ec19a637dbd10073e9b805f02e5.tar.gz gentoo-2-3fcdc42f20591ec19a637dbd10073e9b805f02e5.tar.bz2 gentoo-2-3fcdc42f20591ec19a637dbd10073e9b805f02e5.zip | |
Fix plugins handling and add some fixes from upstream.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-shells/bash/files')
| -rw-r--r-- | app-shells/bash/files/bash-4.3-compat-lvl.patch | 13 | ||||
| -rw-r--r-- | app-shells/bash/files/bash-4.3-parse-time-keyword.patch | 30 |
2 files changed, 43 insertions, 0 deletions
diff --git a/app-shells/bash/files/bash-4.3-compat-lvl.patch b/app-shells/bash/files/bash-4.3-compat-lvl.patch new file mode 100644 index 000000000000..5734687ffeb9 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-compat-lvl.patch @@ -0,0 +1,13 @@ +https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html + +--- a/builtins/shopt.def ++++ b/builtins/shopt.def +@@ -160,7 +160,7 @@ static struct { + { "compat32", &shopt_compat32, set_compatibility_level }, + { "compat40", &shopt_compat40, set_compatibility_level }, + { "compat41", &shopt_compat41, set_compatibility_level }, +- { "compat42", &shopt_compat41, set_compatibility_level }, ++ { "compat42", &shopt_compat42, set_compatibility_level }, + #if defined (READLINE) + { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, + { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, diff --git a/app-shells/bash/files/bash-4.3-parse-time-keyword.patch b/app-shells/bash/files/bash-4.3-parse-time-keyword.patch new file mode 100644 index 000000000000..cd516e5c66c5 --- /dev/null +++ b/app-shells/bash/files/bash-4.3-parse-time-keyword.patch @@ -0,0 +1,30 @@ +https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00034.html + +*** ../bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400 +--- parse.y 2014-06-11 10:25:53.000000000 -0400 +*************** +*** 2789,2797 **** + case OR_OR: + case '&': + case DO: + case THEN: + case ELSE: + case '{': /* } */ +! case '(': /* ) */ + case BANG: /* ! time pipeline */ + case TIME: /* time time pipeline */ +--- 2789,2802 ---- + case OR_OR: + case '&': ++ case WHILE: + case DO: ++ case UNTIL: ++ case IF: + case THEN: ++ case ELIF: + case ELSE: + case '{': /* } */ +! case '(': /* )( */ +! case ')': /* only valid in case statement */ + case BANG: /* ! time pipeline */ + case TIME: /* time time pipeline */ |