rpms/policycoreutils/F-11 policycoreutils-gui.patch, 1.88, 1.89 policycoreutils.spec, 1.616, 1.617

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9503

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Jun 9 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.11
- Fix polgen.py 


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-gui.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- policycoreutils-gui.patch	4 Jun 2009 19:31:10 -0000	1.88
+++ policycoreutils-gui.patch	9 Jun 2009 20:53:42 -0000	1.89
@@ -6415,8 +6415,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.63/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.63/gui/polgen.py	2009-06-04 15:19:33.000000000 -0400
-@@ -0,0 +1,1177 @@
++++ policycoreutils-2.0.63/gui/polgen.py	2009-06-09 16:49:00.000000000 -0400
+@@ -0,0 +1,1179 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -6880,7 +6880,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +                    return ""
 +
 +	def generate_manage_krb5_rcache_rules(self):
-+                if self.use_manage_krb5_rcache:
++                if self.manage_krb5_rcache:
 +                    return re.sub("TEMPLATETYPE", self.name, executable.te_manage_krb5_rcache_rules)
 +                else:
 +                    return ""
@@ -6986,14 +6986,16 @@ diff --exclude-from=exclude -N -u -r nsa
 +		
 +	def generate_capabilities(self):
 +            newte = ""
++            self.capabilities.sort()
 +            if len(self.capabilities) > 0:
-+                newte = "allow %s self:capability { %s };\n" % (self.name, " ".join(self.capabilities))
++                newte = "allow %s_t self:capability { %s };\n" % (self.name, " ".join(self.capabilities))
 +            return newte
 +
 +	def generate_process(self):
 +            newte = ""
++            self.process.sort()
 +            if len(self.processes) > 0:
-+                newte = "allow %s self:process { %s };\n" % (self.name, " ".join(self.processes))
++                newte = "allow %s_t self:process { %s };\n" % (self.name, " ".join(self.processes))
 +            return newte
 +
 +


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -p -r1.616 -r1.617
--- policycoreutils.spec	4 Jun 2009 19:31:11 -0000	1.616
+++ policycoreutils.spec	9 Jun 2009 20:53:42 -0000	1.617
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 12.10%{?dist}
+Release: 12.11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -163,7 +163,6 @@ system-config-selinux is a utility for m
 %defattr(-,root,root)
 %{_bindir}/system-config-selinux
 %{_bindir}/selinux-polgengui
-%{_bindir}/sepolgen
 %{_datadir}/applications/fedora-system-config-selinux.desktop
 %{_datadir}/applications/fedora-selinux-polgengui.desktop
 %dir %{_datadir}/system-config-selinux
@@ -225,6 +224,9 @@ else
 fi
 
 %changelog
+* Tue Jun 9 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.11
+- Fix polgen.py 
+
 * Thu Jun 4 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.10
 - Add sepolgen executable