aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrejzi <krejzi@linuxfromscratch.org>2014-09-26 14:34:54 +0000
committerKrejzi <krejzi@linuxfromscratch.org>2014-09-26 14:34:54 +0000
commit7da0af62d0ec0b0698735acfe7ec41032792967b (patch)
tree2043ddf3f3e13498030a6d3f435aa2baf753cf8e
parent4f2d19e5f92800d813c489564370d61333c5cc36 (diff)
Incorporate bash security fix.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10764 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml12
-rw-r--r--general.ent4
-rw-r--r--patches.ent6
3 files changed, 16 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 32da7f90d..d93036a80 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,16 @@
</itemizedlist>
</listitem>
-->
+ <listitem>
+ <para>2014-09-26</para>
+ <itemizedlist>
+ <listitem>
+ <para>Updated bash upstream patches and added
+ fixes for CVE-2014-7169. Fixes <ulink
+ url="&lfs-ticket-root;3680">#3680</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>2014-09-24</para>
@@ -74,7 +84,7 @@
<para>2014-09-23</para>
<itemizedlist>
<listitem>
- <para>[bdubbs] - LFS-7.r65 released.</para>
+ <para>[bdubbs] - LFS-7.6 released.</para>
</listitem>
</itemizedlist>
</listitem>
diff --git a/general.ent b/general.ent
index bd5f4b969..8b4e0cb89 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version "SVN-20140924">
+<!ENTITY version "SVN-20140926">
<!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate "September 24, 2014">
+<!ENTITY releasedate "September 26, 2014">
<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.7">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index 0f707f8d8..a629df67a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,9 +2,9 @@
<!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-3.patch">
-<!ENTITY bash-fixes-patch-md5 "3266ce3d2f0aa647d4ef068e46899246">
-<!ENTITY bash-fixes-patch-size "28 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-4.patch">
+<!ENTITY bash-fixes-patch-md5 "9233ba62610d4eb3f45ed57073d4273b">
+<!ENTITY bash-fixes-patch-size "40 KB">
<!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
<!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">