From af6aa62ce9151654f2d66502dca8202bdd0106b6 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Jun 14 2005 17:02:07 +0000
Subject: * Tue Jun 14 2005 Dan Walsh <dwalsh@redhat.com> 1.23.11-4

- Fix Ivan's patch for user role changes

---

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 0f8db5f..e85534a 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -45,7 +45,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policy
   
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.23.11/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2005-04-14 07:22:16.000000000 -0400
-+++ policycoreutils-1.23.11/scripts/genhomedircon	2005-05-28 01:26:50.000000000 -0400
++++ policycoreutils-1.23.11/scripts/genhomedircon	2005-06-14 13:01:12.000000000 -0400
 @@ -357,16 +357,22 @@
  		return udict
  
@@ -70,11 +70,11 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po
  		return ret+"\n"
  
  	def checkExists(self, home):
-@@ -428,6 +434,7 @@
- 		ret= self.heading()
+@@ -429,6 +435,7 @@
  		for h in self.getHomeDirs():
  			ret += self.getHomeDirContext ("user_u" , h+'/[^/]*', "user")
-+			ret += self.getUserContext(".*", "user_u", "user") + "\n"
  			ret += self.getHomeRootContext(h)
++		ret += self.getUserContext(".*", "user_u", "user") + "\n"
  		ret += self.genHomeDirContext()
  		return ret
+ 
diff --git a/policycoreutils.spec b/policycoreutils.spec
index b67cec2..8d73d29 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -3,7 +3,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.23.11
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -84,6 +84,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Tue Jun 14 2005 Dan Walsh <dwalsh@redhat.com> 1.23.11-4
+- Fix Ivan's patch for user role changes 
+
 * Sat May 28 2005 Dan Walsh <dwalsh@redhat.com> 1.23.11-3
 - Add Ivan's patch for user role changes in genhomedircon