diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 18e4980..ae7ba64 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -43,8 +43,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/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-17 11:52:44.000000000 -0500 -@@ -0,0 +1,250 @@ ++++ policycoreutils-1.33.1/gui/booleansPage.py 2006-11-17 12:09:55.000000000 -0500 +@@ -0,0 +1,200 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel +# @@ -172,8 +172,6 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + def set(self,name,val): + category=self.translation.get_category(name) + self.modifiers[category][name].set(val) -+ if self.isBoolean(name): -+ self.booleanDirty=True + + def isBoolean(self,name): + c=self.translation.get_category(name) @@ -187,16 +185,6 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + booleans[n]=self.modifiers[c][n] + return booleans + -+ def save(self, boolconf): -+ if self.booleanDirty == True: -+ booleans=self.get_booleans() -+ setseboolS="/usr/sbin/setsebool -P " -+ for b in booleans.keys(): -+ if booleans[b].save==1: -+ setseboolS += "%s=%d " % (b, booleans[b].isOn()) -+ boolconf[b]=str(booleans[b].isOn()) -+ commands.getstatusoutput(setseboolS) -+ +class booleansPage: + def __init__(self, xml, doDebug=None): + self.xml = xml @@ -234,17 +222,8 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + def get_description(self): + return _("Boolean") + -+ def verify(self, message): -+ dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, -+ gtk.BUTTONS_YES_NO, -+ message) -+ dlg.set_position(gtk.WIN_POS_MOUSE) -+ dlg.show_all() -+ rc = dlg.run() -+ dlg.destroy() -+ return rc -+ -+ def loadBooleans(self): ++ def refreshBooleans(self): ++ self.modifiers=Modifiers(self.booleansStore) + booleansList=commands.getoutput("/usr/sbin/getsebool -a").split("\n") + for i in booleansList: + rec=i.split() @@ -255,10 +234,6 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + on=0 + self.modifiers.add(name,Boolean(name,on)) + -+ def refreshBooleans(self): -+ self.modifiers=Modifiers(self.booleansStore) -+ self.loadBooleans() -+ + def boolean_toggled(self, widget, row): + if len(row) == 1: + return @@ -268,33 +243,8 @@ diff --exclude-from=exclude --exclude='*.po' --exclude='*.pot' -N -u -r nsapolic + self.booleansStore.set_value(iter, 0 , not val) + self.modifiers.set(key, not val) + -+ def apply(self): -+ retval = 0 -+ -+ if self.selinuxsupport==False: -+ return retval -+ -+ type=self.getType() -+ -+ return retval -+ -+ def reloadPolicy(self): -+ dialog = gtk.MessageDialog (None, -+ gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, -+ gtk.MESSAGE_WARNING, -+ gtk.BUTTONS_OK, -+ _("Reloading Policy. This may take a minute.")) -+ dialog.set_position(gtk.WIN_POS_MOUSE) -+ dialog.show () -+ dialog.get_toplevel().window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) -+ -+ while gtk.events_pending(): -+ gtk.main_iteration() -+ -+ command= "make -C %s/%s/src/policy reload" % (SELINUXDIR , self.getType()) -+ status=commands.getstatusoutput(command)[0] -+ dialog.destroy () -+ return status ++ setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) ++ commands.getstatusoutput(setsebool) 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-17 11:52:44.000000000 -0500 diff --git a/policycoreutils.spec b/policycoreutils.spec index d17c0f2..48b291f 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.33.1 -Release: 8%{?dist} +Release: 9%{?dist} 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 +* Fri Nov 17 2006 Dan Walsh 1.33.1-9 +- Add Amy Grifis Patch to preserve newrole exit status + * Thu Nov 16 2006 Dan Walsh 1.33.1-8 - Fix display of gui