[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-sysvinit-251-g204c846

[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  204c846c35984cacee551331ab78935f396b2e62 (commit)
      from  0b0775af56b788f2bbd04d8c2e0cf073628c828a (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 204c846c35984cacee551331ab78935f396b2e62
Author: Chris Staub <chris at beaker67.com>
Date:   Fri Feb 19 23:38:23 2016 -0500

    Prevent bashbug from being installed to /bin

diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index c3225c5..b72fc6c 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -33,7 +33,6 @@
 
 <screen os="b"><userinput>./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --without-bash-malloc \
     --with-installed-readline \
     --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
@@ -64,12 +63,18 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="i">Run the newly compiled <command>bash</command> program (replacing
+    <para os="i">Move the <command>bash</command> binary to
+    <filename class="directory">/bin</filename>, overwriting the symlink
+    that was previously created:</para>
+
+<screen os="j"><userinput>mv -v /usr/bin/bash /bin</userinput></screen>
+
+    <para os="k">Run the newly compiled <command>bash</command> program (replacing
     the one that is currently being executed):</para>
 
-<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+<screen os="l" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
 
-    <note os="k">
+    <note os="m">
       <para>The parameters used make the <command>bash</command>
       process an interactive login shell and continue to disable hashing so
       that new programs are found as they become available.</para>
diff --git a/BOOK/final-system/multilib/bash.xml b/BOOK/final-system/multilib/bash.xml
index 91c02ce..06ffa3f 100644
--- a/BOOK/final-system/multilib/bash.xml
+++ b/BOOK/final-system/multilib/bash.xml
@@ -41,7 +41,6 @@
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
 ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --without-bash-malloc \
     --with-installed-readline \
     --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
@@ -86,6 +85,14 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
   </sect2>
 
   <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 5be61ad..f5a58d0 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -54,6 +54,12 @@
           ticket
           <ulink url="&clfs-ticket-root;1104">#1104.</ulink></para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Prevented the <command>bashbug</command> script
+          from being installed in <filename class="directory">/bin</filename>,
+          as it is not needed there. Fixes ticket
+          <ulink url="&clfs-ticket-root;1099">#1099.</ulink></para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

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

Summary of changes:
 BOOK/final-system/common/bash.xml      |   13 +++++++++----
 BOOK/final-system/multilib/bash.xml    |    9 ++++++++-
 BOOK/introduction/common/changelog.xml |    6 ++++++
 3 files changed, 23 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book