From 587a5123d8b077e7d80a1632fd8ff7e130a1f263 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 14 Oct 2005 20:02:42 +0000
Subject: [PATCH] Add updated vim security patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7011 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter03/patches.xml   | 2 +-
 chapter06/vim.xml       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bbeedca3f..d3f413387 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -29,6 +29,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>texinfo-4.8-tempfile_fix-1.patch</para></listitem>
 <listitem><para>bzip2-1.0.3-install_docs-1.patch</para></listitem>
 <listitem><para>bzip2-1.0.3-bzgrep_security-1.patch</para></listitem>
+<listitem><para>vim-6.3-security_fix-2.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
@@ -38,6 +39,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 14th, 2005 [matt]: Added the updated vim security patch.
+</para></listitem>
+
 <listitem><para>October 14th, 2005 [jhuntwork]: Added the bzip2 security
 and install docs patches.</para></listitem> 	
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e6f31e55f..95aa53ddb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -177,7 +177,7 @@ needed to build an LFS system:</para>
 
 <varlistentry>
 <term>Vim Security Patch - 8 KB:</term><listitem>
-<para><ulink url="&patches-root;vim-&vim-version;-security_fix-1.patch"/></para>
+<para><ulink url="&patches-root;vim-&vim-version;-security_fix-2.patch"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index e4d6ea543..9066f90ec 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -49,7 +49,7 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 <para>Vim has a security vulnerability already addressed upstream.  The
 following patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../vim-&vim-version;-security_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../vim-&vim-version;-security_fix-2.patch</userinput></screen>
 
 <para>Now prepare Vim for compilation:</para>