From 64af1f62ed0e2885b15def4ecbaafc706bd70b6c Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 10 Nov 2010 22:23:21 +0000
Subject: [PATCH] Upgrade to Tar-1.25 and install its HTML documentation. Fixes
 #2777 and #2786.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 46cbbf2ce..5e3902327 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,18 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-11-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Tar-1.25, and also install its HTML
+          documentation. Fixes
+          <ulink url="&lfs-ticket-root;2777">#2777</ulink> and
+          <ulink url="&lfs-ticket-root;2786">#2786</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-10-27</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1888675ba..394c4b93a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -181,9 +181,9 @@
     <!--<listitem>
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Tar &tar-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>TCL &tcl-version;</para>
     </listitem>
@@ -272,6 +272,10 @@
       <para>perl-5.12.1-libc-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>tar-1.23-overflow-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6a1df4b4f..2b393b2ae 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -180,14 +180,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Tar Overflow Patch - <token>&tar-overflow-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&tar-overflow-patch;"/></para>
-        <para>MD5 sum: <literal>&tar-overflow-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <!-- <varlistentry>
       <term>Shadow Useradd Patch - <token>&shadow-useradd-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 731166a71..002dc228f 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -43,10 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <para>First fix a bug that was inserted into the latest code release:</para>
-
-<screen><userinput remap="pre">sed -i /SIGPIPE/d src/tar.c</userinput></screen>
-
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 52176566f..7fed883e5 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -40,18 +40,23 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <para>Again, fix a bug that was inserted into the latest code release:</para>
-
-<screen><userinput remap="pre">sed -i /SIGPIPE/d src/tar.c</userinput></screen>
-
-    <para>Also, fix a bug that causes a buffer overflow when creating a new
-    tar file.  This fix is needed when building with gcc-4.5 and later.</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&tar-overflow-patch;</userinput></screen>
-
     <para>Prepare Tar for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
+        <listitem>
+          <para>This forces the test for <function>mknod</function> to be run
+          as root.  It is generally considered dangerous to run this test as
+          the root user, but as it is being run on an only partially built
+          system, overriding it is OK.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
 
@@ -59,13 +64,12 @@
 
     <para>To test the results (about 1 SBU), issue:</para>
 
-<screen><userinput remap="test">sed -i '35 i\
-AT_UNPRIVILEGED_PREREQ' tests/remfiles01.at
-make check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
 
   </sect2>
 
diff --git a/general.ent b/general.ent
index 3933616fb..352f1cfd1 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20101029">
-<!ENTITY releasedate "October 29, 2010">
+<!ENTITY version "SVN-20101110">
+<!ENTITY releasedate "November 10, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index ad1efb27b..048060653 100644
--- a/packages.ent
+++ b/packages.ent
@@ -485,10 +485,10 @@
 <!ENTITY sysvinit-ch6-du "1 MB">
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY tar-version "1.23">
-<!ENTITY tar-size "2,138 KB">
+<!ENTITY tar-version "1.25">
+<!ENTITY tar-size "2,273 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
-<!ENTITY tar-md5 "41e2ca4b924ec7860e51b43ad06cdb7e">
+<!ENTITY tar-md5 "6e497f861c77bbba2f7da4e10270995b">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "20.9 MB">
 <!ENTITY tar-ch5-sbu "0.3 SBU">