Remove lfs-utils in favor of mktemp & iana-etc.

Zack Winkles winkie at linuxfromscratch.org
Sun Mar 21 20:24:25 PST 2004


Attached two patches to do exact what the subject says.  One is against
what is currently HEAD, and the other is against the newxml branch.  Now
nobody can complain that another inconsistency has been introduced.

-------------- next part --------------
diff -Naur lfs-book.orig/appendixa/appendixa.xml lfs-book/appendixa/appendixa.xml
--- lfs-book.orig/appendixa/appendixa.xml	2004-01-27 17:29:45.000000000 -0500
+++ lfs-book/appendixa/appendixa.xml	2004-03-21 21:40:24.839051928 -0500
@@ -27,10 +27,10 @@
 <listitem><para><xref linkend="ch-system-groff"/></para></listitem>
 <listitem><para><xref linkend="ch-system-grub"/></para></listitem>
 <listitem><para><xref linkend="ch-system-gzip"/></para></listitem>
+<listitem><para><xref linkend="ch-system-iana-etc"/></para></listitem>
 <listitem><para><xref linkend="ch-system-inetutils"/></para></listitem>
 <listitem><para><xref linkend="ch-system-kbd"/></para></listitem>
 <listitem><para><xref linkend="ch-system-less"/></para></listitem>
-<listitem><para><xref linkend="ch-system-lfs-utils"/></para></listitem>
 <listitem><para><xref linkend="ch-system-libtool"/></para></listitem>
 <listitem><para><xref linkend="ch-bootable-kernel"/></para></listitem>
 <listitem><para><xref linkend="ch-system-m4"/></para></listitem>
@@ -38,6 +38,7 @@
 <listitem><para><xref linkend="ch-system-MAKEDEV"/></para></listitem>
 <listitem><para><xref linkend="ch-system-man"/></para></listitem>
 <listitem><para><xref linkend="ch-system-man-pages"/></para></listitem>
+<listitem><para><xref linkend="ch-system-mktemp"/></para></listitem>
 <listitem><para><xref linkend="ch-system-modutils"/></para></listitem>
 <listitem><para><xref linkend="ch-system-ncurses"/></para></listitem>
 <listitem><para><xref linkend="ch-system-net-tools"/></para></listitem>
