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

[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  e2745ee8cbfebb78fb9ed8fb0d72e62c3b625bba (commit)
      from  94b2a4795d87fc20b27b64de2f3f8ed93539a005 (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 e2745ee8cbfebb78fb9ed8fb0d72e62c3b625bba
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Fri Sep 18 20:00:12 2015 -0500

    Remove ineffective sed for a security fix which is already applied in version 1.42.13.

diff --git a/BOOK/final-system/common/e2fsprogs.xml b/BOOK/final-system/common/e2fsprogs.xml
index 315870a..91ac10e 100644
--- a/BOOK/final-system/common/e2fsprogs.xml
+++ b/BOOK/final-system/common/e2fsprogs.xml
@@ -28,12 +28,6 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para os="s1">Fix a potential security issue identified upstream:</para>
-
-<screen os="s2"><userinput>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 os="a">The E2fsprogs documentation recommends that the package be
     built in a subdirectory of the source tree:</para>
 
diff --git a/BOOK/final-system/multilib/e2fsprogs-64bit.xml b/BOOK/final-system/multilib/e2fsprogs-64bit.xml
index 2422902..3e5d58c 100644
--- a/BOOK/final-system/multilib/e2fsprogs-64bit.xml
+++ b/BOOK/final-system/multilib/e2fsprogs-64bit.xml
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/e2fsprogs-n32.xml b/BOOK/final-system/multilib/e2fsprogs-n32.xml
index 91addd1..d7c8d2a 100644
--- a/BOOK/final-system/multilib/e2fsprogs-n32.xml
+++ b/BOOK/final-system/multilib/e2fsprogs-n32.xml
@@ -29,14 +29,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/e2fsprogs.xml b/BOOK/final-system/multilib/e2fsprogs.xml
index ae8827c..206d5e5 100644
--- a/BOOK/final-system/multilib/e2fsprogs.xml
+++ b/BOOK/final-system/multilib/e2fsprogs.xml
@@ -24,14 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index b390590..873fd28 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>18 September 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove sed for E2fsprogs. Fixes ticket
+          <ulink url="&clfs-ticket-root;1073">#1073.</ulink></para> 
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>16 September 2015</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/final-system/common/e2fsprogs.xml         |    6 ------
 BOOK/final-system/multilib/e2fsprogs-64bit.xml |    8 --------
 BOOK/final-system/multilib/e2fsprogs-n32.xml   |    8 --------
 BOOK/final-system/multilib/e2fsprogs.xml       |    8 --------
 BOOK/introduction/common/changelog.xml         |   10 ++++++++++
 5 files changed, 10 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book