From 968c7be054bbc38b6472f4f94f4a1924a37fc92a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 30 Jun 2007 14:46:50 +0000
Subject: Upgrade to Tar-1.18.  Fixes #2039.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 661bb9213..eb76cd123 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,10 @@
     <listitem>
       <para>2007-06-30</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Tar-1.18, fixes
+          <ulink url="&lfs-ticket-root;2039">#2039</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Libtool-1.5.24, fixes
           <ulink url="&lfs-ticket-root;2038">#2038</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 97b2916d9..3884419f3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -219,9 +219,6 @@
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
-    <listitem>
-      <para>&tar-sort-exclude-test-patch;</para>
-    </listitem>
     <listitem>
       <para>&util-linux-lseek-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e0f266b5d..7478f8d43 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -218,14 +218,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Tar Sort Exclude Test Patch - <token>&tar-sort-exclude-test-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&tar-sort-exclude-test-patch;"/></para>
-        <para>MD5 sum: <literal>&tar-sort-exclude-test-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Texinfo Multibyte Fixes Patch - <token>&texinfo-multibyte-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 335eefcd9..87c627de8 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -37,14 +37,6 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../chapter06/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../chapter06/tar.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 7f8cd7c9e..4d1d30767 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -34,13 +34,6 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <para os="a">One of the tests in the testsuite (number 12, exclude) fails,
-    at least on recent linux systems, because the output needs to be sorted
-    before it is diffed. If you are going to run the testsuite, fix this by
-    applying the following patch before you configure: </para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&tar-sort-exclude-test-patch;</userinput></screen>
-
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 11dfeb733..2fc3db962 100644
--- a/packages.ent
+++ b/packages.ent
@@ -454,10 +454,10 @@
 <!ENTITY sysvinit-ch6-du "1 MB">
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY tar-version "1.17">
-<!ENTITY tar-size "1,839 KB">
+<!ENTITY tar-version "1.18">
+<!ENTITY tar-size "1,833 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
-<!ENTITY tar-md5 "c6c4f1c075dbf0f75c29737faa58f290">
+<!ENTITY tar-md5 "70170208d7c1bb9ab40120579434b6a3">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "19.9 MB">
 <!ENTITY tar-ch5-sbu "0.3 SBU">
diff --git a/patches.ent b/patches.ent
index dfb709268..053300230 100644
--- a/patches.ent
+++ b/patches.ent
@@ -120,11 +120,6 @@
 <!ENTITY sysklogd-fixes-patch-size "32 KB">
 
 
-<!ENTITY tar-sort-exclude-test-patch "tar-&tar-version;-sort_exclude_test-1.patch">
-<!ENTITY tar-sort-exclude-test-patch-md5 "69326a1d462dad67db495a42854a93c7">
-<!ENTITY tar-sort-exclude-test-patch-size "3.1 KB">
-
-
 <!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch">
 <!ENTITY texinfo-multibyte-patch-md5 "6cb5b760cfdd2dd53a0430eb572a8aaa">
 <!ENTITY texinfo-multibyte-patch-size "1.5 KB">
-- 
cgit v1.2.3-54-g00ecf