[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-systemd-138-gc8c7b3b

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  c8c7b3b48195b09f779f8451f929068950ad9cb5 (commit)
      from  f4642ac15f641487fd7fb5a57f13111e574a34cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c8c7b3b48195b09f779f8451f929068950ad9cb5
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Sun Sep 6 22:12:38 2015 -0500

    Update Grep to 2.21 from 2.20.

diff --git a/BOOK/final-system/common/grep.xml b/BOOK/final-system/common/grep.xml
index dbc6ad9..edc7ac4 100644
--- a/BOOK/final-system/common/grep.xml
+++ b/BOOK/final-system/common/grep.xml
@@ -25,6 +25,10 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
+    <para os="s1">Fix a potential security issue identified upstream:</para>
+
+<screen os="s2"><userinput>sed -i -e '/tp++/a  if (ep <= tp) break;' src/kwset.c</userinput></screen>
+
     <para os="a">Prepare Grep for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/BOOK/final-system/multilib/grep.xml b/BOOK/final-system/multilib/grep.xml
index adf8565..160dd0f 100644
--- a/BOOK/final-system/multilib/grep.xml
+++ b/BOOK/final-system/multilib/grep.xml
@@ -23,6 +23,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/grep.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 414d6e5..0575ea5 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,10 @@
       <para>06 September 2015</para>
       <itemizedlist>
         <listitem>
+          <para>[William Harrington] - Update Grep to 2.21. Fixes ticket
+          <ulink url="&clfs-ticket-root;1028">#1028.</ulink></para> 
+        </listitem>
+        <listitem>
           <para>[William Harrington] - Update DejaGNU to 1.5.3. Fixes ticket
           <ulink url="&clfs-ticket-root;1025">#1025.</ulink></para> 
         </listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 9ffd75a..bebcef7 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -227,10 +227,10 @@
 <!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
 <!ENTITY gperf-home "&gnu-software;gperf">
 
-<!ENTITY grep-version "2.20">
-<!ENTITY grep-size "1,237 KB">
+<!ENTITY grep-version "2.21">
+<!ENTITY grep-size "1,262 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "2cbea44a4f1548aee20b9ff2d3076908">
+<!ENTITY grep-md5 "43c48064d6409862b8a850db83c8038a">
 <!ENTITY grep-home "&gnu-software;grep">
 
 <!ENTITY groff-version "1.22.2">

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/grep.xml      |    4 ++++
 BOOK/final-system/multilib/grep.xml    |    8 ++++++++
 BOOK/introduction/common/changelog.xml |    4 ++++
 BOOK/packages.ent                      |    6 +++---
 4 files changed, 19 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book