aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml8
-rw-r--r--general.ent4
-rw-r--r--patches.ent6
4 files changed, 23 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 37e06832d..ced1a3be3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2011-12-01</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Add latest upstream patches for Bash. Fixes
+ <ulink url="&lfs-ticket-root;2968">#2968</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-11-28</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 78e77fcb9..bd300736f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -223,6 +223,10 @@
<title>Added:</title>
<listitem>
+ <para>&bash-fixes-patch;</para>
+ </listitem>
+
+ <listitem>
<para>&perl-security-patch;</para>
</listitem>
@@ -232,6 +236,10 @@
<title>Removed:</title>
<listitem>
+ <para>bash-4.2-fixes-3.patch</para>
+ </listitem>
+
+ <listitem>
<para>gcc-4.6.1-locale-1.patch</para>
</listitem>
diff --git a/general.ent b/general.ent
index 98b24d01e..5e5c5394a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111128">
-<!ENTITY releasedate "Nov 28, 2011">
+<!ENTITY version "SVN-20111201">
+<!ENTITY releasedate "Dec 1 30, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.1">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index cbf46e100..f05330cb5 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,9 +2,9 @@
<!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
-<!ENTITY bash-fixes-patch-md5 "16ef261d87673ffaa6e838423d1cc4d1">
-<!ENTITY bash-fixes-patch-size "14 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-4.patch">
+<!ENTITY bash-fixes-patch-md5 "244e3ff74d53792f1db32dea75dc8627">
+<!ENTITY bash-fixes-patch-size "22 KB">
<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">