Changeset 96f80a4


Ignore:
Timestamp:
Jan 8, 2011, 1:04:38 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
94d7425d
Parents:
1070a2d
Message:

Updated the Bash Branch Update to -2.

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    r1070a2d r96f80a4  
    4141      <para>January 8, 2011</para>
    4242      <itemizedlist>
     43        <listitem>
     44          <para>[jciccone] - Updated the Bash Branch Update to -2.</para>
     45        </listitem>
    4346        <listitem>
    4447          <para>[jciccone] - Updated CLooG-PPL to 0.15.10.</para>

  • BOOK/patches.ent

    r1070a2d r96f80a4  
    55<!-- Start of Common Patches -->
    66
    7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
    8 <!ENTITY bash-branch_update-patch-md5 "ba6107bdbe9cf7533e3a47e6a92eb4db">
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch">
     8<!ENTITY bash-branch_update-patch-md5 "7645587a6efcefa67936dcaeb9b2bee7">
    99<!ENTITY bash-branch_update-patch-size "8 KB">
    1010

  • patches/bash-4.1-branch_update-2.patch

    r1070a2d r96f80a4  
    11Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 07-25-2010
     2Date: 01-08-2011
    33Initial Package Version: 4.1
    44Origin: Upstream
    55Upstream Status: From Upstream
    6 Description: Contains all upstream patches up to 4.1-007
     6Description: Contains all upstream patches up to 4.1-009
    77
    88diff -Naur bash-4.1.orig//bashline.c bash-4.1/bashline.c
    99--- bash-4.1.orig//bashline.c   2009-10-24 14:10:19.000000000 -0400
    10 +++ bash-4.1/bashline.c 2010-07-25 22:04:42.669952245 -0400
     10+++ bash-4.1/bashline.c 2011-01-08 15:59:31.934906851 -0500
    1111@@ -1680,7 +1680,7 @@
    1212      a single match (multiple matches that end up reducing the number of
    … …  
    1818       if (state == 0)
    1919        {
     20diff -Naur bash-4.1.orig//builtins/declare.def bash-4.1/builtins/declare.def
     21--- bash-4.1.orig//builtins/declare.def 2009-11-25 19:42:00.000000000 -0500
     22+++ bash-4.1/builtins/declare.def       2011-01-08 15:59:58.930671218 -0500
     23@@ -512,7 +512,7 @@
     24            {
     25              /* let bind_{array,assoc}_variable take care of this. */
     26              if (assoc_p (var))
     27-               bind_assoc_variable (var, name, "0", value, aflags);
     28+               bind_assoc_variable (var, name, savestring ("0"), value, aflags);
     29              else
     30                bind_array_variable (name, 0, value, aflags);
     31            }
    2032diff -Naur bash-4.1.orig//builtins/printf.def bash-4.1/builtins/printf.def
    2133--- bash-4.1.orig//builtins/printf.def  2009-11-20 15:31:23.000000000 -0500
    22 +++ bash-4.1/builtins/printf.def        2010-07-25 22:04:42.685951678 -0400
     34+++ bash-4.1/builtins/printf.def        2011-01-08 15:59:31.934906851 -0500
    2335@@ -117,7 +117,7 @@
    2436     else if (have_fieldwidth) \
    … …  
    4153diff -Naur bash-4.1.orig//builtins/read.def bash-4.1/builtins/read.def
    4254--- bash-4.1.orig//builtins/read.def    2009-10-08 11:35:46.000000000 -0400
    43 +++ bash-4.1/builtins/read.def  2010-07-25 22:04:42.673839182 -0400
     55+++ bash-4.1/builtins/read.def  2011-01-08 15:59:31.934906851 -0500
    4456@@ -615,14 +615,15 @@
    4557   if (unbuffered_read == 0)
    … …  
    6274diff -Naur bash-4.1.orig//lib/readline/complete.c bash-4.1/lib/readline/complete.c
    6375--- bash-4.1.orig//lib/readline/complete.c      2009-11-29 18:39:30.000000000 -0500
    64 +++ bash-4.1/lib/readline/complete.c    2010-07-25 22:04:42.669952245 -0400
     76+++ bash-4.1/lib/readline/complete.c    2011-01-08 15:59:31.934906851 -0500
    6577@@ -2138,7 +2138,7 @@
    6678         All other entries except "." and ".." match. */
    … …  
    8395diff -Naur bash-4.1.orig//patchlevel.h bash-4.1/patchlevel.h
    8496--- bash-4.1.orig//patchlevel.h 2009-10-01 16:39:22.000000000 -0400
    85 +++ bash-4.1/patchlevel.h       2010-07-25 22:04:42.689952400 -0400
     97+++ bash-4.1/patchlevel.h       2011-01-08 16:00:00.782985562 -0500
    8698@@ -25,6 +25,6 @@
    8799    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    … …  
    89101 
    90102-#define PATCHLEVEL 0
    91 +#define PATCHLEVEL 7
     103+#define PATCHLEVEL 9
    92104 
    93105 #endif /* _PATCHLEVEL_H_ */
    94106diff -Naur bash-4.1.orig//print_cmd.c bash-4.1/print_cmd.c
    95107--- bash-4.1.orig//print_cmd.c  2009-09-16 15:32:26.000000000 -0400
    96 +++ bash-4.1/print_cmd.c        2010-07-25 22:04:42.677952146 -0400
     108+++ bash-4.1/print_cmd.c        2011-01-08 15:59:31.938922841 -0500
    97109@@ -113,6 +113,12 @@
    98110 
    … …  
    125137 }
    126138 
     139diff -Naur bash-4.1.orig//sig.c bash-4.1/sig.c
     140--- bash-4.1.orig//sig.c        2009-08-14 16:31:52.000000000 -0400
     141+++ bash-4.1/sig.c      2011-01-08 16:00:00.782985562 -0500
     142@@ -655,6 +655,9 @@
     143     act.sa_flags |= SA_INTERRUPT;      /* XXX */
     144   else
     145     act.sa_flags |= SA_RESTART;                /* XXX */
     146+#else
     147+  if (sig == SIGCHLD)
     148+    act.sa_flags |= SA_RESTART;
     149 #endif
     150   sigemptyset (&act.sa_mask);
     151   sigemptyset (&oact.sa_mask);
    127152diff -Naur bash-4.1.orig//variables.c bash-4.1/variables.c
    128153--- bash-4.1.orig//variables.c  2009-11-03 14:13:58.000000000 -0500
    129 +++ bash-4.1/variables.c        2010-07-25 22:04:42.673839182 -0400
     154+++ bash-4.1/variables.c        2011-01-08 15:59:31.938922841 -0500
    130155@@ -3808,6 +3808,11 @@
    131156 
Note: See TracChangeset for help on using the changeset viewer.