diff -Naur lfs-book.orig/appendixa/iana-etc-dep.xml lfs-book/appendixa/iana-etc-dep.xml
--- lfs-book.orig/appendixa/iana-etc-dep.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/iana-etc-dep.xml	2004-03-21 21:21:18.358343488 -0500
@@ -0,0 +1 @@
+<para>The installation dependencies for Iana-Etc haven't been checked yet.</para>
diff -Naur lfs-book.orig/appendixa/iana-etc-down.xml lfs-book/appendixa/iana-etc-down.xml
--- lfs-book.orig/appendixa/iana-etc-down.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/iana-etc-down.xml	2004-03-21 21:22:51.827134072 -0500
@@ -0,0 +1,2 @@
+<literallayout>Official download location for Iana-Etc (&iana-etc-version;):
+<ulink url="http://www.sethwklein.net/projects/iana-etc/"/></literallayout>
diff -Naur lfs-book.orig/appendixa/iana-etc-shortdesc.xml lfs-book/appendixa/iana-etc-shortdesc.xml
--- lfs-book.orig/appendixa/iana-etc-shortdesc.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/iana-etc-shortdesc.xml	2004-03-21 21:23:10.371314928 -0500
@@ -0,0 +1,7 @@
+<sect2><title> </title><para> </para></sect2>
+
+<sect2 id="contents-iana-etc"><title>Contents of Iana-Etc</title>
+
+<para><emphasis>Installed files</emphasis>: protocols, services</para>
+
+</sect2>
diff -Naur lfs-book.orig/appendixa/lfs-utils-dep.xml lfs-book/appendixa/lfs-utils-dep.xml
--- lfs-book.orig/appendixa/lfs-utils-dep.xml	2004-01-12 18:23:37.000000000 -0500
+++ lfs-book/appendixa/lfs-utils-dep.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-<para>The installation dependencies for Lfs-Utils haven't been checked yet.</para>
diff -Naur lfs-book.orig/appendixa/lfs-utils-desc.xml lfs-book/appendixa/lfs-utils-desc.xml
--- lfs-book.orig/appendixa/lfs-utils-desc.xml	2004-02-01 16:49:06.000000000 -0500
+++ lfs-book/appendixa/lfs-utils-desc.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-<sect2><title>Short descriptions</title>
-
-<para><command>mktemp</command> creates temporary files in a secure manner.
-It is used in scripts.</para>
-
-<para><command>tempfile</command> creates temporary files in a less secure
-manner than <command>mktemp</command>. It is installed for
-backwards-compatibility.</para>
-
-<para>The <command>http-get</command> script takes advantage of a little known
-feature of <command>bash</command> called "net redirection". It is used to
-download from websites without using any other programs.</para>
-
-<para><command>iana-net</command> uses the <command>http-get</command>
-script to simplify the process of procuring IANA's services and protocols
-configuration files.</para>
-
-</sect2>
diff -Naur lfs-book.orig/appendixa/lfs-utils-down.xml lfs-book/appendixa/lfs-utils-down.xml
--- lfs-book.orig/appendixa/lfs-utils-down.xml	2004-02-03 17:18:03.000000000 -0500
+++ lfs-book/appendixa/lfs-utils-down.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-<literallayout>Official download location for Lfs-Utils (&lfs-utils-version;):
-<ulink url="&lfs-root;~winkie/downloads/lfs-utils/"/></literallayout>
diff -Naur lfs-book.orig/appendixa/lfs-utils-shortdesc.xml lfs-book/appendixa/lfs-utils-shortdesc.xml
--- lfs-book.orig/appendixa/lfs-utils-shortdesc.xml	2004-01-12 18:23:37.000000000 -0500
+++ lfs-book/appendixa/lfs-utils-shortdesc.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-<sect2><title> </title><para> </para></sect2>
-
-<sect2 id="contents-lfs"><title>Contents of Lfs-Utils</title>
-
-<para><emphasis>Installed programs</emphasis>: mktemp, tempfile, http-get
-and iana-net</para>
-
-<para><emphasis>Installed files</emphasis>: protocols, services</para>
-
-</sect2>
diff -Naur lfs-book.orig/appendixa/mktemp-dep.xml lfs-book/appendixa/mktemp-dep.xml
--- lfs-book.orig/appendixa/mktemp-dep.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/mktemp-dep.xml	2004-03-21 20:48:57.165449664 -0500
@@ -0,0 +1 @@
+<para>The installation dependencies for Mktemp haven't been checked yet.</para>
diff -Naur lfs-book.orig/appendixa/mktemp-desc.xml lfs-book/appendixa/mktemp-desc.xml
--- lfs-book.orig/appendixa/mktemp-desc.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/mktemp-desc.xml	2004-03-21 20:49:38.695136192 -0500
@@ -0,0 +1,10 @@
+<sect2><title>Short descriptions</title>
+
+<para><command>mktemp</command> creates temporary files in a secure manner.
+It is used in scripts.</para>
+
+<para><command>tempfile</command> creates temporary files in a less secure
+manner than <command>mktemp</command>. It is installed for
+backwards-compatibility.</para>
+
+</sect2>
diff -Naur lfs-book.orig/appendixa/mktemp-down.xml lfs-book/appendixa/mktemp-down.xml
--- lfs-book.orig/appendixa/mktemp-down.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/mktemp-down.xml	2004-03-21 21:11:40.498191584 -0500
@@ -0,0 +1,4 @@
+<literallayout>Official download location for Mktemp (&mktemp-version;):
+<ulink url="ftp://ftp.mktemp.org/pub/mktemp/"/>
+And for the patch:
+<ulink url="&patches-root;&mktemp-patch;"/></literallayout>
diff -Naur lfs-book.orig/appendixa/mktemp-shortdesc.xml lfs-book/appendixa/mktemp-shortdesc.xml
--- lfs-book.orig/appendixa/mktemp-shortdesc.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/appendixa/mktemp-shortdesc.xml	2004-03-21 21:00:36.363155456 -0500
@@ -0,0 +1,7 @@
+<sect2><title> </title><para> </para></sect2>
+
+<sect2 id="contents-mktemp"><title>Contents of Mktemp</title>
+
+<para><emphasis>Installed programs</emphasis>: mktemp, tempfile</para>
+
+</sect2>
diff -Naur lfs-book.orig/appendixb/appendixb.xml lfs-book/appendixb/appendixb.xml
--- lfs-book.orig/appendixb/appendixb.xml	2004-01-27 17:29:45.000000000 -0500
+++ lfs-book/appendixb/appendixb.xml	2004-03-21 21:25:18.874779432 -0500
@@ -212,9 +212,7 @@
 <listitem><para>hostname : <xref linkend="ch-system-net-tools"/></para></listitem>
 <listitem><para>hostname : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>hpftodit : <xref linkend="ch-system-groff"/></para></listitem>
-<listitem><para>http-get : <xref linkend="ch-system-lfs-utils"/></para></listitem>
 <listitem><para>hwclock : <xref linkend="ch-system-util-linux"/></para></listitem>
-<listitem><para>iana-net : <xref linkend="ch-system-lfs-utils"/></para></listitem>
 <listitem><para>iconv : <xref linkend="ch-system-glibc"/></para></listitem>
 <listitem><para>iconvconfig : <xref linkend="ch-system-glibc"/></para></listitem>
 <listitem><para>id : <xref linkend="ch-system-coreutils"/></para></listitem>
@@ -367,7 +365,7 @@
 <listitem><para>mknod : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>mkpasswd : <xref linkend="ch-system-shadow"/></para></listitem>
 <listitem><para>mkswap : <xref linkend="ch-system-util-linux"/></para></listitem>
-<listitem><para>mktemp : <xref linkend="ch-system-lfs-utils"/></para></listitem>
+<listitem><para>mktemp : <xref linkend="ch-system-mktemp"/></para></listitem>
 <listitem><para>mk_cmds : <xref linkend="ch-system-e2fsprogs"/></para></listitem>
 <listitem><para>mmroff : <xref linkend="ch-system-groff"/></para></listitem>
 <listitem><para>modinfo : <xref linkend="ch-system-modutils"/></para></listitem>
@@ -572,7 +570,7 @@
 <listitem><para>tee : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>telinit : <xref linkend="ch-system-sysvinit"/></para></listitem>
 <listitem><para>telnet : <xref linkend="ch-system-inetutils"/></para></listitem>
