rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.94, 1.95 policycoreutils-po.patch, 1.57, 1.58 policycoreutils-rhat.patch, 1.449, 1.450 policycoreutils.spec, 1.650, 1.651
Daniel J Walsh
dwalsh at fedoraproject.org
Fri Oct 16 13:38:17 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3690
Modified Files:
policycoreutils-gui.patch policycoreutils-po.patch
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
- Remove translations screen from system-config-selinux
policycoreutils-gui.patch:
Makefile | 40
booleansPage.py | 247 +++
domainsPage.py | 154 ++
fcontextPage.py | 223 ++
html_util.py | 164 ++
lockdown.glade | 771 ++++++++++
lockdown.gladep | 7
lockdown.py | 382 ++++
loginsPage.py | 185 ++
mappingsPage.py | 56
modulesPage.py | 190 ++
polgen.glade | 3305 +++++++++++++++++++++++++++++++++++++++++++
polgen.gladep | 7
polgen.py | 1188 +++++++++++++++
polgengui.py | 627 ++++++++
portsPage.py | 259 +++
selinux.tbl | 234 +++
semanagePage.py | 168 ++
statusPage.py | 190 ++
system-config-selinux.glade | 3025 +++++++++++++++++++++++++++++++++++++++
system-config-selinux.gladep | 7
system-config-selinux.py | 187 ++
templates/__init__.py | 18
templates/boolean.py | 40
templates/etc_rw.py | 129 +
templates/executable.py | 359 ++++
templates/network.py | 80 +
templates/rw.py | 127 +
templates/script.py | 99 +
templates/semodule.py | 41
templates/tmp.py | 97 +
templates/user.py | 182 ++
templates/var_lib.py | 158 ++
templates/var_log.py | 110 +
templates/var_run.py | 118 +
templates/var_spool.py | 129 +
usersPage.py | 150 +
37 files changed, 13453 insertions(+)
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- policycoreutils-gui.patch 2 Oct 2009 12:49:35 -0000 1.94
+++ policycoreutils-gui.patch 16 Oct 2009 13:37:52 -0000 1.95
@@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.74/gui/booleansPage.py
--- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/booleansPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/booleansPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,247 @@
+#
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -251,7 +251,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.74/gui/domainsPage.py
--- nsapolicycoreutils/gui/domainsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/domainsPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/domainsPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,154 @@
+## domainsPage.py - show selinux domains
+## Copyright (C) 2009 Red Hat, Inc.
@@ -409,7 +409,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ self.error(e.args[0])
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.74/gui/fcontextPage.py
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/fcontextPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/fcontextPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,223 @@
+## fcontextPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -636,7 +636,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.74/gui/html_util.py
--- nsapolicycoreutils/gui/html_util.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/html_util.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/html_util.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,164 @@
+# Authors: John Dennis <jdennis at redhat.com>
+#
@@ -804,7 +804,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.74/gui/lockdown.glade
--- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.glade 2009-09-28 09:13:55.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.glade 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,771 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1579,7 +1579,7 @@ diff --exclude-from=exclude -N -u -r nsa
+</glade-interface>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.74/gui/lockdown.gladep
--- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.gladep 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.gladep 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1590,7 +1590,7 @@ diff --exclude-from=exclude -N -u -r nsa
+</glade-project>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.74/gui/lockdown.py
--- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,382 @@
+#!/usr/bin/python
+#
@@ -1976,7 +1976,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.74/gui/loginsPage.py
--- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/loginsPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/loginsPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,185 @@
+## loginsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -2165,8 +2165,8 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.74/gui/Makefile
--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/Makefile 2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,41 @@
++++ policycoreutils-2.0.74/gui/Makefile 2009-10-15 10:50:59.000000000 -0400
+@@ -0,0 +1,40 @@
+# Installation directories.
+PREFIX ?= ${DESTDIR}/usr
+BINDIR ?= $(PREFIX)/bin
@@ -2186,7 +2186,6 @@ diff --exclude-from=exclude -N -u -r nsa
+semanagePage.py \
+statusPage.py \
+system-config-selinux.glade \
-+translationsPage.py \
+usersPage.py \
+selinux.tbl
+
@@ -2210,7 +2209,7 @@ diff --exclude-from=exclude -N -u -r nsa
+relabel:
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.74/gui/mappingsPage.py
--- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/mappingsPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/mappingsPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,56 @@
+## mappingsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -2270,7 +2269,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.74/gui/modulesPage.py
--- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/modulesPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/modulesPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,190 @@
+## modulesPage.py - show selinux mappings
+## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2464,7 +2463,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ self.error(e.args[0])
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.74/gui/polgen.glade
--- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.glade 2009-09-28 09:14:14.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.glade 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,3305 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5773,7 +5772,7 @@ diff --exclude-from=exclude -N -u -r nsa
+</glade-interface>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.74/gui/polgen.gladep
--- nsapolicycoreutils/gui/polgen.gladep 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.gladep 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.gladep 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5784,7 +5783,7 @@ diff --exclude-from=exclude -N -u -r nsa
+</glade-project>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.74/gui/polgengui.py
--- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgengui.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgengui.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,627 @@
+#!/usr/bin/python -E
+#
@@ -6415,7 +6414,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
--- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py 2009-10-01 11:36:54.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,1188 @@
+#!/usr/bin/python
+#
@@ -7607,7 +7606,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ sys.exit(0)
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.74/gui/portsPage.py
--- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/portsPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/portsPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,259 @@
+## portsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -7870,7 +7869,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.74/gui/selinux.tbl
--- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/selinux.tbl 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/selinux.tbl 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,234 @@
+acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
+allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8108,7 +8107,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.74/gui/semanagePage.py
--- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/semanagePage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/semanagePage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,168 @@
+## semanagePage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -8280,7 +8279,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.74/gui/statusPage.py
--- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/statusPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/statusPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,190 @@
+# statusPage.py - show selinux status
+## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8474,8 +8473,8 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.glade 2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,3403 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade 2009-10-15 10:42:01.000000000 -0400
+@@ -0,0 +1,3025 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
@@ -9018,198 +9017,6 @@ diff --exclude-from=exclude -N -u -r nsa
+ </child>
+</widget>
+
-+<widget class="GtkDialog" id="translationsDialog">
-+ <property name="title" translatable="yes">Add SELinux Login Mapping</property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <property name="modal">False</property>
-+ <property name="resizable">True</property>
-+ <property name="destroy_with_parent">False</property>
-+ <property name="decorated">True</property>
-+ <property name="skip_taskbar_hint">False</property>
-+ <property name="skip_pager_hint">False</property>
-+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+ <property name="focus_on_map">True</property>
-+ <property name="urgency_hint">False</property>
-+ <property name="has_separator">True</property>
-+
-+ <child internal-child="vbox">
-+ <widget class="GtkVBox" id="vbox5">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child internal-child="action_area">
-+ <widget class="GtkHButtonBox" id="hbuttonbox2">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+ <child>
-+ <widget class="GtkButton" id="button3">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ <property name="response_id">-6</property>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="button4">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-ok</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ <property name="response_id">-5</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">GTK_PACK_END</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox6">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkTable" id="table3">
-+ <property name="visible">True</property>
-+ <property name="n_rows">2</property>
-+ <property name="n_columns">2</property>
-+ <property name="homogeneous">False</property>
-+ <property name="row_spacing">4</property>
-+ <property name="column_spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label22">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">SELinux MLS/MCS
-+Level</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</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="left_attach">0</property>
-+ <property name="right_attach">1</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label24">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Translation</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</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="left_attach">0</property>
-+ <property name="right_attach">1</property>
-+ <property name="top_attach">1</property>
-+ <property name="bottom_attach">2</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkEntry" id="translationsLevelEntry">
-+ <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>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">2</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkEntry" id="translationsEntry">
-+ <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>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">2</property>
-+ <property name="top_attach">1</property>
-+ <property name="bottom_attach">2</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">5</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
+<widget class="GtkDialog" id="fcontextDialog">
+ <property name="title" translatable="yes">Add SELinux Login Mapping</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -9970,7 +9777,8 @@ diff --exclude-from=exclude -N -u -r nsa
+ <child>
+ <widget class="GtkNotebook" id="notebook">
+ <property name="visible">True</property>
-+ <property name="show_tabs">False</property>
++ <property name="can_focus">True</property>
++ <property name="show_tabs">True</property>
+ <property name="show_border">True</property>
+ <property name="tab_pos">GTK_POS_TOP</property>
+ <property name="scrollable">False</property>
@@ -11020,193 +10828,6 @@ diff --exclude-from=exclude -N -u -r nsa
+ </child>
+
+ <child>
-+ <widget class="GtkVBox" id="vbox13">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkToolbar" id="toolbar4">
-+ <property name="visible">True</property>
-+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-+ <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-+ <property name="tooltips">True</property>
-+ <property name="show_arrow">True</property>
-+
-+ <child>
-+ <widget class="GtkToolButton" id="toolbutton11">
-+ <property name="visible">True</property>
-+ <property name="tooltip" translatable="yes">Add Translation</property>
-+ <property name="stock_id">gtk-add</property>
-+ <property name="visible_horizontal">True</property>
-+ <property name="visible_vertical">True</property>
-+ <property name="is_important">False</property>
-+ <signal name="clicked" handler="on_add_clicked" last_modification_time="Mon, 16 Jan 2006 18:27:03 GMT"/>
-+ </widget>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="homogeneous">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkToolButton" id="toolbutton12">
-+ <property name="visible">True</property>
-+ <property name="tooltip" translatable="yes">Modify Translation</property>
-+ <property name="stock_id">gtk-properties</property>
-+ <property name="visible_horizontal">True</property>
-+ <property name="visible_vertical">True</property>
-+ <property name="is_important">False</property>
-+ <signal name="clicked" handler="on_properties_clicked" last_modification_time="Mon, 16 Jan 2006 18:26:51 GMT"/>
-+ </widget>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="homogeneous">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkToolButton" id="toolbutton13">
-+ <property name="visible">True</property>
-+ <property name="tooltip" translatable="yes">Delete Translation</property>
-+ <property name="stock_id">gtk-delete</property>
-+ <property name="visible_horizontal">True</property>
-+ <property name="visible_vertical">True</property>
-+ <property name="is_important">False</property>
-+ <signal name="clicked" handler="on_delete_clicked" last_modification_time="Mon, 16 Jan 2006 18:26:29 GMT"/>
-+ </widget>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="homogeneous">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </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">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+ <property name="shadow_type">GTK_SHADOW_NONE</property>
-+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+ <child>
-+ <widget class="GtkTreeView" id="translationsView">
-+ <property name="visible">True</property>
-+ <property name="tooltip" translatable="yes">Translation</property>
-+ <property name="can_focus">True</property>
-+ <property name="headers_visible">True</property>
-+ <property name="rules_hint">False</property>
-+ <property name="reorderable">False</property>
-+ <property name="enable_search">True</property>
-+ <property name="fixed_height_mode">False</property>
-+ <property name="hover_selection">False</property>
-+ <property name="hover_expand">False</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="tab_expand">False</property>
-+ <property name="tab_fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label40">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">label40</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="type">tab</property>
-+ </packing>
-+ </child>
-+
-+ <child>
+ <widget class="GtkVBox" id="vbox15">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
@@ -11879,10 +11500,21 @@ diff --exclude-from=exclude -N -u -r nsa
+</widget>
+
+</glade-interface>
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.gladep policycoreutils-2.0.74/gui/system-config-selinux.gladep
+--- nsapolicycoreutils/gui/system-config-selinux.gladep 1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/gui/system-config-selinux.gladep 2009-10-15 10:42:01.000000000 -0400
+@@ -0,0 +1,7 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
++
++<glade-project>
++ <name></name>
++ <program_name></program_name>
++</glade-project>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.74/gui/system-config-selinux.py
--- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.py 2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,189 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.py 2009-10-15 10:38:12.000000000 -0400
+@@ -0,0 +1,187 @@
+#!/usr/bin/python
+#
+# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -11921,7 +11553,6 @@ diff --exclude-from=exclude -N -u -r nsa
+import modulesPage
+import domainsPage
+import fcontextPage
-+import translationsPage
+import selinux
+##
+## I18N
@@ -11972,7 +11603,6 @@ diff --exclude-from=exclude -N -u -r nsa
+ self.add_page(fcontextPage.fcontextPage(xml))
+ self.add_page(loginsPage.loginsPage(xml))
+ self.add_page(usersPage.usersPage(xml))
-+ self.add_page(translationsPage.translationsPage(xml))
+ self.add_page(portsPage.portsPage(xml))
+ self.add_page(modulesPage.modulesPage(xml)) # modules
+ self.add_page(domainsPage.domainsPage(xml)) # domains
@@ -12074,7 +11704,7 @@ diff --exclude-from=exclude -N -u -r nsa
+ app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
--- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/boolean.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,40 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12118,7 +11748,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
--- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/etc_rw.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,129 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12251,7 +11881,7 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py 2009-10-02 08:46:53.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,359 @@
+# Copyright (C) 2007-2009 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12614,7 +12244,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/__init__.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2007 Red Hat, Inc.
@@ -12636,7 +12266,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
--- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/network.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,80 @@
+te_port_types="""
+type TEMPLATETYPE_port_t;
@@ -12720,7 +12350,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
--- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/rw.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/rw.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,127 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12851,7 +12481,7 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,99 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12954,7 +12584,7 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
--- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/semodule.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,41 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12999,7 +12629,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
--- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/tmp.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,97 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13100,7 +12730,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
--- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/user.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,182 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13286,7 +12916,7 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
--- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_lib.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,158 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13448,7 +13078,7 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
--- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_log.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,110 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13562,7 +13192,7 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
--- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_run.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,118 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13684,7 +13314,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
--- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_spool.py 2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,129 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13815,131 +13445,9 @@ diff --exclude-from=exclude -N -u -r nsa
+fc_dir="""\
+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.74/gui/translationsPage.py
---- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/translationsPage.py 2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,118 @@
-+## translationsPage.py - show selinux translations
-+## Copyright (C) 2006 Red Hat, Inc.
-+
-+## This program is free software; you can redistribute it and/or modify
-+## it under the terms of the GNU General Public License as published by
-+## the Free Software Foundation; either version 2 of the License, or
-+## (at your option) any later version.
-+
-+## This program is distributed in the hope that it will be useful,
-+## but WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+## GNU General Public License for more details.
-+
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+## Author: Dan Walsh
-+import string
-+import gtk
-+import gtk.glade
-+import os
-+import gobject
-+import sys
-+import seobject
-+from semanagePage import *;
-+
-+##
-+## I18N
-+##
-+PROGNAME="policycoreutils"
-+import gettext
-+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
-+gettext.textdomain(PROGNAME)
-+try:
-+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
-+except IOError:
-+ import __builtin__
-+ __builtin__.__dict__['_'] = unicode
-+
-+class translationsPage(semanagePage):
-+ def __init__(self, xml):
-+ 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.view.set_model(self.store)
-+ self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)
-+ col = gtk.TreeViewColumn(_("Sensitvity Level"), gtk.CellRendererText(), text = 0)
-+ col.set_sort_column_id(0)
-+ col.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-+ col.set_resizable(True)
-+ col.set_fixed_width(250)
-+ self.view.append_column(col)
-+ col = gtk.TreeViewColumn(_("Translation"), gtk.CellRendererText(), text = 1)
-+ col.set_sort_column_id(1)
-+ col.set_resizable(True)
-+ self.view.append_column(col)
-+
-+ self.load()
-+ self.translationsLevelEntry = xml.get_widget("translationsLevelEntry")
-+ self.translationsEntry = xml.get_widget("translationsEntry")
-+
-+ def load(self, filter = ""):
-+ self.filter = filter
-+ self.translation = seobject.setransRecords()
-+ dict = self.translation.get_all()
-+ keys = dict.keys()
-+ keys.sort()
-+ self.store.clear()
-+ for k in keys:
-+ if not (self.match(k, filter) or self.match(dict[k], filter)):
-+ continue
-+ iter = self.store.append()
-+ self.store.set_value(iter, 0, k)
-+ self.store.set_value(iter, 1, dict[k])
-+ self.view.get_selection().select_path ((0,))
-+
-+ def dialogInit(self):
-+ store, iter = self.view.get_selection().get_selected()
-+ self.translationsLevelEntry.set_text(store.get_value(iter, 0))
-+ self.translationsLevelEntry.set_sensitive(False)
-+ self.translationsEntry.set_text(store.get_value(iter, 1))
-+
-+ def dialogClear(self):
-+ self.translationsLevelEntry.set_text("")
-+ self.translationsLevelEntry.set_sensitive(True)
-+ self.translationsEntry.set_text("")
-+
-+ def delete(self):
-+ store, iter = self.view.get_selection().get_selected()
-+ try:
-+ level = store.get_value(iter, 0)
-+ self.translation.delete(level)
-+ store.remove(iter)
-+ self.view.get_selection().select_path ((0,))
-+ except ValueError, e:
-+ self.error(e.args[0])
-+
-+ def add(self):
-+ level = self.translationsLevelEntry.get_text().strip()
-+ translation = self.translationsEntry.get_text().strip()
-+ self.translation.add(level, translation)
-+ iter = self.store.append()
-+ self.store.set_value(iter, 0, level)
-+ self.store.set_value(iter, 1, translation)
-+
-+ def modify(self):
-+ level = self.translationsLevelEntry.get_text().strip()
-+ translation = self.translationsEntry.get_text().strip()
-+ self.translation.modify(level, translation)
-+ store, iter = self.view.get_selection().get_selected()
-+ self.store.set_value(iter, 0, level)
-+ self.store.set_value(iter, 1, translation)
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.74/gui/usersPage.py
--- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/usersPage.py 2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/usersPage.py 2009-10-15 10:37:42.000000000 -0400
@@ -0,0 +1,150 @@
+## usersPage.py - show selinux mappings
+## Copyright (C) 2006,2007,2008 Red Hat, Inc.
policycoreutils-po.patch:
Makefile | 27
POTFILES | 28
POTFILES.in | 2
af.po | 2499 +++++++++++++++++++++++++---
am.po | 2499 +++++++++++++++++++++++++---
ar.po | 2499 +++++++++++++++++++++++++---
as.po | 3775 +++++++++++++++++++++++++-----------------
be.po | 2499 +++++++++++++++++++++++++---
bg.po | 3670 ++++++++++++++++++++++++-----------------
bn.po | 2499 +++++++++++++++++++++++++---
bn_IN.po | 4080 ++++++++++++++++++++++++++-------------------
bs.po | 2591 ++++++++++++++++++++++++++---
ca.po | 3027 +++++++++++++++++++++++++++++-----
cs.po | 2926 +++++++++++++++++++++++++++-----
cy.po | 2499 +++++++++++++++++++++++++---
da.po | 3206 ++++++++++++++++++++++++++++++------
de.po | 3983 +++++++++++++++++++++++++-------------------
el.po | 2609 ++++++++++++++++++++++++++---
en_GB.po | 2590 ++++++++++++++++++++++++++---
es.po | 4095 ++++++++++++++++++++++++++--------------------
et.po | 2497 +++++++++++++++++++++++++---
eu_ES.po | 2499 +++++++++++++++++++++++++---
fa.po | 2499 +++++++++++++++++++++++++---
fi.po | 3254 +++++++++++++++++++++++++++++++-----
fr.po | 3923 ++++++++++++++++++++++++++------------------
gl.po | 2497 +++++++++++++++++++++++++---
gu.po | 4160 ++++++++++++++++++++++++++--------------------
he.po | 2499 +++++++++++++++++++++++++---
hi.po | 4175 ++++++++++++++++++++++++++--------------------
hr.po | 3105 +++++++++++++++++++++++-----------
hu.po | 3052 +++++++++++++++++++++++++++++-----
hy.po | 2499 +++++++++++++++++++++++++---
id.po | 2497 +++++++++++++++++++++++++---
is.po | 2499 +++++++++++++++++++++++++---
it.po | 4196 ++++++++++++++++++++++++++---------------------
ja.po | 4183 ++++++++++++++++++++++++++---------------------
ka.po | 2499 +++++++++++++++++++++++++---
kn.po | 4621 ++++++++++++++++++++++++++++++++--------------------
ko.po | 2991 +++++++++++++++++++++++++++------
ku.po | 2499 +++++++++++++++++++++++++---
lo.po | 2499 +++++++++++++++++++++++++---
lt.po | 2499 +++++++++++++++++++++++++---
lv.po | 2499 +++++++++++++++++++++++++---
mai.po | 3527 +++++++++++++++++++++++++++++++++++++++
mk.po | 2593 ++++++++++++++++++++++++++---
ml.po | 4276 +++++++++++++++++++++++++++---------------------
mr.po | 4219 +++++++++++++++++++++++++++--------------------
ms.po | 2574 +++++++++++++++++++++++++---
my.po | 2499 +++++++++++++++++++++++++---
nb.po | 2539 +++++++++++++++++++++++++---
nl.po | 3028 +++++++++++++++++++++++++++-------
nn.po | 2499 +++++++++++++++++++++++++---
no.po | 1272 --------------
nso.po | 2499 +++++++++++++++++++++++++---
or.po | 4031 ++++++++++++++++++++++++++-------------------
pa.po | 4101 ++++++++++++++++++++++++++--------------------
pl.po | 4116 ++++++++++++++++++++++++++--------------------
policycoreutils.pot | 2499 +++++++++++++++++++++++++---
pt.po | 4467 ++++++++++++++++++++++++++++----------------------
pt_BR.po | 4543 +++++++++++++++++++++++++++++----------------------
ro.po | 2499 +++++++++++++++++++++++++---
ru.po | 3508 ++++++++++++++++++++++++++-------------
si.po | 2499 +++++++++++++++++++++++++---
sk.po | 2592 ++++++++++++++++++++++++++---
sl.po | 2499 +++++++++++++++++++++++++---
sq.po | 2499 +++++++++++++++++++++++++---
sr.po | 4211 ++++++++++++++++++++++++++---------------------
sr at latin.po | 4221 +++++++++++++++++++++++++++--------------------
sv.po | 3267 +++++++++++++++++++++++++-----------
ta.po | 3588 ++++++++++++++++++++++++++--------------
te.po | 4060 ++++++++++++++++++++++++++-------------------
th.po | 2499 +++++++++++++++++++++++++---
tr.po | 2499 +++++++++++++++++++++++++---
uk.po | 2592 ++++++++++++++++++++++++++---
ur.po | 2499 +++++++++++++++++++++++++---
vi.po | 2499 +++++++++++++++++++++++++---
zh_CN.po | 3954 +++++++++++++++++++++++++-------------------
zh_TW.po | 4234 ++++++++++++++++++++++++++---------------------
zu.po | 2499 +++++++++++++++++++++++++---
79 files changed, 177578 insertions(+), 58166 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.57 -r 1.58 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-po.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- policycoreutils-po.patch 1 Oct 2009 15:39:04 -0000 1.57
+++ policycoreutils-po.patch 16 Oct 2009 13:37:53 -0000 1.58
@@ -1,71 +1,132 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
--- nsapolicycoreutils/po/af.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/af.po 2009-09-30 11:35:04.000000000 -0400
++++ policycoreutils-2.0.74/po/af.po 2009-10-15 10:54:34.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-24 10:53-0400\n"
-+"POT-Creation-Date: 2009-01-21 17:13-0500\n"
++"POT-Creation-Date: 2009-10-15 10:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -118,7 +118,9 @@
- msgid "Level"
+@@ -77,11 +77,11 @@
+ msgid "Could not set exec context to %s.\n"
+ msgstr ""
+
+-#: ../audit2allow/audit2allow:217
++#: ../audit2allow/audit2allow:225
+ msgid "******************** IMPORTANT ***********************\n"
+ msgstr ""
+
+-#: ../audit2allow/audit2allow:218
++#: ../audit2allow/audit2allow:226
+ msgid "To make this policy package active, execute:"
+ msgstr ""
+
+@@ -109,797 +109,818 @@
+ msgid "global"
+ msgstr ""
+
+-#: ../semanage/seobject.py:206
+-#, python-format
+-msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
++#: ../semanage/seobject.py:209
++msgid "Not yet implemented"
+ msgstr ""
+
+-#: ../semanage/seobject.py:239
+-msgid "Level"
++#: ../semanage/seobject.py:213
++msgid "Semanage transaction already in progress"
msgstr ""
-#: ../semanage/seobject.py:239
-+#: ../semanage/seobject.py:239 ../gui/system-config-selinux.glade:651
-+#: ../gui/system-config-selinux.glade:2683 ../gui/translationsPage.py:43
-+#: ../gui/translationsPage.py:59
- msgid "Translation"
+-msgid "Translation"
++#: ../semanage/seobject.py:222
++msgid "Could not start semanage transaction"
+ msgstr ""
+
+-#: ../semanage/seobject.py:247 ../semanage/seobject.py:261
+-#, python-format
+-msgid "Translations can not contain spaces '%s' "
++#: ../semanage/seobject.py:228
++msgid "Could not commit semanage transaction"
+ msgstr ""
+
+-#: ../semanage/seobject.py:250
+-#, python-format
+-msgid "Invalid Level '%s' "
++#: ../semanage/seobject.py:232
++msgid "Semanage transaction not in progress"
msgstr ""
-@@ -142,764 +144,763 @@
- msgid "%s not defined in translations"
+-#: ../semanage/seobject.py:253
+-#, python-format
+-msgid "%s already defined in translations"
++#: ../semanage/seobject.py:244 ../semanage/seobject.py:326
++msgid "Could not list SELinux modules"
+ msgstr ""
+
+-#: ../semanage/seobject.py:265
+-#, python-format
+-msgid "%s not defined in translations"
++#: ../semanage/seobject.py:253
++msgid "Modules Name"
msgstr ""
-#: ../semanage/seobject.py:290
-+#: ../semanage/seobject.py:291
- msgid "Not yet implemented"
+-msgid "Not yet implemented"
++#: ../semanage/seobject.py:253 ../gui/modulesPage.py:62
++msgid "Version"
msgstr ""
-#: ../semanage/seobject.py:294
-msgid "Semanage transaction already in progress"
--msgstr ""
--
++#: ../semanage/seobject.py:256 ../gui/statusPage.py:75
++msgid "Disabled"
+ msgstr ""
+
-#: ../semanage/seobject.py:303
-+#: ../semanage/seobject.py:298
- msgid "Could not start semanage transaction"
+-msgid "Could not start semanage transaction"
++#: ../semanage/seobject.py:271
++#, python-format
++msgid "Could not disable module %s (remove failed)"
msgstr ""
-#: ../semanage/seobject.py:309
-+#: ../semanage/seobject.py:304
- msgid "Could not commit semanage transaction"
+-msgid "Could not commit semanage transaction"
++#: ../semanage/seobject.py:282
++#, python-format
++msgid "Could not enable module %s (remove failed)"
msgstr ""
-#: ../semanage/seobject.py:313
-msgid "Semanage transaction not in progress"
--msgstr ""
--
++#: ../semanage/seobject.py:297
++#, python-format
++msgid "Could not remove module %s (remove failed)"
+ msgstr ""
+
-#: ../semanage/seobject.py:325
-+#: ../semanage/seobject.py:314
- msgid "Could not list SELinux modules"
+-msgid "Could not list SELinux modules"
++#: ../semanage/seobject.py:313
++msgid "dontaudit requires either 'on' or 'off'"
msgstr ""
-#: ../semanage/seobject.py:336
-+#: ../semanage/seobject.py:325
++#: ../semanage/seobject.py:338
msgid "Permissive Types"
msgstr ""
-#: ../semanage/seobject.py:378
-+#: ../semanage/seobject.py:355
++#: ../semanage/seobject.py:380
#, python-format
msgid "Could not set permissive domain %s (module installation failed)"
msgstr ""
-#: ../semanage/seobject.py:384
-+#: ../semanage/seobject.py:369
++#: ../semanage/seobject.py:386
#, python-format
msgid "Could not remove permissive domain %s (remove failed)"
msgstr ""
@@ -76,458 +137,458 @@ diff --exclude-from=exclude -N -u -r nsa
-#: ../semanage/seobject.py:933 ../semanage/seobject.py:1506
-#: ../semanage/seobject.py:1570 ../semanage/seobject.py:1582
-#: ../semanage/seobject.py:1663 ../semanage/seobject.py:1714
-+#: ../semanage/seobject.py:395 ../semanage/seobject.py:455
-+#: ../semanage/seobject.py:501 ../semanage/seobject.py:583
-+#: ../semanage/seobject.py:650 ../semanage/seobject.py:708
-+#: ../semanage/seobject.py:918 ../semanage/seobject.py:1491
-+#: ../semanage/seobject.py:1555 ../semanage/seobject.py:1567
-+#: ../semanage/seobject.py:1648 ../semanage/seobject.py:1699
++#: ../semanage/seobject.py:412 ../semanage/seobject.py:472
++#: ../semanage/seobject.py:518 ../semanage/seobject.py:600
++#: ../semanage/seobject.py:667 ../semanage/seobject.py:725
++#: ../semanage/seobject.py:935 ../semanage/seobject.py:1550
++#: ../semanage/seobject.py:1614 ../semanage/seobject.py:1633
++#: ../semanage/seobject.py:1720 ../semanage/seobject.py:1771
#, python-format
msgid "Could not create a key for %s"
msgstr ""
-#: ../semanage/seobject.py:414 ../semanage/seobject.py:474
-#: ../semanage/seobject.py:520 ../semanage/seobject.py:526
-+#: ../semanage/seobject.py:399 ../semanage/seobject.py:459
-+#: ../semanage/seobject.py:505 ../semanage/seobject.py:511
++#: ../semanage/seobject.py:416 ../semanage/seobject.py:476
++#: ../semanage/seobject.py:522 ../semanage/seobject.py:528
#, python-format
msgid "Could not check if login mapping for %s is defined"
msgstr ""
-#: ../semanage/seobject.py:416
-+#: ../semanage/seobject.py:401
++#: ../semanage/seobject.py:418
#, python-format
[...310280 lines suppressed...]
-+#: ../gui/system-config-selinux.glade:1807
++#: ../gui/system-config-selinux.glade:1616
+msgid "Toggle between Customized and All Booleans"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:1825
++#: ../gui/system-config-selinux.glade:1634
+msgid "Run booleans lockdown wizard"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:1826
++#: ../gui/system-config-selinux.glade:1635
+msgid "Lockdown..."
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:1856
-+#: ../gui/system-config-selinux.glade:2061
-+#: ../gui/system-config-selinux.glade:2248
-+#: ../gui/system-config-selinux.glade:2435
-+#: ../gui/system-config-selinux.glade:2622
-+#: ../gui/system-config-selinux.glade:2865
-+#: ../gui/system-config-selinux.glade:3090
-+#: ../gui/system-config-selinux.glade:3265
++#: ../gui/system-config-selinux.glade:1665
++#: ../gui/system-config-selinux.glade:1870
++#: ../gui/system-config-selinux.glade:2057
++#: ../gui/system-config-selinux.glade:2244
++#: ../gui/system-config-selinux.glade:2487
++#: ../gui/system-config-selinux.glade:2712
++#: ../gui/system-config-selinux.glade:2887
+msgid "Filter"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:1945
++#: ../gui/system-config-selinux.glade:1754
+msgid "label50"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:1982
++#: ../gui/system-config-selinux.glade:1791
+msgid "Add File Context"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:1998
++#: ../gui/system-config-selinux.glade:1807
+msgid "Modify File Context"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2014
++#: ../gui/system-config-selinux.glade:1823
+msgid "Delete File Context"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2030
++#: ../gui/system-config-selinux.glade:1839
+msgid "Toggle between all and customized file context"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2150
++#: ../gui/system-config-selinux.glade:1959
+msgid "label38"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2187
++#: ../gui/system-config-selinux.glade:1996
+msgid "Add SELinux User Mapping"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2203
++#: ../gui/system-config-selinux.glade:2012
+msgid "Modify SELinux User Mapping"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2219
++#: ../gui/system-config-selinux.glade:2028
+msgid "Delete SELinux User Mapping"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2337
++#: ../gui/system-config-selinux.glade:2146
+msgid "label39"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2374
++#: ../gui/system-config-selinux.glade:2183
+msgid "Add User"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2390
++#: ../gui/system-config-selinux.glade:2199
+msgid "Modify User"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2406
++#: ../gui/system-config-selinux.glade:2215
+msgid "Delete User"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2524
++#: ../gui/system-config-selinux.glade:2333
+msgid "label41"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2561
-+msgid "Add Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2577
-+msgid "Modify Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2593
-+msgid "Delete Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2711
-+msgid "label40"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2748
++#: ../gui/system-config-selinux.glade:2370
+msgid "Add Network Port"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2764
++#: ../gui/system-config-selinux.glade:2386
+msgid "Edit Network Port"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2780
++#: ../gui/system-config-selinux.glade:2402
+msgid "Delete Network Port"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2816
-+#: ../gui/system-config-selinux.glade:2834
++#: ../gui/system-config-selinux.glade:2438
++#: ../gui/system-config-selinux.glade:2456
+msgid "Toggle between Customized and All Ports"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2954
++#: ../gui/system-config-selinux.glade:2576
+msgid "label42"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:2991
++#: ../gui/system-config-selinux.glade:2613
+msgid "Generate new policy module"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3007
++#: ../gui/system-config-selinux.glade:2629
+msgid "Load policy module"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3023
++#: ../gui/system-config-selinux.glade:2645
+msgid "Remove loadable policy module"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3059
++#: ../gui/system-config-selinux.glade:2681
+msgid ""
+"Enable/Disable additional audit rules, that are normally not reported in the "
+"log files."
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3179
++#: ../gui/system-config-selinux.glade:2801
+msgid "label44"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3216
++#: ../gui/system-config-selinux.glade:2838
+msgid "Change process mode to permissive."
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3234
++#: ../gui/system-config-selinux.glade:2856
+msgid "Change process mode to enforcing"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3326
++#: ../gui/system-config-selinux.glade:2948
+msgid "Process Domain"
+msgstr ""
+
-+#: ../gui/system-config-selinux.glade:3354
++#: ../gui/system-config-selinux.glade:2976
+msgid "label59"
+msgstr ""
+
-+#: ../gui/translationsPage.py:53
-+msgid "Sensitvity Level"
-+msgstr ""
-+
+#: ../gui/usersPage.py:138
+#, python-format
+msgid "SELinux user '%s' is required"
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 14
load_policy/Makefile | 5
restorecond/Makefile | 24 -
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond |binary
restorecond/restorecond.c | 422 +++---------------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 18
restorecond/restorecond.init | 5
restorecond/restorecond.o |binary
restorecond/restorecond_user.conf | 2
restorecond/stringslist.o |binary
restorecond/user.c | 237 ++++++++++
restorecond/user.o |binary
restorecond/utmpwatcher.o |binary
restorecond/watch.c | 253 +++++++++++
restorecond/watch.o |binary
sandbox/Makefile | 31 +
sandbox/deliverables/README | 32 +
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 ++
sandbox/deliverables/sandbox | 216 +++++++++
sandbox/sandbox | 242 ++++++++++
sandbox/sandbox.8 | 26 +
sandbox/sandboxX.sh | 16
sandbox/seunshare.c | 265 +++++++++++
scripts/Makefile | 2
scripts/chcat | 2
scripts/fixfiles | 1
semanage/semanage | 99 ++--
semanage/seobject.py | 209 +++++----
semodule/semodule.8 | 6
semodule/semodule.c | 53 ++
setfiles/Makefile | 2
setfiles/restore.c | 519 ++++++++++++++++++++++
setfiles/restore.h | 49 ++
setfiles/restore.o |binary
setfiles/setfiles.c | 643 +++-------------------------
40 files changed, 2399 insertions(+), 1064 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- policycoreutils-rhat.patch 6 Oct 2009 16:11:11 -0000 1.449
+++ policycoreutils-rhat.patch 16 Oct 2009 13:38:03 -0000 1.450
@@ -124,6 +124,7 @@ diff --exclude-from=exclude --exclude=se
+[D-BUS Service]
+Name=org.selinux.Restorecond
+Exec=/usr/sbin/restorecond -u
+Binary files nsapolicycoreutils/restorecond/restorecond and policycoreutils-2.0.74/restorecond/restorecond differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2009-08-20 15:49:21.000000000 -0400
+++ policycoreutils-2.0.74/restorecond/restorecond.c 2009-09-24 22:59:01.000000000 -0400
@@ -690,12 +691,14 @@ diff --exclude-from=exclude --exclude=se
exit $RETVAL
-
+Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.74/restorecond/restorecond.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
--- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf 2009-09-20 21:26:36.000000000 -0400
@@ -0,0 +1,2 @@
+~/*
+~/public_html/*
+Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.74/restorecond/stringslist.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
--- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/restorecond/user.c 2009-09-20 21:26:36.000000000 -0400
@@ -937,6 +940,8 @@ diff --exclude-from=exclude --exclude=se
+ return 0;
+}
+
+Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.74/restorecond/user.o differ
+Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.74/restorecond/utmpwatcher.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
--- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/restorecond/watch.c 2009-10-06 12:06:56.000000000 -0400
@@ -1194,6 +1199,7 @@ diff --exclude-from=exclude --exclude=se
+ exitApp("Error watching config file.");
+}
+
+Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.74/restorecond/watch.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.74/sandbox/deliverables/basicwrapper
--- nsapolicycoreutils/sandbox/deliverables/basicwrapper 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper 2009-08-14 10:53:53.000000000 -0400
@@ -2123,6 +2129,17 @@ diff --exclude-from=exclude --exclude=se
sys.exit(errors)
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.74/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles 2009-08-05 15:10:56.000000000 -0400
++++ policycoreutils-2.0.74/scripts/fixfiles 2009-10-14 08:51:36.000000000 -0400
+@@ -136,6 +136,7 @@
+ fi
+ return
+ fi
++[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
+ LogReadOnly
+ ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
--- nsapolicycoreutils/scripts/Makefile 2008-08-28 09:34:24.000000000 -0400
+++ policycoreutils-2.0.74/scripts/Makefile 2009-09-20 21:26:36.000000000 -0400
@@ -3388,6 +3405,7 @@ diff --exclude-from=exclude --exclude=se
+int process_one(char *name, int recurse);
+
+#endif
+Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.74/setfiles/restore.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
--- nsapolicycoreutils/setfiles/setfiles.c 2009-09-17 08:59:43.000000000 -0400
+++ policycoreutils-2.0.74/setfiles/setfiles.c 2009-09-20 21:26:36.000000000 -0400
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -p -r1.650 -r1.651
--- policycoreutils.spec 6 Oct 2009 16:11:12 -0000 1.650
+++ policycoreutils.spec 16 Oct 2009 13:38:04 -0000 1.651
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.74
-Release: 8%{?dist}
+Release: 10%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -133,8 +133,6 @@ The policycoreutils-python package conta
%{_mandir}/ru/man8/chcat.8*
%{_mandir}/man8/semanage.8*
%{_mandir}/ru/man8/semanage.8*
-%{_mandir}/man8/fixfiles.8*
-%{_mandir}/ru/man8/fixfiles.8*
%post python
[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
@@ -249,6 +247,8 @@ rm -rf %{buildroot}
%{_sysconfdir}/xdg/autostart/restorecond.desktop
%{_datadir}/dbus-1/services/org.selinux.Restorecond.service
# selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
+%{_mandir}/man8/fixfiles.8*
+%{_mandir}/ru/man8/fixfiles.8*
%{_mandir}/man8/load_policy.8*
%{_mandir}/ru/man8/load_policy.8*
%{_mandir}/man8/open_init_pty.8*
@@ -296,6 +296,13 @@ fi
exit 0
%changelog
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
+- Remove translations screen from system-config-selinux
+
+* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
+- Move fixfiles man pages into the correct package
+- Add genhomedircon to fixfiles restore
+
* Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
- Add check to sandbox to verify save changes - Chris Pardy
- Fix memory leak in restorecond - Steve Grubb
More information about the fedora-extras-commits
mailing list