Merge lfs svn.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10660 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

8 files changed, 51 insertions, 33 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bb4fbcb6e..b59defd6d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,23 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-07-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tar-1.28. Fixes
+          <ulink url="&lfs-ticket-root;3642">#3642</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Instruct perl to use the system bzip2 library.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to check-0.9.14. Fixes
+          <ulink url="&lfs-ticket-root;3641">#3641</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-07-26</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f4fc87d26..a184c73c7 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -196,9 +196,9 @@
     <listitem>
       <para>Systemd &systemd-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Tar &tar-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>TCL &tcl-version;</para>
     </listitem>-->
@@ -278,6 +278,10 @@
       <para>readline-6.2-fixes-2.patch</para>
     </listitem>
 
+    <listitem>
+      <para>tar-1.27.1-manpage-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 712f1b218..243e4bc63 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -131,7 +131,7 @@
         <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Tar Manpage Patch - <token>&tar-manpage-patch-size;</token>:</term>
       <listitem>
@@ -139,7 +139,7 @@
         <para>MD5 sum: <literal>&tar-manpage-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 7212860f1..b1fed57f9 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,11 +44,6 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>First fix a problem with running regression tests in the LFS chroot
-    environment:</para>
-
-<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
-
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
@@ -121,13 +116,12 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To set up the test suite we need to temporarily copy
-    a library from /tools/lib so the test programs can find it. 
+    <para>To set up and run the test suite we need to first link some 
+    libraries from /tools/lib to a location where the test programs look.
     To run the tests, issue:</para>
 
-<screen><userinput remap="test">cp -v /tools/lib/libblkid.so.1 /lib
-make check
-rm -v /lib/libblkid.so.1</userinput></screen>
+<screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
+make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
 
     <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
     If you do not have significantly more RAM than this, be sure to enable
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 645016932..170aa2388 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -47,15 +47,14 @@
 
 <screen><userinput remap="pre">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
-    <para>This version of Perl now builds the Compress::Raw::Zlib module. By
-    default Perl will use an internal copy of the Zlib source for the build.
-    Issue the following command so that Perl will use the Zlib library
+    <para>This version of Perl now builds the Compress::Raw::Zlib ane 
+    Compress::Raw::BZip2 modules. By
+    default Perl will use an internal copy of the sources for the build.
+    Issue the following command so that Perl will use the libraries
     installed on the system:</para>
 
-<screen><userinput remap="pre">sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|"           \
-       -e "s|INCLUDE\s*= ./zlib-src|INCLUDE    = /usr/include|" \
-       -e "s|LIB\s*= ./zlib-src|LIB        = /usr/lib|"         \
-    cpan/Compress-Raw-Zlib/config.in</userinput></screen>
+<screen><userinput remap="pre">export BUILD_ZLIB=False
+export BUILD_BZIP2=0</userinput></screen>
 
     <para>To have full control over the way Perl is set up, you can remove the
     <quote>-des</quote> options from the following command and hand-pick the way
@@ -115,9 +114,10 @@
 
 <screen><userinput remap="test">make -k test</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and clean up:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index c3c3c0738..ee69bad86 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -39,11 +39,11 @@
 
   <sect2 role="installation">
     <title>Installation of Tar</title>
-
+<!--
     <para>Add a program that generates a man page for tar from the source code:</para>
  
  <screen><userinput remap="pre">patch -Np1 -i ../&tar-manpage-patch;</userinput></screen>
-
+-->
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1  \
@@ -76,11 +76,11 @@
 
 <screen><userinput remap="install">make install
 make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
-
+<!--
     <para>Finally, generate the man page and place it in the proper location:</para>
 
 <screen><userinput remap="install">perl tarman &gt; /usr/share/man/man1/tar.1</userinput></screen>
-
+-->
   </sect2>
 
 
diff --git a/packages.ent b/packages.ent
index 4c78743e2..a4a119159 100644
--- a/packages.ent
+++ b/packages.ent
@@ -92,10 +92,10 @@
 <!ENTITY bzip2-ch6-du "6.9 MB">
 <!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY check-version "0.9.13">
-<!ENTITY check-size "736 KB">
+<!ENTITY check-version "0.9.14">
+<!ENTITY check-size "741 KB">
 <!ENTITY check-url "http://sourceforge.net/projects/check/files/check/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "95530868f81a9496b2518fd2b713008a">
+<!ENTITY check-md5 "38263d115d784c17aa3b959ce94be8b8">
 <!ENTITY check-home "http://check.sourceforge.net/">
 <!ENTITY check-ch5-du "6.9 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
@@ -550,10 +550,10 @@
 <!ENTITY systemd-ch6-du  "518 MB">
 <!ENTITY systemd-ch6-sbu "5.8 SBU">
 
-<!ENTITY tar-version "1.27.1">
-<!ENTITY tar-size "1,835 KB">
+<!ENTITY tar-version "1.28">
+<!ENTITY tar-size "1,921 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
-<!ENTITY tar-md5 "e0382a4064e09a4943f3adeff1435978">
+<!ENTITY tar-md5 "49b6306167724fe48f419a33a5beb857">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "20.6 MB">
 <!ENTITY tar-ch5-sbu "0.4 SBU">
diff --git a/patches.ent b/patches.ent
index a10c3001e..21ccaf01e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -63,6 +63,9 @@
 <!ENTITY systemd-compat-patch-md5 "657a996c67d4a9fbad394ee5aa1b1f34">
 <!ENTITY systemd-compat-patch-size "12 KB">
 
+<!--
 <!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
 <!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156">
 <!ENTITY tar-manpage-patch-size "7.8 KB">
+-->
+