aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/shellutils-desc.xml5
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter04/packages.xml1
-rw-r--r--chapter04/shellutils-hostname-patch.xml3
-rw-r--r--chapter06/shellutils-exp.xml11
-rw-r--r--chapter06/shellutils-inst.xml11
-rw-r--r--chapter06/shellutils.xml1
-rw-r--r--entities/shellutils.ent4
-rw-r--r--index.xml2
9 files changed, 36 insertions, 8 deletions
diff --git a/appendixa/shellutils-desc.xml b/appendixa/shellutils-desc.xml
index e8216f3cc..0029dd845 100644
--- a/appendixa/shellutils-desc.xml
+++ b/appendixa/shellutils-desc.xml
@@ -4,7 +4,7 @@
<sect3><title>Program Files</title>
<para>basename, chroot, date, dirname,
-echo, env, expr, factor, false, groups, hostid, hostname, id, logname,
+echo, env, expr, factor, false, groups, hostid, id, logname,
nice, nohup, pathchk, pinky, printenv, printf, pwd, seq, sleep, stty,
su, tee, test, true, tty, uname, uptime, users, who, whoami and
yes</para></sect3>
@@ -48,9 +48,6 @@ integer numbers.</para></sect4>
<para>hostid prints the numeric identifier (in hexadecimal) for the current
host.</para></sect4>
-<sect4><title>hostname</title>
-<para>hostname prints or sets the name of the current host system.</para></sect4>
-
<sect4><title>id</title>
<para>id prints the effective user and group IDs of the current
user or a given user.</para></sect4>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ec9f7b1da..5b218e1f3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,7 @@
<listitem><para>gzip-1.2.4b.patch</para></listitem>
<listitem><para>ncurses-5.2.patch</para></listitem>
<listitem><para>procps-2.0.7.patch</para></listitem>
+<listitem><para>sh-utils-2.0-hostname.patch</para></listitem>
<listitem><para>vim-6.1.patch</para></listitem>
<listitem><para>zlib-1.1.4</para></listitem>
</itemizedlist>
@@ -55,6 +56,11 @@
</itemizedlist>
</para></listitem>
+<listitem><para>September 12th, 2002 [gerard]: Chapter 06 - Sh-utils: Added
+the sh-utils-hostname patch that supresses the build of the hostname
+program. This is done because the hostname program from the net-tools
+package is superior over this version.</para></listitem>
+
<listitem><para>September 12th, 2002 [gerard]: Chapter 06 - Gawk: Updated
the Gawk patch. It also changes the <emphasis>DDEFPATH</emphasis> directory
location now.</para></listitem>
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index c45edcdb6..341c5209b 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -60,6 +60,7 @@
&c3-sed;
&c3-shadowpwd;
&c3-shellutils;
+&c3-shellutils-hostname-patch;
&c3-shellutils-patch;
&c3-sysklogd;
&c3-sysvinit;
diff --git a/chapter04/shellutils-hostname-patch.xml b/chapter04/shellutils-hostname-patch.xml
new file mode 100644
index 000000000..ddc825078
--- /dev/null
+++ b/chapter04/shellutils-hostname-patch.xml
@@ -0,0 +1,3 @@
+Sh-utils Hostname Patch (&sh-utils-hostname-patch-version;) - &sh-utils-hostname-patch-size;:
+<ulink url="&ftp;/sh-utils-&sh-utils-hostname-patch-version;.patch.bz2"/>
+<ulink url="&http;/sh-utils-&sh-utils-hostname-patch-version;.patch.bz2"/>
diff --git a/chapter06/shellutils-exp.xml b/chapter06/shellutils-exp.xml
new file mode 100644
index 000000000..872f025f6
--- /dev/null
+++ b/chapter06/shellutils-exp.xml
@@ -0,0 +1,11 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch:</userinput> This patch
+supresses the build of the hostname program which we will be installed
+later with the net-tools package. The hostname program from the net-tools
+package is a much better version (and in some cases even required since it
+supports options that are needed by some programs such as XFree86).</para>
+
+</sect2>
+
diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml
index 9c7cee0b9..e883b75ac 100644
--- a/chapter06/shellutils-inst.xml
+++ b/chapter06/shellutils-inst.xml
@@ -1,13 +1,18 @@
<sect2>
<title>Installation of Sh-utils</title>
+<para>This package requires its hostname-patch to be applied before you
+can install it. Make sure it's unpacked before running the installation
+commands.</para>
+
<para>Install Sh-utils by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
make &amp;&amp;
make install &amp;&amp;
-mv /usr/bin/{basename,date,echo,false,hostname} /bin &amp;&amp;
-mv /usr/bin/{pwd,sleep,stty,su,test,true,uname} /bin &amp;&amp;
+mv /usr/bin/{basename,date,echo,false,pwd} /bin &amp;&amp;
+mv /usr/bin/{sleep,stty,su,test,true,uname} /bin &amp;&amp;
mv /usr/bin/chroot /usr/sbin</userinput></screen></para>
</sect2>
diff --git a/chapter06/shellutils.xml b/chapter06/shellutils.xml
index f0b7288c6..4d238f972 100644
--- a/chapter06/shellutils.xml
+++ b/chapter06/shellutils.xml
@@ -6,6 +6,7 @@
Estimated required disk space: &sh-utils-compsize;</screen>
&c6-shellutils-inst;
+&c6-shellutils-exp;
&aa-shellutils-desc;
&aa-shellutils-dep;
diff --git a/entities/shellutils.ent b/entities/shellutils.ent
index acd86f740..486c16fbc 100644
--- a/entities/shellutils.ent
+++ b/entities/shellutils.ent
@@ -1,4 +1,5 @@
<!ENTITY c3-shellutils SYSTEM "../chapter03/shellutils.xml">
+<!ENTITY c3-shellutils-hostname-patch SYSTEM "../chapter03/shellutils-hostname-patch.xml">
<!ENTITY c3-shellutils-patch SYSTEM "../chapter03/shellutils-patch.xml">
<!ENTITY c5-shellutils SYSTEM "../chapter05/shellutils.xml">
@@ -6,6 +7,7 @@
<!ENTITY c6-shellutils SYSTEM "../chapter06/shellutils.xml">
<!ENTITY c6-shellutils-inst SYSTEM "../chapter06/shellutils-inst.xml">
+<!ENTITY c6-shellutils-exp SYSTEM "../chapter06/shellutils-exp.xml">
<!ENTITY aa-shellutils SYSTEM "../appendixa/shellutils.xml">
<!ENTITY aa-shellutils-desc SYSTEM "../appendixa/shellutils-desc.xml">
@@ -18,6 +20,8 @@
<!ENTITY sh-utils-size "824 KB">
<!ENTITY sh-utils-patch-size "1 KB">
<!ENTITY sh-utils-patch-version "2.0">
+<!ENTITY sh-utils-hostname-patch-size "1 KB">
+<!ENTITY sh-utils-hostname-patch-version "2.0-hostname">
<!ENTITY sh-utils-package "sh-utils-&sh-utils-version;.tar.bz2">
<!ENTITY sh-utils-dir "sh-utils-&sh-utils-version;">
diff --git a/index.xml b/index.xml
index e44df2610..f76e5e925 100644
--- a/index.xml
+++ b/index.xml
@@ -15,7 +15,7 @@
<!ENTITY hints-index "http://hints.linuxfromscratch.org/hints.shtml">
<!ENTITY blfs-root "http://beyond.linuxfromscratch.org/">
-<!ENTITY all-version "cvs-20020912-1530">
+<!ENTITY all-version "cvs-20020912-1602">
<!ENTITY all-size-kb "105,560 KB">
<!ENTITY all-size-mb "103.88 MB">