aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml15
-rw-r--r--chapter01/whatsnew.xml11
-rw-r--r--general.ent4
-rw-r--r--patches.ent12
4 files changed, 33 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 757ae4be0..95115baa0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,21 @@
</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>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ba4663dba..7aac7121e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -49,7 +49,7 @@
<!--<listitem>
<para>Bzip2 &bzip2-version;</para>
</listitem>-->
- <!-- <listitem>
+ <!--<listitem>
<para>Check &check-version;</para>
</listitem>-->
<!--<listitem>
@@ -248,6 +248,11 @@
<listitem>
<para>&perl-fix-patch;</para>
</listitem>
+
+ <listitem>
+ <para>&readline-fixes-patch;</para>
+ </listitem>
+
</itemizedlist>
<itemizedlist>
@@ -258,6 +263,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 c095e83af..f081c3976 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version "SVN-20140929">
+<!ENTITY version "SVN-20141004">
<!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate "September 29, 2014">
+<!ENTITY releasedate "October 4, 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 967525e2f..8f7f6c71e 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 "d2ab19ad99e20ca29ccb4e3c95468b72">
+<!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 sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
<!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb">