old

3 files changed, 0 insertions, 330 deletions

diff --git a/app-shells/bash/files/bash-4.2-patmatch.patch b/app-shells/bash/files/bash-4.2-patmatch.patch
deleted file mode 100644
index dfe5610abeac..000000000000
--- a/app-shells/bash/files/bash-4.2-patmatch.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-*** ../bash-4.2/lib/glob/gmisc.c	2011-02-05 16:11:17.000000000 -0500
---- lib/glob/gmisc.c	2011-02-18 23:53:42.000000000 -0500
-***************
-*** 78,83 ****
-       size_t wmax;
-  {
-!   wchar_t wc, *wbrack;
-!   int matlen, t, in_cclass, in_collsym, in_equiv;
-  
-    if (*wpat == 0)
---- 78,83 ----
-       size_t wmax;
-  {
-!   wchar_t wc;
-!   int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
-  
-    if (*wpat == 0)
-***************
-*** 119,123 ****
-  	case L'[':
-  	  /* scan for ending `]', skipping over embedded [:...:] */
-! 	  wbrack = wpat;
-  	  wc = *wpat++;
-  	  do
---- 119,123 ----
-  	case L'[':
-  	  /* scan for ending `]', skipping over embedded [:...:] */
-! 	  bracklen = 1;
-  	  wc = *wpat++;
-  	  do
-***************
-*** 125,140 ****
-  	      if (wc == 0)
-  		{
-! 	          matlen += wpat - wbrack - 1;	/* incremented below */
-! 	          break;
-  	        }
-  	      else if (wc == L'\\')
-  		{
-! 		  wc = *wpat++;
-! 		  if (*wpat == 0)
-! 		    break;
-  		}
-  	      else if (wc == L'[' && *wpat == L':')	/* character class */
-  		{
-  		  wpat++;
-  		  in_cclass = 1;
-  		}
---- 125,148 ----
-  	      if (wc == 0)
-  		{
-! 		  wpat--;			/* back up to NUL */
-! 	          matlen += bracklen;
-! 	          goto bad_bracket;
-  	        }
-  	      else if (wc == L'\\')
-  		{
-! 		  /* *wpat == backslash-escaped character */
-! 		  bracklen++;
-! 		  /* If the backslash or backslash-escape ends the string,
-! 		     bail.  The ++wpat skips over the backslash escape */
-! 		  if (*wpat == 0 || *++wpat == 0)
-! 		    {
-! 		      matlen += bracklen;
-! 		      goto bad_bracket;
-! 		    }
-  		}
-  	      else if (wc == L'[' && *wpat == L':')	/* character class */
-  		{
-  		  wpat++;
-+ 		  bracklen++;
-  		  in_cclass = 1;
-  		}
-***************
-*** 142,145 ****
---- 150,154 ----
-  		{
-  		  wpat++;
-+ 		  bracklen++;
-  		  in_cclass = 0;
-  		}
-***************
-*** 147,152 ****
-  		{
-  		  wpat++;
-  		  if (*wpat == L']')	/* right bracket can appear as collating symbol */
-! 		    wpat++;
-  		  in_collsym = 1;
-  		}
---- 156,165 ----
-  		{
-  		  wpat++;
-+ 		  bracklen++;
-  		  if (*wpat == L']')	/* right bracket can appear as collating symbol */
-! 		    {
-! 		      wpat++;
-! 		      bracklen++;
-! 		    }
-  		  in_collsym = 1;
-  		}
-***************
-*** 154,157 ****
---- 167,171 ----
-  		{
-  		  wpat++;
-+ 		  bracklen++;
-  		  in_collsym = 0;
-  		}
-***************
-*** 159,164 ****
-  		{
-  		  wpat++;
-  		  if (*wpat == L']')	/* right bracket can appear as equivalence class */
-! 		    wpat++;
-  		  in_equiv = 1;
-  		}
---- 173,182 ----
-  		{
-  		  wpat++;
-+ 		  bracklen++;
-  		  if (*wpat == L']')	/* right bracket can appear as equivalence class */
-! 		    {
-! 		      wpat++;
-! 		      bracklen++;
-! 		    }
-  		  in_equiv = 1;
-  		}
-***************
-*** 166,174 ****
---- 184,196 ----
-  		{
-  		  wpat++;
-+ 		  bracklen++;
-  		  in_equiv = 0;
-  		}
-+ 	      else
-+ 		bracklen++;
-  	    }
-  	  while ((wc = *wpat++) != L']');
-  	  matlen++;		/* bracket expression can only match one char */
-+ bad_bracket:
-  	  break;
-  	}
-***************
-*** 214,219 ****
-       size_t max;
-  {
-!   char c, *brack;
-!   int matlen, t, in_cclass, in_collsym, in_equiv;
-  
-    if (*pat == 0)
---- 236,241 ----
-       size_t max;
-  {
-!   char c;
-!   int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
-  
-    if (*pat == 0)
-***************
-*** 255,259 ****
-  	case '[':
-  	  /* scan for ending `]', skipping over embedded [:...:] */
-! 	  brack = pat;
-  	  c = *pat++;
-  	  do
---- 277,281 ----
-  	case '[':
-  	  /* scan for ending `]', skipping over embedded [:...:] */
-! 	  bracklen = 1;
-  	  c = *pat++;
-  	  do
-***************
-*** 261,276 ****
-  	      if (c == 0)
-  		{
-! 	          matlen += pat - brack - 1;	/* incremented below */
-! 	          break;
-  	        }
-  	      else if (c == '\\')
-  		{
-! 		  c = *pat++;
-! 		  if (*pat == 0)
-! 		    break;
-  		}
-  	      else if (c == '[' && *pat == ':')	/* character class */
-  		{
-  		  pat++;
-  		  in_cclass = 1;
-  		}
---- 283,306 ----
-  	      if (c == 0)
-  		{
-! 		  pat--;			/* back up to NUL */
-! 		  matlen += bracklen;
-! 		  goto bad_bracket;
-  	        }
-  	      else if (c == '\\')
-  		{
-! 		  /* *pat == backslash-escaped character */
-! 		  bracklen++;
-! 		  /* If the backslash or backslash-escape ends the string,
-! 		     bail.  The ++pat skips over the backslash escape */
-! 		  if (*pat == 0 || *++pat == 0)
-! 		    {
-! 		      matlen += bracklen;
-! 		      goto bad_bracket;
-! 		    }
-  		}
-  	      else if (c == '[' && *pat == ':')	/* character class */
-  		{
-  		  pat++;
-+ 		  bracklen++;
-  		  in_cclass = 1;
-  		}
-***************
-*** 278,281 ****
---- 308,312 ----
-  		{
-  		  pat++;
-+ 		  bracklen++;
-  		  in_cclass = 0;
-  		}
-***************
-*** 283,288 ****
-  		{
-  		  pat++;
-  		  if (*pat == ']')	/* right bracket can appear as collating symbol */
-! 		    pat++;
-  		  in_collsym = 1;
-  		}
---- 314,323 ----
-  		{
-  		  pat++;
-+ 		  bracklen++;
-  		  if (*pat == ']')	/* right bracket can appear as collating symbol */
-! 		    {
-! 		      pat++;
-! 		      bracklen++;
-! 		    }
-  		  in_collsym = 1;
-  		}
-***************
-*** 290,293 ****
---- 325,329 ----
-  		{
-  		  pat++;
-+ 		  bracklen++;
-  		  in_collsym = 0;
-  		}
-***************
-*** 295,300 ****
-  		{
-  		  pat++;
-  		  if (*pat == ']')	/* right bracket can appear as equivalence class */
-! 		    pat++;
-  		  in_equiv = 1;
-  		}
---- 331,340 ----
-  		{
-  		  pat++;
-+ 		  bracklen++;
-  		  if (*pat == ']')	/* right bracket can appear as equivalence class */
-! 		    {
-! 		      pat++;
-! 		      bracklen++;
-! 		    }
-  		  in_equiv = 1;
-  		}
-***************
-*** 302,310 ****
---- 342,354 ----
-  		{
-  		  pat++;
-+ 		  bracklen++;
-  		  in_equiv = 0;
-  		}
-+ 	      else
-+ 		bracklen++;
-  	    }
-  	  while ((c = *pat++) != ']');
-  	  matlen++;		/* bracket expression can only match one char */
-+ bad_bracket:
-  	  break;
-  	}
diff --git a/app-shells/bash/files/bash-4.2-rhs-split.patch b/app-shells/bash/files/bash-4.2-rhs-split.patch
deleted file mode 100644
index 59c436479ff9..000000000000
--- a/app-shells/bash/files/bash-4.2-rhs-split.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** ../bash-4.2/subst.c	2011-01-02 16:12:51.000000000 -0500
---- subst.c	2011-02-18 22:30:13.000000000 -0500
-***************
-*** 3371,3377 ****
-    if (string == 0 || *string == '\0')
-      return (WORD_LIST *)NULL;
-  
-!   td.flags = 0;
-    td.word = string;
-    tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
-    return (tresult);
---- 3375,3381 ----
-    if (string == 0 || *string == '\0')
-      return (WORD_LIST *)NULL;
-  
-!   td.flags = W_NOSPLIT2;		/* no splitting, remove "" and '' */
-    td.word = string;
-    tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
-    return (tresult);
diff --git a/app-shells/bash/files/bash-4.2-vidomove.patch b/app-shells/bash/files/bash-4.2-vidomove.patch
deleted file mode 100644
index 117b73859db1..000000000000
--- a/app-shells/bash/files/bash-4.2-vidomove.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-*** ../bash-4.2/lib/readline/vi_mode.c	2010-11-20 19:51:39.000000000 -0500
---- lib/readline/vi_mode.c	2011-02-17 20:24:25.000000000 -0500
-***************
-*** 1115,1119 ****
-        _rl_vi_last_motion = c;
-        RL_UNSETSTATE (RL_STATE_VIMOTION);
-!       return (0);
-      }
-  #if defined (READLINE_CALLBACKS)
---- 1115,1119 ----
-        _rl_vi_last_motion = c;
-        RL_UNSETSTATE (RL_STATE_VIMOTION);
-!       return (vidomove_dispatch (m));
-      }
-  #if defined (READLINE_CALLBACKS)
-*** ../bash-4.2/lib/readline/callback.c	2010-06-06 12:18:58.000000000 -0400
---- lib/readline/callback.c	2011-02-17 20:43:28.000000000 -0500
-***************
-*** 149,152 ****
---- 149,155 ----
-  	  /* Should handle everything, including cleanup, numeric arguments,
-  	     and turning off RL_STATE_VIMOTION */
-+ 	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+ 	    _rl_internal_char_cleanup ();
-+ 
-  	  return;
-  	}