rcolebaugh / rpms / bash

Forked from rpms/bash a year ago
Clone
07a490
			     BASH PATCH REPORT
07a490
			     =================
07a490
07a490
Bash-Release:	4.2
07a490
Patch-ID:	bash42-010
07a490
07a490
Bug-Reported-by:	Mike Frysinger <vapier@gentoo.org>
07a490
Bug-Reference-ID:	<201104122356.20160.vapier@gentoo.org>
07a490
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html
07a490
07a490
Bug-Description:
07a490
07a490
Bash did not correctly print/reproduce here documents attached to commands
07a490
inside compound commands such as arithmetic for loops and user-specified
07a490
subshells.  This affected the execution of such commands inside a shell
07a490
function when the function definition is saved and later restored using
07a490
`.' or `eval'.
07a490
07a490
Patch (apply with `patch -p0'):
07a490
07a490
*** ../bash-4.2-patched/print_cmd.c	2010-05-30 18:34:08.000000000 -0400
07a490
--- print_cmd.c	2011-04-14 10:43:18.000000000 -0400
07a490
***************
07a490
*** 316,319 ****
07a490
--- 317,321 ----
07a490
  	  skip_this_indent++;
07a490
  	  make_command_string_internal (command->value.Subshell->command);
07a490
+ 	  PRINT_DEFERRED_HEREDOCS ("");
07a490
  	  cprintf (" )");
07a490
  	  break;
07a490
***************
07a490
*** 593,596 ****
07a490
--- 606,610 ----
07a490
    indentation += indentation_amount;
07a490
    make_command_string_internal (arith_for_command->action);
07a490
+   PRINT_DEFERRED_HEREDOCS ("");
07a490
    semicolon ();
07a490
    indentation -= indentation_amount;
07a490
***************
07a490
*** 654,657 ****
07a490
--- 668,672 ----
07a490
  
07a490
    make_command_string_internal (group_command->command);
07a490
+   PRINT_DEFERRED_HEREDOCS ("");
07a490
  
07a490
    if (inside_function_def)
07a490
*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
07a490
--- patchlevel.h	Thu Feb 24 21:41:34 2011
07a490
***************
07a490
*** 26,30 ****
07a490
     looks for to find the patch level (for the sccs version string). */
07a490
  
07a490
! #define PATCHLEVEL 9
07a490
  
07a490
  #endif /* _PATCHLEVEL_H_ */
07a490
--- 26,30 ----
07a490
     looks for to find the patch level (for the sccs version string). */
07a490
  
07a490
! #define PATCHLEVEL 10
07a490
  
07a490
  #endif /* _PATCHLEVEL_H_ */