From 709533382788f0e23bb81799ea00e4d266c62d8f Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 1 Feb 2006 00:07:06 +0000
Subject: [PATCH] Updte vim to version 6.4

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5619 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 book/bookinfo.xml                  |  2 +-
 general.ent                        |  8 ++++----
 introduction/welcome/changelog.xml |  8 ++++++++
 postlfs/editors/vim.xml            | 13 ++++---------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/book/bookinfo.xml b/book/bookinfo.xml
index a3715e462f..f6343258ef 100644
--- a/book/bookinfo.xml
+++ b/book/bookinfo.xml
@@ -28,7 +28,7 @@
 
   <legalnotice>
 
-    <para>Copyright &copy; 2001-2005, BLFS Development Team</para>
+    <para>Copyright &copy; 2001-2006, BLFS Development Team</para>
 
     <para>All rights reserved.</para>
 
diff --git a/general.ent b/general.ent
index 7805d87516..6687ad074f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,8 +1,8 @@
-<!ENTITY day          "31">
-<!ENTITY month        "01">
+<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "January &day;st, &year;">
+<!ENTITY releasedate  "February &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|stable|testing|unstable|development] -->
@@ -58,7 +58,7 @@
 <!ENTITY xfsprogs-version             "2.6.25">
 
 <!-- Chapter 6 -->
-<!ENTITY vim-version                  "6.3">
+<!ENTITY vim-version                  "6.4">
 <!ENTITY emacs-version                "21.4a">
 <!ENTITY nano-version                 "1.2.5">
 <!ENTITY joe-version                  "3.3">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f92e5ac859..d2b700460d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -40,6 +40,14 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>February 1st, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated vim to version 6.4.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>January 31st, 2006</para>
diff --git a/postlfs/editors/vim.xml b/postlfs/editors/vim.xml
index 0d7f5a5bc7..549ebe93b7 100644
--- a/postlfs/editors/vim.xml
+++ b/postlfs/editors/vim.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY vim-download-http "http://ftp.at.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
   <!ENTITY vim-download-ftp  "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-  <!ENTITY vim-md5sum        "821fda8f14d674346b87e3ef9cb96389">
-  <!ENTITY vim-size          "3.7 MB">
-  <!ENTITY vim-buildsize     "48 MB">
-  <!ENTITY vim-time          "0.59 SBU">
+  <!ENTITY vim-md5sum        "774c14d93ce58674b3b2c880edd12d77">
+  <!ENTITY vim-size          "3.6 MB">
+  <!ENTITY vim-buildsize     "41 MB">
+  <!ENTITY vim-time          "0.6 SBU">
 ]>
 
 <sect1 id="vim" xreflabel="Vim-&vim-version;">
@@ -69,10 +69,6 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/vim-&vim-version;-security_fix-2.patch"/></para>
-      </listitem>
       <listitem>
         <para>Translated Vim messages: <ulink
         url="http://ftp.at.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz"/>
@@ -119,7 +115,6 @@
 
 <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h &amp;&amp;
 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h &amp;&amp;
-patch -Np1 -i ../vim-&vim-version;-security_fix-2.patch &amp;&amp;
 ./configure --prefix=/usr --with-features=huge &amp;&amp;
 make</userinput></screen>