[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-59-g7b1982e

[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  7b1982e29b795f8a2604fcb46342e4fac84b95e4 (commit)
      from  c02c97a3c722518788489b7c090754a3baffe9f2 (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 7b1982e29b795f8a2604fcb46342e4fac84b95e4
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 02fce6d..62b83ff 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