rpms/bash/devel bash40-029, NONE, 1.1 bash40-030, NONE, 1.1 bash40-031, NONE, 1.1 bash40-032, NONE, 1.1 bash40-033, NONE, 1.1 bash.spec, 1.189, 1.190 bash-3.2-rng.patch, 1.2, NONE bash-4.0-key_alloc.patch, 1.1, NONE bash-4.0-no_debug_output.patch, 1.2, NONE bash-4.0-shell_pipelines_handling.patch, 1.1, NONE bash-ulimit-m.patch, 1.2, NONE

Roman Rakus rrakus at fedoraproject.org
Wed Sep 16 10:07:28 UTC 2009


Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23527

Modified Files:
	bash.spec 
Added Files:
	bash40-029 bash40-030 bash40-031 bash40-032 bash40-033 
Removed Files:
	bash-3.2-rng.patch bash-4.0-key_alloc.patch 
	bash-4.0-no_debug_output.patch 
	bash-4.0-shell_pipelines_handling.patch bash-ulimit-m.patch 
Log Message:
Patch level 33. Specfile and cvs cleanup.


--- NEW FILE bash40-029 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-029

Bug-Reported-by:	Christian Krause <chkr at plauener.de>
Bug-Reference-ID:	Thu, 25 Jun 2009 21:47:59 +0200
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-06/msg00078.html

Bug-Description:

Previous versions of bash accepted strings in the initial environment
that were not valid shell variable assignments, usually because the
names were invalid, but still created shell variables from them and
passed them to child processes in the environment.

Bash-4.0 ignores those names and does not pass them to child processes.
Some users and automated processes depend on invalid variables being
ignored and passed to child processes.

This patch makes bash continue to ignore the invalid names, but pass
them to child processes in the export environment.

Patch:

*** ../bash-4.0-patched/variables.c	2009-01-04 14:32:46.000000000 -0500
--- variables.c	2009-06-29 09:17:20.000000000 -0400
***************
*** 253,256 ****
--- 255,259 ----
  static int visible_var __P((SHELL_VAR *));
  static int visible_and_exported __P((SHELL_VAR *));
+ static int export_environment_candidate __P((SHELL_VAR *));
  static int local_and_exported __P((SHELL_VAR *));
  static int variable_in_context __P((SHELL_VAR *));
***************
*** 376,383 ****
  #  endif
  #endif
        else if (legal_identifier (name))
  	{
  	  temp_var = bind_variable (name, string, 0);
! 	  VSETATTR (temp_var, (att_exported | att_imported));
  	  array_needs_making = 1;
  	}
--- 379,393 ----
  #  endif
  #endif
+ #if 0
        else if (legal_identifier (name))
+ #else
+       else
+ #endif
  	{
  	  temp_var = bind_variable (name, string, 0);
! 	  if (legal_identifier (name))
! 	    VSETATTR (temp_var, (att_exported | att_imported));
! 	  else
! 	    VSETATTR (temp_var, (att_exported | att_imported | att_invisible));
  	  array_needs_making = 1;
  	}
***************
*** 3083,3086 ****
--- 3098,3111 ----
  }
  
+ /* Candidate variables for the export environment are either valid variables
+    with the export attribute or invalid variables inherited from the initial
+    environment and simply passed through. */
+ static int
+ export_environment_candidate (var)
+      SHELL_VAR *var;
+ {
+   return (exported_p (var) && (invisible_p (var) == 0 || imported_p (var)));
+ }
+ 
  /* Return non-zero if VAR is a local variable in the current context and
     is exported. */
***************
*** 3439,3443 ****
--- 3464,3472 ----
    SHELL_VAR **vars;
  
+ #if 0
    vars = map_over (visible_and_exported, vcxt);
+ #else
+   vars = map_over (export_environment_candidate, vcxt);
+ #endif
  
    if (vars == 0)
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 28
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 29
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-030 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-030

