[lfs-patches] r3027 - trunk/bash

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Fri Oct 3 05:35:20 PDT 2014


Author: krejzi
Date: Fri Oct  3 05:35:20 2014
New Revision: 3027

Log:
Include patch 029 too.

Modified:
   trunk/bash/bash-4.3-upstream_fixes-6.patch

Modified: trunk/bash/bash-4.3-upstream_fixes-6.patch
==============================================================================
--- trunk/bash/bash-4.3-upstream_fixes-6.patch	Thu Oct  2 09:55:17 2014	(r3026)
+++ trunk/bash/bash-4.3-upstream_fixes-6.patch	Fri Oct  3 05:35:20 2014	(r3027)
@@ -1,14 +1,15 @@
 Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
 Updated By:              Armin K. <krejzi at email dot com>
-Date:                    2014-10-02
+Date:                    2014-10-03
 Initial Package Version: 4.3
 Upstream Status:         Already in upstream patch repo
 Origin:                  Upstream
-Description:             This patch contains upstream patch numbers 001 thru 028
-                         and fixes for CVE-2014-6271, CVE 2014-7169, and CVE-2014-7187
+Description:             This patch contains upstream patch numbers 001 thru 029
+                         and fixes for CVE-2014-6277, CVE-2014-6271, CVE 2014-7169,
+                         and CVE-2014-7187
 
 --- a/arrayfunc.c	2013-08-02 22:19:59.000000000 +0200
-+++ b/arrayfunc.c	2014-10-02 18:53:41.264621284 +0200
++++ b/arrayfunc.c	2014-10-03 14:32:47.797692100 +0200
 @@ -179,6 +179,7 @@
      array_insert (array_cell (entry), ind, newval);
    FREE (newval);
@@ -30,7 +31,7 @@
  	}
  
 --- a/bashline.c	2014-02-10 01:56:58.000000000 +0100
-+++ b/bashline.c	2014-10-02 18:53:41.265621302 +0200
++++ b/bashline.c	2014-10-03 14:32:47.797692100 +0200
 @@ -4167,9 +4167,16 @@
    int qc;
  
@@ -51,7 +52,7 @@
    if (m1 == 0 || m1[0] == 0)
      return m1;
 --- a/builtins/common.h	2013-07-08 22:54:47.000000000 +0200
-+++ b/builtins/common.h	2014-10-02 18:53:41.265621302 +0200
++++ b/builtins/common.h	2014-10-03 14:32:47.797692100 +0200
 @@ -33,6 +33,8 @@
  #define SEVAL_RESETLINE	0x010
  #define SEVAL_PARSEONLY	0x020
@@ -62,7 +63,7 @@
  /* Flags for describe_command, shared between type.def and command.def */
  #define CDESC_ALL		0x001	/* type -a */
 --- a/builtins/evalstring.c	2014-02-11 15:42:10.000000000 +0100
-+++ b/builtins/evalstring.c	2014-10-02 18:53:41.265621302 +0200
++++ b/builtins/evalstring.c	2014-10-03 14:32:47.798692121 +0200
 @@ -308,6 +308,14 @@
  	    {
  	      struct fd_bitmap *bitmap;
@@ -89,7 +90,7 @@
  	}
        else
 --- a/builtins/read.def	2013-09-02 17:54:00.000000000 +0200
-+++ b/builtins/read.def	2014-10-02 18:53:41.266621321 +0200
++++ b/builtins/read.def	2014-10-03 14:32:47.798692121 +0200
 @@ -442,7 +442,10 @@
        add_unwind_protect (reset_alarm, (char *)NULL);
  #if defined (READLINE)
@@ -118,8 +119,19 @@
  
    if (ret == 0)
      return ret;
+--- a/copy_cmd.c	2009-09-11 22:28:02.000000000 +0200
++++ b/copy_cmd.c	2014-10-03 14:33:05.476060620 +0200
+@@ -126,7 +126,7 @@
+     {
+     case r_reading_until:
+     case r_deblank_reading_until:
+-      new_redirect->here_doc_eof = savestring (redirect->here_doc_eof);
++      new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0;
+       /*FALLTHROUGH*/
+     case r_reading_string:
+     case r_appending_to:
 --- a/execute_cmd.c	2014-01-31 16:54:52.000000000 +0100
-+++ b/execute_cmd.c	2014-10-02 18:53:41.266621321 +0200
++++ b/execute_cmd.c	2014-10-03 14:32:47.798692121 +0200
 @@ -2409,7 +2409,16 @@
  #endif
        lstdin = wait_for (lastpid);
@@ -139,7 +151,7 @@
        unfreeze_jobs_list ();
      }
 --- a/externs.h	2014-01-02 20:58:20.000000000 +0100
