Changeset 37ae076 in clfs-sysroot


Ignore:
Timestamp:
Dec 17, 2006, 12:49:32 AM (18 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
f1b7187
Parents:
28641bd
Message:

Update the bash patch.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/bash-3.2-fixes-4.patch

    r28641bd r37ae076  
    11Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
    2 Date: 2006-11-12
     2Date: 2006-12-12
    33Initial Package Version: 3.2
    44Origin: ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
    55Upstream Status: From Upstream
    6 Description: Contains patches 001-005 from upstream
     6Description: Contains patches 001-009 from upstream
    77
    88diff -Naur bash-3.2.orig/builtins/printf.def bash-3.2/builtins/printf.def
    99--- bash-3.2.orig/builtins/printf.def   2006-09-18 05:48:42.000000000 -0700
    10 +++ bash-3.2/builtins/printf.def        2006-11-12 10:01:01.371881025 -0800
     10+++ bash-3.2/builtins/printf.def        2006-12-12 15:10:15.000000000 -0800
    1111@@ -49,6 +49,12 @@
    1212 #  define INT_MIN              (-2147483647-1)
    … …  
    3333 static int printstr __P((char *, char *, int, int, int));
    3434 static int tescape __P((char *, char *, int *));
     35diff -Naur bash-3.2.orig/findcmd.c bash-3.2/findcmd.c
     36--- bash-3.2.orig/findcmd.c     2005-08-17 13:49:54.000000000 -0700
     37+++ bash-3.2/findcmd.c  2006-12-12 15:11:54.000000000 -0800
     38@@ -308,7 +308,7 @@
     39   if (hashed_file && (posixly_correct || check_hashed_filenames))
     40     {
     41       st = file_status (hashed_file);
     42-      if ((st ^ (FS_EXISTS | FS_EXECABLE)) != 0)
     43+      if ((st & (FS_EXISTS|FS_EXECABLE)) != (FS_EXISTS|FS_EXECABLE))
     44        {
     45          phash_remove (pathname);
     46          free (hashed_file);
     47diff -Naur bash-3.2.orig/jobs.c bash-3.2/jobs.c
     48--- bash-3.2.orig/jobs.c        2006-07-29 13:40:48.000000000 -0700
     49+++ bash-3.2/jobs.c     2006-12-12 15:11:37.000000000 -0800
     50@@ -984,8 +984,6 @@
     51   temp = jobs[job_index];
     52   if (temp == 0)
     53     return;
     54-  if (job_index == js.j_current || job_index == js.j_previous)
     55-    reset_current ();
     56 
     57   if ((dflags & DEL_NOBGPID) == 0)
     58     {
     59@@ -1028,6 +1026,9 @@
     60     js.j_firstj = js.j_lastj = 0;
     61   else if (jobs[js.j_firstj] == 0 || jobs[js.j_lastj] == 0)
     62     reset_job_indices ();
     63+
     64+  if (job_index == js.j_current || job_index == js.j_previous)
     65+    reset_current ();
     66 }
     67 
     68 /* Must be called with SIGCHLD blocked. */
     69diff -Naur bash-3.2.orig/lib/readline/display.c bash-3.2/lib/readline/display.c
     70--- bash-3.2.orig/lib/readline/display.c        2006-09-14 11:20:12.000000000 -0700
     71+++ bash-3.2/lib/readline/display.c     2006-12-12 15:11:08.000000000 -0800
     72@@ -2380,6 +2380,8 @@
     73 
     74   if (end <= start)
     75     return 0;
     76+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
     77+    return (end - start);
     78 
     79   memset (&ps, 0, sizeof (mbstate_t));
     80 
    3581diff -Naur bash-3.2.orig/lib/sh/snprintf.c bash-3.2/lib/sh/snprintf.c
    3682--- bash-3.2.orig/lib/sh/snprintf.c     2006-04-06 06:48:40.000000000 -0700
    37 +++ bash-3.2/lib/sh/snprintf.c  2006-11-12 10:01:01.371881025 -0800
     83+++ bash-3.2/lib/sh/snprintf.c  2006-12-12 15:10:15.000000000 -0800
    3884@@ -471,6 +471,8 @@
    3985          10^x ~= r
    … …  
    145191diff -Naur bash-3.2.orig/parse.y bash-3.2/parse.y
    146192--- bash-3.2.orig/parse.y       2006-09-19 13:37:21.000000000 -0700
    147 +++ bash-3.2/parse.y    2006-11-12 09:59:33.343120007 -0800
     193+++ bash-3.2/parse.y    2006-12-12 15:10:15.000000000 -0800
    148194@@ -1029,6 +1029,7 @@
    149195 #define PST_CMDTOKEN   0x1000          /* command token OK - unused */
    … …  
    241287diff -Naur bash-3.2.orig/patchlevel.h bash-3.2/patchlevel.h
    242288--- bash-3.2.orig/patchlevel.h  2006-04-13 05:31:04.000000000 -0700
    243 +++ bash-3.2/patchlevel.h       2006-11-12 10:01:01.371881025 -0800
     289+++ bash-3.2/patchlevel.h       2006-12-12 15:11:54.000000000 -0800
    244290@@ -25,6 +25,6 @@
    245291    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    … …  
    247293 
    248294-#define PATCHLEVEL 0
    249 +#define PATCHLEVEL 5
     295+#define PATCHLEVEL 8
    250296 
    251297 #endif /* _PATCHLEVEL_H_ */
    252298diff -Naur bash-3.2.orig/po/ru.po bash-3.2/po/ru.po
    253299--- bash-3.2.orig/po/ru.po      2006-01-10 14:51:03.000000000 -0800
    254 +++ bash-3.2/po/ru.po   2006-11-12 09:59:33.343120007 -0800
     300+++ bash-3.2/po/ru.po   2006-12-12 15:10:15.000000000 -0800
    255301@@ -12,7 +12,7 @@
    256302 "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
    … …  
    264310diff -Naur bash-3.2.orig/subst.c bash-3.2/subst.c
    265311--- bash-3.2.orig/subst.c       2006-09-19 05:35:09.000000000 -0700
    266 +++ bash-3.2/subst.c    2006-11-12 10:00:35.204842924 -0800
     312+++ bash-3.2/subst.c    2006-12-12 15:10:15.000000000 -0800
    267313@@ -5707,6 +5707,11 @@
    268314   vtype &= ~VT_STARSUB;
    … …  
    298344diff -Naur bash-3.2.orig/tests/new-exp.right bash-3.2/tests/new-exp.right
    299345--- bash-3.2.orig/tests/new-exp.right   2006-08-10 09:00:00.000000000 -0700
    300 +++ bash-3.2/tests/new-exp.right        2006-11-12 10:00:35.204842924 -0800
     346+++ bash-3.2/tests/new-exp.right        2006-12-12 15:10:15.000000000 -0800
    301347@@ -430,7 +430,7 @@
    302348 Case06---1---A B C::---
Note: See TracChangeset for help on using the changeset viewer.