aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-06-04 19:17:25 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-06-04 19:17:25 +0000
commit372aa121e71653f7182c32988aeb09180be99491 (patch)
tree48a3f9a53192b0ea76ffebf5c67c9b9e0528cc8e
parentff7785d01e6e3166f580b1a55b95a81074faf6cd (diff)
Apply latest upstream patches for Bash. Fixes #3103.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9873 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--general.ent4
-rw-r--r--patches.ent6
3 files changed, 15 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3bbae69bd..0649b486c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2012-06-04</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Apply latest upstream patches for Bash. Fixes
+ <ulink url="&lfs-ticket-root;3103">#3103</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-06-03</para>
<itemizedlist>
<listitem>
diff --git a/general.ent b/general.ent
index 75f5143a5..c736f2cef 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120603">
-<!ENTITY releasedate "June 3, 2012">
+<!ENTITY version "SVN-20120604">
+<!ENTITY releasedate "June 4, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index a2cd134f1..e17b7422e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -7,9 +7,9 @@
<!ENTITY automake-perl_fix-patch-size "2.9 KB">
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
-<!ENTITY bash-fixes-patch-md5 "fcca082d3a6e51afc5c02c92221036a6">
-<!ENTITY bash-fixes-patch-size "28.3 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-7.patch">
+<!ENTITY bash-fixes-patch-md5 "4a76c4caaa5d09ebacf79e93f07fd848">
+<!ENTITY bash-fixes-patch-size "42 KB">
<!ENTITY binutils-build-patch "binutils-&binutils-version;-build_fix-1.patch">