[SCM] Vim packaging branch, maint/etch, updated. debian/7.0-122+1etch4-2-g6e269ac

[James Vega]

The following commit has been merged in the maint/etch branch:
commit 7387dc23fed5008c2b1af661ae8438428c7ebe67
Author: James Vega <jamessan at debian.org>
Date:   Tue Feb 17 21:17:16 2009 -0500

    Fix a couple typos in CVE-2008-2712-netrw.vim.diff
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 7c64eb2..bcdbeab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vim (1:7.0-122+1etch5) UNRELEASED; urgency=high
+
+  * Fix a couple typos in CVE-2008-2712-netrw.vim.diff
+
+ -- James Vega <jamessan at debian.org>  Tue, 17 Feb 2009 19:54:39 -0500
+
 vim (1:7.0-122+1etch4) oldstable-security; urgency=high
 
   * Backport upstream patches and runtime fixes for filename escaping
diff --git a/patches/CVE-2008-2712-netrw.vim.diff b/patches/CVE-2008-2712-netrw.vim.diff
index 30e8264..d448e17 100644
--- a/patches/CVE-2008-2712-netrw.vim.diff
+++ b/patches/CVE-2008-2712-netrw.vim.diff
@@ -157,11 +157,11 @@ Index: vim/runtime/autoload/netrw.vim
  "     call Decho("!".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".cygtmpfile)
  "     call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".cygtmpfile)
 -     exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".cygtmpfile
-+     exe "!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".netrw_fname,1)." ".shellescape(cygtmpfile,1)
++     exe "!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".shellescape(cygtmpfile,1)
      else
  "     call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".tmpfile)
 -     exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".tmpfile
-+     exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".netrw_fname,1)." ".shellescape(tmpfile,1)
++     exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1)
      endif
      let result		= s:NetGetFile(readcmd, tmpfile, b:netrw_method)
      let b:netrw_lastfile = choice

-- 
Vim packaging