rpms/bash/devel bash31-002, NONE, 1.1 bash31-003, NONE, 1.1 bash31-004, NONE, 1.1 bash31-005, NONE, 1.1 bash-ulimit.patch, 1.5, 1.6 bash.spec, 1.99, 1.100 bash-arrays.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 10 12:03:29 UTC 2006


Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8282

Modified Files:
	bash-ulimit.patch bash.spec 
Added Files:
	bash31-002 bash31-003 bash31-004 bash31-005 
Removed Files:
	bash-arrays.patch 
Log Message:
* Tue Jan 10 2006 Tim Waugh <twaugh at redhat.com>
- Patchlevel 5.



--- NEW FILE bash31-002 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-002

Bug-Reported-by: vapier at gentoo.org
Bug-Reference-ID: <20051210223218.GD3324 at toucan.gentoo.org>
Bug-Reference-URL:http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00021.html

Bug-Description:

This corrects several omissions in the bash documentation:  It adds the new
options to `ulimit', the exact expansions for `case' patterns, clarification
of the language concerning the return value of `[[', and updated version
information.

Patch:

*** ../bash-3.1/doc/bash.1	Wed Oct 12 11:40:52 2005
--- doc/bash.1	Wed Dec 28 19:58:54 2005
***************
*** 7,16 ****
  .\"	chet at po.cwru.edu
  .\"
! .\"	Last Change: Sat Aug 27 13:28:44 EDT 2005
  .\"
  .\" bash_builtins, strip all but Built-Ins section
  .if \n(zZ=1 .ig zZ
  .if \n(zY=1 .ig zY
! .TH BASH 1 "2005 Aug 27" "GNU Bash-3.1-beta1"
  .\"
  .\" There's some problem with having a `@'
--- 7,16 ----
  .\"	chet at po.cwru.edu
  .\"
! .\"	Last Change: Wed Dec 28 19:58:45 EST 2005
  .\"
  .\" bash_builtins, strip all but Built-Ins section
  .if \n(zZ=1 .ig zZ
  .if \n(zY=1 .ig zY
! .TH BASH 1 "2005 Dec 28" "GNU Bash-3.1"
  .\"
  .\" There's some problem with having a `@'
***************
*** 678,683 ****
  is enabled, the match is performed without regard to the case
  of alphabetic characters.
! The return value is 0 if the string matches or does not match
! the pattern, respectively, and 1 otherwise.
  Any part of the pattern may be quoted to force it to be matched as a
  string.
--- 678,683 ----
  is enabled, the match is performed without regard to the case
  of alphabetic characters.
! The return value is 0 if the string matches (\fB==\fP) or does not match
! (\fB!=\fP) the pattern, and 1 otherwise.
  Any part of the pattern may be quoted to force it to be matched as a
  string.
***************
*** 808,811 ****
--- 808,817 ----
  .B Pathname Expansion
  below).
+ The \fIword\fP is expanded using tilde
+ expansion, parameter and variable expansion, arithmetic substituion,
+ command substitution, process substitution and quote removal.
+ Each \fIpattern\fP examined is expanded using tilde
+ expansion, parameter and variable expansion, arithmetic substituion,
+ command substitution, and process substitution.
  If the shell option
  .B nocasematch
***************
*** 8485,8489 ****
  none are found.
  .TP
! \fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
  Provides control over the resources available to the shell and to
  processes started by it, on systems that allow such control.
--- 8485,8489 ----
  none are found.
  .TP
! \fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]]
  Provides control over the resources available to the shell and to
  processes started by it, on systems that allow such control.
***************
*** 8524,8527 ****
--- 8524,8530 ----
  The maximum size of files created by the shell
  .TP
+ .B \-i
+ The maximum number of pending signals
+ .TP
  .B \-l
  The maximum size that may be locked into memory
***************
*** 8537,8540 ****
--- 8540,8546 ----
  The pipe size in 512-byte blocks (this may not be set)
  .TP
+ .B \-q
+ The maximum number of bytes in POSIX message queues
+ .TP
  .B \-s
  The maximum stack size
***************
*** 8548,8551 ****
--- 8554,8560 ----
  .B \-v
  The maximum amount of virtual memory available to the shell
+ .TP
+ .B \-x
+ The maximum number of file locks
  .PD
  .PP
