Changeset 3614cf6


Ignore:
Timestamp:
Apr 19, 2006, 4:02:23 PM (19 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1acf708
Parents:
c91f39d
Message:

Updated to Bash -8 patch

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/bash-3.1-fixes-8.patch

    rc91f39d r3614cf6  
    44Origin: http://ftp.gnu.org/gnu/bash/bash-3.1-patches/
    55Upstream Status: From Upstream
    6 Description: Contains patches 001-016 from upstream
     6Description: Contains patches 001-017 from upstream
    77
     8diff -Naur bash-3.1.orig/arrayfunc.c bash-3.1/arrayfunc.c
     9--- bash-3.1.orig/arrayfunc.c   2005-07-04 17:25:58.000000000 -0700
     10+++ bash-3.1/arrayfunc.c        2006-04-19 15:59:29.000000000 -0700
     11@@ -592,11 +592,7 @@
     12   exp = (char *)xmalloc (len);
     13   strncpy (exp, s, len - 1);
     14   exp[len - 1] = '\0';
     15-#if 0
     16-  t = expand_string_to_string (exp, 0);
     17-#else
     18-  t = expand_string_to_string (exp, Q_DOUBLE_QUOTES);
     19-#endif
     20+  t = expand_arith_string (exp, 0);
     21   this_command_name = (char *)NULL;
     22   val = evalexp (t, &expok);
     23   free (t);
    824diff -Naur bash-3.1.orig/doc/bash.1 bash-3.1/doc/bash.1
    9 --- bash-3.1.orig/doc/bash.1    2005-10-12 11:40:52.000000000 -0400
    10 +++ bash-3.1/doc/bash.1 2006-04-11 11:36:54.702393214 -0400
     25--- bash-3.1.orig/doc/bash.1    2005-10-12 08:40:52.000000000 -0700
     26+++ bash-3.1/doc/bash.1 2006-04-19 15:58:34.000000000 -0700
    1127@@ -6,12 +6,12 @@
    1228 .\"    Case Western Reserve University
    … …  
    88104 If
    89105diff -Naur bash-3.1.orig/doc/bashref.texi bash-3.1/doc/bashref.texi
    90 --- bash-3.1.orig/doc/bashref.texi      2005-10-03 15:07:21.000000000 -0400
    91 +++ bash-3.1/doc/bashref.texi   2006-04-11 11:36:54.709392515 -0400
     106--- bash-3.1.orig/doc/bashref.texi      2005-10-03 12:07:21.000000000 -0700
     107+++ bash-3.1/doc/bashref.texi   2006-04-19 15:58:34.000000000 -0700
    92108@@ -961,8 +961,8 @@
    93109 (see the description of @code{shopt} in @ref{Bash Builtins})
    … …  
    161177 variable is expanded and the resultant value is printed before
    162178diff -Naur bash-3.1.orig/doc/version.texi bash-3.1/doc/version.texi
    163 --- bash-3.1.orig/doc/version.texi      2005-09-20 14:52:56.000000000 -0400
    164 +++ bash-3.1/doc/version.texi   2006-04-11 11:36:54.710392415 -0400
     179--- bash-3.1.orig/doc/version.texi      2005-09-20 11:52:56.000000000 -0700
     180+++ bash-3.1/doc/version.texi   2006-04-19 15:58:34.000000000 -0700
    165181@@ -2,9 +2,9 @@
    166182 Copyright (C) 1988-2005 Free Software Foundation, Inc.
    … …  
    179195+@set UPDATED-MONTH December 2005
    180196diff -Naur bash-3.1.orig/jobs.c bash-3.1/jobs.c
    181 --- bash-3.1.orig/jobs.c        2005-11-11 23:13:27.000000000 -0500
    182 +++ bash-3.1/jobs.c     2006-04-11 11:36:54.713392115 -0400
     197--- bash-3.1.orig/jobs.c        2005-11-11 20:13:27.000000000 -0800
     198+++ bash-3.1/jobs.c     2006-04-19 15:58:34.000000000 -0700
    183199@@ -619,8 +619,11 @@
    184200           * once in the parent and once in each child.  This is where
    … …  
    286302 
    287303diff -Naur bash-3.1.orig/lib/glob/glob.c bash-3.1/lib/glob/glob.c
    288 --- bash-3.1.orig/lib/glob/glob.c       2005-03-24 12:42:27.000000000 -0500
    289 +++ bash-3.1/lib/glob/glob.c    2006-04-11 11:37:12.868577740 -0400
     304--- bash-3.1.orig/lib/glob/glob.c       2005-03-24 09:42:27.000000000 -0800
     305+++ bash-3.1/lib/glob/glob.c    2006-04-19 15:58:34.000000000 -0700
    290306@@ -360,6 +360,7 @@
    291307   count = lose = skip = 0;
    … …  
    306322          FREE (tmplink);
    307323diff -Naur bash-3.1.orig/lib/glob/sm_loop.c bash-3.1/lib/glob/sm_loop.c
    308 --- bash-3.1.orig/lib/glob/sm_loop.c    2005-10-16 21:21:04.000000000 -0400
    309 +++ bash-3.1/lib/glob/sm_loop.c 2006-04-11 11:37:09.500914295 -0400
     324--- bash-3.1.orig/lib/glob/sm_loop.c    2005-10-16 18:21:04.000000000 -0700
     325+++ bash-3.1/lib/glob/sm_loop.c 2006-04-19 15:58:34.000000000 -0700
    310326@@ -638,12 +638,13 @@
    311327   CHAR *psub;                  /* pointer to sub-pattern */
    … …  
    362378       return (FNM_NOMATCH);
    363379diff -Naur bash-3.1.orig/lib/readline/display.c bash-3.1/lib/readline/display.c
    364 --- bash-3.1.orig/lib/readline/display.c        2005-11-30 14:05:02.000000000 -0500
    365 +++ bash-3.1/lib/readline/display.c     2006-04-11 11:36:54.716391815 -0400
     380--- bash-3.1.orig/lib/readline/display.c        2005-11-30 11:05:02.000000000 -0800
     381+++ bash-3.1/lib/readline/display.c     2006-04-19 15:58:34.000000000 -0700
    366382@@ -1983,11 +1983,15 @@
    367383      int pchar;
    … …  
    408424 
    409425diff -Naur bash-3.1.orig/lib/readline/readline.c bash-3.1/lib/readline/readline.c
    410 --- bash-3.1.orig/lib/readline/readline.c       2005-07-04 22:29:35.000000000 -0400
    411 +++ bash-3.1/lib/readline/readline.c    2006-04-11 11:36:54.717391715 -0400
     426--- bash-3.1.orig/lib/readline/readline.c       2005-07-04 19:29:35.000000000 -0700
     427+++ bash-3.1/lib/readline/readline.c    2006-04-19 15:58:34.000000000 -0700
    412428@@ -282,6 +282,7 @@
    413429 {
    … …  
    419435   return 0;
    420436diff -Naur bash-3.1.orig/lib/readline/terminal.c bash-3.1/lib/readline/terminal.c
    421 --- bash-3.1.orig/lib/readline/terminal.c       2005-11-12 20:46:54.000000000 -0500
    422 +++ bash-3.1/lib/readline/terminal.c    2006-04-11 11:36:54.718391615 -0400
     437--- bash-3.1.orig/lib/readline/terminal.c       2005-11-12 17:46:54.000000000 -0800
     438+++ bash-3.1/lib/readline/terminal.c    2006-04-19 15:58:34.000000000 -0700
    423439@@ -122,7 +122,7 @@
    424440 static char *_rl_visible_bell;
    … …  
    441457   if (cols > 0)
    442458diff -Naur bash-3.1.orig/parse.y bash-3.1/parse.y
    443 --- bash-3.1.orig/parse.y       2005-11-11 23:14:18.000000000 -0500
    444 +++ bash-3.1/parse.y    2006-04-11 11:36:54.722391216 -0400
     459--- bash-3.1.orig/parse.y       2005-11-11 20:14:18.000000000 -0800
     460+++ bash-3.1/parse.y    2006-04-19 15:58:34.000000000 -0700
    445461@@ -2716,6 +2716,7 @@
    446462 #define P_ALLOWESC     0x02
    … …  
    593609 
    594610diff -Naur bash-3.1.orig/patchlevel.h bash-3.1/patchlevel.h
    595 --- bash-3.1.orig/patchlevel.h  2005-07-20 13:58:20.000000000 -0400
    596 +++ bash-3.1/patchlevel.h       2006-04-11 11:37:12.869577641 -0400
     611--- bash-3.1.orig/patchlevel.h  2005-07-20 10:58:20.000000000 -0700
     612+++ bash-3.1/patchlevel.h       2006-04-19 15:59:29.000000000 -0700
    597613@@ -25,6 +25,6 @@
    598614    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    … …  
    600616 
    601617-#define PATCHLEVEL 0
    602 +#define PATCHLEVEL 16
     618+#define PATCHLEVEL 17
    603619 
    604620 #endif /* _PATCHLEVEL_H_ */
    605621diff -Naur bash-3.1.orig/subst.c bash-3.1/subst.c
    606 --- bash-3.1.orig/subst.c       2005-10-24 09:51:13.000000000 -0400
    607 +++ bash-3.1/subst.c    2006-04-11 11:36:54.727390716 -0400
     622--- bash-3.1.orig/subst.c       2005-10-24 06:51:13.000000000 -0700
     623+++ bash-3.1/subst.c    2006-04-19 15:59:29.000000000 -0700
    608624@@ -2187,7 +2187,7 @@
    609625   if (mklocal && variable_context)
    … …  
    615631       v = assign_array_var_from_string (v, value, flags);
    616632     }
    617 @@ -6795,6 +6795,12 @@
     633@@ -2575,6 +2575,13 @@
     634   return (expand_string_to_string_internal (string, quoted, expand_string_assignment));
     635 }
     636 
     637+char *
     638+expand_arith_string (string, quoted)
     639+     char *string;
     640+{
     641+  return (expand_string_if_necessary (string, quoted, expand_string));
     642+}
     643+
     644 #if defined (COND_COMMAND)
     645 /* Just remove backslashes in STRING.  Returns a new string. */
     646 char *
     647@@ -5248,7 +5255,7 @@
     648   else
     649     t = (char *)0;
     650 
     651-  temp1 = expand_string_if_necessary (substr, Q_DOUBLE_QUOTES, expand_string);
     652+  temp1 = expand_arith_string (substr, Q_DOUBLE_QUOTES);
     653   *e1p = evalexp (temp1, &expok);
     654   free (temp1);
     655   if (expok == 0)
     656@@ -5293,7 +5300,7 @@
     657     {
     658       t++;
     659       temp2 = savestring (t);
     660-      temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string);
     661+      temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES);
     662       free (temp2);
     663       t[-1] = ':';
     664       *e2p = evalexp (temp1, &expok);
     665@@ -6435,7 +6442,7 @@
     666          temp2[t_index] = '\0';
     667 
     668          /* Expand variables found inside the expression. */
     669-         temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string);
     670+         temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES);
     671          free (temp2);
     672 
     673 arithsub:
     674@@ -6477,7 +6484,7 @@
     675       zindex = t_index;
     676 
     677        /* Do initial variable expansion. */
     678-      temp1 = expand_string_if_necessary (temp, Q_DOUBLE_QUOTES, expand_string);
     679+      temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES);
     680 
     681       goto arithsub;
     682 
     683@@ -6795,6 +6802,12 @@
    618684          if (temp && *temp && t_index > 0)
    619685            {
    … …  
    628694              temp = temp1;
    629695              sindex += t_index;
     696diff -Naur bash-3.1.orig/subst.h bash-3.1/subst.h
     697--- bash-3.1.orig/subst.h       2004-11-07 12:12:28.000000000 -0800
     698+++ bash-3.1/subst.h    2006-04-19 15:59:29.000000000 -0700
     699@@ -151,6 +151,9 @@
     700 extern char *expand_string_unsplit_to_string __P((char *, int));
     701 extern char *expand_assignment_string_to_string __P((char *, int));
     702 
     703+/* Expand an arithmetic expression string */
     704+extern char *expand_arith_string __P((char *, int));
     705+
     706 /* De-quoted quoted characters in STRING. */
     707 extern char *dequote_string __P((char *));
     708 
    630709diff -Naur bash-3.1.orig/variables.c bash-3.1/variables.c
    631 --- bash-3.1.orig/variables.c   2005-11-12 21:22:37.000000000 -0500
    632 +++ bash-3.1/variables.c        2006-04-11 11:36:54.731390316 -0400
     710--- bash-3.1.orig/variables.c   2005-11-12 18:22:37.000000000 -0800
     711+++ bash-3.1/variables.c        2006-04-19 15:58:34.000000000 -0700
    633712@@ -860,9 +860,11 @@
    634713 {
Note: See TracChangeset for help on using the changeset viewer.