rpms/policycoreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Jun 11 2007 Dan Walsh <dwalsh@redhat.com> 2.0.19-5

Browse Source 
- Fix translations code,  Add more filters to gui
This commit is contained in:
Daniel J Walsh 2007-06-11 16:47:29 +00:00
parent 1f766d055e
commit 4efe23c541
3 changed files with 360 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

426
policycoreutils-gui.patch
View File

@ -1,7 +1,7 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.16/gui/booleansPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.19/gui/booleansPage.py
--- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/booleansPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/booleansPage.py 2007-06-11 12:38:04.000000000 -0400
@@ -0,0 +1,224 @@ @@ -0,0 +1,227 @@
+# +#
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
+# +#
@ -49,7 +49,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py poli
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -226,10 +229,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py poli
+ +
+ setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
+ commands.getstatusoutput(setsebool) + commands.getstatusoutput(setsebool)
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.16/gui/fcontextPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.19/gui/fcontextPage.py
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/fcontextPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/fcontextPage.py 2007-06-11 12:38:08.000000000 -0400
@@ -0,0 +1,207 @@ @@ -0,0 +1,210 @@
+## fcontextPage.py - show selinux mappings +## fcontextPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -285,7 +288,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -437,10 +443,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
+ self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, SPEC_COL, fspec)
+ self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, FTYPE_COL, ftype)
+ self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls)) + self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.16/gui/loginsPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.19/gui/loginsPage.py
--- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/loginsPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/loginsPage.py 2007-06-11 12:38:13.000000000 -0400
@@ -0,0 +1,173 @@ @@ -0,0 +1,176 @@
+## loginsPage.py - show selinux mappings +## loginsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -478,7 +484,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -614,9 +623,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy
+ self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 1, seuser)
+ self.store.set_value(iter, 2, seobject.translate(serange)) + self.store.set_value(iter, 2, seobject.translate(serange))
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.16/gui/Makefile diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.19/gui/Makefile
--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/Makefile 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/Makefile 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+# Installation directories. +# Installation directories.
+PREFIX ?= ${DESTDIR}/usr +PREFIX ?= ${DESTDIR}/usr
@ -652,10 +661,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu
+indent: +indent:
+ +
+relabel: +relabel:
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.16/gui/mappingsPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.19/gui/mappingsPage.py
--- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/mappingsPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/mappingsPage.py 2007-06-11 12:38:18.000000000 -0400
@@ -0,0 +1,54 @@ @@ -0,0 +1,57 @@
+## mappingsPage.py - show selinux mappings +## mappingsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -691,7 +700,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py poli
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -710,10 +722,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py poli
+ for k in keys: + for k in keys:
+ print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.16/gui/modulesPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.19/gui/modulesPage.py
--- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/modulesPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/modulesPage.py 2007-06-11 12:44:16.000000000 -0400
@@ -0,0 +1,172 @@ @@ -0,0 +1,182 @@
+## modulesPage.py - show selinux mappings +## modulesPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -752,7 +764,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -760,6 +775,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
+class modulesPage(semanagePage): +class modulesPage(semanagePage):
+ def __init__(self, xml): + def __init__(self, xml):
+ semanagePage.__init__(self, xml, "modules", _("Policy Module")) + semanagePage.__init__(self, xml, "modules", _("Policy Module"))
+ self.module_filter = xml.get_widget("moduleFilterEntry")
+ self.module_filter.connect("focus_out_event", self.filter_changed)
+ self.module_filter.connect("activate", self.filter_changed)
+
+ self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self.view.set_model(self.store) + self.view.set_model(self.store)
+ self.store.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)
@ -795,7 +814,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
+ except: + except:
+ return 0 + return 0
+ +
+ def load(self): + def load(self, filter=""):
+ self.filter=filter
+ self.store.clear() + self.store.clear()
+ try: + try:
+ fd=os.popen("semodule -l") + fd=os.popen("semodule -l")
@ -803,6 +823,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
+ fd.close() + fd.close()
+ for i in l: + for i in l:
+ module, ver = i.split('\t') + module, ver = i.split('\t')
+ if not (self.match(module, filter) or self.match(ver, filter)):
+ continue
+ iter = self.store.append() + iter = self.store.append()
+ self.store.set_value(iter, 0, module.strip()) + self.store.set_value(iter, 0, module.strip())
+ self.store.set_value(iter, 1, ver.strip()) + self.store.set_value(iter, 1, ver.strip())
@ -886,9 +908,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
+ +
+ +
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.16/gui/polgen.glade diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.19/gui/polgen.glade
--- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/polgen.glade 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/polgen.glade 2007-06-11 12:42:40.000000000 -0400
@@ -0,0 +1,1168 @@ @@ -0,0 +1,1168 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@ -2058,10 +2080,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc
+</widget> +</widget>
+ +
+</glade-interface> +</glade-interface>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.16/gui/polgengui.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.19/gui/polgengui.py
--- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/polgengui.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/polgengui.py 2007-06-11 12:38:30.000000000 -0400
@@ -0,0 +1,253 @@ @@ -0,0 +1,256 @@
+#!/usr/bin/python +#!/usr/bin/python
+# +#
+# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@ -2104,7 +2126,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -2315,10 +2340,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
+ +
+ app = childWindow() + app = childWindow()
+ app.stand_alone() + app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.16/gui/polgen.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.19/gui/polgen.py
--- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/polgen.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/polgen.py 2007-06-11 12:38:46.000000000 -0400
@@ -0,0 +1,455 @@ @@ -0,0 +1,458 @@
+#! /usr/bin/python +#! /usr/bin/python
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -2363,7 +2388,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -2774,10 +2802,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
+ sys.exit(0) + sys.exit(0)
+ +
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.16/gui/portsPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.19/gui/portsPage.py
--- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/portsPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/portsPage.py 2007-06-11 12:44:49.000000000 -0400
@@ -0,0 +1,227 @@ @@ -0,0 +1,248 @@
+## portsPage.py - show selinux mappings +## portsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -2819,7 +2847,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+MLS_COL = 2 +MLS_COL = 2
+PORT_COL = 3 +PORT_COL = 3
+try: +try:
+ gettext.install(PROGNAME, localedir = "/usr/share/locale", unicode = 1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -2827,6 +2858,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+class portsPage(semanagePage): +class portsPage(semanagePage):
+ def __init__(self, xml): + def __init__(self, xml):
+ semanagePage.__init__(self, xml, "ports", "Network Port") + semanagePage.__init__(self, xml, "ports", "Network Port")
+ self.ports_filter = xml.get_widget("portsFilterEntry")
+ self.ports_filter.connect("focus_out_event", self.filter_changed)
+ self.ports_filter.connect("activate", self.filter_changed)
+ self.ports_name_entry = xml.get_widget("portsNameEntry") + self.ports_name_entry = xml.get_widget("portsNameEntry")
+ self.ports_protocol_combo = xml.get_widget("portsProtocolCombo") + self.ports_protocol_combo = xml.get_widget("portsProtocolCombo")
+ self.ports_number_entry = xml.get_widget("portsNumberEntry") + self.ports_number_entry = xml.get_widget("portsNumberEntry")
@ -2843,6 +2877,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+ self.edit = True + self.edit = True
+ self.load() + self.load()
+ +
+ def filter_changed(self, *arg):
+ filter = arg[0].get_text()
+ if filter != self.filter:
+ if self.edit:
+ self.load(filter)
+ else:
+ self.group_load(filter)
+
+ def init_store(self): + def init_store(self):
+ self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING , gobject.TYPE_STRING) + self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING , gobject.TYPE_STRING)
+ self.view.set_model(self.store) + self.view.set_model(self.store)
@ -2877,9 +2919,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+ self.ports_delete_button.set_sensitive(self.edit) + self.ports_delete_button.set_sensitive(self.edit)
+ self.mls_col.set_visible(self.edit) + self.mls_col.set_visible(self.edit)
+ if self.edit: + if self.edit:
+ self.load() + self.load(self.filter)
+ else: + else:
+ self.group_load() + self.group_load(self.filter)
+ +
+ def sort_int(self, treemodel, iter1, iter2, user_data): + def sort_int(self, treemodel, iter1, iter2, user_data):
+ try: + try:
@ -2893,13 +2935,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+ except: + except:
+ return 0 + return 0
+ +
+ def load(self): + def load(self,filter = ""):
+ self.filter=filter
+ self.port = seobject.portRecords() + self.port = seobject.portRecords()
+ dict = self.port.get_all() + dict = self.port.get_all()
+ keys = dict.keys() + keys = dict.keys()
+ keys.sort() + keys.sort()
+ self.store.clear() + self.store.clear()
+ for k in keys: + for k in keys:
+ if not (self.match(str(k[0]), filter) or self.match(dict[k][0], filter) or self.match(dict[k][1], filter) or self.match(dict[k][2], filter)):
+ continue
+ iter = self.store.append() + iter = self.store.append()
+ if k[0] == k[1]: + if k[0] == k[1]:
+ self.store.set_value(iter, PORT_COL, k[0]) + self.store.set_value(iter, PORT_COL, k[0])
@ -2911,17 +2956,21 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+ self.store.set_value(iter, MLS_COL, dict[k][2]) + self.store.set_value(iter, MLS_COL, dict[k][2])
+ self.view.get_selection().select_path ((0,)) + self.view.get_selection().select_path ((0,))
+ +
+ def group_load(self): + def group_load(self, filter = ""):
+ self.filter=filter
+ self.port = seobject.portRecords() + self.port = seobject.portRecords()
+ dict = self.port.get_all_by_type() + dict = self.port.get_all_by_type()
+ keys = dict.keys() + keys = dict.keys()
+ keys.sort() + keys.sort()
+ self.store.clear() + self.store.clear()
+ for k in keys: + for k in keys:
+ ports_string = ", ".join(dict[k])
+ if not (self.match(ports_string, filter) or self.match(k[0], filter) or self.match(k[1], filter) ):
+ continue
+ iter = self.store.append() + iter = self.store.append()
+ self.store.set_value(iter, TYPE_COL, k[0]) + self.store.set_value(iter, TYPE_COL, k[0])
+ self.store.set_value(iter, PROTOCOL_COL, k[1]) + self.store.set_value(iter, PROTOCOL_COL, k[1])
+ self.store.set_value(iter, PORT_COL, ", ".join(dict[k])) + self.store.set_value(iter, PORT_COL, ports_string)
+ self.store.set_value(iter, MLS_COL, "") + self.store.set_value(iter, MLS_COL, "")
+ self.view.get_selection().select_path ((0,)) + self.view.get_selection().select_path ((0,))
+ +
@ -3005,9 +3054,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc
+ self.store.set_value(iter, MLS_COL, mls) + self.store.set_value(iter, MLS_COL, mls)
+ +
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.16/gui/selinux.tbl diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.19/gui/selinux.tbl
--- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/selinux.tbl 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/selinux.tbl 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,274 @@ @@ -0,0 +1,274 @@
+acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
+allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow")
@ -3283,10 +3332,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco
+webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.") +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
+webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.") +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.16/gui/semanagePage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.19/gui/semanagePage.py
--- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/semanagePage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/semanagePage.py 2007-06-11 12:43:46.000000000 -0400
@@ -0,0 +1,115 @@ @@ -0,0 +1,133 @@
+## semanagePage.py - show selinux mappings +## semanagePage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -3322,7 +3371,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -3342,6 +3394,21 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli
+ def itemSelected(self, args): + def itemSelected(self, args):
+ return + return
+ +
+ def filter_changed(self, *arg):
+ filter = arg[0].get_text()
+ if filter != self.filter:
+ self.load(filter)
+
+ def match(self, target, filter):
+ try:
+ f=filter.lower()
+ t=target.lower()
+ if t.find(f) >= 0:
+ return True
+ except:
+ pass
+ return False
+
+ def rowActivated(self, view, row, Column): + def rowActivated(self, view, row, Column):
+ self.propertiesDialog() + self.propertiesDialog()
+ +
@ -3402,9 +3469,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli
+ self.dialog.hide() + self.dialog.hide()
+ +
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.16/gui/statusPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.19/gui/statusPage.py
--- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/statusPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/statusPage.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,220 @@ @@ -0,0 +1,220 @@
+## statusPage.py - show selinux status +## statusPage.py - show selinux status
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
@ -3626,10 +3693,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policy
+ return self.types[self.selinuxTypeOptionMenu.get_active()] + return self.types[self.selinuxTypeOptionMenu.get_active()]
+ +
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.16/gui/system-config-selinux.glade diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.19/gui/system-config-selinux.glade
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/system-config-selinux.glade 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/system-config-selinux.glade 2007-06-11 12:42:41.000000000 -0400
@@ -0,0 +1,3035 @@ @@ -0,0 +1,3209 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+ +
@ -6155,6 +6222,64 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
+ </child> + </child>
+ +
+ <child> + <child>
+ <widget class="GtkHBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Filter</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">10</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="translationsFilterEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">False</property>
+ <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow12"> + <widget class="GtkScrolledWindow" id="scrolledwindow12">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
@ -6393,6 +6518,64 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
+ </child> + </child>
+ +
+ <child> + <child>
+ <widget class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Filter</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">10</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="portsFilterEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">False</property>
+ <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow13"> + <widget class="GtkScrolledWindow" id="scrolledwindow13">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
@ -6577,6 +6760,64 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
+ </child> + </child>
+ +
+ <child> + <child>
+ <widget class="GtkHBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label55">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Filter</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">10</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="policyFilterEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">False</property>
+ <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow15"> + <widget class="GtkScrolledWindow" id="scrolledwindow15">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
@ -6665,10 +6906,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
+</widget> +</widget>
+ +
+</glade-interface> +</glade-interface>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.16/gui/system-config-selinux.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.19/gui/system-config-selinux.py
--- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/system-config-selinux.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/system-config-selinux.py 2007-06-11 12:37:26.000000000 -0400
@@ -0,0 +1,169 @@ @@ -0,0 +1,172 @@
+#!/usr/bin/python +#!/usr/bin/python
+# +#
+# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@ -6718,7 +6959,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") +gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME) +gettext.textdomain(PROGNAME)
+try: +try:
+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) + gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
+except IOError: +except IOError:
+ import __builtin__ + import __builtin__
+ __builtin__.__dict__['_'] = unicode + __builtin__.__dict__['_'] = unicode
@ -6838,9 +7082,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
+ +
+ app = childWindow() + app = childWindow()
+ app.stand_alone() + app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.16/gui/templates/executable.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.19/gui/templates/executable.py
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/executable.py 2007-05-17 13:41:49.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/executable.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,154 @@ @@ -0,0 +1,154 @@
+#! /usr/bin/env python +#! /usr/bin/env python
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
@ -6996,9 +7240,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable
+EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0) +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
+""" +"""
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.16/gui/templates/__init__.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.19/gui/templates/__init__.py
--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/__init__.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/__init__.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+# +#
+# Copyright (C) 2007 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc.
@ -7018,13 +7262,13 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.p
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# +#
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.16/gui/templates/network.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.19/gui/templates/network.py
--- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/network.py 2007-05-17 13:41:29.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/network.py 2007-06-11 12:45:41.000000000 -0400
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+te_port_types="""\ +te_port_types="""\
+type TEMPLATETYPE_port_t; +type TEMPLATETYPE_port_t;
+corenet_port_type(TEMPLATETYPE_port_t) +corenet_port(TEMPLATETYPE_port_t)
+""" +"""
+ +
+te_network="""\ +te_network="""\
@ -7066,9 +7310,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py
+allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind; +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind;
+""" +"""
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.16/gui/templates/rw.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.19/gui/templates/rw.py
--- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/rw.py 2007-05-17 13:41:33.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/rw.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,104 @@ @@ -0,0 +1,104 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7174,9 +7418,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py poli
+fc_dir=""" +fc_dir="""
+FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
+""" +"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.16/gui/templates/script.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.19/gui/templates/script.py
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/script.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/script.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7220,9 +7464,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py
+/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
+""" +"""
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.16/gui/templates/semodule.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.19/gui/templates/semodule.py
--- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/semodule.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/semodule.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7265,9 +7509,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.p
+semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
+""" +"""
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.16/gui/templates/tmp.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.19/gui/templates/tmp.py
--- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/tmp.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/tmp.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7341,9 +7585,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py pol
+ dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms; + dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms;
+') +')
+""" +"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.16/gui/templates/var_lib.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.19/gui/templates/var_lib.py
--- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/var_lib.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/var_lib.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,137 @@ @@ -0,0 +1,137 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7482,9 +7726,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py
+fc_dir="""\ +fc_dir="""\
+FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
+""" +"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.16/gui/templates/var_log.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.19/gui/templates/var_log.py
--- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/var_log.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/var_log.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7575,9 +7819,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py
+fc_dir="""\ +fc_dir="""\
+FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
+""" +"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.16/gui/templates/var_run.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.19/gui/templates/var_run.py
--- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/var_run.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/var_run.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7674,9 +7918,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py
+FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
+""" +"""
+ +
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.16/gui/templates/var_spool.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.19/gui/templates/var_spool.py
--- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/templates/var_spool.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/templates/var_spool.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -7783,10 +8027,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.
+fc_dir="""\ +fc_dir="""\
+FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
+""" +"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.16/gui/translationsPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.19/gui/translationsPage.py
--- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/translationsPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/translationsPage.py 2007-06-11 12:43:05.000000000 -0400
@@ -0,0 +1,111 @@ @@ -0,0 +1,119 @@
+## translationsPage.py - show selinux translations +## translationsPage.py - show selinux translations
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.
+ +
@ -7830,8 +8074,13 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py
+ +
+class translationsPage(semanagePage): +class translationsPage(semanagePage):
+ def __init__(self, xml): + def __init__(self, xml):
+ self.firstTime = False
+ semanagePage.__init__(self, xml, "translations", _("Translation")) + semanagePage.__init__(self, xml, "translations", _("Translation"))
+ self.firstTime = False
+
+ self.translation_filter = xml.get_widget("translationsFilterEntry")
+ self.translation_filter.connect("focus_out_event", self.filter_changed)
+ self.translation_filter.connect("activate", self.filter_changed)
+
+ self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self.view.set_model(self.store) + self.view.set_model(self.store)
+ self.store.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)
@ -7850,13 +8099,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py
+ self.translationsLevelEntry = xml.get_widget("translationsLevelEntry") + self.translationsLevelEntry = xml.get_widget("translationsLevelEntry")
+ self.translationsEntry = xml.get_widget("translationsEntry") + self.translationsEntry = xml.get_widget("translationsEntry")
+ +
+ def load(self): + def load(self, filter = ""):
+ self.filter = filter
+ self.translation = seobject.setransRecords() + self.translation = seobject.setransRecords()
+ dict = self.translation.get_all() + dict = self.translation.get_all()
+ keys = dict.keys() + keys = dict.keys()
+ keys.sort() + keys.sort()
+ self.store.clear() + self.store.clear()
+ for k in keys: + for k in keys:
+ if not (self.match(k, filter) or self.match(dict[k], filter)):
+ continue
+ iter = self.store.append() + iter = self.store.append()
+ self.store.set_value(iter, 0, k) + self.store.set_value(iter, 0, k)
+ self.store.set_value(iter, 1, dict[k]) + self.store.set_value(iter, 1, dict[k])
@ -7898,9 +8150,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py
+ store, iter = self.view.get_selection().get_selected() + store, iter = self.view.get_selection().get_selected()
+ self.store.set_value(iter, 0, level) + self.store.set_value(iter, 0, level)
+ self.store.set_value(iter, 1, translation) + self.store.set_value(iter, 1, translation)
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.16/gui/usersPage.py diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.19/gui/usersPage.py
--- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.16/gui/usersPage.py 2007-05-07 12:59:26.000000000 -0400 +++ policycoreutils-2.0.19/gui/usersPage.py 2007-06-01 10:29:17.000000000 -0400
@@ -0,0 +1,166 @@ @@ -0,0 +1,166 @@
+## usersPage.py - show selinux mappings +## usersPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc. +## Copyright (C) 2006 Red Hat, Inc.

15
policycoreutils-rhat.patch
View File

@ -77,6 +77,21 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po
ret = ret+i ret = ret+i
fd.close() fd.close()
return ret return ret
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.19/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2007-05-04 09:14:39.000000000 -0400
+++ policycoreutils-2.0.19/semanage/semanage 2007-06-11 12:36:56.000000000 -0400
@@ -34,7 +34,10 @@
sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace')
try:
- gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
+ gettext.install(PROGNAME,
+ localedir="/usr/share/locale",
+ unicode=False,
+ codeset = 'utf-8')
except IOError:
import __builtin__
__builtin__.__dict__['_'] = unicode
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.19/semanage/seobject.py diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.19/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2007-04-12 12:43:06.000000000 -0400 --- nsapolicycoreutils/semanage/seobject.py 2007-04-12 12:43:06.000000000 -0400
+++ policycoreutils-2.0.19/semanage/seobject.py 2007-06-01 10:29:17.000000000 -0400 +++ policycoreutils-2.0.19/semanage/seobject.py 2007-06-01 10:29:17.000000000 -0400

9
policycoreutils.spec
View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities. Summary: SELinux policy core utilities.
Name: policycoreutils Name: policycoreutils
Version: 2.0.19 Version: 2.0.19
Release: 4%{?dist} Release: 5%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -21,8 +21,8 @@ Patch1: policycoreutils-po.patch
Patch3: policycoreutils-gui.patch Patch3: policycoreutils-gui.patch
BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext
Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm /bin/sed Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm /bin/sed
Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >= %{libauditver} Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >= %{libauditver} checkpolicy
Requires(post): /sbin/service /sbin/chkconfig Requires(post): /sbin/service /sbin/chkconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then
fi fi
%changelog %changelog
* Mon Jun 11 2007 Dan Walsh <dwalsh@redhat.com> 2.0.19-5
- Fix translations code, Add more filters to gui
* Mon Jun 4 2007 Dan Walsh <dwalsh@redhat.com> 2.0.19-4 * Mon Jun 4 2007 Dan Walsh <dwalsh@redhat.com> 2.0.19-4
- Fix setfiles -c to make it work - Fix setfiles -c to make it work