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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-15 21:59:18 +0000 (Wed, 15 Apr 2009)
New Revision: 2698

Removed:
   debian/trunk/debian/patches/302_vim_selinux_support
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
    - removed debian/patches/302_vim_selinux_support: Applied upstream.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2009-04-15 21:55:36 UTC (rev 2697)
+++ debian/trunk/debian/changelog	2009-04-15 21:59:18 UTC (rev 2698)
@@ -8,9 +8,10 @@
       of the TTYs, UMASK, ERASECHAR or KILLCHAR) in release 1:4.1.3-1 only.
       Closes: #524139
     - removed debian/patches/200_bin_nb: Applied upstream.
+    - removed debian/patches/302_vim_selinux_support: Applied upstream.
     - Fixed login segfault when called without a username. Closes: #524193
 
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Wed, 15 Apr 2009 23:52:04 +0200
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Wed, 15 Apr 2009 23:59:06 +0200
 
 shadow (1:4.1.3-1) unstable; urgency=low
 

Deleted: debian/trunk/debian/patches/302_vim_selinux_support
===================================================================
--- debian/trunk/debian/patches/302_vim_selinux_support	2009-04-15 21:55:36 UTC (rev 2697)
+++ debian/trunk/debian/patches/302_vim_selinux_support	2009-04-15 21:59:18 UTC (rev 2698)
@@ -1,59 +0,0 @@
-Add SE Linux support to vipw/vigr
-
-Fixes: #491907
-
-Status wrt upsream: Still not applied.
-
-Index: shadow-4.1.1/src/vipw.c
-===================================================================
---- shadow-4.1.1.orig/src/vipw.c	2008-07-26 01:00:51.095214653 +0200
-+++ shadow-4.1.1/src/vipw.c	2008-07-26 01:12:49.295214798 +0200
-@@ -42,6 +42,10 @@
- #include "sgroupio.h"
- #include "shadowio.h"
- 
-+#ifdef WITH_SELINUX                                                            
-+#include <selinux/selinux.h>                                                   
-+#endif
-+
- #define MSG_WARN_EDIT_OTHER_FILE _( \
- 	"You have modified %s.\n"\
- 	"You may need to modify %s for consistency.\n"\
-@@ -167,6 +171,22 @@
- 	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 */
-+	if (is_selinux_enabled ()) {
-+		security_context_t passwd_context=NULL;
-+		int ret = 0;
-+		if (getfilecon (file, &passwd_context) < 0) {
-+			vipwexit (_("Couldn't get file context"), errno, 1);
-+		}
-+		ret = setfscreatecon (passwd_context);
-+		freecon (passwd_context);
-+		if (0 != ret) {
-+			vipwexit (_("setfscreatecon () failed"), errno, 1);
-+		}
-+	}
-+#endif
- 	if (file_lock () == 0) {
- 		vipwexit (_("Couldn't lock file"), errno, 5);
- 	}
-@@ -236,6 +256,14 @@
- 			 progname, file, strerror (errno), fileedit);
- 		vipwexit (0, 0, 1);
- 	}
-+#ifdef WITH_SELINUX                                                            
-+	/* unset the fscreatecon */                                             
-+	if (is_selinux_enabled ()) {
-+		if (setfscreatecon (NULL)) {
-+			vipwexit (_("setfscreatecon() failed"), errno, 1);
-+		}
-+	}
-+#endif
- 
- 	(*file_unlock) ();
- }

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2009-04-15 21:55:36 UTC (rev 2697)
+++ debian/trunk/debian/patches/series	2009-04-15 21:59:18 UTC (rev 2698)
@@ -19,5 +19,4 @@
 403_fix_PATH-MAX_hurd
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
-302_vim_selinux_support
 402_cppw_selinux