From 53ac00459c8d2c1a86ab346ccc55e82f5662f906 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Fri, 3 Jan 2014 14:39:18 -0500 Subject: [PATCH] Fixes Customized booleans causing a crash of the sepolicy gui --- policycoreutils-rhat.patch | 20 ++++++++++++++------ policycoreutils.spec | 5 ++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 88df55e..9c4c176 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -657512,7 +657512,7 @@ index 6b53035..32ea970 100644 out += "%s # %s\n" % (self.write_te(out_dir), _("Type Enforcement file")) out += "%s # %s\n" % (self.write_if(out_dir), _("Interface file")) diff --git a/policycoreutils/sepolicy/sepolicy/gui.py b/policycoreutils/sepolicy/sepolicy/gui.py -index 94ddb72..b53694c 100644 +index 94ddb72..e17262e 100644 --- a/policycoreutils/sepolicy/sepolicy/gui.py +++ b/policycoreutils/sepolicy/sepolicy/gui.py @@ -47,12 +47,15 @@ gettext.bindtextdomain(PROGNAME, "/usr/share/locale") @@ -657915,7 +657915,15 @@ index 94ddb72..b53694c 100644 def on_toggle_update(self, cell, path, model): model[path][0] = not model[path][0] -@@ -2444,8 +2440,8 @@ class SELinuxGui(): +@@ -2178,7 +2174,6 @@ class SELinuxGui(): + self.update = True + self.update_treestore.clear() + for bools in self.cur_dict["boolean"]: +- operation = self.cur_dict["boolean"][bools]["action"] + iter = self.update_treestore.append(None) + self.update_treestore.set_value(iter, 0, True) + self.update_treestore.set_value(iter, 1, sepolicy.boolean_desc(bools)) +@@ -2444,8 +2439,8 @@ class SELinuxGui(): self.wait_mouse() try: self.dbus.semanage(update_buffer) @@ -657926,7 +657934,7 @@ index 94ddb72..b53694c 100644 self.ready_mouse() self.init_cur() -@@ -2539,34 +2535,7 @@ class SELinuxGui(): +@@ -2539,34 +2534,7 @@ class SELinuxGui(): self.network_mls_label.set_visible(advanced) self.network_mls_entry.set_visible(advanced) @@ -657962,7 +657970,7 @@ index 94ddb72..b53694c 100644 if label.get_text() == ADVANCED_SEARCH_LABEL[1]: label.set_text(ADVANCED_SEARCH_LABEL[0]) self.close_popup() -@@ -2574,25 +2543,6 @@ class SELinuxGui(): +@@ -2574,25 +2542,6 @@ class SELinuxGui(): label.set_text(ADVANCED_SEARCH_LABEL[1]) self.show_popup(self.advanced_search_window) @@ -657988,7 +657996,7 @@ index 94ddb72..b53694c 100644 def set_enforce_text(self, value): if value: self.status_bar.push(self.context_id, _("System Status: Enforcing")) -@@ -2601,6 +2551,9 @@ class SELinuxGui(): +@@ -2601,6 +2550,9 @@ class SELinuxGui(): self.current_status_permissive.set_active(True) def set_enforce(self, button): @@ -657998,7 +658006,7 @@ index 94ddb72..b53694c 100644 self.dbus.setenforce(button.get_active()) self.set_enforce_text(button.get_active()) -@@ -2728,7 +2681,7 @@ class SELinuxGui(): +@@ -2728,7 +2680,7 @@ class SELinuxGui(): return try: self.dbus.relabel_on_boot(active) diff --git a/policycoreutils.spec b/policycoreutils.spec index 7bedb57..c801b26 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.2.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Base # Based on git repository with tag 20101221 @@ -383,6 +383,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Fri Jan 3 2014 Dan Walsh - 2.2.4-7 +- Fixes Customized booleans causing a crash of the sepolicy gui + * Fri Dec 20 2013 Dan Walsh - 2.2.4-6 - Fix sepolicy gui selection for advanced screen - Update Translations