From 615a56582820d63d362a15e3f9130a68c1766df2 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 7 Feb 2008 19:47:39 +0000
Subject: Upgrade to Coreutils-6.10. Fixes #2133.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8470 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/chapter06.xml |   1 -
 chapter06/coreutils.xml |  31 +++++++-----
 chapter06/mktemp.xml    | 126 ------------------------------------------------
 3 files changed, 19 insertions(+), 139 deletions(-)
 delete mode 100644 chapter06/mktemp.xml

(limited to 'chapter06')

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index ecd970612..2e59bd4bf 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -56,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="psmisc.xml"/>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 3d8288366..3d7be3c19 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -41,12 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>The version of the function <quote>futimens</quote> used
-    by Coreutils is incompatible with the version that current
-    Glibc provides, so we'll rename the function:</para>
-
-<screen><userinput remap="pre">sed -i 's/futimens/gl_&amp;/' src/{copy,touch}.c lib/utimens.{c,h}</userinput></screen>
-
     <para>A known issue with the <command>uname</command> program from
     this package is that the <parameter>-p</parameter> switch always
     returns <computeroutput>unknown</computeroutput>. The following patch
@@ -54,11 +48,6 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
 
-    <para>Prevent Coreutils from installing binaries that will be installed by
-    other packages later:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
-
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
     fixes this non-compliance and other internationalization-related bugs:</para>
@@ -78,7 +67,20 @@
 
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname --enable-no-install-program=kill</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-no-install-program=kill</parameter></term>
+        <listitem>
+          <para>The purpose of this switch is to prevent Coreutils from
+          installing binaries that will be installed by other packages later.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
 
@@ -100,6 +102,11 @@
 
 <screen><userinput remap="test">echo "dummy:x:1000:nobody" &gt;&gt; /etc/group</userinput></screen>
 
+    <para>Fix some of the permissions so that the non-root user can compile and
+    run the tests:</para>
+
+<screen><userinput remap="test">chown -v nobody gnulib-tests/.deps</userinput></screen>
+
     <para>Now run the tests:</para>
 
 <screen><userinput remap="test">su-tools nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
deleted file mode 100644
index 4a9aac7e4..000000000
--- a/chapter06/mktemp.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <sect1info condition="script">
-    <productname>mktemp</productname>
-    <productnumber>&mktemp-version;</productnumber>
-    <address>&mktemp-url;</address>
-  </sect1info>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Mktemp package contains programs used to create secure temporary
-    files in shell scripts.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&mktemp-ch6-sbu;</seg>
-        <seg>&mktemp-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <para>Many scripts still use the deprecated
-    <command>tempfile</command> program, which has functionality similar
-    to <command>mktemp</command>. Patch Mktemp to include a
-    <command>tempfile</command> wrapper:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen>
-
-    <para>Prepare Mktemp for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr --with-libc</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-libc</parameter></term>
-        <listitem>
-          <para>This causes the <command>mktemp</command> program to use the
-          <emphasis>mkstemp</emphasis> and <emphasis>mkdtemp</emphasis>
-          functions from the system C library instead of its own implementation
-          of them. </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install
-make install-tempfile</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-mktemp" role="content">
-    <title>Contents of Mktemp</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>mktemp and tempfile</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mktemp">
-        <term><command>mktemp</command></term>
-        <listitem>
-          <para>Creates temporary files in a secure manner; it is used in
-          scripts</para>
-          <indexterm zone="ch-system-mktemp mktemp">
-            <primary sortas="b-mktemp">mktemp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tempfile">
-        <term><command>tempfile</command></term>
-        <listitem>
-          <para>Creates temporary files in a less secure manner than
-          <command>mktemp</command>; it is installed for
-          backwards-compatibility</para>
-          <indexterm zone="ch-system-mktemp tempfile">
-            <primary sortas="b-tempfile">tempfile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
-- 
cgit v1.2.3-54-g00ecf