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 @@ +   + Ed Installation Dependencies 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 @@ -Contents of Ed +   + +Descriptions Last checked against version &ed-contversion;. -Program Files -ed and red (link to ed) - -Description +Program file description ed 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 @@ +Contents of Ed + +Last checked against version &ed-contversion;. + +GNU ed is an 8-bit clean, POSIX-compliant line editor. + +Ed installs the following: + +Program Files +ed and red (link to ed) + + + 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 @@ &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 @@ +   + Installation of Ed +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. + This package requires its patch to be applied before you can install it. -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. + +patch -Np1 -i ../ed-&ed-patch-version;.patch + -Install Ed by running the following commands: +Prepare Ed to be compiled: -patch -Np1 -i ../ed-&ed-patch-version;.patch && -./configure --prefix=/usr && -make && -make install && -mv /usr/bin/{ed,red} /bin + +./configure --prefix=/usr + +Continue with compiling the package: + +make + +And finish off installing the package: + +make install + +Move the Ed binaries to the root partition. + +mv /usr/bin/{ed,red} /bin + + + + + +Command explanations + +patch -Np1 -i ../ed-&ed-version;.patch: 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. + +mv /usr/bin/{ed,red} /bin: +The Ed binaries are moved to the /bin directory so they may be used in +the event that the /usr partition is unavailable. 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 @@ Estimated build time: &ed-time; Estimated required disk space: &ed-compsize; -&c6-ed-inst; -&c6-ed-exp; -&aa-ed-desc; +&aa-ed-shortdesc; &aa-ed-dep; +&c6-ed-inst; 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 @@ - +