rpms/policycoreutils/devel policycoreutils-rhat.patch,1.397,1.398

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22477

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Mon Oct 27 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-6
- Add usermode-gtk requires


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- policycoreutils-rhat.patch	27 Oct 2008 14:11:35 -0000	1.397
+++ policycoreutils-rhat.patch	28 Oct 2008 19:54:05 -0000	1.398
@@ -30,30 +30,57 @@
  	rc |= cap_set_flag(new_caps, CAP_PERMITTED, 6, cap_list, CAP_SET);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.57/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2008-09-12 11:48:15.000000000 -0400
-+++ policycoreutils-2.0.57/semanage/seobject.py	2008-10-23 14:05:27.000000000 -0400
-@@ -1430,7 +1430,7 @@
- 		if rc < 0:
- 			raise ValueError(_("Could not create key for %s") % target)
++++ policycoreutils-2.0.57/semanage/seobject.py	2008-10-28 15:48:14.000000000 -0400
+@@ -35,7 +35,7 @@
+        import __builtin__
+        __builtin__.__dict__['_'] = unicode
+ 
+-is_mls_enabled = selinux.is_selinux_mls_enabled()
++is_mls_enabled = not selinux.is_selinux_enabled() or selinux.is_selinux_mls_enabled()
  
--		(rc,exists) = semanage_fcontext_exists(self.sh, k)
-+		(rc,exists) = semanage_fcontext_exists_local(self.sh, k)
+ import syslog
+ 
+@@ -1433,8 +1433,14 @@
+ 		(rc,exists) = semanage_fcontext_exists(self.sh, k)
  		if rc < 0:
  			raise ValueError(_("Could not check if file context for %s is defined") % target)
- 		if exists:
-@@ -1485,7 +1485,11 @@
+-		if exists:
+-			raise ValueError(_("File context for %s already defined") % target)
++
++		if not exists:
++                       (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++                       if rc < 0:
++                              raise ValueError(_("Could not check if file context for %s is defined") % target)
++
++                if exists:
++                       raise ValueError(_("File context for %s already defined") % target)
+ 
+ 		(rc,fcontext) = semanage_fcontext_create(self.sh)
+ 		if rc < 0:
+@@ -1481,15 +1487,19 @@
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create a key for %s") % target)
+ 
+-		(rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++		(rc,exists) = semanage_fcontext_exists(self.sh, k)
  		if rc < 0:
  			raise ValueError(_("Could not check if file context for %s is defined") % target)
  		if not exists:
 -			raise ValueError(_("File context for %s is not defined") % target)
-+                       (rc,exists) = semanage_fcontext_exists(self.sh, k)
-+                       if exists:
-+                              return self.__add(target, setype, ftype, serange, seuser)
-+                       else:
++                       (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++                       if not exists:
 +                              raise ValueError(_("File context for %s is not defined") % target)
  		
  		(rc,fcontext) = semanage_fcontext_query_local(self.sh, k)
  		if rc < 0:
-@@ -1591,30 +1595,33 @@
+-			raise ValueError(_("Could not query file context for %s") % target)
++                       (rc,fcontext) = semanage_fcontext_query(self.sh, k)
++                       if rc < 0:
++                              raise ValueError(_("Could not query file context for %s") % target)
+ 
+                 if setype != "<<none>>":
+                        con = semanage_fcontext_get_con(fcontext)
+@@ -1591,30 +1601,33 @@
  
                         self.flist += fclocal