Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 shell-term-fm/bash/CVE-2014-7169.diff |   11 +++++++++++
 shell-term-fm/bash/DETAILS            |    2 +-
 shell-term-fm/bash/HISTORY            |    4 ++++
 shell-term-fm/bash/PRE_BUILD          |    2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit d075d0bdb85b6fd78517064bc911af64a2ef5f4e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    shell-term-fm/bash: fix CVE 2014 7169

diff --git a/shell-term-fm/bash/CVE-2014-7169.diff 
b/shell-term-fm/bash/CVE-2014-7169.diff
new file mode 100644
index 0000000..356184b
--- /dev/null
+++ b/shell-term-fm/bash/CVE-2014-7169.diff
@@ -0,0 +1,11 @@
+--- a/bash/parse.y
++++ b/bash/parse.y
+@@ -2848,6 +2848,8 @@ reset_parser ()
+   FREE (word_desc_to_read);
+   word_desc_to_read = (WORD_DESC *)NULL;
+ 
++  eol_ungetc_lookahead = 0;
++
+   current_token = '\n';               /* XXX */
+   last_read_token = '\n';
+   token_to_read = '\n';
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index f21474e..ee88558 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,6 +1,6 @@
            SPELL=bash
          VERSION=4.3
-  SECURITY_PATCH=3
+  SECURITY_PATCH=4
  BASH_PATCHLEVEL=025
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index c1b3acb..1bb70d8 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2014-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: SECURITY_PATCH++
+       * PRE_BUILD, CVE-2014-7169.diff: fix CVE 2014 7169
+
 2014-09-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PRE_BUILD: version 4.3 patchlevel 25
        * patches/bash-42-*: removed
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index d3aa1ef..a0f2d5f 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -7,6 +7,8 @@ for i in $(seq -w 1 $BASH_PATCHLEVEL); do
   patch -p0 < $SPELL_DIRECTORY/patches/bash43-$i
 done &&
 
+patch -p2 < $SPELL_DIRECTORY/CVE-2014-7169.diff &&
+
 if [[ "$BASH_NI_LOGIN" == y ]]; then
   message "${MESSAGE_COLOR}Defining 
NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
   sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/' 
config-top.h