rpms/vim/devel 6.4.007, NONE, 1.1 README.patches, 1.39, 1.40 vim.spec, 1.96, 1.97

Wed Feb 15 14:28:47 UTC 2006

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11194

Modified Files:
	README.patches vim.spec 
Added Files:
	6.4.007 
Log Message:
- fix vim.csh script (#180429)
- patchlevel 7

--- NEW FILE 6.4.007 ---
To: vim-dev at vim.org
Subject: Patch 6.4.007
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.4.007
Problem:    Crash when expanding a file name argument in backticks. (Adri
	    Verhoef)
Solution:   Check for the NUL after the expansion result.
Files:	    src/os_unix.c


*** ../vim-6.4.006/src/os_unix.c	Sat Oct  8 16:39:10 2005
--- src/os_unix.c	Thu Feb  2 12:48:28 2006
***************
*** 5051,5057 ****
  	/* Space or NL separates */
  	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
  	{
! 	    while (!(shell_style == STYLE_ECHO && *p == ' ') && *p != '\n')
  		++p;
  	    if (p == buffer + len)		/* last entry */
  		*p = NUL;
--- 5051,5058 ----
  	/* Space or NL separates */
  	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
  	{
! 	    while (!(shell_style == STYLE_ECHO && *p == ' ')
! 						   && *p != '\n' && *p != NUL)
  		++p;
  	    if (p == buffer + len)		/* last entry */
  		*p = NUL;
*** ../vim-6.4.006/src/version.c	Thu Dec 22 22:39:11 2005
--- src/version.c	Wed Feb  8 11:10:30 2006
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     7,
  /**/

-- 
"My particular problem is with registry entries, which seem to just accumulate
like plastic coffee cups..."           -- Paul Moore

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://www.ICCF.nl         ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- README.patches	2 Jan 2006 12:12:52 -0000	1.39
+++ README.patches	15 Feb 2006 14:28:45 -0000	1.40
@@ -31,3 +31,4 @@
   1581  6.4.004  "go" doesn't work correctly when 'virtualedit' is set
   1577  6.4.005  truncating message may write before buffer
   2320  6.4.006  ":argedit", "argdel" and ":argadd" used count argument
+  1717  6.4.007  Unix: crash when expanding backticks


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- vim.spec	11 Feb 2006 05:57:20 -0000	1.96
+++ vim.spec	15 Feb 2006 14:28:45 -0000	1.97
@@ -20,12 +20,12 @@
 
 %define baseversion 6.4
 %define vimdir vim64
-%define patchlevel 006
+%define patchlevel 007
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1.2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -58,6 +58,7 @@
 Patch004: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.004
 Patch005: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.005
 Patch006: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.006
+Patch007: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.007
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -188,6 +189,7 @@
 %patch004 -p0
 %patch005 -p0
 %patch006 -p0
+%patch007 -p0
 
 
 %patch3000 -p1
@@ -391,8 +393,7 @@
 EOF
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
 [ -x /usr/bin/id ] || exit
-[ \`/usr/bin/id -u\` -le 100 ] && exit
-alias vi vim
+[ \`/usr/bin/id -u\` -gt 100 ] && alias vi vim
 EOF
 chmod 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
@@ -488,6 +489,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Feb 15 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-1
+- fix vim.csh script (#180429)
+- patchlevel 7
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:6.4.006-1.2
 - bump again for double-long bug on ppc(64)
 


