Changeset 37ae076 in clfs-sysroot
- Timestamp:
- Dec 16, 2006, 4:49:32 PM (18 years ago)
- Branches:
- master
- Children:
- f1b7187
- Parents:
- 28641bd
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/bash-3.2-fixes-4.patch
r28641bd r37ae076 1 1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org) 2 Date: 2006-1 1-122 Date: 2006-12-12 3 3 Initial Package Version: 3.2 4 4 Origin: ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/ 5 5 Upstream Status: From Upstream 6 Description: Contains patches 001-00 5from upstream6 Description: Contains patches 001-009 from upstream 7 7 8 8 diff -Naur bash-3.2.orig/builtins/printf.def bash-3.2/builtins/printf.def 9 9 --- bash-3.2.orig/builtins/printf.def 2006-09-18 05:48:42.000000000 -0700 10 +++ bash-3.2/builtins/printf.def 2006-1 1-12 10:01:01.371881025-080010 +++ bash-3.2/builtins/printf.def 2006-12-12 15:10:15.000000000 -0800 11 11 @@ -49,6 +49,12 @@ 12 12 # define INT_MIN (-2147483647-1) … … 33 33 static int printstr __P((char *, char *, int, int, int)); 34 34 static int tescape __P((char *, char *, int *)); 35 diff -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); 47 diff -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. */ 69 diff -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 35 81 diff -Naur bash-3.2.orig/lib/sh/snprintf.c bash-3.2/lib/sh/snprintf.c 36 82 --- 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-1 1-12 10:01:01.371881025-080083 +++ bash-3.2/lib/sh/snprintf.c 2006-12-12 15:10:15.000000000 -0800 38 84 @@ -471,6 +471,8 @@ 39 85 10^x ~= r … … 145 191 diff -Naur bash-3.2.orig/parse.y bash-3.2/parse.y 146 192 --- bash-3.2.orig/parse.y 2006-09-19 13:37:21.000000000 -0700 147 +++ bash-3.2/parse.y 2006-1 1-12 09:59:33.343120007-0800193 +++ bash-3.2/parse.y 2006-12-12 15:10:15.000000000 -0800 148 194 @@ -1029,6 +1029,7 @@ 149 195 #define PST_CMDTOKEN 0x1000 /* command token OK - unused */ … … 241 287 diff -Naur bash-3.2.orig/patchlevel.h bash-3.2/patchlevel.h 242 288 --- bash-3.2.orig/patchlevel.h 2006-04-13 05:31:04.000000000 -0700 243 +++ bash-3.2/patchlevel.h 2006-1 1-12 10:01:01.371881025-0800289 +++ bash-3.2/patchlevel.h 2006-12-12 15:11:54.000000000 -0800 244 290 @@ -25,6 +25,6 @@ 245 291 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh … … 247 293 248 294 -#define PATCHLEVEL 0 249 +#define PATCHLEVEL 5295 +#define PATCHLEVEL 8 250 296 251 297 #endif /* _PATCHLEVEL_H_ */ 252 298 diff -Naur bash-3.2.orig/po/ru.po bash-3.2/po/ru.po 253 299 --- bash-3.2.orig/po/ru.po 2006-01-10 14:51:03.000000000 -0800 254 +++ bash-3.2/po/ru.po 2006-1 1-12 09:59:33.343120007-0800300 +++ bash-3.2/po/ru.po 2006-12-12 15:10:15.000000000 -0800 255 301 @@ -12,7 +12,7 @@ 256 302 "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n" … … 264 310 diff -Naur bash-3.2.orig/subst.c bash-3.2/subst.c 265 311 --- bash-3.2.orig/subst.c 2006-09-19 05:35:09.000000000 -0700 266 +++ bash-3.2/subst.c 2006-1 1-12 10:00:35.204842924-0800312 +++ bash-3.2/subst.c 2006-12-12 15:10:15.000000000 -0800 267 313 @@ -5707,6 +5707,11 @@ 268 314 vtype &= ~VT_STARSUB; … … 298 344 diff -Naur bash-3.2.orig/tests/new-exp.right bash-3.2/tests/new-exp.right 299 345 --- 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-1 1-12 10:00:35.204842924-0800346 +++ bash-3.2/tests/new-exp.right 2006-12-12 15:10:15.000000000 -0800 301 347 @@ -430,7 +430,7 @@ 302 348 Case06---1---A B C::---
Note:
See TracChangeset
for help on using the changeset viewer.