diff options
author | 2014-05-18 10:06:59 +0000 | |
---|---|---|
committer | 2014-05-18 10:06:59 +0000 | |
commit | a594b407147fadefaad13303bfff67440d19b32c (patch) | |
tree | 1f735b0cdf9a48374ea799350b85519d5b7a49ce /app-shells/bash/files | |
parent | Version bump. Removed old (diff) | |
download | gentoo-2-a594b407147fadefaad13303bfff67440d19b32c.tar.gz gentoo-2-a594b407147fadefaad13303bfff67440d19b32c.tar.bz2 gentoo-2-a594b407147fadefaad13303bfff67440d19b32c.zip |
Version bump. Removed old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-shells/bash/files')
5 files changed, 0 insertions, 166 deletions
diff --git a/app-shells/bash/files/bash-4.3-bind-compound-arry.patch b/app-shells/bash/files/bash-4.3-bind-compound-arry.patch deleted file mode 100644 index c46bc33eca5b..000000000000 --- a/app-shells/bash/files/bash-4.3-bind-compound-arry.patch +++ /dev/null @@ -1,10 +0,0 @@ -*** ../bash-4.3-patched/arrayfunc.c 2014-03-28 10:54:21.000000000 -0400 ---- arrayfunc.c 2014-05-12 11:19:00.000000000 -0400 -*************** -*** 180,183 **** ---- 180,184 ---- - FREE (newval); - -+ VUNSETATTR (entry, att_invisible); /* no longer invisible */ - return (entry); - } diff --git a/app-shells/bash/files/bash-4.3-complete-dequoting.patch b/app-shells/bash/files/bash-4.3-complete-dequoting.patch deleted file mode 100644 index 498d9cfb48d2..000000000000 --- a/app-shells/bash/files/bash-4.3-complete-dequoting.patch +++ /dev/null @@ -1,26 +0,0 @@ -*** ../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) diff --git a/app-shells/bash/files/bash-4.3-extglob-directory.patch b/app-shells/bash/files/bash-4.3-extglob-directory.patch deleted file mode 100644 index aa3e49a09114..000000000000 --- a/app-shells/bash/files/bash-4.3-extglob-directory.patch +++ /dev/null @@ -1,100 +0,0 @@ -*** ../bash-4.3-patched/lib/glob/glob.c 2014-03-28 10:54:23.000000000 -0400 ---- lib/glob/glob.c 2014-05-02 10:24:28.000000000 -0400 -*************** -*** 124,127 **** ---- 124,129 ---- - extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int)); - -+ extern char *glob_dirscan __P((char *, int)); -+ - /* Compile `glob_loop.c' for single-byte characters. */ - #define CHAR unsigned char -*************** -*** 188,191 **** ---- 190,196 ---- - pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */ - /* we should check for invalid extglob pattern here */ -+ if (pe == 0) -+ return 0; -+ - /* if pe != se we have more of the pattern at the end of the extglob - pattern. Check the easy case first ( */ -*************** -*** 1016,1020 **** - char **result; - unsigned int result_size; -! char *directory_name, *filename, *dname; - unsigned int directory_len; - int free_dirname; /* flag */ ---- 1021,1025 ---- - char **result; - unsigned int result_size; -! char *directory_name, *filename, *dname, *fn; - unsigned int directory_len; - int free_dirname; /* flag */ -*************** -*** 1032,1035 **** ---- 1037,1052 ---- - /* Find the filename. */ - filename = strrchr (pathname, '/'); -+ #if defined (EXTENDED_GLOB) -+ if (filename && extended_glob) -+ { -+ fn = glob_dirscan (pathname, '/'); -+ #if DEBUG_MATCHING -+ if (fn != filename) -+ fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename (%s)\n", fn ? fn : "(null)", filename); -+ #endif -+ filename = fn; -+ } -+ #endif -+ - if (filename == NULL) - { -*** ../bash-4.3-patched/lib/glob/gmisc.c 2014-03-28 10:54:23.000000000 -0400 ---- lib/glob/gmisc.c 2014-05-02 09:35:57.000000000 -0400 -*************** -*** 43,46 **** ---- 43,48 ---- - #define WRPAREN L')' - -+ extern char *glob_patscan __P((char *, char *, int)); -+ - /* Return 1 of the first character of WSTRING could match the first - character of pattern WPAT. Wide character version. */ -*************** -*** 376,377 **** ---- 378,410 ---- - return matlen; - } -+ -+ /* Skip characters in PAT and return the final occurrence of DIRSEP. This -+ is only called when extended_glob is set, so we have to skip over extglob -+ patterns x(...) */ -+ char * -+ glob_dirscan (pat, dirsep) -+ char *pat; -+ int dirsep; -+ { -+ char *p, *d, *pe, *se; -+ -+ d = pe = se = 0; -+ for (p = pat; p && *p; p++) -+ { -+ if (extglob_pattern_p (p)) -+ { -+ if (se == 0) -+ se = p + strlen (p) - 1; -+ pe = glob_patscan (p + 2, se, 0); -+ if (pe == 0) -+ continue; -+ else if (*pe == 0) -+ break; -+ p = pe - 1; /* will do increment above */ -+ continue; -+ } -+ if (*p == dirsep) -+ d = p; -+ } -+ return d; -+ } diff --git a/app-shells/bash/files/bash-4.3-jobs-run-sigchld-trap.patch b/app-shells/bash/files/bash-4.3-jobs-run-sigchld-trap.patch deleted file mode 100644 index c97c5aeac6e0..000000000000 --- a/app-shells/bash/files/bash-4.3-jobs-run-sigchld-trap.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2014-04/msg00061.html - -*** ../bash-4.3-patched/jobs.c 2014-03-28 10:54:19.000000000 -0400 ---- jobs.c 2014-04-15 08:47:03.000000000 -0400 -*************** -*** 3598,3601 **** ---- 3598,3602 ---- - unwind_protect_pointer (the_pipeline); - unwind_protect_pointer (subst_assign_varlist); -+ unwind_protect_pointer (this_shell_builtin); - - /* We have to add the commands this way because they will be run diff --git a/app-shells/bash/files/bash-4.3-localvar-invisible.patch b/app-shells/bash/files/bash-4.3-localvar-invisible.patch deleted file mode 100644 index dbfffbbf4cf5..000000000000 --- a/app-shells/bash/files/bash-4.3-localvar-invisible.patch +++ /dev/null @@ -1,18 +0,0 @@ -*** ../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); |