[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-sysvinit-240-g43a01c6

[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, sysvinit has been updated
       via  43a01c6d22690c2c1ad568588ddee2d8d09eb7f5 (commit)
       via  b0d10faae1703ab822f343eeeb017f9d330879ab (commit)
      from  c3912ec3e162904fcd5ebc058331023d711db9c5 (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 43a01c6d22690c2c1ad568588ddee2d8d09eb7f5
Author: Chris Staub <chris at beaker67.com>
Date:   Thu Jan 7 03:28:14 2016 -0500

    No need for grep security fix

diff --git a/BOOK/final-system/common/grep.xml b/BOOK/final-system/common/grep.xml
index 0b70a90..7755d47 100644
--- a/BOOK/final-system/common/grep.xml
+++ b/BOOK/final-system/common/grep.xml
@@ -25,10 +25,6 @@
   <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 \
diff --git a/BOOK/final-system/multilib/grep.xml b/BOOK/final-system/multilib/grep.xml
index 2b24a66..71bb569 100644
--- a/BOOK/final-system/multilib/grep.xml
+++ b/BOOK/final-system/multilib/grep.xml
@@ -23,14 +23,6 @@
 
     <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 \
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index b61a218..384b24c 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>07 January 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed command in Grep instructions for security fix
+          that was addressed in latest version.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>28 December 2015</para>
       <itemizedlist>
         <listitem>

commit b0d10faae1703ab822f343eeeb017f9d330879ab
Author: Chris Staub <chris at beaker67.com>
Date:   Thu Jan 7 03:27:38 2016 -0500

    Updated date

diff --git a/BOOK/general.ent b/BOOK/general.ent
index 89b38ea..314be5c 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "12"> <!-- Use two digits -->
-<!ENTITY month_name "December">
-<!ENTITY day "28"> <!-- Use two digits -->
-<!ENTITY year "2015"> <!-- Use four digits -->
+<!ENTITY month "01"> <!-- Use two digits -->
+<!ENTITY month_name "January">
+<!ENTITY day "07"> <!-- Use two digits -->
+<!ENTITY year "2016"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
 

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

Summary of changes:
 BOOK/final-system/common/grep.xml      |    4 ----
 BOOK/final-system/multilib/grep.xml    |    8 --------
 BOOK/general.ent                       |    8 ++++----
 BOOK/introduction/common/changelog.xml |   10 ++++++++++
 4 files changed, 14 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book