-<listitem><para>tempfile : <xref linkend="ch-system-lfs-utils"/></para></listitem>
+<listitem><para>tempfile : <xref linkend="ch-system-mktemp"/></para></listitem>
 <listitem><para>template : <xref linkend="ch-system-lfs-bootscripts"/></para></listitem>
 <listitem><para>test : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>test.bash : <xref linkend="ch-system-util-linux"/></para></listitem>
diff -Naur lfs-book.orig/chapter01/changelog.xml lfs-book/chapter01/changelog.xml
--- lfs-book.orig/chapter01/changelog.xml	2004-03-14 16:53:12.000000000 -0500
+++ lfs-book/chapter01/changelog.xml	2004-03-21 21:32:07.859604288 -0500
@@ -15,7 +15,6 @@
 <listitem><para>Upgraded to:</para>
 <itemizedlist>
 <listitem><para>less-382</para></listitem>
-<listitem><para>lfs-utils-0.5</para></listitem>
 <listitem><para>linux-2.4.25</para></listitem>
 <listitem><para>man-pages-1.66</para></listitem>
 <listitem><para>ncurses-5.4</para></listitem>
@@ -25,17 +24,23 @@
 
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>iana-etc-1.00</para></listitem>
 <listitem><para>make_devices-1.2</para></listitem>
+<listitem><para>mktemp-1.5</para></listitem>
 </itemizedlist>
 </listitem>
  
 <listitem><para>Removed:</para>
 <itemizedlist>
+<listitem><para>lfs-utils-0.5</para></listitem>
 <listitem><para>MAKEDEV-1.7</para></listitem>
 <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>March 21st, 2004 [winkie]: Chapter 6 - Replaced Lfs-Utils
+with Iana-Etc and Mktemp.</para></listitem>
+
 <listitem><para>March 9th, 2004 [alex]: Chapter 6 - Removed --login from the
 chroot commands.</para></listitem>
 
diff -Naur lfs-book.orig/chapter03/chapter03.xml lfs-book/chapter03/chapter03.xml
--- lfs-book.orig/chapter03/chapter03.xml	2004-03-07 07:09:30.000000000 -0500
+++ lfs-book/chapter03/chapter03.xml	2004-03-21 21:42:11.994761784 -0500
@@ -140,6 +140,9 @@
 Gzip (&gzip-version;) - &gzip-size;:
 <ulink url="ftp://alpha.gnu.org/gnu/gzip/"/>
 
+Iana-Etc (&iana-etc-version;) - &iana-etc-size;:
+<ulink url="http://freshmeat.net/projects/iana-etc/"/>
+
 Inetutils (&inetutils-version;) - &inetutils-size;:
 <ulink url="http://freshmeat.net/projects/inetutils/"/>
 
@@ -152,9 +155,6 @@
 LFS-Bootscripts (&bootscripts-version;) - &bootscripts-size;:
 <ulink url="&http-down;lfs-bootscripts-&bootscripts-version;.tar.bz2"/>
 
-Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;:
-<ulink url="&lfs-root;~winkie/downloads/lfs-utils/"/>
-
 Libtool (&libtool-version;) - &libtool-size;:
 <ulink url="http://freshmeat.net/projects/libtool/"/>
 
@@ -176,6 +176,9 @@
 Man-pages (&man-pages-version;) - &man-pages-size;:
 <ulink url="http://freshmeat.net/projects/man-pages/"/>
 
+Mktemp (&mktemp-version;) - &mktemp-version;:
+<ulink url="http://freshmeat.net/projects/mktemp/"/>
+
 Modutils (&modutils-version;) - &modutils-size;:
 <ulink url="http://freshmeat.net/projects/modutils/"/>
 
@@ -306,6 +309,9 @@
 Man 80-Columns Patch - &man-80cols-patch-size;:
 <ulink url="&patches-root;&man-80cols-patch;"/>
 
+Mktemp Tempfile Patch - &mktemp-patch-size;:
+<ulink url="&patches-root;&mktemp-patch;"/>
+
 Net-tools Mii-Tool-Gcc33 Patch - &net-tools-mii-patch-size;:
 <ulink url="&patches-root;&net-tools-mii-patch;"/>
 
diff -Naur lfs-book.orig/chapter06/chapter06.xml lfs-book/chapter06/chapter06.xml
--- lfs-book.orig/chapter06/chapter06.xml	2004-03-14 16:53:12.000000000 -0500
+++ lfs-book/chapter06/chapter06.xml	2004-03-21 21:35:02.182103240 -0500
@@ -473,7 +473,8 @@
 
 &c6-coreutils;
 &c6-zlib;
-&c6-lfs-utils;
+&c6-mktemp;
+&c6-iana-etc;
 &c6-findutils;
 &c6-gawk;
 &c6-ncurses;
