Changeset 7a39f29


Ignore:
Timestamp:
Mar 2, 2009, 1:03:31 PM (15 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
970c8d2
Parents:
572d0a6
Message:

Updated Bash Branch Update Patch to -2

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    r572d0a6 r7a39f29  
    5353        <listitem>
    5454          <para>[Jim] - Added Patches to File, Man, Tar, and Texinfo to support XZ Utils.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[Jim] - Updated Bash Branch Update Patch to -2.</para>
    5558        </listitem>
    5659      </itemizedlist>
  • BOOK/patches.ent

    r572d0a6 r7a39f29  
    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 "9eb162851d44a45c63a31589282ba906">
    9 <!ENTITY bash-branch_update-patch-size "9 KB">
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch">
     8<!ENTITY bash-branch_update-patch-md5 "75986203c47cf97f650a392ecfce4e65">
     9<!ENTITY bash-branch_update-patch-size "10 KB">
    1010
    1111<!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-1.patch">
  • patches/bash-4.0-branch_update-2.patch

    r572d0a6 r7a39f29  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 01-08-2009
     2Date: 03-02-2009
    33Initial Package Version: 4.0
    44Origin: Upstream
     
    99diff -Naur bash-4.0.orig/arrayfunc.c bash-4.0/arrayfunc.c
    1010--- bash-4.0.orig/arrayfunc.c   2009-01-04 11:32:21.000000000 -0800
    11 +++ bash-4.0/arrayfunc.c        2009-02-27 08:59:33.307629837 -0800
     11+++ bash-4.0/arrayfunc.c        2009-03-02 12:37:07.363274758 -0800
    1212@@ -604,64 +604,7 @@
    1313     }
     
    7878diff -Naur bash-4.0.orig/builtins/declare.def bash-4.0/builtins/declare.def
    7979--- bash-4.0.orig/builtins/declare.def  2009-01-04 11:32:22.000000000 -0800
    80 +++ bash-4.0/builtins/declare.def       2009-02-27 08:59:13.626367370 -0800
     80+++ bash-4.0/builtins/declare.def       2009-03-02 12:37:07.363274758 -0800
    8181@@ -287,6 +287,12 @@
    8282              name[offset - 1] = '\0';
     
    117117diff -Naur bash-4.0.orig/builtins/exit.def bash-4.0/builtins/exit.def
    118118--- bash-4.0.orig/builtins/exit.def     2009-01-04 11:32:22.000000000 -0800
    119 +++ bash-4.0/builtins/exit.def  2009-02-27 08:57:04.682105881 -0800
     119+++ bash-4.0/builtins/exit.def  2009-03-02 12:37:07.367275038 -0800
    120120@@ -113,7 +113,7 @@
    121121       for (i = stopmsg = 0; i < js.j_jobslots; i++)
     
    127127 
    128128       if (stopmsg == JSTOPPED)
     129diff -Naur bash-4.0.orig/builtins/read.def bash-4.0/builtins/read.def
     130--- bash-4.0.orig/builtins/read.def     2009-01-15 20:11:21.000000000 -0800
     131+++ bash-4.0/builtins/read.def  2009-03-02 13:01:12.743891046 -0800
     132@@ -369,14 +369,14 @@
     133       code = setjmp (alrmbuf);
     134       if (code)
     135        {
     136-#if 0
     137+         /* Tricky.  The top of the unwind-protect stack is the free of
     138+            input_string.  We want to run all the rest and use input_string,
     139+            so we have to remove it from the stack. */
     140+         remove_unwind_protect ();
     141          run_unwind_frame ("read_builtin");
     142-         return (EXECUTION_FAILURE);
     143-#else
     144          input_string[i] = '\0';       /* make sure it's terminated */
     145-         retval = 128+SIGALRM;;
     146+         retval = 128+SIGALRM;
     147          goto assign_vars;
     148-#endif
     149        }
     150       old_alrm = set_signal_handler (SIGALRM, sigalrm);
     151       add_unwind_protect (reset_alarm, (char *)NULL);
    129152diff -Naur bash-4.0.orig/parse.y bash-4.0/parse.y
    130153--- bash-4.0.orig/parse.y       2009-01-08 05:29:12.000000000 -0800
    131 +++ bash-4.0/parse.y    2009-02-27 08:59:51.884818830 -0800
     154+++ bash-4.0/parse.y    2009-03-02 12:37:07.367275038 -0800
    132155@@ -1615,10 +1615,11 @@
    133156 {
     
    226249diff -Naur bash-4.0.orig/pcomplete.c bash-4.0/pcomplete.c
    227250--- bash-4.0.orig/pcomplete.c   2009-02-01 14:12:31.000000000 -0800
    228 +++ bash-4.0/pcomplete.c        2009-02-27 08:56:48.837092332 -0800
     251+++ bash-4.0/pcomplete.c        2009-03-02 12:37:07.367275038 -0800
    229252@@ -1032,6 +1032,7 @@
    230253   cmdlist = build_arg_list (funcname, text, lwords, cw);
     
    237260diff -Naur bash-4.0.orig/subst.c bash-4.0/subst.c
    238261--- bash-4.0.orig/subst.c       2009-01-28 11:34:12.000000000 -0800
    239 +++ bash-4.0/subst.c    2009-02-27 08:59:33.307629837 -0800
     262+++ bash-4.0/subst.c    2009-03-02 12:37:07.371275038 -0800
    240263@@ -222,6 +222,7 @@
    241264 static int skip_double_quoted __P((char *, size_t, int));
Note: See TracChangeset for help on using the changeset viewer.