Ignore:
Timestamp:
May 18, 2011, 4:53:46 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1718e20
Parents:
bd31da6b (diff), 279277d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into systemd

File:
1 moved

Legend:

Unmodified
Added
Removed

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

    rbd31da6b r30a199c  
    1 Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 04-16-2011
     1Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk)
     2Date: 2011-05-16
    33Initial Package Version: 4.2
    44Origin: Upstream
    5 Upstream Status: From Upstream
    6 Description: Contains all upstream patches up to 4.2-008
     5Upstream Status: Applied
     6Description: Contains all upstream patches up to 4.2-010
    77
     8diff -Naur bash-4.2.orig/builtins/fc.def bash-4.2/builtins/fc.def
     9--- bash-4.2.orig/builtins/fc.def       2010-05-30 22:25:38.000000000 +0000
     10+++ bash-4.2/builtins/fc.def    2011-05-16 23:42:00.796961011 +0000
     11@@ -304,7 +304,7 @@
     12   last_hist = i - rh - hist_last_line_added;
     13 
     14   /* XXX */
     15-  if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0)
     16+  if (i == last_hist && hlist[last_hist] == 0)
     17     while (last_hist >= 0 && hlist[last_hist] == 0)
     18       last_hist--;
     19   if (last_hist < 0)
     20@@ -475,7 +475,7 @@
     21      HIST_ENTRY **hlist;
     22 {
     23   int sign, n, clen, rh;
     24-  register int i, j;
     25+  register int i, j, last_hist;
     26   register char *s;
     27 
     28   sign = 1;
     29@@ -495,7 +495,15 @@
     30      has been enabled (interactive or not) should use it in the last_hist
     31      calculation as if it were on. */
     32   rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
     33-  i -= rh + hist_last_line_added;
     34+  last_hist = i - rh - hist_last_line_added;
     35+
     36+  if (i == last_hist && hlist[last_hist] == 0)
     37+    while (last_hist >= 0 && hlist[last_hist] == 0)
     38+      last_hist--;
     39+  if (last_hist < 0)
     40+    return (-1);
     41+
     42+  i = last_hist;
     43 
     44   /* No specification defaults to most recent command. */
     45   if (command == NULL)
    846diff -Naur bash-4.2.orig/builtins/printf.def bash-4.2/builtins/printf.def
    9 --- bash-4.2.orig/builtins/printf.def   2010-11-23 10:02:55.000000000 -0500
    10 +++ bash-4.2/builtins/printf.def        2011-04-16 16:50:36.379215007 -0400
     47--- bash-4.2.orig/builtins/printf.def   2010-11-23 15:02:55.000000000 +0000
     48+++ bash-4.2/builtins/printf.def        2011-05-16 23:41:55.617535899 +0000
    1149@@ -465,6 +465,9 @@
    1250                  secs = shell_start_time;      /* roughly $SECONDS */
    … …  
    2058                free (timefmt);
    2159diff -Naur bash-4.2.orig/lib/glob/gmisc.c bash-4.2/lib/glob/gmisc.c
    22 --- bash-4.2.orig/lib/glob/gmisc.c      2011-02-05 16:11:17.000000000 -0500
    23 +++ bash-4.2/lib/glob/gmisc.c   2011-04-16 16:50:36.371215007 -0400
     60--- bash-4.2.orig/lib/glob/gmisc.c      2011-02-05 21:11:17.000000000 +0000
     61+++ bash-4.2/lib/glob/gmisc.c   2011-05-16 23:41:53.037822234 +0000
    2462@@ -77,8 +77,8 @@
    2563      wchar_t *wpat;
    … …  
    223261     }
    224262diff -Naur bash-4.2.orig/lib/readline/callback.c bash-4.2/lib/readline/callback.c
    225 --- bash-4.2.orig/lib/readline/callback.c       2010-06-06 12:18:58.000000000 -0400
    226 +++ bash-4.2/lib/readline/callback.c    2011-04-16 16:50:36.359215007 -0400
     263--- bash-4.2.orig/lib/readline/callback.c       2010-06-06 16:18:58.000000000 +0000
     264+++ bash-4.2/lib/readline/callback.c    2011-05-16 23:41:51.689971838 +0000
    227265@@ -148,6 +148,9 @@
    228266          eof = _rl_vi_domove_callback (_rl_vimvcxt);
    … …  
    236274 #endif
    237275diff -Naur bash-4.2.orig/lib/readline/vi_mode.c bash-4.2/lib/readline/vi_mode.c
    238 --- bash-4.2.orig/lib/readline/vi_mode.c        2010-11-20 19:51:39.000000000 -0500
    239 +++ bash-4.2/lib/readline/vi_mode.c     2011-04-16 16:50:36.359215007 -0400
     276--- bash-4.2.orig/lib/readline/vi_mode.c        2010-11-21 00:51:39.000000000 +0000
     277+++ bash-4.2/lib/readline/vi_mode.c     2011-05-16 23:41:51.689971838 +0000
    240278@@ -1114,7 +1114,7 @@
    241279       rl_beg_of_line (1, c);
    … …  
    248286   /* XXX - these need to handle rl_universal_argument bindings */
    249287diff -Naur bash-4.2.orig/parse.y bash-4.2/parse.y
    250 --- bash-4.2.orig/parse.y       2011-01-02 15:48:11.000000000 -0500
    251 +++ bash-4.2/parse.y    2011-04-16 16:50:36.379215007 -0400
     288--- bash-4.2.orig/parse.y       2011-01-02 20:48:11.000000000 +0000
     289+++ bash-4.2/parse.y    2011-05-16 23:41:55.613536343 +0000
    252290@@ -5135,6 +5135,9 @@
    253291            case 'A':
    … …  
    261299              if (c == 'd')
    262300diff -Naur bash-4.2.orig/patchlevel.h bash-4.2/patchlevel.h
    263 --- bash-4.2.orig/patchlevel.h  2010-06-12 20:14:48.000000000 -0400
    264 +++ bash-4.2/patchlevel.h       2011-04-16 16:50:36.387215007 -0400
     301--- bash-4.2.orig/patchlevel.h  2010-06-13 00:14:48.000000000 +0000
     302+++ bash-4.2/patchlevel.h       2011-05-16 23:42:02.092817179 +0000
    265303@@ -25,6 +25,6 @@
    266304    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    … …  
    268306 
    269307-#define PATCHLEVEL 0
    270 +#define PATCHLEVEL 8
     308+#define PATCHLEVEL 10
    271309 
    272310 #endif /* _PATCHLEVEL_H_ */
     311diff -Naur bash-4.2.orig/print_cmd.c bash-4.2/print_cmd.c
     312--- bash-4.2.orig/print_cmd.c   2010-05-30 22:34:08.000000000 +0000
     313+++ bash-4.2/print_cmd.c        2011-05-16 23:42:02.092817179 +0000
     314@@ -315,6 +315,7 @@
     315          cprintf ("( ");
     316          skip_this_indent++;
     317          make_command_string_internal (command->value.Subshell->command);
     318+         PRINT_DEFERRED_HEREDOCS ("");
     319          cprintf (" )");
     320          break;
     321 
     322@@ -592,6 +593,7 @@
     323   newline ("do\n");
     324   indentation += indentation_amount;
     325   make_command_string_internal (arith_for_command->action);
     326+  PRINT_DEFERRED_HEREDOCS ("");
     327   semicolon ();
     328   indentation -= indentation_amount;
     329   newline ("done");
     330@@ -653,6 +655,7 @@
     331     }
     332 
     333   make_command_string_internal (group_command->command);
     334+  PRINT_DEFERRED_HEREDOCS ("");
     335 
     336   if (inside_function_def)
     337     {
    273338diff -Naur bash-4.2.orig/sig.c bash-4.2/sig.c
    274 --- bash-4.2.orig/sig.c 2010-11-23 08:21:22.000000000 -0500
    275 +++ bash-4.2/sig.c      2011-04-16 16:50:36.387215007 -0400
     339--- bash-4.2.orig/sig.c 2010-11-23 13:21:22.000000000 +0000
     340+++ bash-4.2/sig.c      2011-05-16 23:41:59.501104844 +0000
    276341@@ -46,6 +46,7 @@
    277342 
    … …  
    303368       termsig_handler (sig);
    304369diff -Naur bash-4.2.orig/subst.c bash-4.2/subst.c
    305 --- bash-4.2.orig/subst.c       2011-01-02 16:12:51.000000000 -0500
    306 +++ bash-4.2/subst.c    2011-04-16 16:50:36.383215007 -0400
     370--- bash-4.2.orig/subst.c       2011-01-02 21:12:51.000000000 +0000
     371+++ bash-4.2/subst.c    2011-05-16 23:41:58.205248678 +0000
    307372@@ -1379,10 +1379,12 @@
    308373   slen = strlen (string + *sindex) + *sindex;
    … …  
    349414       else
    350415diff -Naur bash-4.2.orig/subst.h bash-4.2/subst.h
    351 --- bash-4.2.orig/subst.h       2010-12-02 20:21:29.000000000 -0500
    352 +++ bash-4.2/subst.h    2011-04-16 16:50:36.359215007 -0400
     416--- bash-4.2.orig/subst.h       2010-12-03 01:21:29.000000000 +0000
     417+++ bash-4.2/subst.h    2011-05-16 23:41:50.378117447 +0000
    353418@@ -56,6 +56,7 @@
    354419 #define SX_NOLONGJMP   0x0040  /* don't longjmp on fatal error */
    … …  
    360425    STRING, and returns a pointer to it. */
    361426diff -Naur bash-4.2.orig/variables.c bash-4.2/variables.c
    362 --- bash-4.2.orig/variables.c   2011-01-24 20:07:48.000000000 -0500
    363 +++ bash-4.2/variables.c        2011-04-16 16:50:36.379215007 -0400
     427--- bash-4.2.orig/variables.c   2011-01-25 01:07:48.000000000 +0000
     428+++ bash-4.2/variables.c        2011-05-16 23:41:56.917391622 +0000
    364429@@ -3653,6 +3653,22 @@
    365430   return n;
    … …  
    411476 
    412477diff -Naur bash-4.2.orig/variables.h bash-4.2/variables.h
    413 --- bash-4.2.orig/variables.h   2010-12-02 20:22:01.000000000 -0500
    414 +++ bash-4.2/variables.h        2011-04-16 16:50:36.375215007 -0400
     478--- bash-4.2.orig/variables.h   2010-12-03 01:22:01.000000000 +0000
     479+++ bash-4.2/variables.h        2011-05-16 23:41:55.613536343 +0000
    415480@@ -313,6 +313,7 @@
    416481 
Note: See TracChangeset for help on using the changeset viewer.