diff -Naur lfs-book.orig/chapter06/iana-etc.xml lfs-book/chapter06/iana-etc.xml
--- lfs-book.orig/chapter06/iana-etc.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/chapter06/iana-etc.xml	2004-03-21 21:18:42.844985112 -0500
@@ -0,0 +1,32 @@
+<sect1 id="ch-system-iana-etc" xreflabel="Iana-Etc">
+<title>Installing Iana-Etc-&iana-etc-version;</title>
+<?dbhtml filename="iana-etc.html" dir="chapter06"?>
+
+<para>The Iana-Etc package contains network services and protocols data.</para>
+
+<screen>&buildtime; &iana-etc-time;
+&diskspace; &iana-etc-compsize;</screen>
+
+&aa-iana-etc-down;
+&aa-iana-etc-dep;
+
+<sect2><title> </title><para> </para></sect2>
+
+<sect2>
+<title>Installation of Iana-Etc</title>
+
+<para>Parse the data:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+&aa-iana-etc-shortdesc;
+&aa-iana-etc-desc;
+
+</sect1>
+
diff -Naur lfs-book.orig/chapter06/lfs-utils.xml lfs-book/chapter06/lfs-utils.xml
--- lfs-book.orig/chapter06/lfs-utils.xml	2004-02-01 16:49:07.000000000 -0500
+++ lfs-book/chapter06/lfs-utils.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
-<sect1 id="ch-system-lfs-utils" xreflabel="Lfs-Utils">
-<title>Installing Lfs-Utils-&lfs-utils-version;</title>
-<?dbhtml filename="lfs-utils.html" dir="chapter06"?>
-
-<para>The Lfs-Utils package contains a few helper files.</para>
-
-<screen>&buildtime; &lfs-utils-time;
-&diskspace; &lfs-utils-compsize;</screen>
-
-&aa-lfs-utils-down;
-&aa-lfs-utils-dep;
-
-<sect2><title> </title><para> </para></sect2>
-
-<sect2>
-<title>Installation of Lfs-Utils</title>
-
-<para>Prepare Lfs-Utils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
-
-<para>The meaning of the configure option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--with-libc</userinput>: This causes the
-<command>mktemp</command> program to use the <emphasis>mkstemp</emphasis>
-and <emphasis>mkdtemp</emphasis> functions from the system C
-library.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Now copy two supporting files included in the Lfs-Utils tarball to
-their destination:</para>
-
-<screen><userinput>cp etc/{services,protocols} /etc</userinput></screen>
-
-<para>The <filename>/etc/services</filename> file is used to resolve service
-numbers to human-readable names, and the <filename>/etc/protocols</filename>
-does the same for protocol numbers.</para>
-
-</sect2>
-
-&aa-lfs-utils-shortdesc;
-&aa-lfs-utils-desc;
-
-</sect1>
-
diff -Naur lfs-book.orig/chapter06/mktemp.xml lfs-book/chapter06/mktemp.xml
--- lfs-book.orig/chapter06/mktemp.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/chapter06/mktemp.xml	2004-03-21 21:45:03.225730720 -0500
@@ -0,0 +1,52 @@
+<sect1 id="ch-system-mktemp" xreflabel="Mktemp">
+<title>Installing Mktemp-&mktemp-version;</title>
+<?dbhtml filename="mktemp.html" dir="chapter06"?>
+
+<para>The Mktemp package contains programs used to create secure temporary
+files in shell scripts.</para>
+
+<screen>&buildtime; &mktemp-time;
+&diskspace; &mktemp-compsize;</screen>
+
+&aa-mktemp-down;
+&aa-mktemp-dep;
+
+<sect2><title> </title><para> </para></sect2>
+
+<sect2>
+<title>Installation of Mktemp</title>
+
+<para>Many scripts still use the deprecated <command>tempfile</command>
+program, which has functionality much the same as <command>mktemp</command>.
+Patch mktemp to include a <command>tempfile</command> wrapper:</para>
+
+<screen><userinput>patch -Np1 -i ../&mktemp-patch;</userinput></screen>
+
+<para>Now prepare Mktemp for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
+
+<para>The meaning of the configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-libc</userinput>: This causes the
+<command>mktemp</command> program to use the <emphasis>mkstemp</emphasis>
+and <emphasis>mkdtemp</emphasis> functions from the system C
+library.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+&aa-mktemp-shortdesc;
+&aa-mktemp-desc;
+
+</sect1>
+
diff -Naur lfs-book.orig/entities/iana-etc.ent lfs-book/entities/iana-etc.ent
--- lfs-book.orig/entities/iana-etc.ent	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/entities/iana-etc.ent	2004-03-21 21:14:18.201217080 -0500
@@ -0,0 +1,16 @@
+<!ENTITY c6-iana-etc SYSTEM "../chapter06/iana-etc.xml">
+
+<!ENTITY aa-iana-etc-shortdesc SYSTEM "../appendixa/iana-etc-shortdesc.xml">
+<!ENTITY aa-iana-etc-desc SYSTEM "../appendixa/iana-etc-desc.xml">
+<!ENTITY aa-iana-etc-dep SYSTEM "../appendixa/iana-etc-dep.xml">
+<!ENTITY aa-iana-etc-down SYSTEM "../appendixa/iana-etc-down.xml">
+
+<!ENTITY iana-etc-version "1.00">
+<!ENTITY iana-etc-depversion "">
+<!ENTITY iana-etc-contversion "1.00">
+<!ENTITY iana-etc-dir "iana-etc-&iana-etc-version;">
+<!ENTITY iana-etc-package "iana-etc-&iana-etc-version;.tar.bz2">
+<!ENTITY iana-etc-size "161 KB">
+
+<!ENTITY iana-etc-compsize "641 KB">
+<!ENTITY iana-etc-time "0.1 SBU">
diff -Naur lfs-book.orig/entities/lfs-utils.ent lfs-book/entities/lfs-utils.ent
--- lfs-book.orig/entities/lfs-utils.ent	2004-02-28 02:30:39.000000000 -0500
+++ lfs-book/entities/lfs-utils.ent	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-<!ENTITY c6-lfs-utils SYSTEM "../chapter06/lfs-utils.xml">
-
-<!ENTITY aa-lfs-utils-shortdesc SYSTEM "../appendixa/lfs-utils-shortdesc.xml">
-<!ENTITY aa-lfs-utils-desc SYSTEM "../appendixa/lfs-utils-desc.xml">
-<!ENTITY aa-lfs-utils-dep SYSTEM "../appendixa/lfs-utils-dep.xml">
-<!ENTITY aa-lfs-utils-down SYSTEM "../appendixa/lfs-utils-down.xml">
-
-<!ENTITY lfs-utils-version "0.5">
-<!ENTITY lfs-utils-depversion "">
-<!ENTITY lfs-utils-contversion "0.5">
-<!ENTITY lfs-utils-dir "lfs-utils-&lfs-utils-version;">
-<!ENTITY lfs-utils-package "lfs-utils-&lfs-utils-version;.tar.bz2">
-<!ENTITY lfs-utils-size "221 KB">
-
-<!ENTITY lfs-utils-compsize "1.1 MB">
-<!ENTITY lfs-utils-time "0.1 SBU">
diff -Naur lfs-book.orig/entities/mktemp.ent lfs-book/entities/mktemp.ent
--- lfs-book.orig/entities/mktemp.ent	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/entities/mktemp.ent	2004-03-21 21:40:11.266115328 -0500
@@ -0,0 +1,19 @@
+<!ENTITY c6-mktemp SYSTEM "../chapter06/mktemp.xml">
+
+<!ENTITY aa-mktemp-shortdesc SYSTEM "../appendixa/mktemp-shortdesc.xml">
+<!ENTITY aa-mktemp-desc SYSTEM "../appendixa/mktemp-desc.xml">
+<!ENTITY aa-mktemp-dep SYSTEM "../appendixa/mktemp-dep.xml">
+<!ENTITY aa-mktemp-down SYSTEM "../appendixa/mktemp-down.xml">
+
+<!ENTITY mktemp-version "1.5">
+<!ENTITY mktemp-depversion "">
+<!ENTITY mktemp-contversion "1.5">
+<!ENTITY mktemp-dir "mktemp-&mktemp-version;">
+<!ENTITY mktemp-package "mktemp-&mktemp-version;.tar.bz2">
+<!ENTITY mktemp-size "69 KB">
+
+<!ENTITY mktemp-patch "mktemp-&mktemp-version;-add-tempfile.patch">
+<!ENTITY mktemp-patch-size "2.7 KB">
+
+<!ENTITY mktemp-compsize "317 KB">
+<!ENTITY mktemp-time "0.1 SBU">
diff -Naur lfs-book.orig/index.xml lfs-book/index.xml
--- lfs-book.orig/index.xml	2004-03-14 16:53:12.000000000 -0500
+++ lfs-book/index.xml	2004-03-21 21:35:56.325872136 -0500
@@ -54,17 +54,18 @@
 <!ENTITY % groff-entities SYSTEM "entities/groff.ent">
 <!ENTITY % grub-entities SYSTEM "entities/grub.ent">
 <!ENTITY % gzip-entities SYSTEM "entities/gzip.ent">