-+++ b/externs.h	2014-10-02 18:53:41.267621340 +0200
++++ b/externs.h	2014-10-03 14:32:47.799692142 +0200
 @@ -324,6 +324,7 @@
  extern char *sh_backslash_quote __P((char *, const char *, int));
  extern char *sh_backslash_quote_for_double_quotes __P((char *));
@@ -149,7 +161,7 @@
  /* declarations for functions defined in lib/sh/spell.c */
  extern int spname __P((char *, char *));
 --- a/jobs.c	2014-01-10 15:05:34.000000000 +0100
-+++ b/jobs.c	2014-10-02 18:53:41.267621340 +0200
++++ b/jobs.c	2014-10-03 14:32:47.799692142 +0200
 @@ -3597,6 +3597,7 @@
    unwind_protect_int (jobs_list_frozen);
    unwind_protect_pointer (the_pipeline);
@@ -168,7 +180,7 @@
        terminate_stopped_jobs ();
  
 --- a/lib/glob/glob.c	2014-02-01 03:43:51.000000000 +0100
-+++ b/lib/glob/glob.c	2014-10-02 18:53:41.268621358 +0200
++++ b/lib/glob/glob.c	2014-10-03 14:32:47.800692162 +0200
 @@ -123,6 +123,8 @@
  extern char *glob_patscan __P((char *, char *, int));
  extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int));
@@ -318,7 +330,7 @@
      {
        filename = pathname;
 --- a/lib/glob/gmisc.c	2013-10-28 19:45:25.000000000 +0100
-+++ b/lib/glob/gmisc.c	2014-10-02 18:53:41.268621358 +0200
++++ b/lib/glob/gmisc.c	2014-10-03 14:32:47.800692162 +0200
 @@ -42,6 +42,8 @@
  #define WLPAREN         L'('
  #define WRPAREN         L')'
@@ -372,7 +384,7 @@
 +  return d;
 +}
 --- a/lib/readline/display.c	2013-12-27 19:10:56.000000000 +0100
-+++ b/lib/readline/display.c	2014-10-02 18:53:41.268621358 +0200
++++ b/lib/readline/display.c	2014-10-03 14:32:47.800692162 +0200
 @@ -1637,7 +1637,7 @@
    /* If we are changing the number of invisible characters in a line, and
       the spot of first difference is before the end of the invisible chars,
@@ -408,7 +420,7 @@
        fflush (rl_outstream);
        rl_restart_output (1, 0);
 --- a/lib/readline/input.c	2014-01-10 21:07:08.000000000 +0100
-+++ b/lib/readline/input.c	2014-10-02 18:53:41.268621358 +0200
++++ b/lib/readline/input.c	2014-10-03 14:32:47.800692162 +0200
 @@ -534,8 +534,16 @@
  	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
        else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
@@ -427,7 +439,7 @@
        if (rl_signal_event_hook)
  	(*rl_signal_event_hook) ();
 --- a/lib/readline/misc.c	2012-09-02 00:03:11.000000000 +0200
-+++ b/lib/readline/misc.c	2014-10-02 18:53:41.269621377 +0200
++++ b/lib/readline/misc.c	2014-10-03 14:32:47.801692183 +0200
 @@ -461,6 +461,7 @@
  	    saved_undo_list = 0;
  	  /* Set up rl_line_buffer and other variables from history entry */
@@ -445,7 +457,7 @@
        entry = previous_history ();
      }
 --- a/lib/readline/readline.c	2013-10-28 19:58:06.000000000 +0100
-+++ b/lib/readline/readline.c	2014-10-02 18:53:41.269621377 +0200
++++ b/lib/readline/readline.c	2014-10-03 14:32:47.801692183 +0200
 @@ -744,7 +744,8 @@
      r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
  
@@ -466,7 +478,7 @@
      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
  #endif
 --- a/lib/sh/shquote.c	2013-04-01 03:53:32.000000000 +0200
-+++ b/lib/sh/shquote.c	2014-10-02 18:53:41.270621396 +0200
++++ b/lib/sh/shquote.c	2014-10-03 14:32:47.801692183 +0200
 @@ -311,3 +311,17 @@
  
    return (0);
@@ -485,8 +497,18 @@
 +    }
 +  return 0;
 +}
+--- a/make_cmd.c	2011-12-16 14:08:01.000000000 +0100
++++ b/make_cmd.c	2014-10-03 14:33:05.476060620 +0200
+@@ -692,6 +692,7 @@
+   /* First do the common cases. */
+   temp->redirector = source;
+   temp->redirectee = dest_and_filename;
++  temp->here_doc_eof = 0;
+   temp->instruction = instruction;
+   temp->flags = 0;
+   temp->rflags = flags;
 --- a/parse.y	2014-02-11 15:42:10.000000000 +0100
