diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch index 182e0e4..51b6629 100644 --- a/policycoreutils-gui.patch +++ b/policycoreutils-gui.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.85/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/booleansPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/booleansPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -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 nsapolicycoreutils/gui/booleansPage.py poli + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.85/gui/domainsPage.py --- nsapolicycoreutils/gui/domainsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/domainsPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/domainsPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -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 nsapolicycoreutils/gui/domainsPage.py polic + self.error(e.args[0]) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.85/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/fcontextPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/fcontextPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -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 nsapolicycoreutils/gui/fcontextPage.py poli + 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.85/gui/html_util.py --- nsapolicycoreutils/gui/html_util.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/html_util.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/html_util.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,164 @@ +# Authors: John Dennis +# @@ -804,7 +804,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policyc + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.85/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/lockdown.glade 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/lockdown.glade 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,771 @@ + + @@ -1579,7 +1579,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade polic + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.85/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/lockdown.gladep 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/lockdown.gladep 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -1590,7 +1590,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep poli + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.85/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/lockdown.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/lockdown.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,382 @@ +#!/usr/bin/python -Es +# @@ -1976,7 +1976,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policyco + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.85/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/loginsPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/loginsPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2165,7 +2165,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.85/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/Makefile 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/Makefile 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,40 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -2209,7 +2209,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu +relabel: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.85/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/mappingsPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/mappingsPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2269,7 +2269,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py poli + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.85/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/modulesPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/modulesPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,190 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006-2009 Red Hat, Inc. @@ -2463,8 +2463,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic + self.error(e.args[0]) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.85/gui/polgen.glade --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/polgen.glade 2011-01-14 14:38:17.000000000 -0500 -@@ -0,0 +1,3326 @@ ++++ policycoreutils-2.0.85/gui/polgen.glade 2011-02-03 16:11:44.000000000 -0500 +@@ -0,0 +1,3432 @@ + + + @@ -2553,7 +2553,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ 12 + True + SELinux Policy Generation Tool + GTK_WINDOW_TOPLEVEL @@ -2576,68 +2575,50 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + 18 + + -+ ++ + True + False -+ False -+ GTK_POS_TOP ++ True ++ GTK_POS_LEFT + False + False + + -+ -+ True -+ GNOME_EDGE_START -+ SELinux Policy Generation Tool -+ This tool can be used to generate a policy framework, to confine applications or users using SELinux. -+ -+The tool generates: -+Type enforcement file (te) -+Interface file (if) -+File context file (fc) -+Shell script (sh) - used to compile and install the policy. -+ -+ -+ True -+ True -+ -+ -+ -+ -+ ++ + True -+ label25 -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ tab -+ -+ ++ False ++ 0 + -+ -+ -+ True -+ Select type of the application/user role to be confined -+ ++ ++ ++ True ++ <b>Select the policy type for the application or user role you wan to confine:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ + -+ -+ -+ 18 ++ ++ + True + False -+ 6 ++ 0 + + + @@ -2846,8 +2827,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + 0 -+ True -+ True ++ False ++ False + + + @@ -2860,7 +2841,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + 0 -+ True ++ False + True + + @@ -3041,7 +3022,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + 0 + True -+ True ++ False + + + @@ -3054,7 +3035,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + 0 -+ True ++ False + True + + @@ -3150,8 +3131,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + 0 -+ True -+ True ++ False ++ False + + + @@ -3183,18 +3164,23 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + ++ ++ 0 ++ True ++ True ++ + + + -+ False ++ True + True + + + + -+ ++ + True -+ label26 ++ label104 + False + False + GTK_JUSTIFY_LEFT @@ -3215,223 +3201,240 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Enter name of application or user role to be confined ++ False ++ 0 ++ ++ ++ ++ True ++ <b>Enter name of application or user role:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ + -+ -+ -+ 18 ++ ++ + True ++ 3 ++ 3 + False -+ 6 ++ 6 ++ 12 + + -+ ++ + True -+ 3 -+ 3 -+ False -+ 6 -+ 12 ++ Name ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ fill ++ ++ ++ + -+ -+ -+ True -+ Name -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ 1 -+ 0 -+ 1 -+ fill -+ -+ -+ ++ ++ ++ True ++ Enter complete path for executable to be confined. ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ + -+ -+ -+ True -+ Enter complete path for executable to be confined. -+ True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False -+ -+ -+ 1 -+ 2 -+ 1 -+ 2 -+ -+ -+ ++ ++ ++ True ++ True ++ ... ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ 2 ++ 3 ++ 1 ++ 2 ++ fill ++ ++ ++ + -+ -+ -+ True -+ True -+ ... -+ True -+ GTK_RELIEF_NORMAL -+ True -+ -+ -+ -+ 2 -+ 3 -+ 1 -+ 2 -+ fill -+ -+ -+ ++ ++ ++ True ++ Enter unique name for the confined application or user role. ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 1 ++ 3 ++ 0 ++ 1 ++ ++ ++ + -+ -+ -+ True -+ Enter unique name for the confined application or user role. -+ True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False -+ -+ -+ 1 -+ 3 -+ 0 -+ 1 -+ -+ -+ ++ ++ ++ True ++ Executable ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ fill ++ ++ ++ + -+ -+ -+ True -+ Executable -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ 1 -+ 1 -+ 2 -+ fill -+ -+ -+ ++ ++ ++ True ++ Init script ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 2 ++ 3 ++ fill ++ ++ ++ + -+ -+ -+ True -+ Init script -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ 1 -+ 2 -+ 3 -+ fill -+ -+ -+ -+ -+ -+ -+ True -+ Enter complete path to init script used to start the confined application. -+ True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False -+ -+ -+ 1 -+ 2 -+ 2 -+ 3 -+ -+ -+ ++ ++ ++ True ++ Enter complete path to init script used to start the confined application. ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ ++ ++ + -+ -+ -+ True -+ True -+ ... -+ True -+ GTK_RELIEF_NORMAL -+ True -+ -+ -+ -+ 2 -+ 3 -+ 2 -+ 3 -+ fill -+ -+ -+ ++ ++ ++ True ++ True ++ ... ++ True ++ GTK_RELIEF_NORMAL ++ True ++ + + -+ 0 -+ True -+ True ++ 2 ++ 3 ++ 2 ++ 3 ++ fill ++ + + + ++ ++ 0 ++ True ++ True ++ + + + @@ -3441,9 +3444,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label28 ++ label105 + False + False + GTK_JUSTIFY_LEFT @@ -3464,48 +3467,65 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select user roles that you want to customize ++ False ++ 0 + -+ -+ -+ 18 ++ ++ + True -+ False -+ 6 ++ <b>Select existing role to modify:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ GTK_CORNER_TOP_LEFT + + -+ ++ + True ++ Select the user roles that will transiton to the %s domain. + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Select the user roles that will transiton to this applications domains. -+ True -+ False -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ False ++ False ++ False ++ True ++ False ++ False ++ False + -+ -+ 0 -+ True -+ True -+ + + ++ ++ 0 ++ True ++ True ++ + + + @@ -3515,9 +3535,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label28 ++ label106 + False + False + GTK_JUSTIFY_LEFT @@ -3538,48 +3558,65 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select additional domains to which this user role will transition ++ False ++ 0 + -+ -+ -+ 18 ++ ++ + True -+ False -+ 6 ++ <b>Select roles that %s will transition to:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_ALWAYS ++ GTK_POLICY_ALWAYS ++ GTK_SHADOW_NONE ++ GTK_CORNER_TOP_LEFT + + -+ ++ + True ++ Select applications domains that %s will transition to. + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Select the applications domains that you would like this user role to transition to. -+ True -+ False -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ False ++ False ++ False ++ True ++ False ++ False ++ False + -+ -+ 0 -+ True -+ True -+ + + ++ ++ 0 ++ True ++ True ++ + + + @@ -3589,9 +3626,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label30 ++ label107 + False + False + GTK_JUSTIFY_LEFT @@ -3612,48 +3649,65 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select user roles that will transition to this domain ++ False ++ 0 + -+ -+ -+ 18 ++ ++ + True -+ False -+ 6 ++ <b>Select the user_roles that will transition to %s:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_ALWAYS ++ GTK_POLICY_ALWAYS ++ GTK_SHADOW_NONE ++ GTK_CORNER_TOP_LEFT + + -+ ++ + True ++ Select the user roles that will transiton to this applications domains. + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Select the user roles that will transiton to this applications domains. -+ True -+ False -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ False ++ False ++ False ++ True ++ False ++ False ++ False + -+ -+ 0 -+ True -+ True -+ + + ++ ++ 0 ++ True ++ True ++ + + + @@ -3663,9 +3717,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label31 ++ label108 + False + False + GTK_JUSTIFY_LEFT @@ -3686,48 +3740,65 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select additional domains that this user role will administer ++ False ++ 0 + -+ -+ -+ 18 ++ ++ + True -+ False -+ 6 ++ <b>Select domains that %s will administer:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_ALWAYS ++ GTK_POLICY_ALWAYS ++ GTK_SHADOW_NONE ++ GTK_CORNER_TOP_LEFT + + -+ ++ + True ++ Select the domains that you would like this user administer. + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Select the domains that you would like this user administer. -+ True -+ False -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ False ++ False ++ False ++ True ++ False ++ False ++ False + -+ -+ 0 -+ True -+ True -+ + + ++ ++ 0 ++ True ++ True ++ + + + @@ -3737,9 +3808,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label32 ++ label109 + False + False + GTK_JUSTIFY_LEFT @@ -3760,48 +3831,65 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select additional roles for this user ++ False ++ 0 + -+ -+ -+ 18 ++ ++ + True -+ False -+ 6 ++ <b>Select additional roles for %s:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_ALWAYS ++ GTK_POLICY_ALWAYS ++ GTK_SHADOW_NONE ++ GTK_CORNER_TOP_LEFT + + -+ ++ + True ++ Select the domains that you would like this user administer. + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Select the domains that you would like this user administer. -+ True -+ False -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ False ++ False ++ False ++ True ++ False ++ False ++ False + -+ -+ 0 -+ True -+ True -+ + + ++ ++ 0 ++ True ++ True ++ + + + @@ -3811,9 +3899,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label33 ++ label111 + False + False + GTK_JUSTIFY_LEFT @@ -3834,33 +3922,83 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Enter network ports that application/user role listens to ++ False ++ 0 ++ ++ ++ ++ True ++ <b>Enter network ports that %s binds on:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ + -+ -+ -+ 18 ++ ++ + True + False -+ 18 ++ 6 ++ ++ ++ ++ True ++ <b>TCP Ports</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + + -+ ++ + True + False -+ 6 ++ 0 + + -+ ++ + True -+ <b>TCP Ports</b> ++ + False -+ True ++ False + GTK_JUSTIFY_LEFT + False + False -+ 0 ++ 0.5 + 0.5 + 0 + 0 @@ -3877,385 +4015,127 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True + False -+ 0 -+ -+ -+ -+ True -+ -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ 6 + + -+ ++ + True + False -+ 6 ++ 12 + + -+ ++ + True -+ False -+ 12 -+ -+ -+ -+ True -+ Allows confined application/user role to bind to any udp port -+ True -+ All -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ Allow application/user role to call bindresvport with 0. Binding to port 600-1024 -+ True -+ 600-1024 -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ Enter a comma separated list of udp ports or ranges of ports that application/user role binds to. Example: 612, 650-660 -+ True -+ Unreserved Ports (>1024) -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ ++ Allows %s to bind to any udp port ++ True ++ All ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + + -+ 0 -+ True -+ True ++ 10 ++ False ++ False + + + + -+ ++ + True -+ False -+ 12 -+ -+ -+ -+ True -+ Select Ports -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 5 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ Allows application/user role to bind to any udp ports > 1024 -+ True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False -+ -+ -+ 0 -+ True -+ True -+ -+ ++ Allow %s to call bindresvport with 0. Binding to port 600-1024 ++ True ++ 600-1024 ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + + -+ 0 -+ True -+ True ++ 10 ++ False ++ False + + -+ -+ -+ 0 -+ True -+ True -+ -+ -+ -+ -+ 0 -+ True -+ True -+ -+ -+ -+ -+ 0 -+ False -+ True -+ -+ -+ -+ -+ -+ True -+ False -+ 6 -+ -+ -+ -+ True -+ <b>UDP Ports</b> -+ False -+ True -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ False -+ 0 + -+ -+ -+ True -+ -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 ++ ++ ++ True ++ Enter a comma separated list of udp ports or ranges of ports that %s binds to. Example: 612, 650-660 ++ True ++ Unreserved Ports (>1024) ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 10 ++ False ++ False ++ ++ + + + 0 -+ False -+ False ++ True ++ True + + + + -+ ++ + True + False -+ 6 ++ 12 + + -+ ++ + True -+ False -+ 12 -+ -+ -+ -+ True -+ Allows confined application/user role to bind to any udp port -+ True -+ All -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ Allow application/user role to call bindresvport with 0. Binding to port 600-1024 -+ True -+ 600-1024 -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ Enter a comma separated list of udp ports or ranges of ports that application/user role binds to. Example: 612, 650-660 -+ True -+ Unreserved Ports (>1024) -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ ++ Select Ports ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + -+ 0 -+ True -+ True ++ 5 ++ False ++ False + + + + -+ ++ + True -+ False -+ 12 -+ -+ -+ -+ True -+ Select Ports -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 5 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ Allows application/user role to bind to any udp ports > 1024 -+ True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False -+ -+ -+ 0 -+ True -+ True -+ -+ ++ Allows %s to bind to any udp ports > 1024 ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False + + + 0 @@ -4280,70 +4160,65 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + 0 -+ False ++ True + True + + + ++ ++ 0 ++ True ++ True ++ + -+ -+ -+ False -+ True -+ -+ -+ -+ -+ -+ True -+ label34 -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ tab -+ -+ -+ -+ -+ -+ True -+ Enter network ports that application/user role connects to + -+ -+ -+ 18 ++ ++ + True + False -+ 18 ++ 6 ++ ++ ++ ++ True ++ <b>UDP Ports</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + + -+ ++ + True + False -+ 6 ++ 0 + + -+ ++ + True -+ <b>TCP Ports</b> ++ + False -+ True ++ False + GTK_JUSTIFY_LEFT + False + False -+ 0 ++ 0.5 + 0.5 + 0 + 0 @@ -4360,45 +4235,21 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True + False -+ 0 -+ -+ -+ -+ True -+ -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ 6 + + -+ ++ + True + False + 12 + + -+ ++ + True ++ Allows %s to bind to any udp port + True + All + True @@ -4416,47 +4267,42 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select Ports -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 ++ Allow %s to call bindresvport with 0. Binding to port 600-1024 ++ True ++ 600-1024 ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + + -+ 5 ++ 10 + False + False + + + + -+ ++ + True -+ Enter a comma separated list of tcp ports or ranges of ports that application/user role connects to. Example: 612, 650-660 ++ Enter a comma separated list of udp ports or ranges of ports that %s binds to. Example: 612, 650-660 + True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False ++ Unreserved Ports (>1024) ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True + + -+ 0 -+ True -+ True ++ 10 ++ False ++ False + + + @@ -4466,110 +4312,15 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + True + + -+ -+ -+ 0 -+ True -+ True -+ -+ -+ -+ -+ 0 -+ False -+ True -+ -+ -+ -+ -+ -+ True -+ False -+ 6 -+ -+ -+ -+ True -+ <b>UDP Ports</b> -+ False -+ True -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ False -+ 0 -+ -+ -+ -+ True -+ -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ + + -+ ++ + True + False + 12 + + -+ -+ True -+ True -+ All -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 10 -+ False -+ False -+ -+ -+ -+ -+ ++ + True + Select Ports + False @@ -4594,9 +4345,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Enter a comma separated list of udp ports or ranges of ports that application/user role connects to. Example: 612, 650-660 ++ Allows %s to bind to any udp ports > 1024 + True + True + True @@ -4629,11 +4380,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + 0 -+ False ++ True + True + + + ++ ++ 0 ++ True ++ True ++ + + + @@ -4643,9 +4399,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label35 ++ label113 + False + False + GTK_JUSTIFY_LEFT @@ -4666,34 +4422,90 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select common application traits ++ False ++ 0 ++ ++ ++ ++ True ++ <b>Select network ports that %s connects to:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ + -+ -+ -+ 18 ++ ++ + True + False + 6 + + -+ ++ ++ True ++ <b>TCP Ports</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ + True + False -+ 6 ++ 0 + + -+ ++ + True -+ True -+ Writes syslog messages -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True ++ ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 @@ -4703,111 +4515,151 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ True -+ Create/Manipulate temporary files in /tmp -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True ++ False ++ 12 ++ ++ ++ ++ Allows %s to connect to any tcp port ++ True ++ True ++ All ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 10 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Select Ports ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Enter a comma separated list of tcp ports or ranges of ports that %s connects to. Example: 612, 650-660 ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 0 ++ True ++ True ++ ++ + + + 0 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ True -+ Uses Pam for authentication -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False ++ True ++ True + + ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ + -+ -+ -+ True -+ True -+ Uses nsswitch or getpw* calls -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ False ++ 6 + -+ -+ -+ True -+ True -+ Uses dbus -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ <b>UDP Ports</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + -+ -+ -+ True -+ True -+ Sends audit messages -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ False ++ 0 + + -+ ++ + True -+ True -+ Interacts with the terminal -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True ++ ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 @@ -4817,21 +4669,80 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ True -+ Sends email -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True ++ False ++ 12 ++ ++ ++ ++ Allows %s to connect to any udp port ++ True ++ True ++ All ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 10 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Select Ports ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Enter a comma separated list of udp ports or ranges of ports that %s connects to. Example: 612, 650-660 ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 0 ++ True ++ True ++ ++ + + + 0 -+ False -+ False ++ True ++ True + + + @@ -4842,6 +4753,11 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + ++ ++ 0 ++ True ++ True ++ + + + @@ -4851,9 +4767,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label51 ++ label114 + False + False + GTK_JUSTIFY_LEFT @@ -4874,250 +4790,492 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select files/directories that the application manages ++ False ++ 0 + -+ -+ -+ 18 ++ ++ ++ True ++ <b>Select common application traits for %s:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ + True + False + 6 + + -+ ++ ++ True ++ True ++ Writes syslog messages ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Create/Manipulate temporary files in /tmp ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Uses Pam for authentication ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Uses nsswitch or getpw* calls ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Uses dbus ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Sends audit messages ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Interacts with the terminal ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ Sends email ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ label115 ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ tab ++ ++ ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ True ++ <b>Add files/directories that %s manages</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ False ++ 12 ++ ++ ++ + True + False -+ 12 ++ 6 + + -+ ++ + True -+ False -+ 6 ++ True ++ GTK_RELIEF_NORMAL ++ True ++ + + -+ ++ + True -+ True -+ GTK_RELIEF_NORMAL -+ True -+ ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 + + -+ ++ + True -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ 0 -+ 0 -+ 0 -+ 0 ++ False ++ 2 + + -+ ++ + True -+ False -+ 2 -+ -+ -+ -+ True -+ gtk-add -+ 4 -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ gtk-add ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + -+ -+ -+ True -+ Add File -+ True -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ Add File ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + ++ ++ 0 ++ False ++ False ++ + + + + -+ -+ 0 -+ False -+ False -+ + ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ + + -+ ++ + True -+ True -+ GTK_RELIEF_NORMAL -+ True -+ ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 + + -+ ++ + True -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ 0 -+ 0 -+ 0 -+ 0 ++ False ++ 2 + + -+ ++ + True -+ False -+ 2 -+ -+ -+ -+ True -+ gtk-add -+ 4 -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ gtk-add ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + -+ -+ -+ True -+ Add Directory -+ True -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ Add Directory ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + ++ ++ 0 ++ False ++ False ++ + + + + -+ -+ 0 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ True -+ gtk-delete -+ True -+ GTK_RELIEF_NORMAL -+ True -+ -+ -+ -+ -+ 0 -+ False -+ False -+ + + + -+ 4 ++ 0 + False + False + + + + -+ ++ + True + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Add Files/Directories that application will need to "Write" to. Pid Files, Log Files, /var/lib Files ... -+ True -+ False -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ gtk-delete ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ + + + 0 -+ True -+ True ++ False ++ False + + + + ++ 4 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ GTK_CORNER_TOP_LEFT ++ ++ ++ ++ True ++ Files/Directories which the %s "manages". Pid Files, Log Files, /var/lib Files ... ++ True ++ False ++ False ++ False ++ True ++ False ++ False ++ False ++ ++ ++ ++ + 0 + True + True + + + ++ ++ 0 ++ True ++ True ++ + + + @@ -5127,9 +5285,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label43 ++ label116 + False + False + GTK_JUSTIFY_LEFT @@ -5150,171 +5308,188 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select booleans that the application uses ++ False ++ 0 ++ ++ ++ ++ True ++ <b>Add booleans from the %s policy:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ + -+ -+ -+ 18 ++ ++ + True + False -+ 6 ++ 12 + + -+ ++ + True + False -+ 12 ++ 6 + + -+ ++ + True -+ False -+ 6 ++ True ++ GTK_RELIEF_NORMAL ++ True ++ + + -+ ++ + True -+ True -+ GTK_RELIEF_NORMAL -+ True -+ ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 + + -+ ++ + True -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ 0 -+ 0 -+ 0 -+ 0 ++ False ++ 2 + + -+ ++ + True -+ False -+ 2 -+ -+ -+ -+ True -+ gtk-add -+ 4 -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ gtk-add ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + -+ -+ -+ True -+ Add Boolean -+ True -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ Add Boolean ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + ++ ++ 0 ++ False ++ False ++ + + + + -+ -+ 0 -+ False -+ False -+ -+ -+ -+ -+ -+ True -+ True -+ gtk-delete -+ True -+ GTK_RELIEF_NORMAL -+ True -+ -+ -+ -+ -+ 0 -+ False -+ False -+ + + + -+ 4 ++ 0 + False -+ True ++ False + + + + -+ ++ + True + True -+ GTK_POLICY_AUTOMATIC -+ GTK_POLICY_AUTOMATIC -+ GTK_SHADOW_IN -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ True -+ Add/Remove booleans used for this confined application/user -+ True -+ True -+ False -+ False -+ True -+ False -+ False -+ False -+ -+ ++ gtk-delete ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ + + + 0 -+ True -+ True ++ False ++ False + + + + ++ 4 ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ GTK_CORNER_TOP_LEFT ++ ++ ++ ++ True ++ Add/Remove booleans used by the %s domain ++ True ++ True ++ False ++ False ++ True ++ False ++ False ++ False ++ ++ ++ ++ + 0 + True + True + + + ++ ++ 0 ++ True ++ True ++ + + + @@ -5324,9 +5499,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ label44 ++ + False + False + GTK_JUSTIFY_LEFT @@ -5347,90 +5522,107 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True -+ Select directory to generate policy in ++ False ++ 0 ++ ++ ++ ++ True ++ <b>Which directory you will generate the %s policy?</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ + -+ -+ -+ 18 ++ ++ + True + False -+ 5 ++ 12 + + -+ ++ + True -+ False -+ 12 -+ -+ -+ -+ True -+ Policy Directory -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ 5 -+ False -+ False -+ -+ ++ Policy Directory ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 5 ++ False ++ False ++ ++ + -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ True -+ • -+ False -+ -+ -+ 0 -+ True -+ True -+ -+ ++ ++ ++ True ++ True ++ True ++ True ++ 0 ++ ++ True ++ • ++ False ++ ++ ++ 0 ++ True ++ True ++ ++ + -+ -+ -+ True -+ True -+ ... -+ True -+ GTK_RELIEF_NORMAL -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ ++ ++ ++ True ++ True ++ ... ++ True ++ GTK_RELIEF_NORMAL ++ True + + + 0 + False -+ True ++ False + + + ++ ++ 12 ++ False ++ False ++ + + + @@ -5440,95 +5632,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ -+ True -+ label46 -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ tab -+ -+ -+ -+ -+ -+ True -+ GNOME_EDGE_FINISH -+ Generated Policy Files -+ This tool will generate the following: -+Type Enforcement(te), File Context(fc), Interface(if), Shell Script(sh) -+Execute shell script as root to compile/install and relabel files/directories. -+Use semanage or useradd to map Linux login users to user roles. -+Put the machine in permissive mode (setenforce 0). -+Login as the user and test this user role. -+Use audit2allow -R to generate additional rules for the te file. -+ -+ -+ -+ True -+ True -+ -+ -+ -+ -+ -+ True -+ label45 -+ False -+ False -+ GTK_JUSTIFY_LEFT -+ False -+ False -+ 0.5 -+ 0.5 -+ 0 -+ 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 -+ -+ -+ tab -+ -+ -+ -+ -+ -+ True -+ GNOME_EDGE_FINISH -+ Generated Policy Files -+ This tool will generate the following: -+Type Enforcement(te), File Context(fc), Interface(if), Shell Script(sh) -+ -+Execute shell script to compile/install and relabel files/directories. -+Put the machine in permissive mode (setenforce 0). -+Run/restart the application to generate avc messages. -+Use audit2allow -R to generate additional rules for the te file. -+ -+ -+ -+ False -+ True -+ -+ -+ -+ -+ ++ + True -+ label47 ++ + False + False + GTK_JUSTIFY_LEFT @@ -5556,10 +5662,10 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -+ ++ + True + GTK_BUTTONBOX_END -+ 6 ++ 0 + + + @@ -5570,7 +5676,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + True + GTK_RELIEF_NORMAL + True -+ ++ + + + @@ -5583,7 +5689,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + True + GTK_RELIEF_NORMAL + True -+ ++ + + + @@ -5592,18 +5698,18 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + True + True + True -+ gtk-go-forward ++ gtk-media-forward + True + GTK_RELIEF_NORMAL + True -+ ++ + + + + -+ 0 ++ 5 + False -+ True ++ False + + + @@ -5793,7 +5899,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.85/gui/polgen.gladep --- nsapolicycoreutils/gui/polgen.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/polgen.gladep 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/polgen.gladep 2011-02-02 16:17:52.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -5804,8 +5910,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policy + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.85/gui/polgengui.py --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/polgengui.py 2011-01-14 14:38:34.000000000 -0500 -@@ -0,0 +1,665 @@ ++++ policycoreutils-2.0.85/gui/polgengui.py 2011-02-03 15:50:31.000000000 -0500 +@@ -0,0 +1,750 @@ +#!/usr/bin/python -Es +# +# polgengui.py - GUI for SELinux Config tool in system-config-selinux @@ -5881,24 +5987,101 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + +class childWindow: + START_PAGE = 0 -+ SELECT_TYPE_PAGE = 1 -+ APP_PAGE = 2 -+ EXISTING_USER_PAGE = 3 -+ TRANSITION_PAGE = 4 -+ USER_TRANSITION_PAGE = 5 -+ ADMIN_PAGE = 6 -+ ROLE_PAGE = 7 -+ IN_NET_PAGE = 8 -+ OUT_NET_PAGE = 9 -+ COMMON_APPS_PAGE = 10 -+ FILES_PAGE = 11 -+ BOOLEAN_PAGE = 12 -+ SELECT_DIR_PAGE = 13 -+ GEN_POLICY_PAGE = 14 -+ GEN_USER_POLICY_PAGE = 15 -+ ++ SELECT_TYPE_PAGE = 0 ++ APP_PAGE = 1 ++ EXISTING_USER_PAGE = 2 ++ TRANSITION_PAGE = 3 ++ USER_TRANSITION_PAGE = 4 ++ ADMIN_PAGE = 5 ++ ROLE_PAGE = 6 ++ IN_NET_PAGE = 7 ++ OUT_NET_PAGE = 8 ++ COMMON_APPS_PAGE = 9 ++ FILES_PAGE = 10 ++ BOOLEAN_PAGE = 11 ++ SELECT_DIR_PAGE = 12 ++ FINISH_PAGE = 12 ++ + def __init__(self): + self.xml = xml ++ self.notebook = xml.get_widget ("notebook") ++ self.label_dict = {} ++ self.tooltip_dict = {} ++ label = xml.get_widget ("select_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_user_roles_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_dir_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_domain_admin_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_in_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_out_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_common_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_manages_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("select_booleans_label") ++ self.label_dict[label] = label.get_text() ++ ++ label = xml.get_widget ("existing_user_treeview") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("transition_treeview") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_tcp_all_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_tcp_reserved_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_tcp_unreserved_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_tcp_entry") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_udp_all_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_udp_reserved_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_udp_unreserved_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("in_udp_entry") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("out_tcp_entry") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("out_udp_entry") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("out_tcp_all_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("out_udp_all_checkbutton") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("boolean_treeview") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ ++ label = xml.get_widget ("write_treeview") ++ self.tooltip_dict[label] = label.get_tooltip_text() ++ + try: + self.all_types = polgen.get_all_types() + self.all_modules = polgen.get_all_modules() @@ -5930,19 +6113,17 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + self.boolean_name_entry = xml.get_widget ("boolean_name_entry") + self.boolean_description_entry = xml.get_widget ("boolean_description_entry") + -+ self.notebook = xml.get_widget ("notebook1") + self.pages={} -+ self.finish_page = [ self.GEN_POLICY_PAGE, self.GEN_USER_POLICY_PAGE ] + for i in polgen.USERS: -+ self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_USER_POLICY_PAGE] -+ self.pages[polgen.RUSER] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.ADMIN_PAGE, self.USER_TRANSITION_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_USER_POLICY_PAGE] -+ self.pages[polgen.LUSER] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_USER_POLICY_PAGE] -+ self.pages[polgen.SANDBOX] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_POLICY_PAGE] -+ self.pages[polgen.EUSER] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.EXISTING_USER_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_USER_POLICY_PAGE] ++ self.pages[i] = [ self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE ] ++ self.pages[polgen.RUSER] = [ self.SELECT_TYPE_PAGE, self.APP_PAGE, self.ADMIN_PAGE, self.USER_TRANSITION_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE ] ++ self.pages[polgen.LUSER] = [ self.SELECT_TYPE_PAGE, self.APP_PAGE, self.TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE ] ++ self.pages[polgen.SANDBOX] = [ self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] ++ self.pages[polgen.EUSER] = [ self.SELECT_TYPE_PAGE, self.EXISTING_USER_PAGE, self.TRANSITION_PAGE, self.ROLE_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE ] + + for i in polgen.APPLICATIONS: -+ self.pages[i] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_POLICY_PAGE] -+ self.pages[polgen.USER] = [ self.START_PAGE, self.SELECT_TYPE_PAGE, self.APP_PAGE, self.USER_TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE, self.GEN_POLICY_PAGE] ++ self.pages[i] = [ self.SELECT_TYPE_PAGE, self.APP_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE] ++ self.pages[polgen.USER] = [ self.SELECT_TYPE_PAGE, self.APP_PAGE, self.USER_TRANSITION_PAGE, self.IN_NET_PAGE, self.OUT_NET_PAGE, self.COMMON_APPS_PAGE, self.FILES_PAGE, self.BOOLEAN_PAGE, self.SELECT_DIR_PAGE ] + + self.current_page = 0 + self.back_button.set_sensitive(0) @@ -6005,6 +6186,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + iter = self.role_store.append() + self.role_store.set_value(iter, 0, i[:-2]) + ++ self.in_tcp_reserved_checkbutton = xml.get_widget ("in_tcp_reserved_checkbutton") ++ + self.transition_treeview = self.xml.get_widget("transition_treeview") + self.transition_store = gtk.ListStore(gobject.TYPE_STRING) + self.transition_treeview.set_model(self.transition_store) @@ -6082,24 +6265,24 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + if not os.path.isdir(outputdir): + self.error(_("%s must be a directory") % outputdir ) + return False -+ -+ if self.pages[type][self.current_page] in self.finish_page: ++ ++ if self.pages[type][self.current_page] == self.FINISH_PAGE: + self.generate_policy() + self.xml.get_widget ("cancel_button").set_label(gtk.STOCK_CLOSE) + else: + self.current_page = self.current_page + 1 + self.notebook.set_current_page(self.pages[type][self.current_page]) -+ if self.pages[type][self.current_page] in self.finish_page: ++ if self.pages[type][self.current_page] == self.FINISH_PAGE: + self.forward_button.set_label(gtk.STOCK_APPLY) + + def back(self,arg): + type = self.get_type() -+ if self.pages[type][self.current_page] in self.finish_page: ++ if self.pages[type][self.current_page] == self.FINISH_PAGE: + self.forward_button.set_label(gtk.STOCK_GO_FORWARD) + + self.current_page = self.current_page - 1 + self.notebook.set_current_page(self.pages[type][self.current_page]) -+ if self.current_page == 0: ++ if self.pages[type][self.current_page] == self.START_PAGE: + self.back_button.set_sensitive(0) + + def network_all_clicked(self, button): @@ -6430,6 +6613,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + self.error(_("You must enter a name")) + return True + ++ for i in self.label_dict: ++ text = '%s' % (self.label_dict[i] % ("'" + name + "'")) ++ i.set_markup(text) ++ ++ for i in self.tooltip_dict: ++ text = self.tooltip_dict[i] % ("'" + name + "'") ++ i.set_tooltip_text(text) ++ + if self.confine_application(): + exe = self.exec_entry.get_text() + if exe == "": @@ -6473,8 +6664,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.85/gui/polgen.py --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/polgen.py 2011-01-14 16:36:46.000000000 -0500 -@@ -0,0 +1,1346 @@ ++++ policycoreutils-2.0.85/gui/polgen.py 2011-02-03 17:03:56.000000000 -0500 +@@ -0,0 +1,1343 @@ +#!/usr/bin/python -Es +# +# Copyright (C) 2007-2010 Red Hat @@ -7543,7 +7734,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore + t1 = re.sub("PORTNUM", "%d" % i, script.tcp_ports) + newsh += re.sub("TEMPLATETYPE", self.name, t1) + -+ for i in self.in_udp[PORTS] + self.out_udp[PORTS]: ++ for i in self.in_udp[PORTS]: + if self.find_port(i,"udp") == None: + t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports) + newsh += re.sub("TEMPLATETYPE", self.name, t1) @@ -7624,12 +7815,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore + fd.close() + + def generate(self, out_dir = "."): -+ out = "Created the following files:\n" -+ out += "%-25s %s\n" % (_("Type Enforcement file"), self.write_te(out_dir)) -+ out += "%-25s %s\n" % (_("Interface file"), self.write_if(out_dir)) -+ out += "%-25s %s\n" % (_("File Contexts file"), self.write_fc(out_dir)) -+ out += "%-25s %s\n" % (_("Setup Script"),self.write_sh(out_dir)) -+ return out ++ self.write_te(out_dir) ++ self.write_if(out_dir) ++ self.write_fc(out_dir) ++ self.write_sh(out_dir) ++ out = "Created the following files in:\n%s/\n" % out_dir ++ out += "%s.te # %s\n" % (self.file_name, _("Type Enforcement file")) ++ out += "%s.if # %s\n" % (self.file_name, _("Interface file")) ++ out += "%s.fc # %s\n" % (self.file_name, _("File Contexts file")) ++ out += "%s.sh # %s\n" % (self.file_name, _("Setup Script")) ++ return out + +def errorExit(error): + sys.stderr.write("%s: " % sys.argv[0]) @@ -7679,16 +7874,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore + mypolicy.set_out_tcp(0,"8000") + print mypolicy.generate(tmpdir) + -+ mypolicy = policy("mycgi", SANDBOX) -+ mypolicy.set_in_tcp(1, 0, 0, "512, 55000-55000") -+ mypolicy.set_in_udp(1, 0, 0, "1513") -+ mypolicy.set_use_uid(True) -+ mypolicy.set_use_tmp(False) -+ mypolicy.set_use_syslog(True) -+ mypolicy.set_use_pam(True) -+ mypolicy.set_out_tcp(0,"8000") -+ print mypolicy.generate(tmpdir) -+ + mypolicy = policy("myinetd", INETD) + mypolicy.set_program("/usr/bin/mytest") + mypolicy.set_in_tcp(1, 0, 0, "513") @@ -7744,13 +7929,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore + mypolicy.set_transition_users(["unconfined_u", "staff_u"]) + print mypolicy.generate(tmpdir) + ++ mypolicy = policy("mysandbox", SANDBOX) ++ mypolicy.set_out_udp(0, "993") ++ print mypolicy.generate("/tmp") ++ + mypolicy = policy("mydbadm", RUSER) + mypolicy.set_admin_domains(["postgresql", "mysql"]) + print mypolicy.generate(tmpdir) + os.chdir(tmpdir) + rc, output=commands.getstatusoutput("make -f /usr/share/selinux/devel/Makefile") + print output -+ print type(rc), os.WEXITSTATUS(rc) + sys.exit(os.WEXITSTATUS(rc)) + +import os, sys, getopt, socket, random, fcntl @@ -7823,7 +8011,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore + usage(e) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.85/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/portsPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/portsPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,259 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -8086,7 +8274,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.85/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/selinux.tbl 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/selinux.tbl 2011-01-21 09:25:41.000000000 -0500 @@ -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 /") @@ -8324,7 +8512,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.85/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/semanagePage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/semanagePage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,168 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -8496,7 +8684,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.85/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/statusPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/statusPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,190 @@ +# statusPage.py - show selinux status +## Copyright (C) 2006-2009 Red Hat, Inc. @@ -8690,7 +8878,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policy + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.85/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/system-config-selinux.glade 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/system-config-selinux.glade 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,3024 @@ + + @@ -11718,7 +11906,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.gladep policycoreutils-2.0.85/gui/system-config-selinux.gladep --- nsapolicycoreutils/gui/system-config-selinux.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/system-config-selinux.gladep 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/system-config-selinux.gladep 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -11729,7 +11917,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.85/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/system-config-selinux.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/system-config-selinux.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,187 @@ +#!/usr/bin/python -Es +# @@ -11920,7 +12108,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu + app.stand_alone() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.85/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/boolean.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/boolean.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11964,7 +12152,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.85/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/etc_rw.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/etc_rw.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,113 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12081,7 +12269,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.85/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/executable.py 2011-01-14 14:20:52.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/executable.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,447 @@ +# Copyright (C) 2007-2009 Red Hat +# see file 'COPYING' for use and warranty information @@ -12532,7 +12720,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.85/gui/templates/__init__.py --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/__init__.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/__init__.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007 Red Hat, Inc. @@ -12554,7 +12742,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.p + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.85/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/network.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/network.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -12638,7 +12826,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.85/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/rw.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/rw.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,131 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12773,7 +12961,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py poli +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.85/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/script.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/script.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,126 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12903,7 +13091,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.85/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/semodule.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/semodule.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12948,7 +13136,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.p + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.85/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/tmp.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/tmp.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,102 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13054,7 +13242,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py pol +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.85/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/user.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/user.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,205 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13263,7 +13451,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py po +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_cache.py policycoreutils-2.0.85/gui/templates/var_cache.py --- nsapolicycoreutils/gui/templates/var_cache.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/var_cache.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/var_cache.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,133 @@ +# Copyright (C) 2010 Red Hat +# see file 'COPYING' for use and warranty information @@ -13400,7 +13588,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_cache. +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.85/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/var_lib.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/var_lib.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,161 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13565,7 +13753,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.85/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/var_log.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/var_log.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,116 @@ +# Copyright (C) 2007,2010 Red Hat +# see file 'COPYING' for use and warranty information @@ -13685,7 +13873,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.85/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/var_run.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/var_run.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,101 @@ +# Copyright (C) 2007,2010 Red Hat +# see file 'COPYING' for use and warranty information @@ -13790,7 +13978,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.85/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/templates/var_spool.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/templates/var_spool.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,133 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -13927,7 +14115,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool. +""" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.85/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.85/gui/usersPage.py 2011-01-06 16:45:14.000000000 -0500 ++++ policycoreutils-2.0.85/gui/usersPage.py 2011-01-21 09:25:41.000000000 -0500 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index c02e295..2695756 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -500,7 +500,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po endif diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-2.0.83/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2010-06-16 08:04:12.000000000 -0400 -+++ policycoreutils-2.0.83/newrole/newrole.c 2011-01-21 09:11:18.000000000 -0500 ++++ policycoreutils-2.0.83/newrole/newrole.c 2011-02-04 14:53:44.000000000 -0500 @@ -77,7 +77,7 @@ #endif #if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV) @@ -514,8 +514,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po #define PACKAGE "policycoreutils" /* the name of this package lang translation */ #endif -+# define TRUE 1 -+# define FALSE 0 ++#define TRUE 1 ++#define FALSE 0 + /* USAGE_STRING describes the command-line args of this program. */ #define USAGE_STRING "USAGE: newrole [ -r role ] [ -t type ] [ -l level ] [ -p ] [ -V ] [ -- args ]" @@ -553,14 +553,14 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po - fprintf(stderr, _("Error setting capabilities, aborting\n")); - goto out; - } -- + - /* Keep capabilities across uid change */ - if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) { - fprintf(stderr, _("Error setting KEEPCAPS, aborting\n")); - rc = -1; - goto out; - } - +- - /* Does this temporary change really buy us much? */ - /* We should still have root's caps, so drop most capabilities now */ - if ((rc = cap_set_proc(tmp_caps))) { @@ -631,13 +631,13 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po - fprintf(stderr, _("Error setting capabilities, aborting\n")); - goto out; - } - +- - /* Ensure that caps are dropped after setuid call */ - if ((rc = prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) < 0)) { - fprintf(stderr, _("Error resetting KEEPCAPS, aborting\n")); - goto out; - } -- + - /* We should still have root's caps, so drop most capabilities now */ - if ((rc = cap_set_proc(new_caps))) { - fprintf(stderr, _("Error dropping capabilities, aborting\n")); @@ -653,7 +653,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po - fprintf(stderr, _("Error freeing caps\n")); - return rc; + if (! full) -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_SYS_ADMIN | CAP_FOWNER | CAP_CHOWN | CAP_DAC_OVERRIDE); ++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_SYS_ADMIN | CAP_FOWNER | CAP_CHOWN | CAP_DAC_OVERRIDE | CAP_SETPCAP ); + return capng_apply(CAPNG_SELECT_BOTH); } @@ -663,16 +663,22 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po { return 0; } -@@ -1098,7 +1030,7 @@ +@@ -1098,8 +1030,13 @@ * if it makes sense to continue to run newrole, and setting up * a scrubbed environment. */ - if (drop_capabilities()) -+ if (drop_capabilities(FALSE)) ++ ++/* if (drop_capabilities(FALSE)) { ++ fprintf(stderr, _("Sorry, newrole failed to drop capabilities\n")); ++ perror(""); return -1; ++ } ++*/ if (set_signal_handles()) return -1; -@@ -1334,11 +1266,15 @@ + +@@ -1334,11 +1271,17 @@ if (send_audit_message(1, old_context, new_context, ttyn)) goto err_close_pam_session; @@ -684,7 +690,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po goto err_close_pam_session; #endif -+ drop_capabilities(TRUE); ++ if (drop_capabilities(TRUE)) ++ goto err_close_pam_session; ++ /* Handle environment changes */ if (restore_environment(preserve_environment, old_environ, &pw)) { fprintf(stderr, _("Unable to restore the environment, " @@ -1895,6 +1903,32 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + if (master_wd == -1) + exitApp("Error watching config file."); +} +diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/run_init/open_init_pty.8 policycoreutils-2.0.83/run_init/open_init_pty.8 +--- nsapolicycoreutils/run_init/open_init_pty.8 2010-06-16 08:04:12.000000000 -0400 ++++ policycoreutils-2.0.83/run_init/open_init_pty.8 2011-02-04 14:54:44.000000000 -0500 +@@ -24,18 +24,18 @@ + .\" + .TH OPEN_INIT_PTY "8" "January 2005" "Security Enhanced Linux" NSA + .SH NAME +-open_init_pty \- run an program under a psuedo terminal ++open_init_pty \- run an program under a pseudo terminal + .SH SYNOPSIS + .B open_init_pty + \fISCRIPT\fR [[\fIARGS\fR]...] + .br + .SH DESCRIPTION + .PP +-Run a program under a psuedo terminal. This is used by ++Run a program under a pseudo terminal. This is used by + .B run_init + to run actually run the program after setting up the proper +-context. This program acquires a new Psuedo terminal, forks a child +-process that binds to the psueado terminal, and then sits around and ++context. This program acquires a new Pseudo terminal, forks a child ++process that binds to the pseudo terminal, and then sits around and + connects the physical terminal it was invoked upon with the pseudo + terminal, passing keyboard input into to the child process, and passing the + output of the child process to the physical terminal. diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.83/sandbox/deliverables/basicwrapper --- nsapolicycoreutils/sandbox/deliverables/basicwrapper 1969-12-31 19:00:00.000000000 -0500 +++ policycoreutils-2.0.83/sandbox/deliverables/basicwrapper 2011-01-21 09:11:18.000000000 -0500 @@ -2952,6 +2986,16 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po # Copyright (C) 2005 Red Hat # see file 'COPYING' for use and warranty information # +diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-2.0.83/scripts/chcat.8 +--- nsapolicycoreutils/scripts/chcat.8 2010-06-16 08:04:12.000000000 -0400 ++++ policycoreutils-2.0.83/scripts/chcat.8 2011-02-04 14:52:22.000000000 -0500 +@@ -51,5 +51,5 @@ + .SH "FILES" + /etc/selinux/{SELINUXTYPE}/setrans.conf + .br +-/etc/selinux/{SELINUXTYPE}/seuser ++/etc/selinux/{SELINUXTYPE}/seusers + diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.83/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2010-06-16 08:04:12.000000000 -0400 +++ policycoreutils-2.0.83/scripts/fixfiles 2011-01-21 09:11:18.000000000 -0500 @@ -4569,7 +4613,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + errorExit(error.args[1]) diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.83/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2010-06-16 08:04:12.000000000 -0400 -+++ policycoreutils-2.0.83/semanage/seobject.py 2011-01-21 09:11:18.000000000 -0500 ++++ policycoreutils-2.0.83/semanage/seobject.py 2011-02-04 14:54:18.000000000 -0500 @@ -29,47 +29,12 @@ import gettext gettext.bindtextdomain(PROGNAME, "/usr/share/locale") @@ -4622,7 +4666,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po file_types = {} file_types[""] = SEMANAGE_FCONTEXT_ALL; -@@ -194,44 +159,153 @@ +@@ -194,45 +159,148 @@ return trans else: return raw @@ -4715,8 +4759,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po raise ValueError(_("Semanage transaction not in progress")) - self.transaction = False + semanageRecords.transaction = False -+ self.commit() -+ + self.commit() + +class moduleRecords(semanageRecords): + def __init__(self, store): + semanageRecords.__init__(self, store) @@ -4780,17 +4824,12 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + if rc < 0 and rc != -2: + raise ValueError(_("Could not remove module %s (remove failed)") % m) + - self.commit() ++ self.commit() + -+ def deleteall(self): -+ l = self.get_all() -+ if len(l) > 0: -+ all = " ".join(l[0]) -+ self.delete(all) - class dontauditClass(semanageRecords): def __init__(self, store): -@@ -259,14 +333,23 @@ + semanageRecords.__init__(self, store) +@@ -259,14 +327,23 @@ name = semanage_module_get_name(mod) if name and name.startswith("permissive_"): l.append(name.split("permissive_")[1]) @@ -4818,7 +4857,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def add(self, type): import glob -@@ -343,7 +426,9 @@ +@@ -343,7 +420,9 @@ if rc < 0: raise ValueError(_("Could not check if login mapping for %s is defined") % name) if exists: @@ -4829,7 +4868,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if name[0] == '%': try: grp.getgrnam(name[1:]) -@@ -475,6 +560,16 @@ +@@ -475,6 +554,16 @@ mylog.log(1, "delete SELinux user mapping", name); @@ -4846,7 +4885,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def get_all(self, locallist = 0): ddict = {} if locallist: -@@ -489,6 +584,15 @@ +@@ -489,6 +578,15 @@ ddict[name] = (semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) return ddict @@ -4862,7 +4901,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def list(self,heading = 1, locallist = 0): ddict = self.get_all(locallist) keys = ddict.keys() -@@ -531,7 +635,8 @@ +@@ -531,7 +629,8 @@ if rc < 0: raise ValueError(_("Could not check if SELinux user %s is defined") % name) if exists: @@ -4872,7 +4911,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po (rc, u) = semanage_user_create(self.sh) if rc < 0: -@@ -682,6 +787,16 @@ +@@ -682,6 +781,16 @@ mylog.log(1,"delete SELinux user record", name) @@ -4889,7 +4928,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def get_all(self, locallist = 0): ddict = {} if locallist: -@@ -702,6 +817,15 @@ +@@ -702,6 +811,15 @@ return ddict @@ -4905,7 +4944,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def list(self, heading = 1, locallist = 0): ddict = self.get_all(locallist) keys = ddict.keys() -@@ -740,12 +864,16 @@ +@@ -740,12 +858,16 @@ low = int(ports[0]) high = int(ports[1]) @@ -4922,7 +4961,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if is_mls_enabled == 1: if serange == "": serange = "s0" -@@ -808,6 +936,7 @@ +@@ -808,6 +930,7 @@ self.commit() def __modify(self, port, proto, serange, setype): @@ -4930,7 +4969,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if serange == "" and setype == "": if is_mls_enabled == 1: raise ValueError(_("Requires setype or serange")) -@@ -942,6 +1071,18 @@ +@@ -942,6 +1065,18 @@ ddict[(ctype,proto_str)].append("%d-%d" % (low, high)) return ddict @@ -4949,7 +4988,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def list(self, heading = 1, locallist = 0): if heading: print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number")) -@@ -958,7 +1099,8 @@ +@@ -958,7 +1093,8 @@ class nodeRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self,store) @@ -4959,7 +4998,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def __add(self, addr, mask, proto, serange, ctype): if addr == "": raise ValueError(_("Node Address is required")) -@@ -966,14 +1108,11 @@ +@@ -966,14 +1102,11 @@ if mask == "": raise ValueError(_("Node Netmask is required")) @@ -4977,7 +5016,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if is_mls_enabled == 1: if serange == "": serange = "s0" -@@ -991,11 +1130,13 @@ +@@ -991,11 +1124,13 @@ (rc, exists) = semanage_node_exists(self.sh, k) if exists: @@ -4992,7 +5031,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po rc = semanage_node_set_addr(self.sh, node, proto, addr) (rc, con) = semanage_context_create(self.sh) -@@ -1005,8 +1146,7 @@ +@@ -1005,8 +1140,7 @@ rc = semanage_node_set_mask(self.sh, node, proto, mask) if rc < 0: raise ValueError(_("Could not set mask for %s") % addr) @@ -5002,7 +5041,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po rc = semanage_context_set_user(self.sh, con, "system_u") if rc < 0: raise ValueError(_("Could not set user in addr context for %s") % addr) -@@ -1047,13 +1187,10 @@ +@@ -1047,13 +1181,10 @@ if mask == "": raise ValueError(_("Node Netmask is required")) @@ -5020,7 +5059,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if serange == "" and setype == "": raise ValueError(_("Requires setype or serange")) -@@ -1068,12 +1205,11 @@ +@@ -1068,12 +1199,11 @@ if not exists: raise ValueError(_("Addr %s is not defined") % addr) @@ -5034,7 +5073,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po if serange != "": semanage_context_set_mls(self.sh, con, untranslate(serange)) if setype != "": -@@ -1098,11 +1234,9 @@ +@@ -1098,11 +1228,9 @@ if mask == "": raise ValueError(_("Node Netmask is required")) @@ -5049,7 +5088,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po raise ValueError(_("Unknown or missing protocol")) (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto) -@@ -1132,6 +1266,16 @@ +@@ -1132,6 +1260,16 @@ self.__delete(addr, mask, proto) self.commit() @@ -5066,7 +5105,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def get_all(self, locallist = 0): ddict = {} if locallist : -@@ -1145,15 +1289,20 @@ +@@ -1145,15 +1283,20 @@ con = semanage_node_get_con(node) addr = semanage_node_get_addr(self.sh, node) mask = semanage_node_get_mask(self.sh, node) @@ -5092,7 +5131,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def list(self, heading = 1, locallist = 0): if heading: print "%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context") -@@ -1193,7 +1342,8 @@ +@@ -1193,7 +1336,8 @@ if rc < 0: raise ValueError(_("Could not check if interface %s is defined") % interface) if exists: @@ -5102,7 +5141,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po (rc, iface) = semanage_iface_create(self.sh) if rc < 0: -@@ -1307,6 +1457,16 @@ +@@ -1307,6 +1451,16 @@ self.__delete(interface) self.commit() @@ -5119,7 +5158,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def get_all(self, locallist = 0): ddict = {} if locallist: -@@ -1322,6 +1482,15 @@ +@@ -1322,6 +1476,15 @@ return ddict @@ -5135,7 +5174,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def list(self, heading = 1, locallist = 0): if heading: print "%-30s %s\n" % (_("SELinux Interface"), _("Context")) -@@ -1338,6 +1507,48 @@ +@@ -1338,6 +1501,48 @@ class fcontextRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) @@ -5184,7 +5223,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def createcon(self, target, seuser = "system_u"): (rc, con) = semanage_context_create(self.sh) -@@ -1364,6 +1575,8 @@ +@@ -1364,6 +1569,8 @@ def validate(self, target): if target == "" or target.find("\n") >= 0: raise ValueError(_("Invalid file specification")) @@ -5193,7 +5232,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def __add(self, target, type, ftype = "", serange = "", seuser = "system_u"): self.validate(target) -@@ -1388,7 +1601,8 @@ +@@ -1388,7 +1595,8 @@ raise ValueError(_("Could not check if file context for %s is defined") % target) if exists: @@ -5203,7 +5242,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po (rc, fcontext) = semanage_fcontext_create(self.sh) if rc < 0: -@@ -1504,9 +1718,16 @@ +@@ -1504,9 +1712,16 @@ raise ValueError(_("Could not delete the file context %s") % target) semanage_fcontext_key_free(k) @@ -5220,7 +5259,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype]) if rc < 0: raise ValueError(_("Could not create a key for %s") % target) -@@ -1561,12 +1782,22 @@ +@@ -1561,12 +1776,22 @@ return ddict @@ -5245,7 +5284,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po for k in keys: if fcon_dict[k]: if is_mls_enabled: -@@ -1575,6 +1806,12 @@ +@@ -1575,6 +1800,12 @@ print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2]) else: print "%-50s %-18s <>" % (k[0], k[1]) @@ -5258,7 +5297,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po class booleanRecords(semanageRecords): def __init__(self, store = ""): -@@ -1587,6 +1824,18 @@ +@@ -1587,6 +1818,18 @@ self.dict["1"] = 1 self.dict["0"] = 0 @@ -5277,7 +5316,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po def __mod(self, name, value): (rc, k) = semanage_bool_key_create(self.sh, name) if rc < 0: -@@ -1606,9 +1855,10 @@ +@@ -1606,9 +1849,10 @@ else: raise ValueError(_("You must specify one of the following values: %s") % ", ".join(self.dict.keys()) ) @@ -5291,7 +5330,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po rc = semanage_bool_modify_local(self.sh, k, b) if rc < 0: raise ValueError(_("Could not modify boolean %s") % name) -@@ -1691,8 +1941,12 @@ +@@ -1691,8 +1935,12 @@ value = [] name = semanage_bool_get_name(boolean) value.append(semanage_bool_get_value(boolean)) @@ -5306,7 +5345,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po ddict[name] = value return ddict -@@ -1706,6 +1960,16 @@ +@@ -1706,6 +1954,16 @@ else: return _("unknown") diff --git a/policycoreutils.spec b/policycoreutils.spec index 1d0aa88..b697eff 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.83 -Release: 33.11%{?dist} +Release: 33.12%{?dist} License: GPLv2 Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -317,6 +317,9 @@ fi exit 0 %changelog +* Fri Feb 4 2011 Dan Walsh 2.0.83-33.12 +-- Update version og selinux-polgengui + * Wed Feb 2 2011 Dan Walsh 2.0.83-33.11 - Fix sandbox to work on nfs homedirs - Fix error message to print out complete information in sandbox