Index: patches/bash-4.1-branch_update-2.patch
===================================================================
--- patches/bash-4.1-branch_update-2.patch	(revision d3cbdd9e444f57adf9acce97339734ef3c25b80d)
+++ 	(revision )
@@ -1,166 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 01-08-2011
-Initial Package Version: 4.1
-Origin: Upstream
-Upstream Status: From Upstream
-Description: Contains all upstream patches up to 4.1-009
-
-diff -Naur bash-4.1.orig//bashline.c bash-4.1/bashline.c
---- bash-4.1.orig//bashline.c	2009-10-24 14:10:19.000000000 -0400
-+++ bash-4.1/bashline.c	2011-01-08 15:59:31.934906851 -0500
-@@ -1680,7 +1680,7 @@
-      a single match (multiple matches that end up reducing the number of
-      characters in the common prefix are bad) will ever be returned on
-      regular completion. */
--  if (glob_pattern_p (hint))
-+  if (globpat)
-     {
-       if (state == 0)
- 	{
-diff -Naur bash-4.1.orig//builtins/declare.def bash-4.1/builtins/declare.def
---- bash-4.1.orig//builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
-+++ bash-4.1/builtins/declare.def	2011-01-08 15:59:58.930671218 -0500
-@@ -512,7 +512,7 @@
- 	    {
- 	      /* let bind_{array,assoc}_variable take care of this. */
- 	      if (assoc_p (var))
--		bind_assoc_variable (var, name, "0", value, aflags);
-+		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
- 	      else
- 		bind_array_variable (name, 0, value, aflags);
- 	    }
-diff -Naur bash-4.1.orig//builtins/printf.def bash-4.1/builtins/printf.def
---- bash-4.1.orig//builtins/printf.def	2009-11-20 15:31:23.000000000 -0500
-+++ bash-4.1/builtins/printf.def	2011-01-08 15:59:31.934906851 -0500
-@@ -117,7 +117,7 @@
-     else if (have_fieldwidth) \
-       nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
-     else if (have_precision) \
--      nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
-+      nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
-     else \
-       nw = vflag ? vbprintf (f, func) : printf (f, func); \
-     tw += nw; \
-@@ -172,7 +172,7 @@
- #endif
- 
- #if !HAVE_VSNPRINTF
--extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-+extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
- #endif
- 
- static void printf_erange __P((char *));
-diff -Naur bash-4.1.orig//builtins/read.def bash-4.1/builtins/read.def
---- bash-4.1.orig//builtins/read.def	2009-10-08 11:35:46.000000000 -0400
-+++ bash-4.1/builtins/read.def	2011-01-08 15:59:31.934906851 -0500
-@@ -615,14 +615,15 @@
-   if (unbuffered_read == 0)
-     zsyncfd (fd);
- 
--  interrupt_immediately--;
--  terminate_immediately--;
-   discard_unwind_frame ("read_builtin");
- 
-   retval = eof ? EXECUTION_FAILURE : EXECUTION_SUCCESS;
- 
- assign_vars:
- 
-+  interrupt_immediately--;
-+  terminate_immediately--;
-+
- #if defined (ARRAY_VARS)
-   /* If -a was given, take the string read, break it into a list of words,
-      an assign them to `arrayname' in turn. */
-diff -Naur bash-4.1.orig//lib/readline/complete.c bash-4.1/lib/readline/complete.c
---- bash-4.1.orig//lib/readline/complete.c	2009-11-29 18:39:30.000000000 -0500
-+++ bash-4.1/lib/readline/complete.c	2011-01-08 15:59:31.934906851 -0500
-@@ -2138,7 +2138,7 @@
- 	 All other entries except "." and ".." match. */
-       if (filename_len == 0)
- 	{
--	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
-+	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
- 	    continue;
- 
- 	  if (convfn[0] != '.' ||
-@@ -2219,7 +2219,7 @@
- 		temp[dirlen++] = '/';
- 	    }
- 
--	  strcpy (temp + dirlen, entry->d_name);
-+	  strcpy (temp + dirlen, convfn);
- 	}
-       else
- 	temp = savestring (convfn);
-diff -Naur bash-4.1.orig//patchlevel.h bash-4.1/patchlevel.h
---- bash-4.1.orig//patchlevel.h	2009-10-01 16:39:22.000000000 -0400
-+++ bash-4.1/patchlevel.h	2011-01-08 16:00:00.782985562 -0500
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 0
-+#define PATCHLEVEL 9
- 
- #endif /* _PATCHLEVEL_H_ */
-diff -Naur bash-4.1.orig//print_cmd.c bash-4.1/print_cmd.c
---- bash-4.1.orig//print_cmd.c	2009-09-16 15:32:26.000000000 -0400
-+++ bash-4.1/print_cmd.c	2011-01-08 15:59:31.938922841 -0500
-@@ -113,6 +113,12 @@
- 
- #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
- 
-+#define PRINT_DEFERRED_HEREDOCS(x) \
-+  do { \
-+    if (deferred_heredocs) \
-+      print_deferred_heredocs (x); \
-+  } while (0)
-+
- /* Non-zero means the stuff being printed is inside of a function def. */
- static int inside_function_def;
- static int skip_this_indent;
-@@ -560,13 +566,15 @@
-      FOR_COM *for_command;
- {
-   print_for_command_head (for_command);
--
-   cprintf (";");
-   newline ("do\n");
-+
-   indentation += indentation_amount;
-   make_command_string_internal (for_command->action);
-+  PRINT_DEFERRED_HEREDOCS ("");
-   semicolon ();
-   indentation -= indentation_amount;
-+
-   newline ("done");
- }
- 
-diff -Naur bash-4.1.orig//sig.c bash-4.1/sig.c
---- bash-4.1.orig//sig.c	2009-08-14 16:31:52.000000000 -0400
-+++ bash-4.1/sig.c	2011-01-08 16:00:00.782985562 -0500
-@@ -655,6 +655,9 @@
-     act.sa_flags |= SA_INTERRUPT;	/* XXX */
-   else
-     act.sa_flags |= SA_RESTART;		/* XXX */
-+#else
-+  if (sig == SIGCHLD)
-+    act.sa_flags |= SA_RESTART;
- #endif
-   sigemptyset (&act.sa_mask);
-   sigemptyset (&oact.sa_mask);
-diff -Naur bash-4.1.orig//variables.c bash-4.1/variables.c
---- bash-4.1.orig//variables.c	2009-11-03 14:13:58.000000000 -0500
-+++ bash-4.1/variables.c	2011-01-08 15:59:31.938922841 -0500
-@@ -3808,6 +3808,11 @@
- 
-   if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
-     {
-+      /* Make sure we have a hash table to store the variable in while it is
-+	 being propagated down to the global variables table.  Create one if
-+	 we have to */
-+      if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
-+	shell_variables->table = hash_create (0);
-       /* XXX - should we set v->context here? */
-       v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
-       if (shell_variables == global_variables)
Index: patches/bash-4.2-branch_update-1.patch
===================================================================
--- patches/bash-4.2-branch_update-1.patch	(revision b36b9f9427e2e9edf4795dfa860db6d6245de9ae)
+++ patches/bash-4.2-branch_update-1.patch	(revision b36b9f9427e2e9edf4795dfa860db6d6245de9ae)
@@ -0,0 +1,422 @@
+Submitted By: Joe Ciccone <jciccone@gmail.com>
+Date: 04-16-2011
+Initial Package Version: 4.2
+Origin: Upstream
+Upstream Status: From Upstream
+Description: Contains all upstream patches up to 4.2-008
+
+diff -Naur bash-4.2.orig/builtins/printf.def bash-4.2/builtins/printf.def
+--- bash-4.2.orig/builtins/printf.def	2010-11-23 10:02:55.000000000 -0500
++++ bash-4.2/builtins/printf.def	2011-04-16 16:50:36.379215007 -0400
+@@ -465,6 +465,9 @@
+ 		  secs = shell_start_time;	/* roughly $SECONDS */
+ 		else
+ 		  secs = arg;
++#if defined (HAVE_TZSET)
++		sv_tz ("TZ");		/* XXX -- just make sure */
++#endif
+ 		tm = localtime (&secs);
+ 		n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
+ 		free (timefmt);
+diff -Naur bash-4.2.orig/lib/glob/gmisc.c bash-4.2/lib/glob/gmisc.c
+--- bash-4.2.orig/lib/glob/gmisc.c	2011-02-05 16:11:17.000000000 -0500
++++ bash-4.2/lib/glob/gmisc.c	2011-04-16 16:50:36.371215007 -0400
+@@ -77,8 +77,8 @@
+      wchar_t *wpat;
+      size_t wmax;
+ {
+-  wchar_t wc, *wbrack;
+-  int matlen, t, in_cclass, in_collsym, in_equiv;
++  wchar_t wc;
++  int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
+ 
+   if (*wpat == 0)
+     return (0);
+@@ -118,58 +118,80 @@
+ 	  break;
+ 	case L'[':
+ 	  /* scan for ending `]', skipping over embedded [:...:] */
+-	  wbrack = wpat;
++	  bracklen = 1;
+ 	  wc = *wpat++;
+ 	  do
+ 	    {
+ 	      if (wc == 0)
+ 		{
+-	          matlen += wpat - wbrack - 1;	/* incremented below */
+-	          break;
++		  wpat--;			/* back up to NUL */
++	          matlen += bracklen;
++	          goto bad_bracket;
+ 	        }
+ 	      else if (wc == L'\\')
+ 		{
+-		  wc = *wpat++;
+-		  if (*wpat == 0)
+-		    break;
++		  /* *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;
+ 		}
+ 	      else if (in_cclass && wc == L':' && *wpat == L']')
+ 		{
+ 		  wpat++;
++		  bracklen++;
+ 		  in_cclass = 0;
+ 		}
+ 	      else if (wc == L'[' && *wpat == L'.')	/* collating symbol */
+ 		{
+ 		  wpat++;
++		  bracklen++;
+ 		  if (*wpat == L']')	/* right bracket can appear as collating symbol */
+-		    wpat++;
++		    {
++		      wpat++;
++		      bracklen++;
++		    }
+ 		  in_collsym = 1;
+ 		}
+ 	      else if (in_collsym && wc == L'.' && *wpat == L']')
+ 		{
+ 		  wpat++;
++		  bracklen++;
+ 		  in_collsym = 0;
+ 		}
+ 	      else if (wc == L'[' && *wpat == L'=')	/* equivalence class */
+ 		{
+ 		  wpat++;
++		  bracklen++;
+ 		  if (*wpat == L']')	/* right bracket can appear as equivalence class */
+-		    wpat++;
++		    {
++		      wpat++;
++		      bracklen++;
++		    }
+ 		  in_equiv = 1;
+ 		}
+ 	      else if (in_equiv && wc == L'=' && *wpat == L']')
+ 		{
+ 		  wpat++;
++		  bracklen++;
+ 		  in_equiv = 0;
+ 		}
++	      else
++		bracklen++;
+ 	    }
+ 	  while ((wc = *wpat++) != L']');
+ 	  matlen++;		/* bracket expression can only match one char */
++bad_bracket:
+ 	  break;
+ 	}
+     }
+@@ -213,8 +235,8 @@
+      char *pat;
+      size_t max;
+ {
+-  char c, *brack;
+-  int matlen, t, in_cclass, in_collsym, in_equiv;
++  char c;
++  int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
+ 
+   if (*pat == 0)
+     return (0);
+@@ -254,58 +276,80 @@
+ 	  break;
+ 	case '[':
+ 	  /* scan for ending `]', skipping over embedded [:...:] */
+-	  brack = pat;
++	  bracklen = 1;
+ 	  c = *pat++;
+ 	  do
+ 	    {
+ 	      if (c == 0)
+ 		{
+-	          matlen += pat - brack - 1;	/* incremented below */
+-	          break;
++		  pat--;			/* back up to NUL */
++		  matlen += bracklen;
++		  goto bad_bracket;
+ 	        }
+ 	      else if (c == '\\')
+ 		{
+-		  c = *pat++;
+-		  if (*pat == 0)
+-		    break;
++		  /* *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;
+ 		}
+ 	      else if (in_cclass && c == ':' && *pat == ']')
+ 		{
+ 		  pat++;
++		  bracklen++;
+ 		  in_cclass = 0;
+ 		}
+ 	      else if (c == '[' && *pat == '.')	/* collating symbol */
+ 		{
+ 		  pat++;
++		  bracklen++;
+ 		  if (*pat == ']')	/* right bracket can appear as collating symbol */
+-		    pat++;
++		    {
++		      pat++;
++		      bracklen++;
++		    }
+ 		  in_collsym = 1;
+ 		}
+ 	      else if (in_collsym && c == '.' && *pat == ']')
+ 		{
+ 		  pat++;
++		  bracklen++;
+ 		  in_collsym = 0;
+ 		}
+ 	      else if (c == '[' && *pat == '=')	/* equivalence class */
+ 		{
+ 		  pat++;
++		  bracklen++;
+ 		  if (*pat == ']')	/* right bracket can appear as equivalence class */
+-		    pat++;
++		    {
++		      pat++;
++		      bracklen++;
++		    }
+ 		  in_equiv = 1;
+ 		}
+ 	      else if (in_equiv && c == '=' && *pat == ']')
+ 		{
+ 		  pat++;
++		  bracklen++;
+ 		  in_equiv = 0;
+ 		}
++	      else
++		bracklen++;
+ 	    }
+ 	  while ((c = *pat++) != ']');
+ 	  matlen++;		/* bracket expression can only match one char */
++bad_bracket:
+ 	  break;
+ 	}
+     }
+diff -Naur bash-4.2.orig/lib/readline/callback.c bash-4.2/lib/readline/callback.c
+--- bash-4.2.orig/lib/readline/callback.c	2010-06-06 12:18:58.000000000 -0400
++++ bash-4.2/lib/readline/callback.c	2011-04-16 16:50:36.359215007 -0400
+@@ -148,6 +148,9 @@
+ 	  eof = _rl_vi_domove_callback (_rl_vimvcxt);
+ 	  /* 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;
+ 	}
+ #endif
+diff -Naur bash-4.2.orig/lib/readline/vi_mode.c bash-4.2/lib/readline/vi_mode.c
+--- bash-4.2.orig/lib/readline/vi_mode.c	2010-11-20 19:51:39.000000000 -0500
++++ bash-4.2/lib/readline/vi_mode.c	2011-04-16 16:50:36.359215007 -0400
+@@ -1114,7 +1114,7 @@
+       rl_beg_of_line (1, c);
+       _rl_vi_last_motion = c;
+       RL_UNSETSTATE (RL_STATE_VIMOTION);
+-      return (0);
++      return (vidomove_dispatch (m));
+     }
+ #if defined (READLINE_CALLBACKS)
+   /* XXX - these need to handle rl_universal_argument bindings */
+diff -Naur bash-4.2.orig/parse.y bash-4.2/parse.y
+--- bash-4.2.orig/parse.y	2011-01-02 15:48:11.000000000 -0500
++++ bash-4.2/parse.y	2011-04-16 16:50:36.379215007 -0400
+@@ -5135,6 +5135,9 @@
+ 	    case 'A':
+ 	      /* Make the current time/date into a string. */
+ 	      (void) time (&the_time);
++#if defined (HAVE_TZSET)
++	      sv_tz ("TZ");		/* XXX -- just make sure */
++#endif
+ 	      tm = localtime (&the_time);
+ 
+ 	      if (c == 'd')
+diff -Naur bash-4.2.orig/patchlevel.h bash-4.2/patchlevel.h
+--- bash-4.2.orig/patchlevel.h	2010-06-12 20:14:48.000000000 -0400
++++ bash-4.2/patchlevel.h	2011-04-16 16:50:36.387215007 -0400
+@@ -25,6 +25,6 @@
+    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
+    looks for to find the patch level (for the sccs version string). */
+ 
+-#define PATCHLEVEL 0
++#define PATCHLEVEL 8
+ 
+ #endif /* _PATCHLEVEL_H_ */
+diff -Naur bash-4.2.orig/sig.c bash-4.2/sig.c
+--- bash-4.2.orig/sig.c	2010-11-23 08:21:22.000000000 -0500
++++ bash-4.2/sig.c	2011-04-16 16:50:36.387215007 -0400
+@@ -46,6 +46,7 @@
+ 
+ #if defined (READLINE)
+ #  include "bashline.h"
++#  include <readline/readline.h>
+ #endif
+ 
+ #if defined (HISTORY)
+@@ -62,6 +63,7 @@
+ #if defined (HISTORY)
+ extern int history_lines_this_session;
+ #endif
++extern int no_line_editing;
+ 
+ extern void initialize_siglist ();
+ 
+@@ -505,7 +507,10 @@
+     {
+ #if defined (HISTORY)
+       /* XXX - will inhibit history file being written */
+-      history_lines_this_session = 0;
++#  if defined (READLINE)
++      if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0))
++#  endif
++        history_lines_this_session = 0;
+ #endif
+       terminate_immediately = 0;
+       termsig_handler (sig);
+diff -Naur bash-4.2.orig/subst.c bash-4.2/subst.c
+--- bash-4.2.orig/subst.c	2011-01-02 16:12:51.000000000 -0500
++++ bash-4.2/subst.c	2011-04-16 16:50:36.383215007 -0400
+@@ -1379,10 +1379,12 @@
+   slen = strlen (string + *sindex) + *sindex;
+ 
+   /* The handling of dolbrace_state needs to agree with the code in parse.y:
+-     parse_matched_pair() */
+-  dolbrace_state = 0;
+-  if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+-    dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM;
++     parse_matched_pair().  The different initial value is to handle the
++     case where this function is called to parse the word in
++     ${param op word} (SX_WORD). */
++  dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM;
++  if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP))
++    dolbrace_state = DOLBRACE_QUOTE;
+ 
+   i = *sindex;
+   while (c = string[i])
+@@ -3371,7 +3373,7 @@
+   if (string == 0 || *string == '\0')
+     return (WORD_LIST *)NULL;
+ 
+-  td.flags = 0;
++  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);
+@@ -4607,6 +4609,7 @@
+   if (ifs_firstc == 0)
+ #endif
+     word->flags |= W_NOSPLIT;
++  word->flags |= W_NOSPLIT2;
+   result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
+   expand_no_split_dollar_star = 0;
+ 
+@@ -7176,7 +7179,7 @@
+     {
+       /* Extract the contents of the ${ ... } expansion
+ 	 according to the Posix.2 rules. */
+-      value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0);
++      value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD);
+       if (string[sindex] == RBRACE)
+ 	sindex++;
+       else
+diff -Naur bash-4.2.orig/subst.h bash-4.2/subst.h
+--- bash-4.2.orig/subst.h	2010-12-02 20:21:29.000000000 -0500
++++ bash-4.2/subst.h	2011-04-16 16:50:36.359215007 -0400
+@@ -56,6 +56,7 @@
+ #define SX_NOLONGJMP	0x0040	/* don't longjmp on fatal error */
+ #define SX_ARITHSUB	0x0080	/* extracting $(( ... )) (currently unused) */
+ #define SX_POSIXEXP	0x0100	/* extracting new Posix pattern removal expansions in extract_dollar_brace_string */
++#define SX_WORD		0x0200	/* extracting word in ${param op word} */
+ 
+ /* Remove backslashes which are quoting backquotes from STRING.  Modifies
+    STRING, and returns a pointer to it. */
+diff -Naur bash-4.2.orig/variables.c bash-4.2/variables.c
+--- bash-4.2.orig/variables.c	2011-01-24 20:07:48.000000000 -0500
++++ bash-4.2/variables.c	2011-04-16 16:50:36.379215007 -0400
+@@ -3653,6 +3653,22 @@
+   return n;
+ }
+ 
++int
++chkexport (name)
++     char *name;
++{
++  SHELL_VAR *v;
++
++  v = find_variable (name);
++  if (v && exported_p (v))
++    {
++      array_needs_making = 1;
++      maybe_make_export_env ();
++      return 1;
++    }
++  return 0;
++}
++
+ void
+ maybe_make_export_env ()
+ {
+@@ -4214,7 +4230,7 @@
+   { "TEXTDOMAIN", sv_locale },
+   { "TEXTDOMAINDIR", sv_locale },
+ 
+-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
++#if defined (HAVE_TZSET)
+   { "TZ", sv_tz },
+ #endif
+ 
+@@ -4558,12 +4574,13 @@
+ }
+ #endif /* HISTORY */
+ 
+-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
++#if defined (HAVE_TZSET)
+ void
+ sv_tz (name)
+      char *name;
+ {
+-  tzset ();
++  if (chkexport (name))
++    tzset ();
+ }
+ #endif
+ 
+diff -Naur bash-4.2.orig/variables.h bash-4.2/variables.h
+--- bash-4.2.orig/variables.h	2010-12-02 20:22:01.000000000 -0500
++++ bash-4.2/variables.h	2011-04-16 16:50:36.375215007 -0400
+@@ -313,6 +313,7 @@
+ 
+ extern void sort_variables __P((SHELL_VAR **));
+ 
++extern int chkexport __P((char *));
+ extern void maybe_make_export_env __P((void));
+ extern void update_export_env_inplace __P((char *, int, char *));
+ extern void put_command_name_into_env __P((char *));
