From 326224b21fa847158049d89fea60ba734343abaa Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 4 Mar 2015 03:23:00 +0000
Subject: 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
---
 chapter06/e2fsprogs.xml | 6 ++++++
 chapter06/eudev.xml     | 3 +--
 chapter06/glibc.xml     | 2 +-
 chapter06/grep.xml      | 4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'chapter06')

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>
-- 
cgit v1.2.3-54-g00ecf