# HG changeset patch # User Christopher Rogers # Date 1294579271 0 # Node ID 3ff4aa663ce25bf68d96a064429030e5c02a115d # Parent 58b03979b9da105d1aa25247c3237e2e1e91eb91 Fixed bash patch. It had 2 slashs (//) instead of one. diff -r 58b03979b9da -r 3ff4aa663ce2 bash/stuff/bash-4.1-fixes-3.patch --- a/bash/stuff/bash-4.1-fixes-3.patch Sun Jan 09 12:07:10 2011 +0000 +++ b/bash/stuff/bash-4.1-fixes-3.patch Sun Jan 09 13:21:11 2011 +0000 @@ -5,9 +5,9 @@ Origin: Upstream Description: This patch contains upstream patch numbers 1 thru 9. -diff -Naur bash-4.1.orig//bashline.c bash-4.1//bashline.c ---- bash-4.1.orig//bashline.c 2009-10-24 19:10:19.000000000 +0100 -+++ bash-4.1//bashline.c 2010-10-11 22:39:38.213029316 +0100 +diff -Naur bash-4.1.orig/bashline.c bash-4.1/bashline.c +--- bash-4.1.orig/bashline.c 2009-10-24 19:10:19.000000000 +0100 ++++ bash-4.1/bashline.c 2010-10-11 22:39:38.213029316 +0100 @@ -1680,7 +1680,7 @@ a single match (multiple matches that end up reducing the number of characters in the common prefix are bad) will ever be returned on @@ -17,9 +17,9 @@ { if (state == 0) { -diff -Naur bash-4.1.orig//builtins/declare.def bash-4.1//builtins/declare.def ---- bash-4.1.orig//builtins/declare.def 2009-11-26 00:42:00.000000000 +0000 -+++ bash-4.1//builtins/declare.def 2010-10-11 22:39:38.397029565 +0100 +diff -Naur bash-4.1.orig/builtins/declare.def bash-4.1/builtins/declare.def +--- bash-4.1.orig/builtins/declare.def 2009-11-26 00:42:00.000000000 +0000 ++++ bash-4.1/builtins/declare.def 2010-10-11 22:39:38.397029565 +0100 @@ -512,7 +512,7 @@ { /* let bind_{array,assoc}_variable take care of this. */ @@ -29,9 +29,9 @@ else bind_array_variable (name, 0, value, aflags); } -diff -Naur bash-4.1.orig//builtins/printf.def bash-4.1//builtins/printf.def ---- bash-4.1.orig//builtins/printf.def 2009-11-20 20:31:23.000000000 +0000 -+++ bash-4.1//builtins/printf.def 2010-10-11 22:39:38.381029548 +0100 +diff -Naur bash-4.1.orig/builtins/printf.def bash-4.1/builtins/printf.def +--- bash-4.1.orig/builtins/printf.def 2009-11-20 20:31:23.000000000 +0000 ++++ bash-4.1/builtins/printf.def 2010-10-11 22:39:38.381029548 +0100 @@ -117,7 +117,7 @@ else if (have_fieldwidth) \ nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ @@ -50,9 +50,9 @@ #endif static void printf_erange __P((char *)); -diff -Naur bash-4.1.orig//builtins/read.def bash-4.1//builtins/read.def ---- bash-4.1.orig//builtins/read.def 2009-10-08 16:35:46.000000000 +0100 -+++ bash-4.1//builtins/read.def 2010-10-11 22:39:38.321029469 +0100 +diff -Naur bash-4.1.orig/builtins/read.def bash-4.1/builtins/read.def +--- bash-4.1.orig/builtins/read.def 2009-10-08 16:35:46.000000000 +0100 ++++ bash-4.1/builtins/read.def 2010-10-11 22:39:38.321029469 +0100 @@ -615,14 +615,15 @@ if (unbuffered_read == 0) zsyncfd (fd); @@ -71,9 +71,9 @@ #if defined (ARRAY_VARS) /* If -a was given, take the string read, break it into a list of words, an assign them to `arrayname' in turn. */ -diff -Naur bash-4.1.orig//lib/readline/complete.c bash-4.1//lib/readline/complete.c ---- bash-4.1.orig//lib/readline/complete.c 2009-11-29 23:39:30.000000000 +0000 -+++ bash-4.1//lib/readline/complete.c 2010-10-11 22:39:38.189029310 +0100 +diff -Naur bash-4.1.orig/lib/readline/complete.c bash-4.1/lib/readline/complete.c +--- bash-4.1.orig/lib/readline/complete.c 2009-11-29 23:39:30.000000000 +0000 ++++ bash-4.1/lib/readline/complete.c 2010-10-11 22:39:38.189029310 +0100 @@ -2138,7 +2138,7 @@ All other entries except "." and ".." match. */ if (filename_len == 0) @@ -92,9 +92,9 @@ } else temp = savestring (convfn); -diff -Naur bash-4.1.orig//patchlevel.h bash-4.1//patchlevel.h ---- bash-4.1.orig//patchlevel.h 2009-10-01 21:39:22.000000000 +0100 -+++ bash-4.1//patchlevel.h 2010-10-11 22:39:38.433029614 +0100 +diff -Naur bash-4.1.orig/patchlevel.h bash-4.1/patchlevel.h +--- bash-4.1.orig/patchlevel.h 2009-10-01 21:39:22.000000000 +0100 ++++ bash-4.1/patchlevel.h 2010-10-11 22:39:38.433029614 +0100 @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ @@ -103,9 +103,9 @@ +#define PATCHLEVEL 9 #endif /* _PATCHLEVEL_H_ */ -diff -Naur bash-4.1.orig//print_cmd.c bash-4.1//print_cmd.c ---- bash-4.1.orig//print_cmd.c 2009-09-16 20:32:26.000000000 +0100 -+++ bash-4.1//print_cmd.c 2010-10-11 22:39:38.357029519 +0100 +diff -Naur bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c +--- bash-4.1.orig/print_cmd.c 2009-09-16 20:32:26.000000000 +0100 ++++ bash-4.1/print_cmd.c 2010-10-11 22:39:38.357029519 +0100 @@ -113,6 +113,12 @@ #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) @@ -136,9 +136,9 @@ newline ("done"); } -diff -Naur bash-4.1.orig//sig.c bash-4.1//sig.c ---- bash-4.1.orig//sig.c 2009-08-14 21:31:52.000000000 +0100 -+++ bash-4.1//sig.c 2010-10-11 22:39:38.421029599 +0100 +diff -Naur bash-4.1.orig/sig.c bash-4.1/sig.c +--- bash-4.1.orig/sig.c 2009-08-14 21:31:52.000000000 +0100 ++++ bash-4.1/sig.c 2010-10-11 22:39:38.421029599 +0100 @@ -655,6 +655,9 @@ act.sa_flags |= SA_INTERRUPT; /* XXX */ else @@ -149,9 +149,9 @@ #endif sigemptyset (&act.sa_mask); sigemptyset (&oact.sa_mask); -diff -Naur bash-4.1.orig//variables.c bash-4.1//variables.c ---- bash-4.1.orig//variables.c 2009-11-03 19:13:58.000000000 +0000 -+++ bash-4.1//variables.c 2010-10-11 22:39:38.281029411 +0100 +diff -Naur bash-4.1.orig/variables.c bash-4.1/variables.c +--- bash-4.1.orig/variables.c 2009-11-03 19:13:58.000000000 +0000 ++++ bash-4.1/variables.c 2010-10-11 22:39:38.281029411 +0100 @@ -3808,6 +3808,11 @@ if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))