Changeset cf468ea
- Timestamp:
- Apr 12, 2006, 5:21:01 PM (19 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- b237cbc
- Parents:
- 69cde8d
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/bash-3.1-fixes-7.patch
r69cde8d rcf468ea 1 Submitted By: Matthew Burgess (matthewat linuxfromscratch dot org)2 Date: 2006-0 3-181 Submitted By: Jeremy Huntwork (jhuntwork at linuxfromscratch dot org) 2 Date: 2006-04-11 3 3 Initial Package Version: 3.1 4 4 Origin: http://ftp.gnu.org/gnu/bash/bash-3.1-patches/ 5 Upstream Status: From Upstream 6 Description: Contains patches 001-01 4from upstream5 Upstream Status: From Upstream 6 Description: Contains patches 001-016 from upstream 7 7 8 8 diff -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 1 5:40:52.000000000 +000010 +++ bash-3.1/doc/bash.1 2006-0 3-18 09:23:33.000000000 +00009 --- 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 11 11 @@ -6,12 +6,12 @@ 12 12 .\" Case Western Reserve University … … 88 88 If 89 89 diff -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 1 9:07:21.000000000 +000091 +++ bash-3.1/doc/bashref.texi 2006-0 3-18 09:23:33.000000000 +000090 --- 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 92 92 @@ -961,8 +961,8 @@ 93 93 (see the description of @code{shopt} in @ref{Bash Builtins}) … … 161 161 variable is expanded and the resultant value is printed before 162 162 diff -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 1 8:52:56.000000000 +0000164 +++ bash-3.1/doc/version.texi 2006-0 3-18 09:23:33.000000000 +0000163 --- 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 165 165 @@ -2,9 +2,9 @@ 166 166 Copyright (C) 1988-2005 Free Software Foundation, Inc. … … 179 179 +@set UPDATED-MONTH December 2005 180 180 diff -Naur bash-3.1.orig/jobs.c bash-3.1/jobs.c 181 --- bash-3.1.orig/jobs.c 2005-11-1 2 04:13:27.000000000 +0000182 +++ bash-3.1/jobs.c 2006-0 3-18 09:23:33.000000000 +0000181 --- 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 183 183 @@ -619,8 +619,11 @@ 184 184 * once in the parent and once in each child. This is where … … 285 285 termination_state = last_command_exit_value; 286 286 287 diff -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 290 @@ -360,6 +360,7 @@ 291 count = lose = skip = 0; 292 293 firstmalloc = 0; 294 + nalloca = 0; 295 296 /* If PAT is empty, skip the loop, but return one (empty) filename. */ 297 if (pat == 0 || *pat == '\0') 298 @@ -546,6 +547,8 @@ 299 firstmalloc = 0; 300 tmplink = lastlink; 301 } 302 + else 303 + tmplink = 0; 304 free (lastlink->name); 305 lastlink = lastlink->next; 306 FREE (tmplink); 307 diff -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 310 @@ -638,12 +638,13 @@ 311 CHAR *psub; /* pointer to sub-pattern */ 312 CHAR *pnext; /* pointer to next sub-pattern */ 313 CHAR *srest; /* pointer to rest of string */ 314 - int m1, m2; 315 + int m1, m2, xflags; /* xflags = flags passed to recursive matches */ 316 317 #if DEBUG_MATCHING 318 fprintf(stderr, "extmatch: xc = %c\n", xc); 319 fprintf(stderr, "extmatch: s = %s; se = %s\n", s, se); 320 fprintf(stderr, "extmatch: p = %s; pe = %s\n", p, pe); 321 +fprintf(stderr, "extmatch: flags = %d\n", flags); 322 #endif 323 324 prest = PATSCAN (p + (*p == L('(')), pe, 0); /* ) */ 325 @@ -677,8 +678,12 @@ 326 string matches the rest of the pattern. Also handle 327 multiple matches of the pattern. */ 328 if (m1) 329 - m2 = (GMATCH (srest, se, prest, pe, flags) == 0) || 330 - (s != srest && GMATCH (srest, se, p - 1, pe, flags) == 0); 331 + { 332 + /* if srest > s, we are not at start of string */ 333 + xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; 334 + m2 = (GMATCH (srest, se, prest, pe, xflags) == 0) || 335 + (s != srest && GMATCH (srest, se, p - 1, pe, xflags) == 0); 336 + } 337 if (m1 && m2) 338 return (0); 339 } 340 @@ -704,8 +709,10 @@ 341 srest = (prest == pe) ? se : s; 342 for ( ; srest <= se; srest++) 343 { 344 + /* if srest > s, we are not at start of string */ 345 + xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; 346 if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 && 347 - GMATCH (srest, se, prest, pe, flags) == 0) 348 + GMATCH (srest, se, prest, pe, xflags) == 0) 349 return (0); 350 } 351 if (pnext == prest) 352 @@ -726,7 +733,9 @@ 353 if (pnext == prest) 354 break; 355 } 356 - if (m1 == 0 && GMATCH (srest, se, prest, pe, flags) == 0) 357 + /* if srest > s, we are not at start of string */ 358 + xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; 359 + if (m1 == 0 && GMATCH (srest, se, prest, pe, xflags) == 0) 360 return (0); 361 } 362 return (FNM_NOMATCH); 287 363 diff -Naur bash-3.1.orig/lib/readline/display.c bash-3.1/lib/readline/display.c 288 --- bash-3.1.orig/lib/readline/display.c 2005-11-30 1 9:05:02.000000000 +0000289 +++ bash-3.1/lib/readline/display.c 2006-0 3-18 09:23:33.000000000 +0000364 --- 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 290 366 @@ -1983,11 +1983,15 @@ 291 367 int pchar; … … 332 408 333 409 diff -Naur bash-3.1.orig/lib/readline/readline.c bash-3.1/lib/readline/readline.c 334 --- bash-3.1.orig/lib/readline/readline.c 2005-07-0 5 02:29:35.000000000 +0000335 +++ bash-3.1/lib/readline/readline.c 2006-0 3-18 09:23:33.000000000 +0000410 --- 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 336 412 @@ -282,6 +282,7 @@ 337 413 { … … 343 419 return 0; 344 420 diff -Naur bash-3.1.orig/lib/readline/terminal.c bash-3.1/lib/readline/terminal.c 345 --- bash-3.1.orig/lib/readline/terminal.c 2005-11-1 3 01:46:54.000000000 +0000346 +++ bash-3.1/lib/readline/terminal.c 2006-0 3-18 09:23:33.000000000 +0000421 --- 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 347 423 @@ -122,7 +122,7 @@ 348 424 static char *_rl_visible_bell; … … 365 441 if (cols > 0) 366 442 diff -Naur bash-3.1.orig/parse.y bash-3.1/parse.y 367 --- bash-3.1.orig/parse.y 2005-11-1 2 04:14:18.000000000 +0000368 +++ bash-3.1/parse.y 2006-0 3-18 09:23:33.000000000 +0000443 --- 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 369 445 @@ -2716,6 +2716,7 @@ 370 446 #define P_ALLOWESC 0x02 … … 517 593 518 594 diff -Naur bash-3.1.orig/patchlevel.h bash-3.1/patchlevel.h 519 --- bash-3.1.orig/patchlevel.h 2005-07-20 1 7:58:20.000000000 +0000520 +++ bash-3.1/patchlevel.h 2006-0 3-18 09:23:33.000000000 +0000595 --- 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 521 597 @@ -25,6 +25,6 @@ 522 598 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh … … 524 600 525 601 -#define PATCHLEVEL 0 526 +#define PATCHLEVEL 1 4602 +#define PATCHLEVEL 16 527 603 528 604 #endif /* _PATCHLEVEL_H_ */ 529 605 diff -Naur bash-3.1.orig/subst.c bash-3.1/subst.c 530 --- bash-3.1.orig/subst.c 2005-10-24 13:51:13.000000000 +0000531 +++ bash-3.1/subst.c 2006-0 3-18 09:23:33.000000000 +0000606 --- 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 532 608 @@ -2187,7 +2187,7 @@ 533 609 if (mklocal && variable_context) … … 553 629 sindex += t_index; 554 630 diff -Naur bash-3.1.orig/variables.c bash-3.1/variables.c 555 --- bash-3.1.orig/variables.c 2005-11-1 3 02:22:37.000000000 +0000556 +++ bash-3.1/variables.c 2006-0 3-18 09:23:33.000000000 +0000631 --- 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 557 633 @@ -860,9 +860,11 @@ 558 634 {
Note:
See TracChangeset
for help on using the changeset viewer.