components/bash/patches/bash42-018.patch
changeset 1082 6d49548fa9da
equal deleted inserted replaced
1081:3d086c82286d 1082:6d49548fa9da
       
     1 			     BASH PATCH REPORT
       
     2 			     =================
       
     3 
       
     4 Bash-Release:	4.2
       
     5 Patch-ID:	bash42-018
       
     6 
       
     7 Bug-Reported-by:	Thomas Cort <[email protected]>
       
     8 Bug-Reference-ID:	<[email protected]>
       
     9 Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
       
    10 
       
    11 Bug-Description:
       
    12 
       
    13 Bash fails to compile unless JOB_CONTROL is defined.
       
    14 
       
    15 Patch (apply with `patch -p0'):
       
    16 
       
    17 *** ../bash-4.2-patched/execute_cmd.c	2011-02-09 17:32:25.000000000 -0500
       
    18 --- execute_cmd.c	2011-11-06 15:12:48.000000000 -0500
       
    19 ***************
       
    20 *** 2197,2200 ****
       
    21 --- 2315,2319 ----
       
    22       cmd->flags |= CMD_IGNORE_RETURN;
       
    23   
       
    24 + #if defined (JOB_CONTROL)
       
    25     lastpipe_flag = 0;
       
    26     begin_unwind_frame ("lastpipe-exec");
       
    27 ***************
       
    28 *** 2216,2228 ****
       
    29   	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
       
    30   	}
       
    31 !       cmd->flags |= CMD_LASTPIPE;
       
    32       }	  
       
    33     if (prev >= 0)
       
    34       add_unwind_protect (close, prev);
       
    35   
       
    36     exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
       
    37   
       
    38     if (lstdin > 0)
       
    39       restore_stdin (lstdin);
       
    40   
       
    41     if (prev >= 0)
       
    42 --- 2335,2351 ----
       
    43   	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
       
    44   	}
       
    45 !       if (cmd)
       
    46 ! 	cmd->flags |= CMD_LASTPIPE;
       
    47       }	  
       
    48     if (prev >= 0)
       
    49       add_unwind_protect (close, prev);
       
    50 + #endif
       
    51   
       
    52     exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
       
    53   
       
    54 + #if defined (JOB_CONTROL)
       
    55     if (lstdin > 0)
       
    56       restore_stdin (lstdin);
       
    57 + #endif
       
    58   
       
    59     if (prev >= 0)
       
    60 *** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
       
    61 --- patchlevel.h	Thu Feb 24 21:41:34 2011
       
    62 ***************
       
    63 *** 26,30 ****
       
    64      looks for to find the patch level (for the sccs version string). */
       
    65   
       
    66 ! #define PATCHLEVEL 17
       
    67   
       
    68   #endif /* _PATCHLEVEL_H_ */
       
    69 --- 26,30 ----
       
    70      looks for to find the patch level (for the sccs version string). */
       
    71   
       
    72 ! #define PATCHLEVEL 18
       
    73   
       
    74   #endif /* _PATCHLEVEL_H_ */