[Pkg-shadow-commits] r2386 - in debian/trunk/debian: . patches

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:21:50 +0000 (Sat, 13 Sep 2008)
New Revision: 2386

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/302_vim_selinux_support
Log:
302_vim_selinux_support updated for upstream version 4.1.2.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:21:05 UTC (rev 2385)
+++ debian/trunk/debian/changelog	2008-09-13 17:21:50 UTC (rev 2386)
@@ -9,6 +9,7 @@
       + debian/patches/200_Czech_binary_translation
       + debian/patches/494_passwd_lock-no_account_lock
       + debian/patches/008_su_get_PAM_username
+      + debian/patches/302_vim_selinux_support
   * debian/patches/506_relaxed_usernames: Use an extra paragraph for the note
     on username with a '/'.
   * debian/patches/504_undef_USE_PAM.dpatch:

Modified: debian/trunk/debian/patches/302_vim_selinux_support
===================================================================
--- debian/trunk/debian/patches/302_vim_selinux_support	2008-09-13 17:21:05 UTC (rev 2385)
+++ debian/trunk/debian/patches/302_vim_selinux_support	2008-09-13 17:21:50 UTC (rev 2386)
@@ -20,9 +20,9 @@
  	"You have modified %s.\n"\
  	"You may need to modify %s for consistency.\n"\
 @@ -167,6 +171,22 @@
- 
- 	if (access (file, F_OK))
+ 	if (access (file, F_OK) != 0) {
  		vipwexit (file, 1, 1);
+ 	}
 +#ifdef WITH_SELINUX
 +	/* if SE Linux is enabled then set the context of all new files
 +	   to be the context of the file we are editing */
@@ -39,9 +39,9 @@
 +		}
 +	}
 +#endif
- 	if (!file_lock ())
+ 	if (file_lock () == 0) {
  		vipwexit (_("Couldn't lock file"), errno, 5);
- 	filelocked = 1;
+ 	}
 @@ -236,6 +256,14 @@
  			 progname, file, strerror (errno), fileedit);
  		vipwexit (0, 0, 1);