+<!ENTITY % iana-etc-entities SYSTEM "entities/iana-etc.ent">
 <!ENTITY % inetutils-entities SYSTEM "entities/inetutils.ent">
 <!ENTITY % kbd-entities SYSTEM "entities/kbd.ent">
 <!ENTITY % kernel-entities SYSTEM "entities/kernel.ent">
 <!ENTITY % less-entities SYSTEM "entities/less.ent">
-<!ENTITY % lfs-utils-entities SYSTEM "entities/lfs-utils.ent">
 <!ENTITY % libtool-entities SYSTEM "entities/libtool.ent">
 <!ENTITY % m4-entities SYSTEM "entities/m4.ent">
 <!ENTITY % make-entities SYSTEM "entities/make.ent">
 <!ENTITY % makedev-entities SYSTEM "entities/makedev.ent">
 <!ENTITY % man-entities SYSTEM "entities/man.ent">
 <!ENTITY % manpages-entities SYSTEM "entities/manpages.ent">
+<!ENTITY % mktemp-entities SYSTEM "entities/mktemp.ent">
 <!ENTITY % modutils-entities SYSTEM "entities/modutils.ent">
 <!ENTITY % ncurses-entities SYSTEM "entities/ncurses.ent">
 <!ENTITY % nettools-entities SYSTEM "entities/nettools.ent">
@@ -111,17 +112,18 @@
 %groff-entities;
 %grub-entities;
 %gzip-entities;
+%iana-etc-entities;
 %inetutils-entities;
 %kbd-entities;
 %kernel-entities;
 %less-entities;
-%lfs-utils-entities;
 %libtool-entities;
 %m4-entities;
 %make-entities;
 %makedev-entities;
 %man-entities;
 %manpages-entities;
+%mktemp-entities;
 %modutils-entities;
 %ncurses-entities;
 %nettools-entities;
-------------- next part --------------
diff -Naur lfs-book.orig/appendixa/appendixa.xml lfs-book/appendixa/appendixa.xml
--- lfs-book.orig/appendixa/appendixa.xml	2004-03-09 16:57:50.000000000 -0500
+++ lfs-book/appendixa/appendixa.xml	2004-03-21 22:36:18.469222648 -0500
@@ -33,10 +33,10 @@
 <listitem><para><xref linkend="ch-system-groff"/></para></listitem>
 <listitem><para><xref linkend="ch-system-grub"/></para></listitem>
 <listitem><para><xref linkend="ch-system-gzip"/></para></listitem>
