import bash-3.1 patches

			     BASH PATCH REPORT

			     =================

Bash-Release: 3.1

Patch-ID: bash31-001

Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>

Bug-Reference-ID: <20051212015924.GA820@toucan.gentoo.org> <20051214034438.GK1863@toucan.gentoo.org>

Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00030.html http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00041.html

Bug-Description:

There are parsing problems with compound assignments in several contexts,

including as arguments to builtins like `local', `eval', and `let', and

as multiple assignments in a single command.

Patch:

*** bash-3.1/parse.y	Fri Nov 11 23:14:18 2005

--- bash-3.1/parse.y	Fri Dec 16 20:43:07 2005

***************

*** 3696,3700 ****

        b = builtin_address_internal (token, 0);

        if (b && (b->flags & ASSIGNMENT_BUILTIN))

!         parser_state |= PST_ASSIGNOK;

      }

--- 3696,3702 ----

        b = builtin_address_internal (token, 0);

        if (b && (b->flags & ASSIGNMENT_BUILTIN))

! 	parser_state |= PST_ASSIGNOK;

!       else if (STREQ (token, "eval") || STREQ (token, "let"))

! 	parser_state |= PST_ASSIGNOK;

      }

***************

*** 4687,4691 ****

  {

    WORD_LIST *wl, *rl;

!   int tok, orig_line_number, orig_token_size;

    char *saved_token, *ret;

--- 4689,4693 ----

  {

    WORD_LIST *wl, *rl;

!   int tok, orig_line_number, orig_token_size, orig_last_token, assignok;

    char *saved_token, *ret;

***************

*** 4693,4696 ****

--- 4695,4699 ----

    orig_token_size = token_buffer_size;

    orig_line_number = line_number;

+   orig_last_token = last_read_token;

    last_read_token = WORD;	/* WORD to allow reserved words here */

***************

*** 4699,4702 ****

--- 4702,4707 ----

    token_buffer_size = 0;

+   assignok = parser_state&PST_ASSIGNOK;		/* XXX */

+ 

    wl = (WORD_LIST *)NULL;	/* ( */

    parser_state |= PST_COMPASSIGN;

***************

*** 4741,4745 ****

      }

!   last_read_token = WORD;

    if (wl)

      {

--- 4746,4750 ----

      }

!   last_read_token = orig_last_token;		/* XXX - was WORD? */

    if (wl)

      {

***************

*** 4753,4756 ****

--- 4758,4765 ----

    if (retlenp)

      *retlenp = (ret && *ret) ? strlen (ret) : 0;

+ 

+   if (assignok)

+     parser_state |= PST_ASSIGNOK;

+ 

    return ret;

  }

*** bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005

--- bash-3.1/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 0

  #endif /* _PATCHLEVEL_H_ */

--- 26,30 ----

     looks for to find the patch level (for the sccs version string). */

! #define PATCHLEVEL 1

  #endif /* _PATCHLEVEL_H_ */

			     BASH PATCH REPORT

			     =================

Bash-Release: 3.1

Patch-ID: bash31-002

Bug-Reported-by: vapier@gentoo.org

Bug-Reference-ID: <20051210223218.GD3324@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

--- bash-3.1/doc/bash.1	Wed Dec 28 19:58:54 2005

***************

*** 7,16 ****

  .\"	chet@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@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

--- bash-3.1/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

--- bash-3.1/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

--- bash-3.1/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_ */

			     BASH PATCH REPORT

			     =================

Bash-Release: 3.1

Patch-ID: bash31-003

Bug-Reported-by: Adam Buraczewski <adamb@nor.pl>

Bug-Reference-ID: <200512210950.jBL9o4C2008608@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

--- bash-3.1/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

--- bash-3.1/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_ */

			     BASH PATCH REPORT

			     =================

Bash-Release: 3.1

Patch-ID: bash31-004

Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>

Bug-Reference-ID: <20051223172359.GF14579@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

--- bash-3.1/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

--- bash-3.1/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_ */

			     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

--- bash-3.1/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

--- bash-3.1/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_ */