[policycoreutils] If policy is not installed get_bools should not crash
Daniel J Walsh
dwalsh at fedoraproject.org
Fri Aug 9 09:49:48 UTC 2013
commit 79e2d33ac3f3b37379db7b6e461c6f792141d5fb
Author: Dan Walsh <dwalsh at redhat.com>
Date: Fri Aug 9 05:49:38 2013 -0400
If policy is not installed get_bools should not crash
policycoreutils-rhat.patch | 324 ++++++++++++--------------------------------
policycoreutils.spec | 14 ++-
2 files changed, 99 insertions(+), 239 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 7d0f127..c0be572 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -509902,7 +509902,7 @@ index 0000000..e2befdb
+ packages=["policycoreutils"],
+)
diff --git a/policycoreutils/semanage/semanage b/policycoreutils/semanage/semanage
-index 6e33c85..2ccddd7 100644
+index 6e33c85..faaed5b 100644
--- a/policycoreutils/semanage/semanage
+++ b/policycoreutils/semanage/semanage
@@ -1,5 +1,7 @@
@@ -509914,7 +509914,7 @@ index 6e33c85..2ccddd7 100644
# see file 'COPYING' for use and warranty information
#
# semanage is a tool for managing SELinux configuration files
-@@ -19,564 +21,792 @@
+@@ -19,564 +21,795 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA
#
@@ -510258,7 +510258,7 @@ index 6e33c85..2ccddd7 100644
+ label. This is used with fcontext. Requires source and target
+ path arguments. The context labeling for the target subtree is
+ made equivalent to that defined for the source.'''))
-+ fcontextParser.add_argument('-f', '--ftype', default="", choices=["--","-d","-c","-b","-s","-l","-p"], help=_(ftype_help))
++ fcontextParser.add_argument('-f', '--ftype', default="", choices=["all files","--","-d","-c","-b","-s","-l","-p"], help=_(ftype_help))
+ parser_add_seuser(fcontextParser, "fcontext")
+ parser_add_type(fcontextParser, "fcontext")
+ parser_add_range(fcontextParser, "fcontext")
@@ -510630,6 +510630,9 @@ index 6e33c85..2ccddd7 100644
+ trans.start()
+
+ for l in sys.stdin.readlines():
++ if len(l.strip()) == 0:
++ continue
++
+ try:
+ commandParser = createCommandParser()
+ args = commandParser.parse_args(mkargv(l))
@@ -514081,7 +514084,7 @@ index b25d3b2..0dc3b9b 100755
sys.exit(0)
+
diff --git a/policycoreutils/sepolicy/sepolicy/__init__.py b/policycoreutils/sepolicy/sepolicy/__init__.py
-index 5e7415c..5cebe57 100644
+index 5e7415c..7734ba0 100644
--- a/policycoreutils/sepolicy/sepolicy/__init__.py
+++ b/policycoreutils/sepolicy/sepolicy/__init__.py
@@ -1,12 +1,15 @@
@@ -514514,7 +514517,7 @@ index 5e7415c..5cebe57 100644
roles = map(lambda x: x['name'], info(ROLE))
roles.remove("object_r")
roles.sort()
-@@ -104,115 +437,256 @@ def get_all_users():
+@@ -104,115 +437,259 @@ def get_all_users():
if users:
return users
users = map(lambda x: x['name'], info(USER))
@@ -514755,7 +514758,10 @@ index 5e7415c..5cebe57 100644
+ for b in i:
+ if not isinstance(b,tuple):
+ continue
-+ enabled = selinux.security_get_boolean_active(b[0])
++ try:
++ enabled = selinux.security_get_boolean_active(b[0])
++ except OSError:
++ enabled = b[1]
+ if b[0].startswith(short_name) or b[0].startswith(domainname):
+ if (b[0], enabled) not in domainbools and (b[0], not enabled) not in domainbools:
+ domainbools.append((b[0], enabled))
@@ -514843,7 +514849,7 @@ index 5e7415c..5cebe57 100644
def boolean_category(boolean):
booleans_dict = gen_bool_dict()
-@@ -233,18 +707,18 @@ def get_os_version():
+@@ -233,18 +710,18 @@ def get_os_version():
os_version = ""
pkg_name = "selinux-policy"
try:
@@ -515162,10 +515168,10 @@ index 26f8390..ba959ae 100644
return out
diff --git a/policycoreutils/sepolicy/sepolicy/gui.py b/policycoreutils/sepolicy/sepolicy/gui.py
new file mode 100644
-index 0000000..af4278f
+index 0000000..112596d
--- /dev/null
+++ b/policycoreutils/sepolicy/sepolicy/gui.py
-@@ -0,0 +1,2353 @@
+@@ -0,0 +1,2351 @@
+#!/usr/bin/python -Es
+#
+# Copyright (C) 2013 Red Hat
@@ -515257,7 +515263,6 @@ index 0000000..af4278f
+ self.applications_button_selection = self.builder.get_object("applications_selection_button")
+ self.revert_button = self.builder.get_object("Revert_button")
+ self.application = None
-+ self.add_path_dialog = self.builder.get_object("Add_path_dialog")
+ self.busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
+ self.ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
+ self.current_popup = None
@@ -515314,8 +515319,7 @@ index 0000000..af4278f
+ # System Items **************************************
+
+ # Browse Items **************************************
-+ self.browse_popup_window = self.builder.get_object("Add_path_dialog")
-+ self.file_config_window = self.builder.get_object("file_configurations")
++ self.file_dialog = self.builder.get_object("add_path_dialog")
+ self.select_button_browse = self.builder.get_object("select_button_browse")
+ self.cancel_button_browse = self.builder.get_object("cancel_button_browse")
+ # Browse Items **************************************
@@ -517318,11 +517322,11 @@ index 0000000..af4278f
+ self.set_enforce_text(button.get_active())
+
+ def on_browse_select(self, *args):
-+ filename = self.add_path_dialog.get_filename()
++ filename = self.file_dialog.get_filename()
+ if filename == None:
+ return
+ self.clear_entry = False
-+ self.add_path_dialog.hide()
++ self.file_dialog.hide()
+ self.files_path_entry.set_text(filename)
+
+ def recursive_path(self, *args):
@@ -517365,13 +517369,13 @@ index 0000000..af4278f
+ renderer = self.booleans_column_1.get_cell_renderers()
+
+ def browse_for_files(self, *args):
-+ self.add_path_dialog.show()
++ self.file_dialog.show()
+
+ def close_browse_popup(self, *args):
-+ self.browse_popup_window.hide()
++ self.file_dialog.hide()
+
+ def close_config_window(self, *args):
-+ self.file_config_window.hide()
++ self.file_dialog.hide()
+
+ def change_system_policy(self, *args):
+ self.dbus.change_policy_type(self.system_policy_type_combobox.get_active_text())
@@ -517381,27 +517385,27 @@ index 0000000..af4278f
+ self.dbus.change_default_policy(button.get_label().lower())
+
+ def import_config_show(self, *args):
-+ self.file_config_window.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
-+ self.file_config_window.set_title("Import Configuration")
-+ self.file_config_window.show()
++ self.file_dialog.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
++ self.file_dialog.set_title("Import Configuration")
++ self.file_dialog.show()
+ self.import_export = 'Import'
+
+ def export_config_show(self, *args):
-+ self.file_config_window.set_action(gtk.FILE_CHOOSER_ACTION_SAVE)
-+ self.file_config_window.set_title("Export Configuration")
-+ self.file_config_window.show()
++ self.file_dialog.set_action(gtk.FILE_CHOOSER_ACTION_SAVE)
++ self.file_dialog.set_title("Export Configuration")
++ self.file_dialog.show()
+ self.import_export = 'Export'
+
+ def import_or_export(self, button, *args):
-+ self.file_config_window.show()
++ self.file_dialog.show()
+ if self.import_export == 'Import':
+ self.import_config()
+ elif self.import_export == 'Export':
+ self.export_config()
+
+ def export_config(self, *args):
-+ self.file_config_window.hide()
-+ filename = self.file_config_window.get_filename()
++ self.file_dialog.hide()
++ filename = self.file_dialog.get_filename()
+ if filename == None:
+ return
+ if os.path.exists(filename):
@@ -517415,11 +517419,11 @@ index 0000000..af4278f
+ #self.exportwindow.set_action
+
+ def import_config(self, *args):
-+ self.file_config_window.hide()
-+ filename = self.file_config_window.get_filename()
++ self.file_dialog.hide()
++ filename = self.file_dialog.get_filename()
+ if filename == None:
+ return
-+ self.add_path_dialog.hide()
++ self.file_dialog.hide()
+ fd = open(filename, "r")
+ buf = fd.read()
+ fd.close()
@@ -518337,78 +518341,13 @@ index 0000000..07d5a98
+ print e
diff --git a/policycoreutils/sepolicy/sepolicy/sepolicy.glade b/policycoreutils/sepolicy/sepolicy/sepolicy.glade
new file mode 100644
-index 0000000..9cae364
+index 0000000..da6318f
--- /dev/null
+++ b/policycoreutils/sepolicy/sepolicy/sepolicy.glade
-@@ -0,0 +1,3964 @@
+@@ -0,0 +1,3814 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
-+ <requires lib="gtk+" version="2.24"/>
-+ <!-- interface-naming-policy project-wide -->
-+ <object class="GtkFileChooserDialog" id="Add_path_dialog">
-+ <property name="can_focus">False</property>
-+ <property name="border_width">5</property>
-+ <property name="role">GtkFileChooserDialog</property>
-+ <property name="modal">True</property>
-+ <property name="default_width">320</property>
-+ <property name="default_height">260</property>
-+ <property name="type_hint">dialog</property>
-+ <child internal-child="vbox">
-+ <object class="GtkVBox" id="dialog-vbox1">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="spacing">2</property>
-+ <child internal-child="action_area">
-+ <object class="GtkHButtonBox" id="dialog-action_area1">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="layout_style">end</property>
-+ <child>
-+ <object class="GtkButton" id="select_button_browse">
-+ <property name="label" translatable="yes">Select</property>
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <signal name="clicked" handler="on_select_button_browse_clicked" swapped="no"/>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkButton" id="cancel_button_browse">
-+ <property name="label" translatable="yes">Cancel</property>
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <signal name="clicked" handler="on_cancel_button_browse_clicked" swapped="no"/>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">end</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <placeholder/>
-+ </child>
-+ </object>
-+ </child>
-+ <action-widgets>
-+ <action-widget response="0">select_button_browse</action-widget>
-+ <action-widget response="0">cancel_button_browse</action-widget>
-+ </action-widgets>
-+ </object>
++ <!-- interface-requires gtk+ 3.8 -->
+ <object class="GtkListStore" id="Advanced_search_liststore">
+ <columns>
+ <!-- column-name Application -->
@@ -518425,7 +518364,7 @@ index 0000000..9cae364
+ <column type="gchararray"/>
+ <!-- column-name Destination -->
+ <column type="gchararray"/>
-+ <!-- column-name File Name -->
++ <!-- column-name File -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
@@ -518530,8 +518469,6 @@ index 0000000..9cae364
+ <property name="primary_icon_stock">gtk-find</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_completion_entry_changed" swapped="no"/>
+ <signal name="activate" handler="on_SELinux_window_configure_event" swapped="no"/>
+ </object>
@@ -518672,6 +518609,7 @@ index 0000000..9cae364
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Display boolean information that can be used to modify the policy for the 'selected domain'.</property>
++ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">Files_button</property>
@@ -518690,6 +518628,7 @@ index 0000000..9cae364
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Display file type information that can be used by the 'selected domain'.</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">Booleans_button</property>
+ <signal name="toggled" handler="on_Files_button_toggled" swapped="no"/>
@@ -518707,6 +518646,7 @@ index 0000000..9cae364
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Display network ports to which the 'selected domain' can connect or listen to.</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">Booleans_button</property>
+ <signal name="toggled" handler="on_Network_button_toggled" swapped="no"/>
@@ -518724,6 +518664,7 @@ index 0000000..9cae364
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Display applications that can transition into or out of the 'selected domain'.</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">Booleans_button</property>
+ <signal name="toggled" handler="on_Transitions_button_toggled" swapped="no"/>
@@ -518739,6 +518680,7 @@ index 0000000..9cae364
+ <property name="label" translatable="yes">System</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ </object>
@@ -518795,10 +518737,7 @@ index 0000000..9cae364
+ <property name="shadow_type">none</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_stock">gtk-find</property>
-+ <property name="primary_icon_activatable">True</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_booleans_filter_changed" swapped="no"/>
+ </object>
+ <packing>
@@ -518820,6 +518759,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_Show_modified_only_toggle_booleans_toggled" swapped="no"/>
+ </object>
@@ -518833,8 +518773,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="Boolean_treeview">
+ <property name="visible">True</property>
@@ -518975,10 +518913,7 @@ index 0000000..9cae364
+ <property name="shadow_type">none</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_stock">gtk-find</property>
-+ <property name="primary_icon_activatable">True</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_files_filter_changed" swapped="no"/>
+ </object>
+ <packing>
@@ -518995,6 +518930,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_Show_modified_only_toggle_files_toggled" swapped="no"/>
+ </object>
@@ -519010,6 +518946,7 @@ index 0000000..9cae364
+ <property name="label" translatable="yes">Show mislabeled files only</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_Show_mislabeled_files_toggled" swapped="no"/>
+ </object>
@@ -519125,13 +519062,10 @@ index 0000000..9cae364
+ <object class="GtkNotebook" id="files_inner_notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="tab_vborder">0</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="Executable_files_treeview">
+ <property name="visible">True</property>
@@ -519236,8 +519170,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="Writable_files_treeview">
+ <property name="visible">True</property>
@@ -519346,8 +519278,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="Application_file_types_treeview">
+ <property name="visible">True</property>
@@ -519517,10 +519447,7 @@ index 0000000..9cae364
+ <property name="shadow_type">none</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_stock">gtk-find</property>
-+ <property name="primary_icon_activatable">True</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_network_filter_changed" swapped="no"/>
+ </object>
+ <packing>
@@ -519599,6 +519526,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_Show_modified_only_toggle_network_toggled" swapped="no"/>
+ </object>
@@ -519612,13 +519540,10 @@ index 0000000..9cae364
+ <object class="GtkNotebook" id="network_inner_notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="tab_vborder">0</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="outbound_treeview">
+ <property name="visible">True</property>
@@ -519700,8 +519625,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="inbound_treeview">
+ <property name="visible">True</property>
@@ -519835,10 +519758,7 @@ index 0000000..9cae364
+ <property name="shadow_type">none</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_stock">gtk-find</property>
-+ <property name="primary_icon_activatable">True</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_transitions_filter_changed" swapped="no"/>
+ </object>
+ <packing>
@@ -519862,8 +519782,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="transitions_from_x_treeview">
+ <property name="visible">True</property>
@@ -519949,8 +519867,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="transitions_into_x_treeview">
+ <property name="visible">True</property>
@@ -520024,8 +519940,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow9">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="file_transitions_treeview">
+ <property name="visible">True</property>
@@ -520177,6 +520091,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_Enforcing_button_default_toggled" swapped="no"/>
@@ -520194,6 +520109,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">Enforcing_button_default</property>
+ <signal name="toggled" handler="on_Permissive_button_default_toggled" swapped="no"/>
@@ -520210,6 +520126,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">Enforcing_button_default</property>
+ <signal name="toggled" handler="on_Disabled_button_default_toggled" swapped="no"/>
@@ -520283,6 +520200,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">Permissive_button</property>
@@ -520300,6 +520218,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">Enforcing_button</property>
+ </object>
@@ -520646,6 +520565,16 @@ index 0000000..9cae364
+ <column type="gboolean"/>
+ </columns>
+ </object>
++ <object class="GtkFileChooserDialog" id="add_path_dialog">
++ <property name="can_focus">False</property>
++ <property name="border_width">5</property>
++ <property name="role">GtkFileChooserDialog</property>
++ <property name="type_hint">dialog</property>
++ <property name="action">save</property>
++ </object>
++ <object class="GtkTreeModelSort" id="advanced_treemodel_sort">
++ <property name="model">advanced_treemodel_filter</property>
++ </object>
+ <object class="GtkWindow" id="advanced_search_window">
+ <property name="can_focus">False</property>
+ <property name="window_position">center-on-parent</property>
@@ -520669,10 +520598,7 @@ index 0000000..9cae364
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_stock">gtk-find</property>
-+ <property name="primary_icon_activatable">True</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="changed" handler="on_advanced_filter_entry_changed" swapped="no"/>
+ </object>
+ <packing>
@@ -520688,6 +520614,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">Installed_advanced_button</property>
@@ -520705,6 +520632,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">All_advanced_button</property>
+ <signal name="toggled" handler="on_Installed_advanced_button_toggled" swapped="no"/>
@@ -520726,8 +520654,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow11">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="advanced_search_treeview">
+ <property name="visible">True</property>
@@ -520790,9 +520716,6 @@ index 0000000..9cae364
+ <object class="GtkTreeModelFilter" id="advanced_treemodel_filter">
+ <property name="child_model">Advanced_search_liststore</property>
+ </object>
-+ <object class="GtkTreeModelSort" id="advanced_treemodel_sort">
-+ <property name="model">advanced_treemodel_filter</property>
-+ </object>
+ <object class="GtkTreeStore" id="application_filetypes_treestore">
+ <columns>
+ <!-- column-name File -->
@@ -520878,33 +520801,15 @@ index 0000000..9cae364
+ <column type="gchararray"/>
+ </columns>
+ </object>
-+ <object class="GtkTreeStore" id="executable_files_treestore">
-+ <columns>
-+ <!-- column-name Executable -->
-+ <column type="gchararray"/>
-+ <!-- column-name SELinux -->
-+ <column type="gchararray"/>
-+ <!-- column-name Class -->
-+ <column type="gchararray"/>
-+ <!-- column-name Fix -->
-+ <column type="gboolean"/>
-+ <!-- column-name Mislabled -->
-+ <column type="gboolean"/>
-+ <!-- column-name Cur -->
-+ <column type="gchararray"/>
-+ <!-- column-name Con -->
-+ <column type="gchararray"/>
-+ </columns>
-+ </object>
+ <object class="GtkTreeModelFilter" id="executable_files_treemodelfilter">
+ <property name="child_model">executable_files_treestore</property>
+ </object>
+ <object class="GtkTreeModelSort" id="executable_files_treemodelsort">
+ <property name="model">executable_files_treemodelfilter</property>
+ </object>
-+ <object class="GtkListStore" id="files_type_combo_store">
++ <object class="GtkListStore" id="files_class_combo_store">
+ <columns>
-+ <!-- column-name Type -->
++ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
@@ -521263,73 +521168,21 @@ index 0000000..9cae364
+ </object>
+ </child>
+ </object>
-+ <object class="GtkFileChooserDialog" id="file_configurations">
-+ <property name="can_focus">False</property>
-+ <property name="border_width">5</property>
-+ <property name="role">GtkFileChooserDialog</property>
-+ <property name="modal">True</property>
-+ <property name="default_width">320</property>
-+ <property name="default_height">260</property>
-+ <property name="type_hint">dialog</property>
-+ <child internal-child="vbox">
-+ <object class="GtkVBox" id="dialog-vbox4">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="spacing">2</property>
-+ <child internal-child="action_area">
-+ <object class="GtkHButtonBox" id="dialog-action_area4">
-+ <property name="visible">True</property>
-+ <property name="can_focus">False</property>
-+ <property name="layout_style">end</property>
-+ <child>
-+ <object class="GtkButton" id="select_button_config">
-+ <property name="label" translatable="yes">Select</property>
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <signal name="clicked" handler="on_select_button_config_clicked" swapped="no"/>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkButton" id="cancel_button_config">
-+ <property name="label" translatable="yes">Cancel</property>
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <signal name="clicked" handler="on_cancel_button_config_clicked" swapped="no"/>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">end</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <placeholder/>
-+ </child>
-+ </object>
-+ </child>
-+ <action-widgets>
-+ <action-widget response="0">select_button_config</action-widget>
-+ <action-widget response="0">cancel_button_config</action-widget>
-+ </action-widgets>
-+ </object>
-+ <object class="GtkListStore" id="files_class_combo_store">
++ <object class="GtkTreeStore" id="executable_files_treestore">
+ <columns>
-+ <!-- column-name gchararray1 -->
++ <!-- column-name Executable -->
++ <column type="gchararray"/>
++ <!-- column-name SELinux -->
++ <column type="gchararray"/>
++ <!-- column-name Class -->
++ <column type="gchararray"/>
++ <!-- column-name Fix -->
++ <column type="gboolean"/>
++ <!-- column-name Mislabled -->
++ <column type="gboolean"/>
++ <!-- column-name Cur -->
++ <column type="gchararray"/>
++ <!-- column-name Con -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
@@ -521339,6 +521192,12 @@ index 0000000..9cae364
+ <column type="gchararray"/>
+ </columns>
+ </object>
++ <object class="GtkListStore" id="files_type_combo_store">
++ <columns>
++ <!-- column-name Type -->
++ <column type="gchararray"/>
++ </columns>
++ </object>
+ <object class="GtkListStore" id="in_network_liststore">
+ <columns>
+ <!-- column-name Port -->
@@ -521370,8 +521229,8 @@ index 0000000..9cae364
+ <object class="GtkProgressBar" id="progress_bar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
-+ <property name="show_text">True</property>
+ <property name="pulse_step">0.050000000223517416</property>
++ <property name="show_text">True</property>
+ </object>
+ </child>
+ </object>
@@ -521402,8 +521261,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow12">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="moreTypes_treeview_files">
+ <property name="visible">True</property>
@@ -521690,6 +521547,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_make_path_recursive_toggled" swapped="no"/>
+ </object>
@@ -521763,8 +521621,6 @@ index 0000000..9cae364
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ <signal name="button-press-event" handler="on_files_path_entry_button_press_event" swapped="no"/>
+ <signal name="changed" handler="on_files_path_entry_changed" swapped="no"/>
+ </object>
@@ -521887,8 +521743,6 @@ index 0000000..9cae364
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
-+ <property name="primary_icon_sensitive">True</property>
-+ <property name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
@@ -522046,6 +521900,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">udp_button</property>
@@ -522062,6 +521917,7 @@ index 0000000..9cae364
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
++ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">tcp_button</property>
+ </object>
@@ -522163,8 +522019,6 @@ index 0000000..9cae364
+ <object class="GtkScrolledWindow" id="scrolledwindow10">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">automatic</property>
-+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkTreeView" id="update_treeview">
+ <property name="height_request">380</property>
diff --git a/policycoreutils.spec b/policycoreutils.spec
index f9b7bad..a9e93f4 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.1.14
-Release: 72%{?dist}
+Release: 74%{?dist}
License: GPLv2
Group: System Environment/Base
# Based on git repository with tag 20101221
@@ -62,8 +62,8 @@ mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_mandir}/man5
mkdir -p %{buildroot}%{_mandir}/man8
-%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}-%{version}/
-cp COPYING %{buildroot}/%{_usr}/share/doc/%{name}-%{version}/
+%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/
+cp COPYING %{buildroot}/%{_usr}/share/doc/%{name}/
make LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
@@ -301,7 +301,7 @@ fi
%{_mandir}/man1/secon.1*
%{_mandir}/ru/man1/secon.1*
%{_mandir}/man8/genhomedircon.8*
-%doc %{_usr}/share/doc/%{name}-%{version}
+%doc %{_usr}/share/doc/%{name}
%package restorecond
Summary: SELinux restorecond utilities
@@ -334,6 +334,12 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service
%changelog
+* Wed Aug 7 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.14-74
+- If policy is not installed get_bools should not crash
+
+* Wed Aug 7 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.14-73
+- Fix doc versioning
+
* Tue Aug 6 2013 Dan Walsh <dwalsh at redhat.com> - 2.1.14-72
- Update sepolicy gui code, cleanups and add file transition tab
- Fix semanage argparse problems
More information about the scm-commits
mailing list