diff options
| -rw-r--r-- | appendixa/ed-dep.xml | 2 | ||||
| -rw-r--r-- | appendixa/ed-desc.xml | 9 | ||||
| -rw-r--r-- | appendixa/ed-shortdesc.xml | 13 | ||||
| -rw-r--r-- | appendixa/ed.xml | 1 | ||||
| -rw-r--r-- | chapter06/ed-inst.xml | 51 | ||||
| -rw-r--r-- | chapter06/ed.xml | 5 | ||||
| -rw-r--r-- | entities/ed.ent | 2 |
7 files changed, 64 insertions, 19 deletions
diff --git a/appendixa/ed-dep.xml b/appendixa/ed-dep.xml index 800c47fb1..b034725ad 100644 --- a/appendixa/ed-dep.xml +++ b/appendixa/ed-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Ed Installation Dependencies</title> diff --git a/appendixa/ed-desc.xml b/appendixa/ed-desc.xml index 9d5de8589..da374c07c 100644 --- a/appendixa/ed-desc.xml +++ b/appendixa/ed-desc.xml @@ -1,11 +1,10 @@ -<sect2><title>Contents of Ed</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &ed-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>ed and red (link to ed)</para></sect3> +<para>Last checked against version &ed-contversion;.</para> -<sect3><title>Description</title> +<sect3><title>Program file description</title> <sect4><title>ed</title> <para>ed is a line-oriented text editor. It is used to create, display, diff --git a/appendixa/ed-shortdesc.xml b/appendixa/ed-shortdesc.xml new file mode 100644 index 000000000..d0265aa47 --- /dev/null +++ b/appendixa/ed-shortdesc.xml @@ -0,0 +1,13 @@ +<sect2><title>Contents of Ed</title> + +<para>Last checked against version &ed-contversion;.</para> + +<para>GNU ed is an 8-bit clean, POSIX-compliant line editor.</para> + +<para>Ed installs the following:</para> + +<sect3><title>Program Files</title> +<para>ed and red (link to ed)</para></sect3> + +</sect2> + diff --git a/appendixa/ed.xml b/appendixa/ed.xml index 155dc2f44..cf1943b93 100644 --- a/appendixa/ed.xml +++ b/appendixa/ed.xml @@ -3,6 +3,7 @@ <?dbhtml filename="ed.html" dir="appendixa"?> &aa-ed-down; +&aa-ed-shortdesc; &aa-ed-desc; &aa-ed-dep; 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> </title><para> </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 && -./configure --prefix=/usr && -make && -make install && -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> diff --git a/entities/ed.ent b/entities/ed.ent index d8955f766..1790bf65d 100644 --- a/entities/ed.ent +++ b/entities/ed.ent @@ -3,9 +3,9 @@ <!ENTITY c6-ed SYSTEM "../chapter06/ed.xml"> <!ENTITY c6-ed-inst SYSTEM "../chapter06/ed-inst.xml"> -<!ENTITY c6-ed-exp SYSTEM "../chapter06/ed-exp.xml"> <!ENTITY aa-ed SYSTEM "../appendixa/ed.xml"> +<!ENTITY aa-ed-shortdesc SYSTEM "../appendixa/ed-shortdesc.xml"> <!ENTITY aa-ed-desc SYSTEM "../appendixa/ed-desc.xml"> <!ENTITY aa-ed-dep SYSTEM "../appendixa/ed-dep.xml"> <!ENTITY aa-ed-down SYSTEM "../appendixa/ed-down.xml"> |