-+++ b/parse.y	2014-10-02 18:53:41.270621396 +0200
++++ b/parse.y	2014-10-03 14:32:47.802692204 +0200
 @@ -168,6 +168,9 @@
  
  static int reserved_word_acceptable __P((int));
@@ -640,17 +662,17 @@
    FREE (token);
    token = ps->token;
 --- a/patchlevel.h	2012-12-29 16:47:57.000000000 +0100
-+++ b/patchlevel.h	2014-10-02 18:53:41.271621415 +0200
++++ b/patchlevel.h	2014-10-03 14:33:05.476060620 +0200
 @@ -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 28
++#define PATCHLEVEL 29
  
  #endif /* _PATCHLEVEL_H_ */
 --- a/pcomplete.c	2013-08-26 21:23:45.000000000 +0200
-+++ b/pcomplete.c	2014-10-02 18:53:41.271621415 +0200
++++ b/pcomplete.c	2014-10-03 14:32:47.802692204 +0200
 @@ -183,6 +183,7 @@
  
  COMPSPEC *pcomp_curcs;
@@ -720,7 +742,7 @@
    /* We need to conditionally handle setting *retryp here */
    if (retryp)
 --- a/shell.h	2012-12-26 03:11:01.000000000 +0100
-+++ b/shell.h	2014-10-02 18:53:41.271621415 +0200
++++ b/shell.h	2014-10-03 14:32:47.803692225 +0200
 @@ -168,7 +168,8 @@
    /* flags state affecting the parser */
    int expand_aliases;
@@ -732,7 +754,7 @@
  
  typedef struct _sh_input_line_state_t {
 --- a/subst.c	2014-01-23 22:26:37.000000000 +0100
-+++ b/subst.c	2014-10-02 18:53:41.272621433 +0200
++++ b/subst.c	2014-10-03 14:32:47.804692246 +0200
 @@ -1192,12 +1192,18 @@
     Start extracting at (SINDEX) as if we had just seen "<(".
     Make (SINDEX) get the position of the matching ")". */ /*))*/
@@ -865,7 +887,7 @@
  	    tword->flags |= W_QUOTED;
  	  if (word->flags & W_ASSIGNMENT)
 --- a/subst.h	2014-01-12 03:02:27.000000000 +0100
-+++ b/subst.h	2014-10-02 18:53:41.273621452 +0200
++++ b/subst.h	2014-10-03 14:32:47.804692246 +0200
 @@ -82,7 +82,7 @@
  /* Extract the <( or >( construct in STRING, and return a new string.
     Start extracting at (SINDEX) as if we had just seen "<(".
@@ -876,7 +898,7 @@
  
  /* Extract the name of the variable to bind to from the assignment string. */
 --- a/test.c	2014-02-04 22:52:58.000000000 +0100
-+++ b/test.c	2014-10-02 18:53:41.273621452 +0200
++++ b/test.c	2014-10-03 14:32:47.804692246 +0200
 @@ -646,8 +646,8 @@
        return (v && invisible_p (v) == 0 && var_isset (v) ? TRUE : FALSE);
  
@@ -897,7 +919,7 @@
      }
  
 --- a/trap.c	2014-02-05 16:03:21.000000000 +0100
-+++ b/trap.c	2014-10-02 18:53:41.273621452 +0200
++++ b/trap.c	2014-10-03 14:32:47.804692246 +0200
 @@ -920,7 +920,8 @@
        subst_assign_varlist = 0;
  
@@ -919,7 +941,7 @@
  
        subst_assign_varlist = save_subst_varlist;
 --- a/variables.c	2014-02-14 17:55:12.000000000 +0100
-+++ b/variables.c	2014-10-02 18:53:41.274621471 +0200
++++ b/variables.c	2014-10-03 14:32:47.805692267 +0200
 @@ -83,6 +83,11 @@
  
  #define ifsname(s)	((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' && (s)[3] == '\0')
@@ -1086,7 +1108,7 @@
  	  if (USE_EXPORTSTR == 0)
  	    SAVE_EXPORTSTR (var, list[list_index]);
 --- a/y.tab.c	2014-02-11 16:57:47.000000000 +0100
-+++ b/y.tab.c	2014-10-02 18:53:41.276621508 +0200
++++ b/y.tab.c	2014-10-03 14:32:47.807692309 +0200
 @@ -168,7 +168,7 @@
  
  


More information about the patches mailing list