diff options
| -rw-r--r-- | chapter01/changelog.xml | 6 | ||||
| -rw-r--r-- | chapter03/packages.xml | 2 | ||||
| -rw-r--r-- | chapter03/patches.xml | 6 | ||||
| -rw-r--r-- | chapter06/vim.xml | 5 | ||||
| -rw-r--r-- | general.ent | 2 | ||||
| -rw-r--r-- | patches.ent | 2 |
6 files changed, 6 insertions, 17 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7090c1195..4892c2ccb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -80,7 +80,7 @@ First a summary, then a detailed log.</para> <!-- <listitem><para>Texinfo &texinfo-version;</para></listitem> --> <listitem><para>Udev &udev-version;</para></listitem> <!-- <listitem><para>Util-Linux &util-linux-version;</para></listitem> --> -<!-- <listitem><para>Vim &vim-version;</para></listitem> --> +<listitem><para>Vim &vim-version;</para></listitem> <listitem><para>Zlib &zlib-version;</para></listitem> </itemizedlist> </listitem> @@ -103,7 +103,6 @@ First a summary, then a detailed log.</para> <listitem><para>&perl-libc-patch;</para></listitem> <listitem><para>&tar-gcc4_fix-patch;</para></listitem> <listitem><para>&texinfo-tempfile_fix-patch;</para></listitem> -<listitem><para>&vim-security_fix-patch;</para></listitem> </itemizedlist> </listitem> @@ -122,6 +121,9 @@ First a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>October 31, 2005 [matt]: Upgrade to vim-6.4.</para> +</listitem> + <listitem><para>October 31, 2005 [matt]: Upgrade to procps-3.2.6.</para> </listitem> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 24ab2eb12..316a7a0a9 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -415,7 +415,7 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note> </varlistentry> <varlistentry> -<term>Vim (&vim-version;) - 3,620 KB:</term> +<term>Vim (&vim-version;) - 3,650 KB:</term> <listitem> <para><ulink url="ftp://ftp.vim.org/pub/vim/unix/"/></para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 49ad204a7..d37075822 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -211,12 +211,6 @@ needed to build an LFS system:</para> </listitem> </varlistentry> -<varlistentry> -<term>Vim Security Patch - 9 KB:</term><listitem> -<para><ulink url="&patches-root;&vim-security_fix-patch;"/></para> -</listitem> -</varlistentry> - </variablelist> <para>In addition to the above required patches, there exist a number of diff --git a/chapter06/vim.xml b/chapter06/vim.xml index a49b5b4ef..15d53e47e 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -46,11 +46,6 @@ class="directory">/etc</filename>:</para> <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen> -<para>Vim has two known security vulnerabilities that have already been -addressed upstream. The following patch fixes the problems:</para> - -<screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen> - <para>Now prepare Vim for compilation:</para> <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen> diff --git a/general.ent b/general.ent index 3f9475229..ebf0bac64 100644 --- a/general.ent +++ b/general.ent @@ -79,5 +79,5 @@ <!ENTITY texinfo-version "4.8"> <!ENTITY udev-version "071"> <!ENTITY util-linux-version "2.12r"> -<!ENTITY vim-version "6.3"> +<!ENTITY vim-version "6.4"> <!ENTITY zlib-version "1.2.3"> diff --git a/patches.ent b/patches.ent index 4f9c857cf..26b61a2ff 100644 --- a/patches.ent +++ b/patches.ent @@ -46,5 +46,3 @@ <!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch"> <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch"> - -<!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch"> |