*** ../bash-3.1/doc/bashref.texi	Mon Oct  3 15:07:21 2005
--- doc/bashref.texi	Fri Dec 30 10:50:39 2005
***************
*** 962,967 ****
  is enabled, the match is performed without regard to the case
  of alphabetic characters.
! The return value is 0 if the string matches or does not match
! the pattern, respectively, and 1 otherwise.
  Any part of the pattern may be quoted to force it to be matched as a
  string.
--- 962,967 ----
  is enabled, the match is performed without regard to the case
  of alphabetic characters.
! The return value is 0 if the string matches (@samp{==}) or does not
! match (@samp{!=})the pattern, and 1 otherwise.
  Any part of the pattern may be quoted to force it to be matched as a
  string.
***************
*** 2599,2603 ****
  or inconvenient to obtain with separate utilities.
  
! This section briefly the builtins which Bash inherits from
  the Bourne Shell, as well as the builtin commands which are unique
  to or have been extended in Bash.
--- 2597,2601 ----
  or inconvenient to obtain with separate utilities.
  
! This section briefly describes the builtins which Bash inherits from
  the Bourne Shell, as well as the builtin commands which are unique
  to or have been extended in Bash.
***************
*** 3834,3838 ****
  @btindex ulimit
  @example
! ulimit [-acdflmnpstuvSH] [@var{limit}]
  @end example
  @code{ulimit} provides control over the resources available to processes
--- 3834,3838 ----
  @btindex ulimit
  @example
! ulimit [-acdfilmnpqstuvxSH] [@var{limit}]
  @end example
  @code{ulimit} provides control over the resources available to processes
***************
*** 3858,3861 ****
--- 3858,3864 ----
  The maximum size of files created by the shell.
  
+ @item -i
+ The maximum number of pending signals.
+ 
  @item -l
  The maximum size that may be locked into memory.
***************
*** 3870,3873 ****
--- 3873,3879 ----
  The pipe buffer size.
  
+ @item -q
+ The maximum number of bytes in POSIX message queues.
+ 
  @item -s
  The maximum stack size.
***************
*** 3882,3885 ****
--- 3888,3894 ----
  The maximum amount of virtual memory available to the process.
  
+ @item -x
+ The maximum number of file locks.
+ 
  @end table
  
***************
*** 4090,4095 ****
  
  @item -x
! Print a trace of simple commands, \fBfor\fP commands, \fBcase\fP
! commands, \fBselect\fP commands, and arithmetic \fBfor\fP commands
  and their arguments or associated word lists after they are
  expanded and before they are executed.  The value of the @env{PS4}
--- 4103,4108 ----
  
  @item -x
! Print a trace of simple commands, @code{for} commands, @code{case}
! commands, @code{select} commands, and arithmetic @code{for} commands
  and their arguments or associated word lists after they are
  expanded and before they are executed.  The value of the @env{PS4}
*** ../bash-3.1/doc/version.texi	Tue Sep 20 14:52:56 2005
--- doc/version.texi	Fri Dec 30 10:50:58 2005
***************
*** 3,10 ****
  @end ignore
  
! @set LASTCHANGE Mon Sep  5 11:47:04 EDT 2005
  
! @set EDITION 3.1-beta1
! @set VERSION 3.1-beta1
! @set UPDATED 5 September 2005
! @set UPDATED-MONTH September 2005
--- 3,10 ----
  @end ignore
  
! @set LASTCHANGE Fri Dec 30 10:50:51 EST 2005
  
! @set EDITION 3.1
! @set VERSION 3.1
! @set UPDATED 30 December 2005
! @set UPDATED-MONTH December 2005
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 1
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 2
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash31-003 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-003

Bug-Reported-by: Adam Buraczewski <adamb at nor.pl>
Bug-Reference-ID: <200512210950.jBL9o4C2008608 at localhost.localdomain>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00055.html

Bug-Description:

