rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.143, 1.144 policycoreutils.spec, 1.212, 1.213

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5984

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Jan 10 2006 Dan Walsh <dwalsh at redhat.com> 1.29.5-3
- Fixes for mls policy


policycoreutils-rhat.patch:
 scripts/genhomedircon |    9 
 semanage/Makefile     |    4 
 semanage/semanage     |  376 ++------------------------
 semanage/seobject.py  |  722 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 763 insertions(+), 348 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- policycoreutils-rhat.patch	10 Jan 2006 17:12:58 -0000	1.143
+++ policycoreutils-rhat.patch	10 Jan 2006 19:13:15 -0000	1.144
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.5/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2006-01-05 10:35:49.000000000 -0500
-+++ policycoreutils-1.29.5/scripts/genhomedircon	2006-01-10 12:11:48.000000000 -0500
++++ policycoreutils-1.29.5/scripts/genhomedircon	2006-01-10 14:10:21.000000000 -0500
 @@ -144,7 +144,7 @@
  		for i in  fd.read().split('\n'):
  			if i.find("HOME_ROOT") == 0:
@@ -10,24 +10,20 @@
  		fd.close()
  		if ret=="":
  			errorExit("No Home Root Context Found")
-@@ -240,7 +240,7 @@
- 				i=i.replace("HOME_DIR", home)
- 				i=i.replace("ROLE", role)
- 				i=i.replace("system_u", user)
--				ret = ret+i+"\n"
-+				ret += i+"\n"
- 		fd.close()
- 		return ret
- 
-@@ -252,7 +252,7 @@
- 				i=i.replace("USER", user)
- 				i=i.replace("ROLE", role)
- 				i=i.replace("system_u", sel_user)
--				ret=ret+i+"\n"
-+				ret = i+"\n"
- 		fd.close()
- 		return ret
- 
+@@ -162,9 +162,10 @@
+ 		for idx in range(self.usize):
+ 			user = semanage_user_by_idx(self.ulist, idx)
+ 			if semanage_user_get_name(user) == name:
+-				#role=semanage_user_get_defrole(user)
+-				#return role
+-				return "user_r"
++				if name == "staff_u" or name == "root" and self.type != "targeted":
++					return "staff_r"
++				else:
++					return "user_r"
+ 		return name
+ 	def getOldRole(self, role):
+ 		rc=findval(self.selinuxdir+self.type+"/users/system.users", 'grep "^user %s"' % role, "=")
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.29.5/semanage/Makefile
 --- nsapolicycoreutils/semanage/Makefile	2005-11-29 10:55:01.000000000 -0500
 +++ policycoreutils-1.29.5/semanage/Makefile	2006-01-06 14:34:47.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- policycoreutils.spec	10 Jan 2006 17:12:58 -0000	1.212
+++ policycoreutils.spec	10 Jan 2006 19:13:15 -0000	1.213
@@ -4,7 +4,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.5
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -97,6 +97,9 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Tue Jan 10 2006 Dan Walsh <dwalsh at redhat.com> 1.29.5-3
+- Fixes for mls policy
+
 * Tue Jan 10 2006 Dan Walsh <dwalsh at redhat.com> 1.29.5-2
 - Update semanage and split out seobject
 - Fix labeleing of home_root