rpms/bash/devel bash41-006, NONE, 1.1 bash41-007, NONE, 1.1 bash.spec, 1.202, 1.203

[Roman Rakus]

Author: rrakus

Update of /cvs/pkgs/rpms/bash/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9895

Modified Files:
	bash.spec 
Added Files:
	bash41-006 bash41-007 
Log Message:
Patch level 7


--- NEW FILE bash41-006 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.1
Patch-ID:	bash41-006

Bug-Reported-by:	Mike Frysinger <vapier at gentoo.org>
Bug-Reference-ID:	<201003210155.56618.vapier at gentoo.org>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html

Bug-Description:

Bash did not correctly print/reproduce here documents attached to commands
inside compound commands such as for and while.  This affected the
execution of such commands inside a shell function when the function
definition is saved and later restored using `.' or `eval'.

Patch (apply with `patch -p0'):

*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
--- print_cmd.c	2010-03-22 21:15:30.000000000 -0400
***************
*** 114,117 ****
--- 114,123 ----
  #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;
***************
*** 561,571 ****
  {
    print_for_command_head (for_command);
- 
    cprintf (";");
    newline ("do\n");
    indentation += indentation_amount;
    make_command_string_internal (for_command->action);
    semicolon ();
    indentation -= indentation_amount;
    newline ("done");
  }
--- 566,578 ----
  {
    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");
  }
*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 5
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 6
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash41-007 ---
			     BASH PATCH REPORT
			     =================

Bash-Release:	4.1
Patch-ID:	bash41-007

Bug-Reported-by:	Rob Robason <rob at robason.net>
Bug-Reference-ID:	<1269513145.22336.9.camel at home.robason.homelinux.net>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html

Bug-Description:

A typo caused bash to not honor a precision specification in a printf
format.

Patch (apply with `patch -p0'):

*** ../bash-4.1-patched/builtins/printf.def	2010-01-18 10:50:22.000000000 -0500
--- builtins/printf.def	2010-03-25 09:40:56.000000000 -0400
***************
*** 118,122 ****
        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
      else if (have_precision) \
!       nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
      else \
        nw = vflag ? vbprintf (f, func) : printf (f, func); \
--- 118,122 ----
        nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
      else if (have_precision) \
!       nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
      else \
        nw = vflag ? vbprintf (f, func) : printf (f, func); \
*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
--- patchlevel.h	2010-01-14 09:38:08.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 6
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 7
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- bash.spec	12 Apr 2010 13:22:20 -0000	1.202
+++ bash.spec	21 May 2010 17:13:18 -0000	1.203
@@ -1,5 +1,5 @@
 #% define beta_tag rc1
-%define patchleveltag .5
+%define patchleveltag .7
 %define baseversion 4.1
 
 Version: %{baseversion}%{patchleveltag}
@@ -24,6 +24,8 @@ Patch002: ftp://ftp.gnu.org/pub/gnu/bash
 Patch003: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-003
 Patch004: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-004
 Patch005: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-005
+Patch006: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-006
+Patch007: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-007
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -79,7 +81,8 @@ This package contains documentation file
 %patch003 -p0 -b .003
 %patch004 -p0 -b .004
 %patch005 -p0 -b .005
-
+%patch006 -p0 -b .006
+%patch007 -p0 -b .007
 
 # Other patches
 %patch101 -p1 -b .security
@@ -267,6 +270,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri May 21 2010 Roman Rakus <rrakus at redhat.com> - 4.1.7-1
+- Patch level 7
+
 * Mon Apr 12 2010 Roman Rakus <rrakus at redhat.com> - 4.1.5-1
 - Patch level 5
 - There's no more need for Requires(post) ncurses-libs