A missing #define guard causes bash to not compile when readline is not
configured in, either as the result of explicit disabling or when the
`--enable-minimal-config' option is given to configure.

Patch:

*** ../bash-3.1/variables.c	Sat Nov 12 21:22:37 2005
--- variables.c	Mon Dec 26 13:34:03 2005
***************
*** 861,867 ****
--- 863,871 ----
    char val[INT_STRLEN_BOUND(int) + 1], *v;
  
+ #if defined (READLINE)
    /* If we are currently assigning to LINES or COLUMNS, don't do anything. */
    if (winsize_assignment)
      return;
+ #endif
  
    v = inttostr (lines, val, sizeof (val));
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 2
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 3
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash31-004 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-004

Bug-Reported-by: Mike Frysinger <vapier at gentoo.org>
Bug-Reference-ID: <20051223172359.GF14579 at toucan.gentoo.org>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00062.html

Bug-Description:

A local array variable declared at function scope that shadows a variable
of the same name declared in a previous scope did not create a separate
variable instance, but used the previous one.

Patch:

*** ../bash-3.1/subst.c	Mon Oct 24 09:51:13 2005
--- subst.c	Fri Dec 30 12:11:53 2005
***************
*** 2188,2192 ****
      {
        v = find_variable (name);
!       if (v == 0 || array_p (v) == 0)
          v = make_local_array_variable (name);
        v = assign_array_var_from_string (v, value, flags);
--- 2188,2192 ----
      {
        v = find_variable (name);
!       if (v == 0 || array_p (v) == 0 || v->context != variable_context)
          v = make_local_array_variable (name);
        v = assign_array_var_from_string (v, value, flags);
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 3
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 4
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash31-005 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-005

Bug-Reported-by:
Bug-Reference-ID:
Bug-Reference-URL:

Bug-Description:

When tilde expansion fails, POSIX leaves it unspecified whether or not the
word undergoes the additional word expansions.  Bash-3.1 as distributed
skipped the rest of the expansions; this patch restores the bash-3.0 behavior.

This means that something like
	USER=ratbert
	echo ~$USER

will echo `~ratbert' rather than `~$USER'.

Patch:

*** ../bash-3.1/subst.c	Mon Oct 24 09:51:13 2005
--- subst.c	Fri Dec 30 12:11:53 2005
***************
*** 6796,6799 ****
--- 6823,6832 ----
  	    {
  	      temp1 = bash_tilde_expand (temp, tflag);
+ 	      if  (temp1 && *temp1 == '~' && STREQ (temp, temp1))
+ 		{
+ 		  FREE (temp);
+ 		  FREE (temp1);
+ 		  goto add_character;		/* tilde expansion failed */
+ 		}
  	      free (temp);
  	      temp = temp1;
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 4
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 5
  
  #endif /* _PATCHLEVEL_H_ */

bash-ulimit.patch:
 builtins/ulimit.def |   11 +++++++++++
 doc/bash.1          |    8 +++++++-
 doc/bashref.texi    |   11 ++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

Index: bash-ulimit.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-ulimit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bash-ulimit.patch	2 Jan 2006 11:02:47 -0000	1.5
+++ bash-ulimit.patch	10 Jan 2006 12:03:16 -0000	1.6
@@ -1,5 +1,5 @@
 --- bash-3.1/builtins/ulimit.def.ulimit	2005-08-04 13:39:04.000000000 +0100
-+++ bash-3.1/builtins/ulimit.def	2005-12-23 16:06:56.000000000 +0000
++++ bash-3.1/builtins/ulimit.def	2006-01-10 11:21:49.000000000 +0000
 @@ -34,6 +34,7 @@
      -a	all current limits are reported
      -c	the maximum size of core files created
@@ -46,18 +46,18 @@
    { -1, -1, -1, (char *)NULL, (char *)NULL }
  };
  #define NCMDS	(sizeof(limits) / sizeof(limits[0]))
---- bash-3.1/doc/bashref.texi.ulimit	2005-12-23 16:04:31.000000000 +0000
-+++ bash-3.1/doc/bashref.texi	2005-12-23 16:04:31.000000000 +0000
+--- bash-3.1/doc/bashref.texi.ulimit	2006-01-10 11:21:49.000000000 +0000
++++ bash-3.1/doc/bashref.texi	2006-01-10 11:25:06.000000000 +0000
 @@ -3833,7 +3833,7 @@
  @item ulimit
  @btindex ulimit
  @example
--ulimit [-acdflmnpstuvSH] [@var{limit}]
-+ulimit [-acdeflmnpqrstuvxSH] [@var{limit}]
+-ulimit [-acdfilmnpqstuvxSH] [@var{limit}]
++ulimit [-acdefilmnpqrstuvxSH] [@var{limit}]
  @end example
  @code{ulimit} provides control over the resources available to processes
  started by the shell, on systems that allow such control.  If an
