Billy's ed conversion.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2366 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 43 insertions, 13 deletions

diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml
index cc992bd8c..4646fecb1 100644
--- a/chapter06/ed-inst.xml
+++ b/chapter06/ed-inst.xml
@@ -1,21 +1,52 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Ed</title>
 
+<note><para>Ed isn't something you would personally use. It's installed here
+because it can be used by the patch program if you encounter an ed-based patch
+file. This happens rarely because diff-based patches are preferred these
+days.</para></note>
+
 <para>This package requires its patch to be applied before you can
 install it.</para>
 
-<para>Ed isn't something you would personally use. It's installed here
-because it can be used by the patch program if you encounter an ed-based patch
-file. This happens rarely because diff-based patches are preferred these
-days.</para>
+<para><screen><userinput>
+patch -Np1 -i ../ed-&ed-patch-version;.patch
+</userinput></screen></para>
+
+<para>Prepare Ed to be compiled:</para>
+
+<para><screen><userinput>
+./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Move the Ed binaries to the root partition.</para>
+
+<para><screen><userinput>mv /usr/bin/{ed,red} /bin
+</userinput></screen></para>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
 
-<para>Install Ed by running the following commands:</para>
+<para><userinput>patch -Np1 -i ../ed-&ed-version;.patch:</userinput> This
+patch fixes a symlink vulnerability in ed. The ed executable creates files
+in /tmp with predictable names. By using various symlink attacks, it is
+possible to have ed write to files it should not, change the permissions
+of files, etc.</para>
 
-<para><screen><userinput>patch -Np1 -i ../ed-&ed-patch-version;.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-mv /usr/bin/{ed,red} /bin</userinput></screen></para>
+<para><userinput>mv /usr/bin/{ed,red} /bin:</userinput>
+The Ed binaries are moved to the /bin directory so they may be used in
+the event that the /usr partition is unavailable.</para>
 
 </sect2>
 
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index 27beae00f..e5a0c3100 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &ed-time;
 Estimated required disk space:  &ed-compsize;</screen>
 
-&c6-ed-inst;
-&c6-ed-exp;
-&aa-ed-desc;
+&aa-ed-shortdesc;
 &aa-ed-dep;
+&c6-ed-inst;
 
 </sect1>