+<listitem><para><xref linkend="ch-system-iana-etc"/></para></listitem>
 <listitem><para><xref linkend="ch-system-inetutils"/></para></listitem>
 <listitem><para><xref linkend="ch-system-kbd"/></para></listitem>
 <listitem><para><xref linkend="ch-system-less"/></para></listitem>
-<listitem><para><xref linkend="ch-system-lfs-utils"/></para></listitem>
 <listitem><para><xref linkend="ch-system-libtool"/></para></listitem>
 <listitem><para><xref linkend="ch-bootable-kernel"/></para></listitem>
 <listitem><para><xref linkend="ch-system-m4"/></para></listitem>
@@ -44,6 +44,7 @@
 <listitem><para><xref linkend="ch-system-MAKEDEV"/></para></listitem>
 <listitem><para><xref linkend="ch-system-man"/></para></listitem>
 <listitem><para><xref linkend="ch-system-man-pages"/></para></listitem>
+<listitem><para><xref linkend="ch-system-mktemp"/></para></listitem>
 <listitem><para><xref linkend="ch-system-modutils"/></para></listitem>
 <listitem><para><xref linkend="ch-system-ncurses"/></para></listitem>
 <listitem><para><xref linkend="ch-system-net-tools"/></para></listitem>
diff -Naur lfs-book.orig/appendixb/appendixb.xml lfs-book/appendixb/appendixb.xml
--- lfs-book.orig/appendixb/appendixb.xml	2004-03-09 16:57:50.000000000 -0500
+++ lfs-book/appendixb/appendixb.xml	2004-03-21 22:37:23.132392352 -0500
@@ -218,9 +218,7 @@
 <listitem><para>hostname : <xref linkend="ch-system-net-tools"/></para></listitem>
 <listitem><para>hostname : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>hpftodit : <xref linkend="ch-system-groff"/></para></listitem>
-<listitem><para>http-get : <xref linkend="ch-system-lfs-utils"/></para></listitem>
 <listitem><para>hwclock : <xref linkend="ch-system-util-linux"/></para></listitem>
-<listitem><para>iana-net : <xref linkend="ch-system-lfs-utils"/></para></listitem>
 <listitem><para>iconv : <xref linkend="ch-system-glibc"/></para></listitem>
 <listitem><para>iconvconfig : <xref linkend="ch-system-glibc"/></para></listitem>
 <listitem><para>id : <xref linkend="ch-system-coreutils"/></para></listitem>
@@ -373,7 +371,7 @@
 <listitem><para>mknod : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>mkpasswd : <xref linkend="ch-system-shadow"/></para></listitem>
 <listitem><para>mkswap : <xref linkend="ch-system-util-linux"/></para></listitem>
-<listitem><para>mktemp : <xref linkend="ch-system-lfs-utils"/></para></listitem>
+<listitem><para>mktemp : <xref linkend="ch-system-mktemp"/></para></listitem>
 <listitem><para>mk_cmds : <xref linkend="ch-system-e2fsprogs"/></para></listitem>
 <listitem><para>mmroff : <xref linkend="ch-system-groff"/></para></listitem>
 <listitem><para>modinfo : <xref linkend="ch-system-modutils"/></para></listitem>
@@ -578,7 +576,7 @@
 <listitem><para>tee : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>telinit : <xref linkend="ch-system-sysvinit"/></para></listitem>
 <listitem><para>telnet : <xref linkend="ch-system-inetutils"/></para></listitem>
-<listitem><para>tempfile : <xref linkend="ch-system-lfs-utils"/></para></listitem>
+<listitem><para>tempfile : <xref linkend="ch-system-mktemp"/></para></listitem>
 <listitem><para>template : <xref linkend="ch-scripts-bootscripts"/></para></listitem>
 <listitem><para>test : <xref linkend="ch-system-coreutils"/></para></listitem>
 <listitem><para>test.bash : <xref linkend="ch-system-util-linux"/></para></listitem>
diff -Naur lfs-book.orig/chapter01/changelog.xml lfs-book/chapter01/changelog.xml
--- lfs-book.orig/chapter01/changelog.xml	2004-03-09 16:57:50.000000000 -0500
+++ lfs-book/chapter01/changelog.xml	2004-03-21 22:39:19.312730256 -0500
@@ -20,7 +20,6 @@
 <listitem><para>Upgraded to:</para>
 <itemizedlist>
 <listitem><para>less-382</para></listitem>
-<listitem><para>lfs-utils-0.5</para></listitem>
 <listitem><para>linux-2.4.25</para></listitem>
 <listitem><para>man-pages-1.66</para></listitem>
 <listitem><para>ncurses-5.4</para></listitem>
@@ -30,17 +29,23 @@
 
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>iana-etc-1.00</para></listitem>
 <listitem><para>make_devices-1.2</para></listitem>
+<listitem><para>mktemp-1.5</para></listitem>
 </itemizedlist>
 </listitem>
  
 <listitem><para>Removed:</para>
 <itemizedlist>
+<listitem><para>lfs-utils-0.5</para></listitem>
 <listitem><para>MAKEDEV-1.7</para></listitem>
 <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
