aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml9
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml4
-rw-r--r--chapter06/bash.xml4
-rw-r--r--general.ent6
-rw-r--r--patches.ent4
6 files changed, 26 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a021db5dd..535fe9673 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,15 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2017-02-07</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add bash-4.4 upstream fixes patch. </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2017-02-05</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ccec27808..569d4e32d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -250,6 +250,10 @@
<itemizedlist>
<title>Added:</title>
<listitem><para></para></listitem> <!-- satisfy build -->
+
+ <listitem>
+ <para>bash-4.4-upstream_fixes-1.patch</para>
+ </listitem>
<!--
<listitem>
<para>gcc-6.1.0-asan-1.patch</para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e4b3afdf3..c298bc79f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -17,7 +17,7 @@
needed to build an LFS system:</para>
<variablelist role="materials">
-<!--
+
<varlistentry>
<term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
<listitem>
@@ -25,7 +25,7 @@
<para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
--->
+
<varlistentry>
<term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term>
<listitem>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 8c5896ece..1d1e9fc10 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -40,6 +40,10 @@
<sect2 role="installation">
<title>Installation of Bash</title>
+ <para>Incorporate some upstream fixes:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/general.ent b/general.ent
index c2d561045..c4856148c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20170205">
+<!ENTITY version "SVN-20170207">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20170205-systemd">
+<!ENTITY versiond "20170207-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "February 5, 2016">
+<!ENTITY releasedate "February 7, 2016">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.0">
diff --git a/patches.ent b/patches.ent
index c88d56e2d..dff83fa98 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,10 @@
<!-- Start of Common Patches -->
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "e3d5bf23a4e5628680893d46e6ff286e">
+<!ENTITY bash-fixes-patch-size "17 KB">
+
<!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
<!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
<!ENTITY bc-memory-leak-patch-size "1.4 KB">