aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--patches.ent4
2 files changed, 6 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e05ffa553..91f8170d8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,10 @@
<para>[bdubbs] - Update to file-5.20. Fixes
<ulink url="&lfs-ticket-root;3691">#3691</ulink>.</para>
</listitem>
+ <listitem>
+ <para>[krejzi] - Updated bash upstream patches and added fixes for
+ CVE-2014-6278.</para>
+ </listitem>
</itemizedlist>
</listitem>
diff --git a/patches.ent b/patches.ent
index 8f7f6c71e..b7c6005be 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,8 +2,8 @@
<!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-6.patch">
-<!ENTITY bash-fixes-patch-md5 "d2ab19ad99e20ca29ccb4e3c95468b72">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-7.patch">
+<!ENTITY bash-fixes-patch-md5 "ccf2f526dda9405a6a9fc9b8ceff11c4">
<!ENTITY bash-fixes-patch-size "88 KB">
<!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">