+<listitem><para>March 21st, 2004 [winkie]: Chapter 6 - Replaced Lfs-Utils
+with Iana-Etc and Mktemp.</para></listitem>
+
 <listitem><para>February 27th, 2004 [jeremy]: Upgraded to
 Procps-3.2.0.</para></listitem>
 
diff -Naur lfs-book.orig/chapter04/packages.xml lfs-book/chapter04/packages.xml
--- lfs-book.orig/chapter04/packages.xml	2004-03-09 16:57:51.000000000 -0500
+++ lfs-book/chapter04/packages.xml	2004-03-21 22:41:19.662434320 -0500
@@ -88,6 +88,9 @@
 Gzip (&gzip-version;) - 324 KB:
 <ulink url="ftp://alpha.gnu.org/gnu/gzip/"/>
 
+Iana-Etc (&iana-etc-version;) - 161 KB:
+<ulink url="&freshmeat;iana-etc/"/>
+
 Inetutils (&inetutils-version;) - 1,019 KB:
 <ulink url="&freshmeat;inetutils/"/>
 
@@ -100,9 +103,6 @@
 LFS-Bootscripts (&bootscripts-version;) - 25 KB:
 <ulink url="&http-down;lfs-bootscripts-1.12.tar.bz2"/>
 
-Lfs-Utils (&lfs-utils-version;) - 221 KB:
-<ulink url="&lfs-root;~winkie/downloads/lfs-utils/"/>
-
 Libtool (&libtool-version;) - 2,591 KB:
 <ulink url="&freshmeat;libtool/"/>
 
@@ -124,6 +124,9 @@
 Man-pages (&man-pages-version;) - 1,582 KB:
 <ulink url="&freshmeat;man-pages/"/>
 
+Mktemp (&mktemp-version;) - 69 KB:
+<ulink url="&freshmeat;mktemp/"/>
+
 Modutils (&modutils-version;) - 229 KB:
 <ulink url="&freshmeat;modutils/"/>
 
diff -Naur lfs-book.orig/chapter04/patches.xml lfs-book/chapter04/patches.xml
--- lfs-book.orig/chapter04/patches.xml	2004-03-09 16:57:51.000000000 -0500
+++ lfs-book/chapter04/patches.xml	2004-03-21 22:42:50.709593048 -0500
@@ -58,6 +58,9 @@
 Man 80-Columns Patch - 1 KB:
 <ulink url="&patches-root;man-&man-version;-80cols.patch"/>
 
+Mktemp Tempfile Patch - 3 KB:
+<ulink url="&patches-root;mktemp-&mktemp-version;-add-tempfile.patch"/>
+
 Net-tools Mii-Tool-Gcc33 Patch - 2 KB:
 <ulink url="&patches-root;net-tools-&net-tools-version;-miitool-gcc33-1.patch"/>
 
diff -Naur lfs-book.orig/chapter06/chapter06.xml lfs-book/chapter06/chapter06.xml
--- lfs-book.orig/chapter06/chapter06.xml	2004-03-09 16:57:51.000000000 -0500
+++ lfs-book/chapter06/chapter06.xml	2004-03-21 22:43:32.267275320 -0500
@@ -60,7 +60,10 @@
 <xi:include href="zlib.xml"/>
 
 
-<xi:include href="lfs-utils.xml"/>
+<xi:include href="mktemp.xml"/>
+
+
+<xi:include href="iana-etc.xml"/>
 
 
 <xi:include href="findutils.xml"/>
