Add seds to grep and e3fsprogs to fix security issues found upstream.

Remove unrecognized option in eudev.
Minor text corrections.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10863 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 31 insertions, 6 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e4db1e6eb..1f6cbb39e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,22 @@
     </listitem>
 -->
     <listitem>
+      <para>2015-03-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a sed to fix an upstream security issue
+          in e2fsprogs. Fixes
+          <ulink url="&lfs-ticket-root;3759">#3759</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add a sed to fix an upstream security issue
+          in grep. Fixes
+          <ulink url="&lfs-ticket-root;3760">#3760</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-02-25</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 7d98d9008..974a7292f 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -52,7 +52,7 @@
   su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
 fi</userinput></screen>
 
-    <para>Fix is regression in the package that affects 32-bit architectures:</para>
+    <para>Fix a regression in the package that affects 32-bit architectures:</para>
 
 <screen><userinput remap="pre">sed -e '/ia32/s/^/1:/' \
     -e '/SSE2/s/^1://' \
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 7aa781254..071fb147e 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,6 +44,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
+    <para>First, fix a potential security issue identified upstream:</para>
+
+<screen><userinput remap="pre">sed -e '/int.*old_desc_blocks/s/int/blk64_t/' \
+    -e '/if (old_desc_blocks/s/super->s_first_meta_bg/desc_blocks/' \
+    -i lib/ext2fs/closefs.c</userinput></screen>
+
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml
index 129d99d94..b9aca2c4c 100644
--- a/chapter06/eudev.xml
+++ b/chapter06/eudev.xml
@@ -62,8 +62,7 @@ BLKID_LIBS='-L/tools/lib -lblkid'   \
             --enable-keymap         \
             --disable-introspection \
             --disable-gudev         \
-            --disable-gtk-doc-html  \
-            --with-firmware-path=/lib/firmware </userinput></screen>
+            --disable-gtk-doc-html</userinput></screen>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 1ba0e7c84..183b33c75 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -155,7 +155,7 @@ cd ../glibc-build</userinput></screen>
 -->
       <listitem>
         <para>Other tests known to fail on some architectures are
-        malloc/tst-malloc-usable and  nptl/tst-cleanupx4. </para>
+        malloc/tst-malloc-usable and nptl/tst-cleanupx4. </para>
       </listitem>
 
     </itemizedlist>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 58b0db366..126b65182 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
+    <para>First fix a potential security issue identified upstream:</para>
+
+<screen><userinput remap="configure">sed -i -e '/tp++/a  if (ep &lt;= tp) break;' src/kwset.c</userinput></screen>
+
     <para>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/general.ent b/general.ent
index 49fc0a39b..a222181d3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20150225">
+<!ENTITY version         "SVN-20150303">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "February 25, 2015">
+<!ENTITY releasedate     "March 3, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->