From 008a51dd95b72c93b27ed8a07aad35e51ca811eb Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Fri, 31 Dec 2004 06:40:24 +0000
Subject: [PATCH] Added Vim Security Vulnerability patch

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index eefc82d94..a9d17e26b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,7 @@ of the LFS Book.</para>
 <itemizedlist>
 <listitem><para>util-linux-2.12p-cramfs-1.patch</para></listitem>
 <listitem><para>linux-2.6.10-security_fix-1.patch</para></listitem>
+<listitem><para>vim-6.3-security_fix-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
@@ -48,6 +49,8 @@ of the LFS Book.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>December 30th, 2004 [jeremy]: Added Vim security vulnerability patch - Thanks Matt</para></listitem>
+
 <listitem><para>December 30th, 2004 [jeremy]: Added Linux kernel security vulnerability fix into chapter 8</para></listitem>
 
 <listitem><para>December 30th, 2004 [jeremy]: Upgrade Bison to version 2.0</para></listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index bd07b2ec8..f2d430e5b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -154,6 +154,12 @@ following:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Vim Security Patch - 8KB:</term><listitem>
+<para><ulink url="&patches-root;vim-&vim-version;-security_fix-1.patch"/></para>
+</listitem>
+</varlistentry>
+
 </variablelist>
 
 <!--
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index ee83d2134..537176681 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -27,6 +27,11 @@
 <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h
 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput></screen>
 
+<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>
+
 <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 5b1f523fa..4f8dae525 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20041225">
-<!ENTITY releasedate "December 25, 2004">
+<!ENTITY version "SVN-20041230">
+<!ENTITY releasedate "December 30, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">