From e8e34ee134dde435a95209339574ae48e4e94700 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 15 Nov 2006 23:24:20 +0000 Subject: [PATCH] * Wed Nov 15 2006 Dan Walsh 1.33.1-6 - More fixes to gui --- policycoreutils-rhat.patch | 56 ++++++++++++++++++++++---------------- policycoreutils.spec | 5 +++- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 0d71a28..a5a3651 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -43,7 +43,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.1/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/booleansPage.py 2006-11-14 09:54:05.000000000 -0500 ++++ policycoreutils-1.33.1/gui/booleansPage.py 2006-11-15 18:22:45.000000000 -0500 @@ -0,0 +1,247 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -294,7 +294,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + return status diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.1/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/fcontextPage.py 2006-11-14 09:54:05.000000000 -0500 ++++ policycoreutils-1.33.1/gui/fcontextPage.py 2006-11-15 18:22:45.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -456,7 +456,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.1/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/loginsPage.py 2006-11-14 09:54:05.000000000 -0500 ++++ policycoreutils-1.33.1/gui/loginsPage.py 2006-11-15 18:22:45.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -502,7 +502,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic +class loginsPage(semanagePage): + def __init__(self, xml): + self.firstTime = False -+ semanagePage.__init__(self, xml, "logins", _("SELinux User Mapping")) ++ semanagePage.__init__(self, xml, "logins", _("User Mapping")) + self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) + self.view.set_model(self.store) + self.store.set_sort_column_id(0, gtk.SORT_ASCENDING) @@ -654,7 +654,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic +relabel: diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.1/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/mappingsPage.py 2006-11-14 09:54:05.000000000 -0500 ++++ policycoreutils-1.33.1/gui/mappingsPage.py 2006-11-15 18:22:45.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -712,7 +712,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.1/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/modulesPage.py 2006-11-15 13:22:01.000000000 -0500 ++++ policycoreutils-1.33.1/gui/modulesPage.py 2006-11-15 18:22:45.000000000 -0500 @@ -0,0 +1,157 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -873,8 +873,8 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.1/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/portsPage.py 2006-11-15 13:21:49.000000000 -0500 -@@ -0,0 +1,210 @@ ++++ policycoreutils-1.33.1/gui/portsPage.py 2006-11-15 18:22:45.000000000 -0500 +@@ -0,0 +1,209 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. + @@ -1012,7 +1012,6 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + keys = dict.keys() + keys.sort() + self.store.clear() -+ print dir(self.store) + for k in keys: + iter = self.store.append() + self.store.set_value(iter, TYPE_COL, k[0]) @@ -1087,8 +1086,8 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.1/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/semanagePage.py 2006-11-15 10:15:16.000000000 -0500 -@@ -0,0 +1,103 @@ ++++ policycoreutils-1.33.1/gui/semanagePage.py 2006-11-15 18:22:45.000000000 -0500 +@@ -0,0 +1,104 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. + @@ -1144,10 +1143,11 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + def rowActivated(self, view, row, Column): + self.propertiesDialog() + -+ def verify(self, message): ++ def verify(self, message, title="" ): + dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, + gtk.BUTTONS_YES_NO, + message) ++ dlg.set_title(title) + dlg.set_position(gtk.WIN_POS_MOUSE) + dlg.show_all() + rc = dlg.run() @@ -1165,7 +1165,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + + def deleteDialog(self): + store, iter = self.view.get_selection().get_selected() -+ if self.verify(_("Are you sure you want to delete %s '%s'?" % (self.description, store.get_value(iter, 0)))) == gtk.RESPONSE_YES: ++ if self.verify(_("Are you sure you want to delete %s '%s'?" % (self.description, store.get_value(iter, 0))), _("Delete %s" % self.description)) == gtk.RESPONSE_YES: + self.delete() + + def addDialog(self): @@ -1194,8 +1194,8 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.1/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/statusPage.py 2006-11-14 10:46:46.000000000 -0500 -@@ -0,0 +1,231 @@ ++++ policycoreutils-1.33.1/gui/statusPage.py 2006-11-15 18:22:46.000000000 -0500 +@@ -0,0 +1,230 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. + @@ -1314,7 +1314,6 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + return rc + + def typemenu_changed(self, menu): -+ print "type changed" + self.dirty = True + type = self.getType() + if self.initialtype != type: @@ -1429,7 +1428,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.1/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/system-config-selinux.glade 2006-11-15 13:20:19.000000000 -0500 ++++ policycoreutils-1.33.1/gui/system-config-selinux.glade 2006-11-15 18:21:26.000000000 -0500 @@ -0,0 +1,2784 @@ + + @@ -2954,7 +2953,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + + True + True -+ True ++ False + False + GTK_POS_TOP + False @@ -4217,7 +4216,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.1/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/system-config-selinux.py 2006-11-15 08:06:42.000000000 -0500 ++++ policycoreutils-1.33.1/gui/system-config-selinux.py 2006-11-15 18:22:46.000000000 -0500 @@ -0,0 +1,164 @@ +#!/usr/bin/python +# @@ -4357,7 +4356,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + iter = self.store.append() + self.store.set_value(iter, 0, _("File Contexts")) + iter = self.store.append() -+ self.store.set_value(iter, 0, _("Linux to SELinux User Mappings")) ++ self.store.set_value(iter, 0, _("SELinux User/Login Mappings")) + iter = self.store.append() + self.store.set_value(iter, 0, _("Translations")) + iter = self.store.append() @@ -4385,7 +4384,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + app.stand_alone() diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.1/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/translationsPage.py 2006-11-14 09:54:05.000000000 -0500 ++++ policycoreutils-1.33.1/gui/translationsPage.py 2006-11-15 18:22:46.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4431,7 +4430,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic +class translationsPage(semanagePage): + def __init__(self, xml): + self.firstTime = False -+ semanagePage.__init__(self, xml, "translations", _("SELinux Level Translation")) ++ semanagePage.__init__(self, xml, "translations", _("Translation")) + self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + self.view.set_model(self.store) + self.store.set_sort_column_id(0, gtk.SORT_ASCENDING) @@ -4498,7 +4497,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + self.store.set_value(iter, 1, translation) diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.1/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.1/gui/usersPage.py 2006-11-14 09:54:05.000000000 -0500 ++++ policycoreutils-1.33.1/gui/usersPage.py 2006-11-15 18:22:46.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4780,7 +4779,7 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic .TP diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.1/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-10-17 12:04:55.000000000 -0400 -+++ policycoreutils-1.33.1/semanage/seobject.py 2006-11-15 15:02:57.000000000 -0500 ++++ policycoreutils-1.33.1/semanage/seobject.py 2006-11-15 18:20:53.000000000 -0500 @@ -94,23 +94,25 @@ return re.search("^" + reg +"$",raw) @@ -4821,6 +4820,15 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic if raw == "": return trans else: +@@ -157,7 +159,7 @@ + def out(self): + rec = "" + for c in self.comments: +- rec += c +"\n" ++ rec += c + keys = self.ddict.keys() + keys.sort() + for k in keys: @@ -204,7 +206,8 @@ os.write(fd, self.out()) os.close(fd) diff --git a/policycoreutils.spec b/policycoreutils.spec index f797fdc..7833b54 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.33.1 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,9 @@ fi [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Wed Nov 15 2006 Dan Walsh 1.33.1-6 +- More fixes to gui + * Wed Nov 15 2006 Dan Walsh 1.33.1-5 - Fix audit2allow to generate referene policy