Bug-Reported-by:	Henning Bekel <h.bekel at googlemail.com>
Bug-Reference-ID:	<7c6eacF262ctuU1 at mid.individual.net>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-07/msg00054.html

Bug-Description:

A shell function invoked with `bind -x' is supposed to be able to move the
cursor by setting READLINE_POINT.  The effects of this assignment were
sometimes ignored.

Patch:

*** ../bash-4.0-patched/bashline.c	2009-01-08 09:29:24.000000000 -0500
--- bashline.c	2009-07-16 14:13:41.000000000 -0400
***************
*** 3389,3393 ****
    register int i;
    intmax_t mi;
-   int save_point;
    sh_parser_state_t ps;
    char *cmd, *value, *l;
--- 3389,3392 ----
***************
*** 3433,3437 ****
      VSETATTR (v, att_exported);
    l = value_cell (v);
-   save_point = rl_point;
    value = inttostr (rl_point, ibuf, sizeof (ibuf));
    v = bind_int_variable ("READLINE_POINT", value);
--- 3432,3435 ----
***************
*** 3451,3455 ****
      {
        i = mi;
!       if (i != save_point)
  	{
  	  rl_point = i;
--- 3449,3453 ----
      {
        i = mi;
!       if (i != rl_point)
  	{
  	  rl_point = i;
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 29
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 30
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-031 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-031

Bug-Reported-by:	Roman Rakus <rrakus at redhat.com>
Bug-Reference-ID:	<4A93F6E9.4050401 at redhat.com>
Bug-Reference-URL:	

Bug-Description:

An implicit assignment to index "0" of an existing array variable caused
the shell to crash when the variable was unset.

Patch:

*** ../bash-4.0-patched/arrayfunc.c	2009-03-08 21:24:39.000000000 -0400
--- arrayfunc.c	2009-08-24 09:29:43.000000000 -0400
***************
*** 99,103 ****
    hash = assoc_create (0);
    if (oldval)
!     assoc_insert (hash, "0", oldval);
  
    FREE (value_cell (var));
--- 99,103 ----
    hash = assoc_create (0);
    if (oldval)
!     assoc_insert (hash, savestring ("0"), oldval);
  
    FREE (value_cell (var));
*** ../bash-4.0-patched/variables.c	2009-01-04 14:32:46.000000000 -0500
--- variables.c	2009-08-24 09:29:58.000000000 -0400
***************
*** 2218,2222 ****
        else if (assoc_p (entry))
  	{
! 	  assoc_insert (assoc_cell (entry), "0", newval);
  	  free (newval);
  	}
--- 2218,2222 ----
        else if (assoc_p (entry))
  	{
! 	  assoc_insert (assoc_cell (entry), savestring ("0"), newval);
  	  free (newval);
  	}
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 30
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 31
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-032 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-032

Bug-Reported-by:	muszi at muszi.kite.hu
Bug-Reference-ID:	<20090826113159.18815.qmail at muszi.kite.hu>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-08/msg00090.html

Bug-Description:

Bash-4.0 has a memory leak when processing ${!prefix@}.

Patch:

*** ../bash-4.0-patched/subst.c	2009-07-22 23:18:55.000000000 -0400
--- subst.c	2009-08-26 23:08:51.000000000 -0400
***************
*** 6607,6611 ****
  	}
        free (x);
!       free (xlist);
        free (temp1);
        *indexp = sindex;
--- 6769,6773 ----
  	}
        free (x);
!       dispose_words (xlist);
        free (temp1);
        *indexp = sindex;
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 31
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 32
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash40-033 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 4.0
Patch-ID: bash40-033

Bug-Reported-by:	Dr. Werner Fink <werner at suse.de>
Bug-Reference-ID:	<200907010951.n619p76I013912 at boole.suse.de>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2009-07/msg00000.html

Bug-Description:

Bash-4.0 has a memory leak in the `read' builtin when the number of fields
read is not the same as the number of variables passed as arguments.

Patch:

