rpms/policycoreutils/devel policycoreutils-gui.patch, 1.24, 1.25 policycoreutils.spec, 1.440, 1.441

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-6
- Add more role_templates


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policycoreutils-gui.patch	28 Aug 2007 15:45:56 -0000	1.24
+++ policycoreutils-gui.patch	28 Aug 2007 19:31:24 -0000	1.25
@@ -3179,8 +3179,8 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.25/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.25/gui/polgengui.py	2007-08-28 10:01:46.000000000 -0400
-@@ -0,0 +1,392 @@
++++ policycoreutils-2.0.25/gui/polgengui.py	2007-08-28 15:23:13.000000000 -0400
+@@ -0,0 +1,407 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -3213,6 +3213,9 @@
 +import gnome
 +import sys
 +import polgen
++import sepolgen.interfaces as interfaces
++import sepolgen.defaults as defaults
++import re
 +
 +##
 +## I18N
@@ -3250,6 +3253,13 @@
 +else:
 +    xml = gtk.glade.XML ("/usr/share/system-config-selinux/polgen.glade", domain=PROGNAME)
 +
++fn = defaults.interface_info()
++try:
++    fd = open(fn)
++except:
++    sys.stderr.write("could not open interface info [%s]\n" % fn)
++    sys.exit(1)
++
 +FILE = 1
 +DIR = 2
 +class childWindow:
@@ -3326,10 +3336,15 @@
 +        self.transition_store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
 +        col = gtk.TreeViewColumn(_("Application"), gtk.CellRendererText(), text = 0)
 +        self.transition_treeview.append_column(col)
-+        # Need to figure out a way to optain these
-+        for k in ["mozilla", "ssh"]:
-+            iter = self.transition_store.append()
-+            self.transition_store.set_value(iter, 0, k)
++        # List of per_role_template interfaces
++        ifs = interfaces.InterfaceSet()
++        ifs.from_file(fd)
++        fd.close()
++        for i in ifs.interfaces.keys():
++            m = re.findall("(.*)_per_role_template", i) 
++            if len(m) > 0:
++                iter = self.transition_store.append()
++                self.transition_store.set_value(iter, 0, m[0])
 +
 +    def forward(self, arg):
 +        type = self.confine_application.get_active()


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- policycoreutils.spec	28 Aug 2007 15:45:56 -0000	1.440
+++ policycoreutils.spec	28 Aug 2007 19:31:24 -0000	1.441
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.25
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -200,6 +200,9 @@
 fi
 
 %changelog
+* Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-6
+- Add more role_templates
+
 * Tue Aug 28 2007 Dan Walsh <dwalsh at redhat.com> 2.0.25-5
 - Update genpolgui to add creation of user domains