[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 96f80a41366892d11cd24b05ac23d8b4599d6a84
git
git at cross-lfs.org
Sat Jan 8 13:09:40 PST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 96f80a41366892d11cd24b05ac23d8b4599d6a84 (commit)
from 1070a2deb63ce82f5ce180809f27db037f1e3e3c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 96f80a41366892d11cd24b05ac23d8b4599d6a84
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Jan 8 16:04:38 2011 -0500
Updated the Bash Branch Update to -2.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index b3f74c3..8b47419 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -41,6 +41,9 @@
<para>January 8, 2011</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated the Bash Branch Update to -2.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated CLooG-PPL to 0.15.10.</para>
</listitem>
<listitem>
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 7b10bc5..e1b3b7f 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -4,8 +4,8 @@
<!-- Start of Common Patches -->
-<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
-<!ENTITY bash-branch_update-patch-md5 "ba6107bdbe9cf7533e3a47e6a92eb4db">
+<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch">
+<!ENTITY bash-branch_update-patch-md5 "7645587a6efcefa67936dcaeb9b2bee7">
<!ENTITY bash-branch_update-patch-size "8 KB">
<!ENTITY cloog-ppl-autogen-patch "cloog-ppl-&cloog-ppl-version;-autogen-1.patch">
diff --git a/patches/bash-4.1-branch_update-1.patch b/patches/bash-4.1-branch_update-2.patch
similarity index 75%
rename from patches/bash-4.1-branch_update-1.patch
rename to patches/bash-4.1-branch_update-2.patch
index a2ab185..45c2e96 100644
--- a/patches/bash-4.1-branch_update-1.patch
+++ b/patches/bash-4.1-branch_update-2.patch
@@ -1,13 +1,13 @@
Submitted By: Joe Ciccone <jciccone at gmail.com>
-Date: 07-25-2010
+Date: 01-08-2011
Initial Package Version: 4.1
Origin: Upstream
Upstream Status: From Upstream
-Description: Contains all upstream patches up to 4.1-007
+Description: Contains all upstream patches up to 4.1-009
diff -Naur bash-4.1.orig//bashline.c bash-4.1/bashline.c
--- bash-4.1.orig//bashline.c 2009-10-24 14:10:19.000000000 -0400
-+++ bash-4.1/bashline.c 2010-07-25 22:04:42.669952245 -0400
++++ bash-4.1/bashline.c 2011-01-08 15:59:31.934906851 -0500
@@ -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,21 @@ diff -Naur bash-4.1.orig//bashline.c bash-4.1/bashline.c
{
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-25 19:42:00.000000000 -0500
++++ bash-4.1/builtins/declare.def 2011-01-08 15:59:58.930671218 -0500
+@@ -512,7 +512,7 @@
+ {
+ /* let bind_{array,assoc}_variable take care of this. */
+ if (assoc_p (var))
+- bind_assoc_variable (var, name, "0", value, aflags);
++ bind_assoc_variable (var, name, savestring ("0"), value, aflags);
+ 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 15:31:23.000000000 -0500
-+++ bash-4.1/builtins/printf.def 2010-07-25 22:04:42.685951678 -0400
++++ bash-4.1/builtins/printf.def 2011-01-08 15:59:31.934906851 -0500
@@ -117,7 +117,7 @@
else if (have_fieldwidth) \
nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
@@ -40,7 +52,7 @@ diff -Naur bash-4.1.orig//builtins/printf.def bash-4.1/builtins/printf.def
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 11:35:46.000000000 -0400
-+++ bash-4.1/builtins/read.def 2010-07-25 22:04:42.673839182 -0400
++++ bash-4.1/builtins/read.def 2011-01-08 15:59:31.934906851 -0500
@@ -615,14 +615,15 @@
if (unbuffered_read == 0)
zsyncfd (fd);
@@ -61,7 +73,7 @@ diff -Naur bash-4.1.orig//builtins/read.def bash-4.1/builtins/read.def
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 18:39:30.000000000 -0500
-+++ bash-4.1/lib/readline/complete.c 2010-07-25 22:04:42.669952245 -0400
++++ bash-4.1/lib/readline/complete.c 2011-01-08 15:59:31.934906851 -0500
@@ -2138,7 +2138,7 @@
All other entries except "." and ".." match. */
if (filename_len == 0)
@@ -82,18 +94,18 @@ diff -Naur bash-4.1.orig//lib/readline/complete.c bash-4.1/lib/readline/complete
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 16:39:22.000000000 -0400
-+++ bash-4.1/patchlevel.h 2010-07-25 22:04:42.689952400 -0400
++++ bash-4.1/patchlevel.h 2011-01-08 16:00:00.782985562 -0500
@@ -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). */
-#define PATCHLEVEL 0
-+#define PATCHLEVEL 7
++#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 15:32:26.000000000 -0400
-+++ bash-4.1/print_cmd.c 2010-07-25 22:04:42.677952146 -0400
++++ bash-4.1/print_cmd.c 2011-01-08 15:59:31.938922841 -0500
@@ -113,6 +113,12 @@
#define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
@@ -124,9 +136,22 @@ diff -Naur bash-4.1.orig//print_cmd.c bash-4.1/print_cmd.c
newline ("done");
}
+diff -Naur bash-4.1.orig//sig.c bash-4.1/sig.c
+--- bash-4.1.orig//sig.c 2009-08-14 16:31:52.000000000 -0400
++++ bash-4.1/sig.c 2011-01-08 16:00:00.782985562 -0500
+@@ -655,6 +655,9 @@
+ act.sa_flags |= SA_INTERRUPT; /* XXX */
+ else
+ act.sa_flags |= SA_RESTART; /* XXX */
++#else
++ if (sig == SIGCHLD)
++ act.sa_flags |= SA_RESTART;
+ #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 14:13:58.000000000 -0500
-+++ bash-4.1/variables.c 2010-07-25 22:04:42.673839182 -0400
++++ bash-4.1/variables.c 2011-01-08 15:59:31.938922841 -0500
@@ -3808,6 +3808,11 @@
if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
-----------------------------------------------------------------------
Summary of changes:
BOOK/introduction/common/changelog.xml | 3 +
BOOK/patches.ent | 4 +-
...date-1.patch => bash-4.1-branch_update-2.patch} | 45 +++++++++++++++----
3 files changed, 40 insertions(+), 12 deletions(-)
rename patches/{bash-4.1-branch_update-1.patch => bash-4.1-branch_update-2.patch} (75%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list