*** ../bash-4.0-patched/builtins/read.def	2009-03-08 21:24:45.000000000 -0400
--- builtins/read.def	2009-07-01 15:32:42.000000000 -0400
***************
*** 764,768 ****
  	tofree = input_string = t;
        else
! 	input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape);
      }
  #endif
--- 764,771 ----
  	tofree = input_string = t;
        else
! 	{
! 	  input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape);
! 	  tofree = t;
! 	}
      }
  #endif
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 32
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 33
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- bash.spec	4 Sep 2009 13:04:17 -0000	1.189
+++ bash.spec	16 Sep 2009 10:07:26 -0000	1.190
@@ -1,11 +1,11 @@
 #%define beta_tag rc1
-%define patchlevel .28
+%define patchlevel .33
 %define baseversion 4.0
 
 Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 3%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -47,6 +47,11 @@ Patch025: ftp://ftp.gnu.org/pub/gnu/bash
 Patch026: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-026
 Patch027: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-027
 Patch028: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-028
+Patch029: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-029
+Patch030: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-030
+Patch031: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-031
+Patch032: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-032
+Patch033: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.0-patches/bash40-033
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -59,7 +64,6 @@ Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch109: bash-2.05b-xcc.patch
 Patch110: bash-3.2-audit.patch
-#Patch111: bash-3.2-rng.patch
 Patch112: bash-3.2-ssh_source_bash.patch
 Patch113: bash-bashbug.patch
 Patch114: bash-cond-rmatch.patch
@@ -67,12 +71,7 @@ Patch115: bash-infotags.patch
 Patch116: bash-requires.patch
 Patch117: bash-setlocale.patch
 Patch118: bash-tty-tests.patch
-#Patch119: bash-ulimit-m.patch
-#Patch120: bash-4.0-no_debug_output.patch
-#Patch121: bash-4.0-shell_pipelines_handling.patch
 
-# 518644, alloc memory for key in associative array creation
-Patch122: bash-4.0-key_alloc.patch
 
 # 484809, check if interp section is NOBITS
 Patch123: bash-4.0-nobits.patch
@@ -133,6 +132,11 @@ This package contains documentation file
 %patch026 -p0 -b .026
 %patch027 -p0 -b .027
 %patch028 -p0 -b .028
+%patch029 -p0 -b .029
+%patch030 -p0 -b .030
+%patch031 -p0 -b .031
+%patch032 -p0 -b .032
+%patch033 -p0 -b .033
 
 # Other patches
 %patch101 -p1 -b .security
@@ -145,7 +149,6 @@ This package contains documentation file
 %patch108 -p1 -b .readline_oom
 %patch109 -p1 -b .xcc
 %patch110 -p1 -b .audit
-#%patch111 -p1 -b .rng
 %patch112 -p1 -b .ssh_source_bash
 %patch113 -p1 -b .bashbug
 %patch114 -p1 -b .cond_rmatch
@@ -153,10 +156,6 @@ This package contains documentation file
 %patch116 -p1 -b .requires
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
-#%patch119 -p1 -b .ulimit-m
-#%patch120 -p1 -b .no_debug_output
-#%patch121 -p1 -b .pipelines_handling
-%patch122 -p1 -b .key_alloc
 %patch123 -p1 -b .nobits
 
 echo %{version} > _distribution
@@ -324,6 +323,10 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Sep 16 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-1
+- Patch level 33
+- spec file cleanup
+
 * Fri Sep 04 2009 Roman Rakus <rrakus at redhat.com> - 4.0.28-3
 - check if interp section is NOBITS
 - define Recycles pids


--- bash-3.2-rng.patch DELETED ---


--- bash-4.0-key_alloc.patch DELETED ---


--- bash-4.0-no_debug_output.patch DELETED ---


--- bash-4.0-shell_pipelines_handling.patch DELETED ---


--- bash-ulimit-m.patch DELETED ---




More information about the scm-commits mailing list