[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-rc1-systemd-64-g7f5eda5

[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  7f5eda562b35cb81aef43b9b946b159bd2daf7e6 (commit)
      from  7eea5e4ca099d8d9eff4486ed0ab7a5680b44213 (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 7f5eda562b35cb81aef43b9b946b159bd2daf7e6
Author: Chris Staub <chris at beaker67.com>
Date:   Sun Aug 17 01:23:33 2014 -0400

    Consolidated sed commands

diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index ab3f563..8120ed9 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -22,38 +22,37 @@
   <sect2 role="installation">
     <title>Installation of Shadow</title>
 
-    <para os="a">Disable the installation of the <command>groups</command> and
-    <command>nologin</command> programs, as better versions
-    of these programs are provided by Coreutils and Util-linux:</para>
+    <para os="a">Run the following <command>sed</command> command to disable
+    the installation of the <command>groups</command> and
+    <command>nologin</command> programs, as better versions of these programs
+    are provided by other packages, and prevent Shadow from setting the suid
+    bit on its installed programs:</para>
 
 <screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
+sed -e 's/groups$(EXEEXT) //' \
+    -e 's/= nologin$(EXEEXT)/= /' \
+    -e 's/\(^suidu*bins = \).*/\1/' \
     src/Makefile.in.orig > src/Makefile.in</userinput></screen>
 
-    <para os="c">Prevent Shadow from setting installed programs suid:</para>
-
-<screen os="d"><userinput>cp -v src/Makefile.in{,.orig}
-sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
-
-    <para os="e">Tell Shadow to use <command>passwd</command> in
+    <para os="c">Tell Shadow to use <command>passwd</command> in
     <filename class="directory">/tools/bin</filename>:</para>
 
-<screen os="f"><userinput>cat > config.cache << "EOF"
+<screen os="d"><userinput>cat > config.cache << "EOF"
 shadow_cv_passwd_dir=/tools/bin
 EOF</userinput></screen>
 
-    <para os="g">Prepare Shadow for compilation:</para>
+    <para os="e">Prepare Shadow for compilation:</para>
 
-<screen os="h"><userinput>./configure --prefix=/tools \
+<screen os="f"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
-    <para os="i">Compile the package:</para>
+    <para os="g">Compile the package:</para>
 
-<screen os="j"><userinput>make</userinput></screen>
+<screen os="h"><userinput>make</userinput></screen>
 
-    <para os="k">Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen os="l"><userinput>make install</userinput></screen>
+<screen os="j"><userinput>make install</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index f7420e3..619438e 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>17 August 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Combined Makefile modification commands in
+          Boot section Shadow install into one command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>14 August 2014</para>
       <itemizedlist>
         <listitem>

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

Summary of changes:
 BOOK/boot/common/shadow.xml            |   33 +++++++++++++++----------------
 BOOK/introduction/common/changelog.xml |   10 +++++++++
 2 files changed, 26 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book