Author: matthew
Date: 2008-02-07 12:47:39 -0700 (Thu, 07 Feb 2008)
New Revision: 8470
Removed:
trunk/BOOK/chapter06/mktemp.xml
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter03/patches.xml
trunk/BOOK/chapter05/coreutils.xml
trunk/BOOK/chapter05/perl.xml
trunk/BOOK/chapter06/chapter06.xml
trunk/BOOK/chapter06/coreutils.xml
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Log:
Upgrade to Coreutils-6.10. Fixes #2133.
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter01/changelog.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -40,6 +40,13 @@
<para>2008-02-07</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgraded to Coreutils-6.10. Removed Mktemp-1.5 as
+ Coreutils provides its own implementation now. Removed the coreutils
+ binary suppression patch as the configure script can now be given a
+ list of programs not to install. Fixes
+ <ulink url="&lfs-ticket-root;2133">#2133</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgraded to E2fsprogs-1.40.5. Fixes
<ulink url="&lfs-ticket-root;2138">#2138</ulink>.</para>
</listitem>
Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter03/patches.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -51,14 +51,6 @@
</varlistentry>
<varlistentry>
- <term>Coreutils Suppress Uptime, Kill, Su Patch -
<token>&coreutils-suppress-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
url="&patches-root;&coreutils-suppress-patch;"/></para>
- <para>MD5 sum: <literal>&coreutils-suppress-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Coreutils Uname Patch -
<token>&coreutils-uname-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&coreutils-uname-patch;"/></para>
Modified: trunk/BOOK/chapter05/coreutils.xml
===================================================================
--- trunk/BOOK/chapter05/coreutils.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter05/coreutils.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -43,18 +43,22 @@
<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>
+ <para>Prepare Coreutils for compilation:</para>
-<screen><userinput remap="pre">for file in src/{copy,touch}.c
lib/utimens.{c,h} ; do \
- cp -v $file{,.orig}
- sed 's/futimens/gl_&/' $file.orig > $file
-done</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools
--enable-install-program=hostname</userinput></screen>
- <para>Prepare Coreutils for compilation:</para>
+ <variablelist>
+ <title>The meaning of the configure options:</title>
-<screen><userinput remap="configure">./configure
--prefix=/tools</userinput></screen>
+ <varlistentry>
+ <term><envar>--enable-install-program=hostname</envar></term>
+ <listitem>
+ <para>This enables the <command>hostname</command> binary to be built
+ and installed – it is disabled by default but is required by
the
+ Perl test suite.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>Compile the package:</para>
Modified: trunk/BOOK/chapter05/perl.xml
===================================================================
--- trunk/BOOK/chapter05/perl.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter05/perl.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -73,10 +73,10 @@
</variablelist>
- <para>Only a few of the utilities contained in this package need to be
- built:</para>
+ <para>Only a few of the utilities contained in this package, and one of its
+ libraries need to be built:</para>
-<screen><userinput remap="make">make perl utilities</userinput></screen>
+<screen><userinput remap="make">make perl utilities
ext/Errno/pm_to_blib</userinput></screen>
<para>Although Perl comes with a test suite, it is not recommended to
run it at this point. Only part of Perl was built and running
Modified: trunk/BOOK/chapter06/chapter06.xml
===================================================================
--- trunk/BOOK/chapter06/chapter06.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter06/chapter06.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -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"/>
Modified: trunk/BOOK/chapter06/coreutils.xml
===================================================================
--- trunk/BOOK/chapter06/coreutils.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter06/coreutils.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -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_&/'
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,8 +67,21 @@
<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>
<screen><userinput remap="make">make</userinput></screen>
@@ -100,6 +102,11 @@
<screen><userinput remap="test">echo "dummy:x:1000:nobody" >>
/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>
Deleted: trunk/BOOK/chapter06/mktemp.xml
===================================================================
--- trunk/BOOK/chapter06/mktemp.xml 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/chapter06/mktemp.xml 2008-02-07 19:47:39 UTC (rev 8470)
@@ -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>
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/packages.ent 2008-02-07 19:47:39 UTC (rev 8470)
@@ -72,10 +72,10 @@
<!ENTITY bzip2-ch6-du "5.3 MB">
<!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
-<!ENTITY coreutils-version "6.9">
-<!ENTITY coreutils-size "5,258 KB">
-<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2">
-<!ENTITY coreutils-md5 "c9607d8495f16e98906e7ed2d9751a06">
+<!ENTITY coreutils-version "6.10">
+<!ENTITY coreutils-size "8,978 KB">
+<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
+<!ENTITY coreutils-md5 "eca0de1bf7389694305d7e52cd76a472">
<!ENTITY coreutils-home "&gnu-software;coreutils/">
<!ENTITY coreutils-ch5-du "67.6 MB">
<!ENTITY coreutils-ch5-sbu "0.5 SBU">
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2008-02-07 19:35:36 UTC (rev 8469)
+++ trunk/BOOK/patches.ent 2008-02-07 19:47:39 UTC (rev 8470)
@@ -17,13 +17,9 @@
<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "806ce5bcb16a763a77bea411ec5ff637">
-<!ENTITY coreutils-i18n-patch-size "101 KB">
+<!ENTITY coreutils-i18n-patch-md5 "791df67d25a45d846c1af4dadf2612c8">
+<!ENTITY coreutils-i18n-patch-size "102 KB">
-<!ENTITY coreutils-suppress-patch
"coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
-<!ENTITY coreutils-suppress-patch-md5 "e8ae92cdec364ca2a318f5c4c77bf032">
-<!ENTITY coreutils-suppress-patch-size "13 KB">
-
<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
<!ENTITY coreutils-uname-patch-md5 "c05b735710fbd62239588c07084852a0">
<!ENTITY coreutils-uname-patch-size "4.6 KB">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