-@@ -3854,9 +3854,15 @@
+@@ -3854,6 +3854,9 @@
  @item -d
  The maximum size of a process's data segment.
  
@@ -67,28 +67,19 @@
  @item -f
  The maximum size of files created by the shell.
  
-+ at item -i
-+The maximum number of pending signals.
-+
- @item -l
- The maximum size that may be locked into memory.
- 
-@@ -3869,6 +3875,12 @@
- @item -p
- The pipe buffer size.
+@@ -3875,6 +3878,9 @@
+ @item -q
+ The maximum number of bytes in POSIX message queues.
  
-+ at item -q
-+The maximum number of bytes in POSIX message queues.
-+
 + at item -r
 +The maximum RT priority.
 +
  @item -s
  The maximum stack size.
  
-@@ -3881,6 +3893,9 @@
- @item -v
- The maximum amount of virtual memory available to the process.
+@@ -3890,6 +3896,9 @@
+ @item -x
+ The maximum number of file locks.
  
 + at item -x
 +The maximum amount of file locks.
@@ -96,18 +87,18 @@
  @end table
  
  If @var{limit} is given, it is the new value of the specified resource;
---- bash-3.1/doc/bash.1.ulimit	2005-12-23 16:04:31.000000000 +0000
-+++ bash-3.1/doc/bash.1	2005-12-23 16:04:31.000000000 +0000
-@@ -8490,7 +8490,7 @@
+--- bash-3.1/doc/bash.1.ulimit	2006-01-10 11:21:49.000000000 +0000
++++ bash-3.1/doc/bash.1	2006-01-10 11:24:43.000000000 +0000
+@@ -8496,7 +8496,7 @@
  returns true if any of the arguments are found, false if
  none are found.
  .TP
--\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
+-\fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]]
 +\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
  Provides control over the resources available to the shell and to
  processes started by it, on systems that allow such control.
  The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
-@@ -8526,9 +8526,15 @@
+@@ -8532,6 +8532,9 @@
  .B \-d
  The maximum size of a process's data segment
  .TP
@@ -117,32 +108,13 @@
  .B \-f
  The maximum size of files created by the shell
  .TP
-+.B \-i
-+The maximum number of pending signals
-+.TP
- .B \-l
- The maximum size that may be locked into memory
- .TP
-@@ -8542,6 +8548,12 @@
- .B \-p
- The pipe size in 512-byte blocks (this may not be set)
+@@ -8554,6 +8557,9 @@
+ .B \-q
+ The maximum number of bytes in POSIX message queues
  .TP
-+.B \-q
-+The maximum number of bytes in POSIX message queues
-+.TP
 +.B \-r
 +The maximum rt priority
 +.TP
  .B \-s
  The maximum stack size
  .TP
-@@ -8553,6 +8565,9 @@
- .TP
- .B \-v
- The maximum amount of virtual memory available to the shell
-+.TP
-+.B \-x
-+The maximum number of file locks
- .PD
- .PP
- If


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- bash.spec	6 Jan 2006 17:29:17 -0000	1.99
+++ bash.spec	10 Jan 2006 12:03:16 -0000	1.100
@@ -11,8 +11,11 @@
 Source4: dot-bash_profile
 Source5: dot-bash_logout
 # Official upstream patches
-Patch1: bash31-001
-Patch2: bash-arrays.patch
+Patch1: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-001
+Patch2: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-002
+Patch3: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-003
+Patch4: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-004
+Patch5: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-005
 # Other patches
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
@@ -54,7 +57,10 @@
 %setup -q -a 2
 # Official upstream patches
 %patch1 -p0 -b .001
-%patch2 -p0 -b .arrays
+%patch2 -p0 -b .002
+%patch3 -p0 -b .003
+%patch4 -p0 -b .004
+%patch5 -p0 -b .005
 
 # Other patches
 %patch100 -p1 -b .paths
@@ -205,6 +211,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Jan 10 2006 Tim Waugh <twaugh at redhat.com>
+- Patchlevel 5.
+
 * Fri Jan  6 2006 Tim Waugh <twaugh at redhat.com> 3.1-2
 - No longer need loadables, mbinc or shellfunc patches.
 - Use literal single-quote in bash man page where appropriate (bug #177051).


--- bash-arrays.patch DELETED ---




More information about the fedora-cvs-commits mailing list