r87 - in trunk/vim: debian upstream/patches
Norbert Tretkowski
nobse@costa.debian.org
Fri, 18 Mar 2005 20:53:25 +0100
Author: nobse
Date: 2005-03-18 20:53:20 +0100 (Fri, 18 Mar 2005)
New Revision: 87
Added:
trunk/vim/upstream/patches/6.3.067
Modified:
trunk/vim/debian/README
trunk/vim/debian/changelog
Log:
new upstream patch 6.3.067
Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README 2005-03-18 15:17:09 UTC (rev 86)
+++ trunk/vim/debian/README 2005-03-18 19:53:20 UTC (rev 87)
@@ -20,6 +20,8 @@
After applying a patch, you need to compile Vim. There are no
patches for binaries.
+Checksums for the patch files can be found in the file MD5.
+
Individual patches for Vim 6.3:
SIZE NAME FIXES
@@ -88,5 +90,5 @@
1434 6.3.063 after the CursorHold event 'mousefocus' may stop working
1586 6.3.064 line2byte(line("$") + 1) sometimes returns the wrong number
4436 6.3.065 there was no digraph for euro in Unicode
- 4728 6.3.066 Backup file may get wrong permissions (use permission of orignal file)
-
+ 4728 6.3.066 permissions of backup file may be wrong
+ 2200 6.3.067 (after 6.3.066) newly created file gets execute permission
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-03-18 15:17:09 UTC (rev 86)
+++ trunk/vim/debian/changelog 2005-03-18 19:53:20 UTC (rev 87)
@@ -1,6 +1,6 @@
-vim (1:6.3-066+1~pre) UNRELEASED; urgency=low
+vim (1:6.3-067+1~pre) UNRELEASED; urgency=low
- * New upstream patches (065 to 066), see README.gz for details.
+ * New upstream patches (065 to 067), see README.gz for details.
+ 6.3.065: Entering Euro char via digraph doesn't always work.
(closes: #298162)
Added: trunk/vim/upstream/patches/6.3.067
===================================================================
--- trunk/vim/upstream/patches/6.3.067 2005-03-18 15:17:09 UTC (rev 86)
+++ trunk/vim/upstream/patches/6.3.067 2005-03-18 19:53:20 UTC (rev 87)
@@ -0,0 +1,68 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.067
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.067 (after 6.3.066)
+Problem: Newly created file gets execute permission.
+Solution: Check for "perm" to be negative before using it.
+Files: src/fileio.c
+
+
+*** ../vim-6.3.030/src/fileio.c Fri Mar 18 13:37:34 2005
+--- src/fileio.c Fri Mar 18 19:16:29 2005
+***************
+*** 3698,3704 ****
+ while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
+ ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
+ : (O_CREAT | O_TRUNC))
+! , perm & 0777)) < 0)
+ {
+ /*
+ * A forced write will try to create a new file if the old one is
+--- 3698,3704 ----
+ while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
+ ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
+ : (O_CREAT | O_TRUNC))
+! , perm < 0 ? 0666 : (perm & 0777))) < 0)
+ {
+ /*
+ * A forced write will try to create a new file if the old one is
+***************
+*** 4262,4268 ****
+
+ if (org == NULL
+ || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+! perm & 0777)) < 0)
+ EMSG(_("E206: patchmode: can't touch empty original file"));
+ else
+ close(empty_fd);
+--- 4262,4268 ----
+
+ if (org == NULL
+ || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+! perm < 0 ? 0666 : (perm & 0777))) < 0)
+ EMSG(_("E206: patchmode: can't touch empty original file"));
+ else
+ close(empty_fd);
+*** ../vim-6.3.030/src/version.c Fri Mar 18 13:37:34 2005
+--- src/version.c Fri Mar 18 19:17:45 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 67,
+ /**/
+
+--
+If corn oil comes from corn, where does baby oil come from?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///