diff -Naur lfs-book.orig/chapter06/iana-etc.xml lfs-book/chapter06/iana-etc.xml
--- lfs-book.orig/chapter06/iana-etc.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/chapter06/iana-etc.xml	2004-03-21 22:54:03.602297808 -0500
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "http://www.docbook.org/xml/4.3CR3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 xmlns:xi="http://www.w3.org/2003/XInclude" id="ch-system-iana-etc" xreflabel="Iana-Etc">
+<title>Installing Iana-Etc-&iana-etc-version;</title>
+<?dbhtml filename="iana-etc.html"?>
+
+<para>The Iana-Etc package network services and protocols data.</para>
+
+<screen>&buildtime; 0.1 SBU
+&diskspace; 641 KB</screen>
+
+<literallayout>Official download location for Iana-Etc (&iana-etc-version;):
+<ulink url="http://www.sethwklein.net/projects/iana-etc/"/></literallayout>
+
+<para>The installation dependencies for Iana-Etc haven't been checked yet.</para>
+
+
+
+<sect2>
+<title>Installation of Iana-Etc</title>
+
+<para>Parse the data:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+
+<sect2 id="contents-iana-etc"><title>Contents of Iana-Etc</title>
+
+<para><emphasis>Installed files</emphasis>: protocols, services</para>
+
+</sect2>
+
+
+</sect1>
diff -Naur lfs-book.orig/chapter06/lfs-utils.xml lfs-book/chapter06/lfs-utils.xml
--- lfs-book.orig/chapter06/lfs-utils.xml	2004-03-09 16:57:52.000000000 -0500
+++ lfs-book/chapter06/lfs-utils.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "http://www.docbook.org/xml/4.3CR3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 xmlns:xi="http://www.w3.org/2003/XInclude" id="ch-system-lfs-utils" xreflabel="Lfs-Utils">
-<title>Installing Lfs-Utils-&lfs-utils-version;</title>
-<?dbhtml filename="lfs-utils.html"?>
-
-<para>The Lfs-Utils package contains a few helper files.</para>
-
-<screen>&buildtime; 0.1 SBU
-&diskspace; 1.1 MB</screen>
-
-<literallayout>Official download location for Lfs-Utils (&lfs-utils-version;):
-<ulink url="&lfs-root;~winkie/downloads/lfs-utils/"/></literallayout>
-
-<para>The installation dependencies for Lfs-Utils haven't been checked yet.</para>
-
-
-
-<sect2>
-<title>Installation of Lfs-Utils</title>
-
-<para>Prepare Lfs-Utils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
-
-<para>The meaning of the configure option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--with-libc</userinput>: This causes the
-<command>mktemp</command> program to use the <emphasis>mkstemp</emphasis>
-and <emphasis>mkdtemp</emphasis> functions from the system C
-library.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Now copy two supporting files included in the Lfs-Utils tarball to
-their destination:</para>
-
-<screen><userinput>cp etc/{services,protocols} /etc</userinput></screen>
-
-<para>The <filename>/etc/services</filename> file is used to resolve service
-numbers to human-readable names, and the <filename>/etc/protocols</filename>
-does the same for protocol numbers.</para>
-
-</sect2>
-
-
-<sect2 id="contents-lfs"><title>Contents of Lfs-Utils</title>
-
-<para><emphasis>Installed programs</emphasis>: mktemp, tempfile, http-get
-and iana-net</para>
-
-<para><emphasis>Installed files</emphasis>: protocols, services</para>
-
-</sect2>
-
-<sect2><title>Short descriptions</title>
-
-<para><command>mktemp</command> creates temporary files in a secure manner.
-It is used in scripts.</para>
-
-<para><command>tempfile</command> creates temporary files in a less secure
-manner than <command>mktemp</command>. It is installed for
-backwards-compatibility.</para>
-
-<para>The <command>http-get</command> script takes advantage of a little known
-feature of <command>bash</command> called "net redirection". It is used to
-download from websites without using any other programs.</para>
-
-<para><command>iana-net</command> uses the <command>http-get</command>
-script to simplify the process of procuring IANA's services and protocols
-configuration files.</para>
-
-</sect2>
-
-
-</sect1>
diff -Naur lfs-book.orig/chapter06/mktemp.xml lfs-book/chapter06/mktemp.xml
--- lfs-book.orig/chapter06/mktemp.xml	1969-12-31 19:00:00.000000000 -0500
+++ lfs-book/chapter06/mktemp.xml	2004-03-21 22:49:55.589001560 -0500
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "http://www.docbook.org/xml/4.3CR3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 xmlns:xi="http://www.w3.org/2003/XInclude" id="ch-system-mktemp" xreflabel="Mktemp">
+<title>Installing Mktemp-&mktemp-version;</title>
+<?dbhtml filename="mktemp.html"?>
+
+<para>The Mktemp package contains programs used to create secure temporary
+files in shell scripts.</para>
+
+<screen>&buildtime; 0.1 SBU
+&diskspace; 317 KB</screen>
+
+<literallayout>Official download location for Mktemp (&mktemp-version;):
+<ulink url="ftp://ftp.mktemp.org/pub/mktemp/"/></literallayout>
+
+<para>The installation dependencies for Mktemp haven't been checked yet.</para>
+
+
+
+<sect2>
+<title>Installation of Mktemp</title>
+
+<para>Many scripts still use the deprecated <command>tempfile</command>
+program, which has functionality much the same as <command>mktemp</command>.
+Patch mktemp to include a <command>tempfile</command> wrapper:</para>
+
+<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add-tempfile.patch</userinput></screen>
+
+<para>Now prepare Mktemp for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
+
+<para>The meaning of the configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-libc</userinput>: This causes the
+<command>mktemp</command> program to use the <emphasis>mkstemp</emphasis>
+and <emphasis>mkdtemp</emphasis> functions from the system C
+library.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+
+<sect2 id="contents-mktemp"><title>Contents of Mktemp</title>
+
+<para><emphasis>Installed programs</emphasis>: mktemp, tempfile</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<para><command>mktemp</command> creates temporary files in a secure manner.
+It is used in scripts.</para>
+
+<para><command>tempfile</command> creates temporary files in a less secure
+manner than <command>mktemp</command>. It is installed for
+backwards-compatibility.</para>
+
+</sect2>
+
+
+</sect1>
diff -Naur lfs-book.orig/general.ent lfs-book/general.ent
--- lfs-book.orig/general.ent	2004-03-21 13:39:57.000000000 -0500
+++ lfs-book/general.ent	2004-03-21 22:55:24.605983376 -0500
@@ -40,10 +40,10 @@
 <!ENTITY groff-version "1.19">
 <!ENTITY grub-version "0.94">
 <!ENTITY gzip-version "1.3.5">
+<!ENTITY iana-etc-version "1.00">
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
-<!ENTITY lfs-utils-version "0.5">
 <!ENTITY libtool-version "1.5.2">
 <!ENTITY linux-version "2.4.25">
 <!ENTITY m4-version "1.4">
@@ -51,6 +51,7 @@
 <!ENTITY make-version "3.80">
 <!ENTITY man-version "1.5m2">
 <!ENTITY man-pages-version "1.66">
+<!ENTITY mktemp-version "1.5">
 <!ENTITY modutils-version "2.4.27">
 <!ENTITY ncurses-version "5.4">
 <!ENTITY net-tools-version "1.60">


More information about the lfs-book mailing list