wok-current rev 7911
Fixed bash patch. It had 2 slashs (//) instead of one.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Sun Jan 09 13:21:11 2011 +0000 (2011-01-09) |
| parents | 58b03979b9da |
| children | 86f9599cdd19 |
| files | bash/stuff/bash-4.1-fixes-3.patch |
line diff
1.1 --- a/bash/stuff/bash-4.1-fixes-3.patch Sun Jan 09 12:07:10 2011 +0000 1.2 +++ b/bash/stuff/bash-4.1-fixes-3.patch Sun Jan 09 13:21:11 2011 +0000 1.3 @@ -5,9 +5,9 @@ 1.4 Origin: Upstream 1.5 Description: This patch contains upstream patch numbers 1 thru 9. 1.6 1.7 -diff -Naur bash-4.1.orig//bashline.c bash-4.1//bashline.c 1.8 ---- bash-4.1.orig//bashline.c 2009-10-24 19:10:19.000000000 +0100 1.9 -+++ bash-4.1//bashline.c 2010-10-11 22:39:38.213029316 +0100 1.10 +diff -Naur bash-4.1.orig/bashline.c bash-4.1/bashline.c 1.11 +--- bash-4.1.orig/bashline.c 2009-10-24 19:10:19.000000000 +0100 1.12 ++++ bash-4.1/bashline.c 2010-10-11 22:39:38.213029316 +0100 1.13 @@ -1680,7 +1680,7 @@ 1.14 a single match (multiple matches that end up reducing the number of 1.15 characters in the common prefix are bad) will ever be returned on 1.16 @@ -17,9 +17,9 @@ 1.17 { 1.18 if (state == 0) 1.19 { 1.20 -diff -Naur bash-4.1.orig//builtins/declare.def bash-4.1//builtins/declare.def 1.21 ---- bash-4.1.orig//builtins/declare.def 2009-11-26 00:42:00.000000000 +0000 1.22 -+++ bash-4.1//builtins/declare.def 2010-10-11 22:39:38.397029565 +0100 1.23 +diff -Naur bash-4.1.orig/builtins/declare.def bash-4.1/builtins/declare.def 1.24 +--- bash-4.1.orig/builtins/declare.def 2009-11-26 00:42:00.000000000 +0000 1.25 ++++ bash-4.1/builtins/declare.def 2010-10-11 22:39:38.397029565 +0100 1.26 @@ -512,7 +512,7 @@ 1.27 { 1.28 /* let bind_{array,assoc}_variable take care of this. */ 1.29 @@ -29,9 +29,9 @@ 1.30 else 1.31 bind_array_variable (name, 0, value, aflags); 1.32 } 1.33 -diff -Naur bash-4.1.orig//builtins/printf.def bash-4.1//builtins/printf.def 1.34 ---- bash-4.1.orig//builtins/printf.def 2009-11-20 20:31:23.000000000 +0000 1.35 -+++ bash-4.1//builtins/printf.def 2010-10-11 22:39:38.381029548 +0100 1.36 +diff -Naur bash-4.1.orig/builtins/printf.def bash-4.1/builtins/printf.def 1.37 +--- bash-4.1.orig/builtins/printf.def 2009-11-20 20:31:23.000000000 +0000 1.38 ++++ bash-4.1/builtins/printf.def 2010-10-11 22:39:38.381029548 +0100 1.39 @@ -117,7 +117,7 @@ 1.40 else if (have_fieldwidth) \ 1.41 nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ 1.42 @@ -50,9 +50,9 @@ 1.43 #endif 1.44 1.45 static void printf_erange __P((char *)); 1.46 -diff -Naur bash-4.1.orig//builtins/read.def bash-4.1//builtins/read.def 1.47 ---- bash-4.1.orig//builtins/read.def 2009-10-08 16:35:46.000000000 +0100 1.48 -+++ bash-4.1//builtins/read.def 2010-10-11 22:39:38.321029469 +0100 1.49 +diff -Naur bash-4.1.orig/builtins/read.def bash-4.1/builtins/read.def 1.50 +--- bash-4.1.orig/builtins/read.def 2009-10-08 16:35:46.000000000 +0100 1.51 ++++ bash-4.1/builtins/read.def 2010-10-11 22:39:38.321029469 +0100 1.52 @@ -615,14 +615,15 @@ 1.53 if (unbuffered_read == 0) 1.54 zsyncfd (fd); 1.55 @@ -71,9 +71,9 @@ 1.56 #if defined (ARRAY_VARS) 1.57 /* If -a was given, take the string read, break it into a list of words, 1.58 an assign them to `arrayname' in turn. */ 1.59 -diff -Naur bash-4.1.orig//lib/readline/complete.c bash-4.1//lib/readline/complete.c 1.60 ---- bash-4.1.orig//lib/readline/complete.c 2009-11-29 23:39:30.000000000 +0000 1.61 -+++ bash-4.1//lib/readline/complete.c 2010-10-11 22:39:38.189029310 +0100 1.62 +diff -Naur bash-4.1.orig/lib/readline/complete.c bash-4.1/lib/readline/complete.c 1.63 +--- bash-4.1.orig/lib/readline/complete.c 2009-11-29 23:39:30.000000000 +0000 1.64 ++++ bash-4.1/lib/readline/complete.c 2010-10-11 22:39:38.189029310 +0100 1.65 @@ -2138,7 +2138,7 @@ 1.66 All other entries except "." and ".." match. */ 1.67 if (filename_len == 0) 1.68 @@ -92,9 +92,9 @@ 1.69 } 1.70 else 1.71 temp = savestring (convfn); 1.72 -diff -Naur bash-4.1.orig//patchlevel.h bash-4.1//patchlevel.h 1.73 ---- bash-4.1.orig//patchlevel.h 2009-10-01 21:39:22.000000000 +0100 1.74 -+++ bash-4.1//patchlevel.h 2010-10-11 22:39:38.433029614 +0100 1.75 +diff -Naur bash-4.1.orig/patchlevel.h bash-4.1/patchlevel.h 1.76 +--- bash-4.1.orig/patchlevel.h 2009-10-01 21:39:22.000000000 +0100 1.77 ++++ bash-4.1/patchlevel.h 2010-10-11 22:39:38.433029614 +0100 1.78 @@ -25,6 +25,6 @@ 1.79 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh 1.80 looks for to find the patch level (for the sccs version string). */ 1.81 @@ -103,9 +103,9 @@ 1.82 +#define PATCHLEVEL 9 1.83 1.84 #endif /* _PATCHLEVEL_H_ */ 1.85 -diff -Naur bash-4.1.orig//print_cmd.c bash-4.1//print_cmd.c 1.86 ---- bash-4.1.orig//print_cmd.c 2009-09-16 20:32:26.000000000 +0100 1.87 -+++ bash-4.1//print_cmd.c 2010-10-11 22:39:38.357029519 +0100 1.88 +diff -Naur bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c 1.89 +--- bash-4.1.orig/print_cmd.c 2009-09-16 20:32:26.000000000 +0100 1.90 ++++ bash-4.1/print_cmd.c 2010-10-11 22:39:38.357029519 +0100 1.91 @@ -113,6 +113,12 @@ 1.92 1.93 #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) 1.94 @@ -136,9 +136,9 @@ 1.95 newline ("done"); 1.96 } 1.97 1.98 -diff -Naur bash-4.1.orig//sig.c bash-4.1//sig.c 1.99 ---- bash-4.1.orig//sig.c 2009-08-14 21:31:52.000000000 +0100 1.100 -+++ bash-4.1//sig.c 2010-10-11 22:39:38.421029599 +0100 1.101 +diff -Naur bash-4.1.orig/sig.c bash-4.1/sig.c 1.102 +--- bash-4.1.orig/sig.c 2009-08-14 21:31:52.000000000 +0100 1.103 ++++ bash-4.1/sig.c 2010-10-11 22:39:38.421029599 +0100 1.104 @@ -655,6 +655,9 @@ 1.105 act.sa_flags |= SA_INTERRUPT; /* XXX */ 1.106 else 1.107 @@ -149,9 +149,9 @@ 1.108 #endif 1.109 sigemptyset (&act.sa_mask); 1.110 sigemptyset (&oact.sa_mask); 1.111 -diff -Naur bash-4.1.orig//variables.c bash-4.1//variables.c 1.112 ---- bash-4.1.orig//variables.c 2009-11-03 19:13:58.000000000 +0000 1.113 -+++ bash-4.1//variables.c 2010-10-11 22:39:38.281029411 +0100 1.114 +diff -Naur bash-4.1.orig/variables.c bash-4.1/variables.c 1.115 +--- bash-4.1.orig/variables.c 2009-11-03 19:13:58.000000000 +0000 1.116 ++++ bash-4.1/variables.c 2010-10-11 22:39:38.281029411 +0100 1.117 @@ -3808,6 +3808,11 @@ 1.118 1.119 if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))