aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL2
-rw-r--r--chapter01/changelog.xml27
-rw-r--r--chapter01/whatsnew.xml12
-rw-r--r--chapter03/introduction.xml2
-rw-r--r--chapter06/man-db.xml4
-rw-r--r--general.ent4
-rw-r--r--packages.ent10
-rw-r--r--patches.ent6
8 files changed, 44 insertions, 23 deletions
diff --git a/INSTALL b/INSTALL
index 4e744b671..a67f53496 100644
--- a/INSTALL
+++ b/INSTALL
@@ -41,7 +41,7 @@ If you want to convert the XML to PDF, install the items listed above (except
lynx) and then install the following:
* JDK
- - http://www.linuxfromscratch.org/blfs/view/svn/general/jdk.html
+ - http://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html
* FOP and JAI
- http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bfe6d2f6a..bb239cef1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,11 +36,34 @@
</listitem>
-->
<listitem>
+ <para>2014-09-29</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Updated bash upstream patches and added fixes for
+ CVE-2014-6271, CVE-2014-7169, and CVE-2014-7187 (through upstream
+ patch bash43-027).</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to tzdata-2014h. Fixes
+ <ulink url="&lfs-ticket-root;3682">#3682</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to man-db-2.7.0.2. Fixes
+ <ulink url="&lfs-ticket-root;3683">#3683</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Improved wget command line in Section 3.1. Fixes
+ <ulink url="&lfs-ticket-root;3684">#3684</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-09-26</para>
<itemizedlist>
<listitem>
- <para>[krejzi] - Updated bash upstream patches
- and added fixes for CVE-2014-7169. Fixes <ulink
+ <para>[krejzi] - Updated bash upstream patches and added fixes for
+ CVE-2014-7169. Fixes <ulink
url="&lfs-ticket-root;3680">#3680</ulink>.</para>
</listitem>
</itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 829f1adb5..9e7167a65 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -208,9 +208,9 @@
<!--<listitem>
<para>Texinfo &texinfo-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Tzdata &tzdata-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Util-Linux &util-linux-version;</para>
</listitem>-->
@@ -248,9 +248,11 @@
<listitem>
<para>attr-&attr-version;</para>
</listitem>
+-->
<listitem>
<para>&bash-fixes-patch;</para>
</listitem>
+<!--
<listitem>
<para>&bc-memory-leak-patch;</para>
</listitem>
@@ -296,11 +298,11 @@
<itemizedlist>
<title>Removed:</title>
<listitem><para></para></listitem> <!-- satisfy build -->
-<!--
+
<listitem>
- <para>bash-4.2-fixes-12.patch</para>
+ <para>bash-4.3-upstream_fixes-3.patch</para>
</listitem>
-
+<!--
<listitem>
<para>glibc-2.19-fhs-1.patch</para>
</listitem>
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index cbe8a31a4..3c4f26452 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -53,7 +53,7 @@
<ulink url="../wget-list">wget-list</ulink> as an input to
<command>wget</command>. For example:</para>
-<screen role="nodump"><userinput>wget -i wget-list -P $LFS/sources</userinput></screen>
+<screen role="nodump"><userinput>wget --input-file=wget-list --continue --directory-prefix=$LFS/sources</userinput></screen>
<para>Additionally, starting with LFS-7.0, there is a separate file,
<ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 24f3f697a..503c9c07a 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -41,10 +41,6 @@
<sect2 role="installation">
<title>Installation of Man-DB</title>
- <para>Disable two tests that fail:</para>
-
-<screen><userinput remap="pre">sed -i 's/mandb-2 mandb-3 mandb-4/mandb-3/' src/tests/Makefile.in</userinput></screen>
-
<para>Prepare Man-DB for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/general.ent b/general.ent
index 8b4e0cb89..c095e83af 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version "SVN-20140926">
+<!ENTITY version "SVN-20140929">
<!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate "September 26, 2014">
+<!ENTITY releasedate "September 29, 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/packages.ent b/packages.ent
index 303903949..44bd912c0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -424,10 +424,10 @@
<!ENTITY make-ch6-du "11.8 MB">
<!ENTITY make-ch6-sbu "0.5 SBU">
-<!ENTITY man-db-version "2.7.0.1">
+<!ENTITY man-db-version "2.7.0.2">
<!ENTITY man-db-size "1,457 KB">
<!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "7961179a2d8fb4c8f3947c92e80ee232">
+<!ENTITY man-db-md5 "8ea7be9daf7af7da0fcd619e3da3991c">
<!ENTITY man-db-home "http://www.nongnu.org/man-db/">
<!ENTITY man-db-ch6-du "28 MB">
<!ENTITY man-db-ch6-sbu "0.5 SBU">
@@ -581,10 +581,10 @@
<!ENTITY texinfo-ch6-du "99 MB">
<!ENTITY texinfo-ch6-sbu "0.6 SBU">
-<!ENTITY tzdata-version "2014g">
-<!ENTITY tzdata-size "279 KB">
+<!ENTITY tzdata-version "2014h">
+<!ENTITY tzdata-size "280 KB">
<!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "f9f59425e55b21d2e52bb3a95fc17b8d">
+<!ENTITY tzdata-md5 "ed05111948beba8a0f30956baa46b272">
<!ENTITY tzdata-home "http://www.iana.org/time-zones">
<!ENTITY udev-lfs-version "udev-lfs-20140408">
diff --git a/patches.ent b/patches.ent
index a629df67a..1d2340035 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,9 +2,9 @@
<!-- Start of Common Patches -->
-<!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 bash-fixes-patch "bash-&bash-version;-upstream_fixes-5.patch">
+<!ENTITY bash-fixes-patch-md5 "65f72a5b5fc7c36970347a26ec0f0e99">
+<!ENTITY bash-fixes-patch-size "37 KB">
<!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
<!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-30 23:02:24 +0000