From 14accdf2a003f1fe27d710cc8cee7a710cbb4a49 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 27 Jul 2014 22:59:21 +0000
Subject: Update to tar-1.28

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10659 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 8 ++++++--
 chapter03/patches.xml   | 4 ++--
 chapter06/chapter06.xml | 2 +-
 chapter06/tar.xml       | 8 ++++----
 packages.ent            | 6 +++---
 patches.ent             | 3 +++
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dbed74d8b..31115e8a6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,10 @@
     <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>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0e86e302f..9520e4714 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -184,9 +184,9 @@
     <!--<listitem>
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Tar &tar-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>TCL &tcl-version;</para>
     </listitem>-->
@@ -299,6 +299,10 @@
       <para>readline-6.2-fixes-2.patch</para>
     </listitem>
 
+    <listitem>
+      <para>tar-1.27.1-manpage-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>udev 208</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index a509c4c2d..e462a7ac3 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -131,7 +131,7 @@
         <para>MD5 sum: <literal>&sysvinit-consolidated-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/chapter06.xml b/chapter06/chapter06.xml
index 879cccc58..d10b804a5 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -56,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
@@ -76,6 +75,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
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 60dc0a18d..dd4c65230 100644
--- a/packages.ent
+++ b/packages.ent
@@ -577,10 +577,10 @@
 <!ENTITY sysvinit-ch6-du "1.4 MB">
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 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 6a7b73d50..4594297ae 100644
--- a/patches.ent
+++ b/patches.ent
@@ -63,6 +63,9 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb">
 <!ENTITY sysvinit-consolidated-patch-size "3.9 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">
+-->
+
-- 
cgit v1.2.3-54-g00ecf