From 6a24823d14a85ef767f4ad6291440ac8a6fc432d Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sat, 4 Oct 2014 20:10:00 +0000
Subject: [PATCH] Updated bash and readline fixes to latest available from
 upstream.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10771 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 15 +++++++++++++++
 chapter01/whatsnew.xml  |  9 +++++++++
 general.ent             |  4 ++--
 patches.ent             | 12 ++++++------
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4c4c13881..060b15b8b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,21 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-09-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Updated bash upstream patches and added fixes for
+          CVE-2014-6277. Fixes <ulink
+          url="&lfs-ticket-root;3680">#3686</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated reaadline upstream patches. Fixes <ulink
+          url="&lfs-ticket-root;3680">#3687</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-10-02</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index bf16c4fe6..e5a7ede60 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -245,6 +245,11 @@
     <listitem>
       <para>&perl-fix-patch;</para>
     </listitem>
+
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
@@ -255,6 +260,10 @@
       <para>bash-4.3-upstream_fixes-3.patch</para>
     </listitem>
 
+    <listitem>
+      <para>readline-6.3-upstream_fixes-2.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/general.ent b/general.ent
index a2efa60a5..4a419a8a3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20140926-systemd">
+<!ENTITY version         "20141014-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "September 26, 2014">
+<!ENTITY releasedate     "October 4, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index cbc0e58d7..0f96ae877 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,9 +2,9 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-5.patch">
-<!ENTITY bash-fixes-patch-md5 "65f72a5b5fc7c36970347a26ec0f0e99">
-<!ENTITY bash-fixes-patch-size "37 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-6.patch">
+<!ENTITY bash-fixes-patch-md5 "6d2ab19ad99e20ca29ccb4e3c95468b72">
+<!ENTITY bash-fixes-patch-size "88 KB">
 
 <!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
 <!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
@@ -57,9 +57,9 @@
 <!ENTITY perl-fix-patch-md5 "579dfed34e97e0a2fe21b74aa53946ac">
 <!ENTITY perl-fix-patch-size "11 KB">
 
-<!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-2.patch">
-<!ENTITY readline-fixes-patch-md5 "97f74f1c3c83008f268b32d36e9fd376">
-<!ENTITY readline-fixes-patch-size "4 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
+<!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">
+<!ENTITY readline-fixes-patch-size "8 KB">
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
 <!ENTITY systemd-compat-patch-md5 "f26da3adcdc621ea0d715d60baa91962">