diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch index 1d37064..71f5835 100644 --- a/policycoreutils-gui.patch +++ b/policycoreutils-gui.patch @@ -1,6 +1,6 @@ diff -up policycoreutils-2.1.10/gui/booleansPage.py.gui policycoreutils-2.1.10/gui/booleansPage.py ---- policycoreutils-2.1.10/gui/booleansPage.py.gui 2012-02-01 08:39:50.132218033 -0500 -+++ policycoreutils-2.1.10/gui/booleansPage.py 2012-02-01 08:39:50.132218033 -0500 +--- policycoreutils-2.1.10/gui/booleansPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/booleansPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,247 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -250,8 +250,8 @@ diff -up policycoreutils-2.1.10/gui/booleansPage.py.gui policycoreutils-2.1.10/g + return True + diff -up policycoreutils-2.1.10/gui/domainsPage.py.gui policycoreutils-2.1.10/gui/domainsPage.py ---- policycoreutils-2.1.10/gui/domainsPage.py.gui 2012-02-01 08:39:50.132218033 -0500 -+++ policycoreutils-2.1.10/gui/domainsPage.py 2012-02-01 08:39:50.132218033 -0500 +--- policycoreutils-2.1.10/gui/domainsPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/domainsPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,154 @@ +## domainsPage.py - show selinux domains +## Copyright (C) 2009 Red Hat, Inc. @@ -408,8 +408,8 @@ diff -up policycoreutils-2.1.10/gui/domainsPage.py.gui policycoreutils-2.1.10/gu + except ValueError, e: + self.error(e.args[0]) diff -up policycoreutils-2.1.10/gui/fcontextPage.py.gui policycoreutils-2.1.10/gui/fcontextPage.py ---- policycoreutils-2.1.10/gui/fcontextPage.py.gui 2012-02-01 08:39:50.133218034 -0500 -+++ policycoreutils-2.1.10/gui/fcontextPage.py 2012-02-01 08:39:50.133218034 -0500 +--- policycoreutils-2.1.10/gui/fcontextPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/fcontextPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,223 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -635,8 +635,8 @@ diff -up policycoreutils-2.1.10/gui/fcontextPage.py.gui policycoreutils-2.1.10/g + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) diff -up policycoreutils-2.1.10/gui/html_util.py.gui policycoreutils-2.1.10/gui/html_util.py ---- policycoreutils-2.1.10/gui/html_util.py.gui 2012-02-01 08:39:50.134218035 -0500 -+++ policycoreutils-2.1.10/gui/html_util.py 2012-02-01 08:39:50.134218035 -0500 +--- policycoreutils-2.1.10/gui/html_util.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/html_util.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,164 @@ +# Authors: John Dennis +# @@ -803,8 +803,8 @@ diff -up policycoreutils-2.1.10/gui/html_util.py.gui policycoreutils-2.1.10/gui/ + return doc + diff -up policycoreutils-2.1.10/gui/lockdown.glade.gui policycoreutils-2.1.10/gui/lockdown.glade ---- policycoreutils-2.1.10/gui/lockdown.glade.gui 2012-02-01 08:39:50.135218036 -0500 -+++ policycoreutils-2.1.10/gui/lockdown.glade 2012-02-01 08:39:50.135218036 -0500 +--- policycoreutils-2.1.10/gui/lockdown.glade.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/lockdown.glade 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,771 @@ + + @@ -1578,8 +1578,8 @@ diff -up policycoreutils-2.1.10/gui/lockdown.glade.gui policycoreutils-2.1.10/gu + + diff -up policycoreutils-2.1.10/gui/lockdown.gladep.gui policycoreutils-2.1.10/gui/lockdown.gladep ---- policycoreutils-2.1.10/gui/lockdown.gladep.gui 2012-02-01 08:39:50.135218036 -0500 -+++ policycoreutils-2.1.10/gui/lockdown.gladep 2012-02-01 08:39:50.135218036 -0500 +--- policycoreutils-2.1.10/gui/lockdown.gladep.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/lockdown.gladep 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -1589,8 +1589,8 @@ diff -up policycoreutils-2.1.10/gui/lockdown.gladep.gui policycoreutils-2.1.10/g + + diff -up policycoreutils-2.1.10/gui/lockdown.py.gui policycoreutils-2.1.10/gui/lockdown.py ---- policycoreutils-2.1.10/gui/lockdown.py.gui 2012-02-01 08:39:50.136218037 -0500 -+++ policycoreutils-2.1.10/gui/lockdown.py 2012-02-01 08:39:50.136218037 -0500 +--- policycoreutils-2.1.10/gui/lockdown.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/lockdown.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,375 @@ +#!/usr/bin/python +# @@ -1968,8 +1968,8 @@ diff -up policycoreutils-2.1.10/gui/lockdown.py.gui policycoreutils-2.1.10/gui/l + app = booleanWindow() + app.stand_alone() diff -up policycoreutils-2.1.10/gui/loginsPage.py.gui policycoreutils-2.1.10/gui/loginsPage.py ---- policycoreutils-2.1.10/gui/loginsPage.py.gui 2012-02-01 08:39:50.137218037 -0500 -+++ policycoreutils-2.1.10/gui/loginsPage.py 2012-02-01 08:39:50.137218037 -0500 +--- policycoreutils-2.1.10/gui/loginsPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/loginsPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2157,8 +2157,8 @@ diff -up policycoreutils-2.1.10/gui/loginsPage.py.gui policycoreutils-2.1.10/gui + self.store.set_value(iter, 2, seobject.translate(serange)) + diff -up policycoreutils-2.1.10/gui/Makefile.gui policycoreutils-2.1.10/gui/Makefile ---- policycoreutils-2.1.10/gui/Makefile.gui 2012-02-01 08:39:50.137218037 -0500 -+++ policycoreutils-2.1.10/gui/Makefile 2012-02-01 08:39:50.138218037 -0500 +--- policycoreutils-2.1.10/gui/Makefile.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/Makefile 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,40 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -2201,8 +2201,8 @@ diff -up policycoreutils-2.1.10/gui/Makefile.gui policycoreutils-2.1.10/gui/Make + +relabel: diff -up policycoreutils-2.1.10/gui/mappingsPage.py.gui policycoreutils-2.1.10/gui/mappingsPage.py ---- policycoreutils-2.1.10/gui/mappingsPage.py.gui 2012-02-01 08:39:50.138218037 -0500 -+++ policycoreutils-2.1.10/gui/mappingsPage.py 2012-02-01 08:39:50.138218037 -0500 +--- policycoreutils-2.1.10/gui/mappingsPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/mappingsPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2261,8 +2261,8 @@ diff -up policycoreutils-2.1.10/gui/mappingsPage.py.gui policycoreutils-2.1.10/g + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + diff -up policycoreutils-2.1.10/gui/modulesPage.py.gui policycoreutils-2.1.10/gui/modulesPage.py ---- policycoreutils-2.1.10/gui/modulesPage.py.gui 2012-02-01 08:39:50.138218037 -0500 -+++ policycoreutils-2.1.10/gui/modulesPage.py 2012-02-01 08:39:50.139218038 -0500 +--- policycoreutils-2.1.10/gui/modulesPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/modulesPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,190 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006-2009 Red Hat, Inc. @@ -2455,8 +2455,8 @@ diff -up policycoreutils-2.1.10/gui/modulesPage.py.gui policycoreutils-2.1.10/gu + except ValueError, e: + self.error(e.args[0]) diff -up policycoreutils-2.1.10/gui/polgen.glade.gui policycoreutils-2.1.10/gui/polgen.glade ---- policycoreutils-2.1.10/gui/polgen.glade.gui 2012-02-01 08:39:50.141218040 -0500 -+++ policycoreutils-2.1.10/gui/polgen.glade 2012-02-01 08:39:50.142218041 -0500 +--- policycoreutils-2.1.10/gui/polgen.glade.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/polgen.glade 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,3432 @@ + + @@ -5891,8 +5891,8 @@ diff -up policycoreutils-2.1.10/gui/polgen.glade.gui policycoreutils-2.1.10/gui/ + + diff -up policycoreutils-2.1.10/gui/polgen.gladep.gui policycoreutils-2.1.10/gui/polgen.gladep ---- policycoreutils-2.1.10/gui/polgen.gladep.gui 2012-02-01 08:39:50.143218042 -0500 -+++ policycoreutils-2.1.10/gui/polgen.gladep 2012-02-01 08:39:50.143218042 -0500 +--- policycoreutils-2.1.10/gui/polgen.gladep.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/polgen.gladep 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -5902,8 +5902,8 @@ diff -up policycoreutils-2.1.10/gui/polgen.gladep.gui policycoreutils-2.1.10/gui + + diff -up policycoreutils-2.1.10/gui/polgengui.py.gui policycoreutils-2.1.10/gui/polgengui.py ---- policycoreutils-2.1.10/gui/polgengui.py.gui 2012-02-01 08:39:50.144218043 -0500 -+++ policycoreutils-2.1.10/gui/polgengui.py 2012-02-01 08:39:50.144218043 -0500 +--- policycoreutils-2.1.10/gui/polgengui.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/polgengui.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,750 @@ +#!/usr/bin/python -Es +# @@ -6656,8 +6656,8 @@ diff -up policycoreutils-2.1.10/gui/polgengui.py.gui policycoreutils-2.1.10/gui/ + app = childWindow() + app.stand_alone() diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/polgen.py ---- policycoreutils-2.1.10/gui/polgen.py.gui 2012-02-01 08:39:50.145218044 -0500 -+++ policycoreutils-2.1.10/gui/polgen.py 2012-02-01 08:39:50.146218045 -0500 +--- policycoreutils-2.1.10/gui/polgen.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/polgen.py 2012-03-08 10:19:33.433837435 -0500 @@ -0,0 +1,1353 @@ +#!/usr/bin/python -Es +# @@ -6957,7 +6957,7 @@ diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/pol + self.DEFAULT_DIRS["/etc"] = ["etc_rw", [], etc_rw]; + self.DEFAULT_DIRS["/tmp"] = ["tmp", [], tmp]; + self.DEFAULT_DIRS["rw"] = ["rw", [], rw]; -+ self.DEFAULT_DIRS["/lib/systemd/system"] = ["unit_file", [], unit_file]; ++ self.DEFAULT_DIRS["/usr/lib/systemd/system"] = ["unit_file", [], unit_file]; + self.DEFAULT_DIRS["/etc/systemd/system"] = ["unit_file", [], unit_file]; + self.DEFAULT_DIRS["/var/cache"] = ["var_cache", [], var_cache]; + self.DEFAULT_DIRS["/var/lib"] = ["var_lib", [], var_lib]; @@ -6965,7 +6965,7 @@ diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/pol + self.DEFAULT_DIRS["/var/run"] = ["var_run", [], var_run]; + self.DEFAULT_DIRS["/var/spool"] = ["var_spool", [], var_spool]; + -+ self.DEFAULT_KEYS=["/etc", "/var/cache", "/var/log", "/tmp", "rw", "/var/lib", "/var/run", "/var/spool", "/etc/systemd/system", "/lib/systemd/system" ] ++ self.DEFAULT_KEYS=["/etc", "/var/cache", "/var/log", "/tmp", "rw", "/var/lib", "/var/run", "/var/spool", "/etc/systemd/system", "/usr/lib/systemd/system" ] + + self.DEFAULT_TYPES = (\ +( self.generate_daemon_types, self.generate_daemon_rules), \ @@ -8013,8 +8013,8 @@ diff -up policycoreutils-2.1.10/gui/polgen.py.gui policycoreutils-2.1.10/gui/pol + except ValueError, e: + usage(e) diff -up policycoreutils-2.1.10/gui/portsPage.py.gui policycoreutils-2.1.10/gui/portsPage.py ---- policycoreutils-2.1.10/gui/portsPage.py.gui 2012-02-01 08:39:50.146218045 -0500 -+++ policycoreutils-2.1.10/gui/portsPage.py 2012-02-01 08:39:50.146218045 -0500 +--- policycoreutils-2.1.10/gui/portsPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/portsPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,259 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -8276,8 +8276,8 @@ diff -up policycoreutils-2.1.10/gui/portsPage.py.gui policycoreutils-2.1.10/gui/ + return True + diff -up policycoreutils-2.1.10/gui/selinux.tbl.gui policycoreutils-2.1.10/gui/selinux.tbl ---- policycoreutils-2.1.10/gui/selinux.tbl.gui 2012-02-01 08:39:50.147218045 -0500 -+++ policycoreutils-2.1.10/gui/selinux.tbl 2012-02-01 08:39:50.147218045 -0500 +--- policycoreutils-2.1.10/gui/selinux.tbl.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/selinux.tbl 2012-02-01 08:39:50.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 /") @@ -8514,8 +8514,8 @@ diff -up policycoreutils-2.1.10/gui/selinux.tbl.gui policycoreutils-2.1.10/gui/s +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories") + diff -up policycoreutils-2.1.10/gui/semanagePage.py.gui policycoreutils-2.1.10/gui/semanagePage.py ---- policycoreutils-2.1.10/gui/semanagePage.py.gui 2012-02-01 08:39:50.148218045 -0500 -+++ policycoreutils-2.1.10/gui/semanagePage.py 2012-02-01 08:39:50.148218045 -0500 +--- policycoreutils-2.1.10/gui/semanagePage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/semanagePage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,168 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -8686,8 +8686,8 @@ diff -up policycoreutils-2.1.10/gui/semanagePage.py.gui policycoreutils-2.1.10/g + return True + diff -up policycoreutils-2.1.10/gui/statusPage.py.gui policycoreutils-2.1.10/gui/statusPage.py ---- policycoreutils-2.1.10/gui/statusPage.py.gui 2012-02-01 08:39:50.148218045 -0500 -+++ policycoreutils-2.1.10/gui/statusPage.py 2012-02-01 08:39:50.149218046 -0500 +--- policycoreutils-2.1.10/gui/statusPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/statusPage.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,190 @@ +# statusPage.py - show selinux status +## Copyright (C) 2006-2009 Red Hat, Inc. @@ -8880,8 +8880,8 @@ diff -up policycoreutils-2.1.10/gui/statusPage.py.gui policycoreutils-2.1.10/gui + + diff -up policycoreutils-2.1.10/gui/system-config-selinux.glade.gui policycoreutils-2.1.10/gui/system-config-selinux.glade ---- policycoreutils-2.1.10/gui/system-config-selinux.glade.gui 2012-02-01 08:39:50.151218048 -0500 -+++ policycoreutils-2.1.10/gui/system-config-selinux.glade 2012-02-01 08:39:50.151218048 -0500 +--- policycoreutils-2.1.10/gui/system-config-selinux.glade.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/system-config-selinux.glade 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,3024 @@ + + @@ -11908,8 +11908,8 @@ diff -up policycoreutils-2.1.10/gui/system-config-selinux.glade.gui policycoreut + + diff -up policycoreutils-2.1.10/gui/system-config-selinux.gladep.gui policycoreutils-2.1.10/gui/system-config-selinux.gladep ---- policycoreutils-2.1.10/gui/system-config-selinux.gladep.gui 2012-02-01 08:39:50.152218049 -0500 -+++ policycoreutils-2.1.10/gui/system-config-selinux.gladep 2012-02-01 08:39:50.152218049 -0500 +--- policycoreutils-2.1.10/gui/system-config-selinux.gladep.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/system-config-selinux.gladep 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,7 @@ + + @@ -11919,8 +11919,8 @@ diff -up policycoreutils-2.1.10/gui/system-config-selinux.gladep.gui policycoreu + + diff -up policycoreutils-2.1.10/gui/system-config-selinux.py.gui policycoreutils-2.1.10/gui/system-config-selinux.py ---- policycoreutils-2.1.10/gui/system-config-selinux.py.gui 2012-02-01 08:39:50.152218049 -0500 -+++ policycoreutils-2.1.10/gui/system-config-selinux.py 2012-02-01 08:39:50.153218050 -0500 +--- policycoreutils-2.1.10/gui/system-config-selinux.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/system-config-selinux.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,187 @@ +#!/usr/bin/python -Es +# @@ -12110,8 +12110,8 @@ diff -up policycoreutils-2.1.10/gui/system-config-selinux.py.gui policycoreutils + app = childWindow() + app.stand_alone() diff -up policycoreutils-2.1.10/gui/templates/boolean.py.gui policycoreutils-2.1.10/gui/templates/boolean.py ---- policycoreutils-2.1.10/gui/templates/boolean.py.gui 2012-02-01 08:39:50.153218050 -0500 -+++ policycoreutils-2.1.10/gui/templates/boolean.py 2012-02-01 08:39:50.153218050 -0500 +--- policycoreutils-2.1.10/gui/templates/boolean.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/boolean.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,40 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -12154,8 +12154,8 @@ diff -up policycoreutils-2.1.10/gui/templates/boolean.py.gui policycoreutils-2.1 +""" + diff -up policycoreutils-2.1.10/gui/templates/etc_rw.py.gui policycoreutils-2.1.10/gui/templates/etc_rw.py ---- policycoreutils-2.1.10/gui/templates/etc_rw.py.gui 2012-02-01 08:39:50.154218051 -0500 -+++ policycoreutils-2.1.10/gui/templates/etc_rw.py 2012-02-01 08:39:50.154218051 -0500 +--- policycoreutils-2.1.10/gui/templates/etc_rw.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/etc_rw.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,112 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -12270,9 +12270,9 @@ diff -up policycoreutils-2.1.10/gui/templates/etc_rw.py.gui policycoreutils-2.1. +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/executable.py.gui policycoreutils-2.1.10/gui/templates/executable.py ---- policycoreutils-2.1.10/gui/templates/executable.py.gui 2012-02-01 08:39:50.155218052 -0500 -+++ policycoreutils-2.1.10/gui/templates/executable.py 2012-02-01 08:39:50.155218052 -0500 -@@ -0,0 +1,441 @@ +--- policycoreutils-2.1.10/gui/templates/executable.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/executable.py 2012-02-15 13:50:39.736034774 -0500 +@@ -0,0 +1,445 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information +# @@ -12699,6 +12699,10 @@ diff -up policycoreutils-2.1.10/gui/templates/executable.py.gui policycoreutils- +""" + +if_end_admin="""\ ++ optional_policy(` ++ systemd_passwd_agent_exec($1) ++ systemd_read_fifo_file_passwd_run($1) ++ ') +') +""" + @@ -12715,8 +12719,8 @@ diff -up policycoreutils-2.1.10/gui/templates/executable.py.gui policycoreutils- +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/__init__.py.gui policycoreutils-2.1.10/gui/templates/__init__.py ---- policycoreutils-2.1.10/gui/templates/__init__.py.gui 2012-02-01 08:39:50.155218052 -0500 -+++ policycoreutils-2.1.10/gui/templates/__init__.py 2012-02-01 08:39:50.155218052 -0500 +--- policycoreutils-2.1.10/gui/templates/__init__.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/__init__.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007-2012 Red Hat @@ -12737,8 +12741,8 @@ diff -up policycoreutils-2.1.10/gui/templates/__init__.py.gui policycoreutils-2. +# + diff -up policycoreutils-2.1.10/gui/templates/network.py.gui policycoreutils-2.1.10/gui/templates/network.py ---- policycoreutils-2.1.10/gui/templates/network.py.gui 2012-02-01 08:39:50.156218053 -0500 -+++ policycoreutils-2.1.10/gui/templates/network.py 2012-02-01 08:39:50.156218053 -0500 +--- policycoreutils-2.1.10/gui/templates/network.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/network.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,102 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -12843,8 +12847,8 @@ diff -up policycoreutils-2.1.10/gui/templates/network.py.gui policycoreutils-2.1 +""" + diff -up policycoreutils-2.1.10/gui/templates/rw.py.gui policycoreutils-2.1.10/gui/templates/rw.py ---- policycoreutils-2.1.10/gui/templates/rw.py.gui 2012-02-01 08:39:50.156218053 -0500 -+++ policycoreutils-2.1.10/gui/templates/rw.py 2012-02-01 08:39:50.157218053 -0500 +--- policycoreutils-2.1.10/gui/templates/rw.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/rw.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,129 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -12976,8 +12980,8 @@ diff -up policycoreutils-2.1.10/gui/templates/rw.py.gui policycoreutils-2.1.10/g +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/script.py.gui policycoreutils-2.1.10/gui/templates/script.py ---- policycoreutils-2.1.10/gui/templates/script.py.gui 2012-02-01 08:39:50.157218053 -0500 -+++ policycoreutils-2.1.10/gui/templates/script.py 2012-02-01 08:39:50.157218053 -0500 +--- policycoreutils-2.1.10/gui/templates/script.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/script.py 2012-03-28 08:09:39.353230984 -0400 @@ -0,0 +1,126 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13044,7 +13048,7 @@ diff -up policycoreutils-2.1.10/gui/templates/script.py.gui policycoreutils-2.1. + +echo "Building and Loading Policy" +set -x -+make -f /usr/share/selinux/devel/Makefile || exit ++make -f /usr/share/selinux/devel/Makefile TEMPLATEFILE.pp || exit +/usr/sbin/semodule -i TEMPLATEFILE.pp + +""" @@ -13106,8 +13110,8 @@ diff -up policycoreutils-2.1.10/gui/templates/script.py.gui policycoreutils-2.1. +fi +""" diff -up policycoreutils-2.1.10/gui/templates/semodule.py.gui policycoreutils-2.1.10/gui/templates/semodule.py ---- policycoreutils-2.1.10/gui/templates/semodule.py.gui 2012-02-01 08:39:50.157218053 -0500 -+++ policycoreutils-2.1.10/gui/templates/semodule.py 2012-02-01 08:39:50.158218053 -0500 +--- policycoreutils-2.1.10/gui/templates/semodule.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/semodule.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,41 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13151,8 +13155,8 @@ diff -up policycoreutils-2.1.10/gui/templates/semodule.py.gui policycoreutils-2. +""" + diff -up policycoreutils-2.1.10/gui/templates/tmp.py.gui policycoreutils-2.1.10/gui/templates/tmp.py ---- policycoreutils-2.1.10/gui/templates/tmp.py.gui 2012-02-01 08:39:50.158218053 -0500 -+++ policycoreutils-2.1.10/gui/templates/tmp.py 2012-02-01 08:39:50.158218053 -0500 +--- policycoreutils-2.1.10/gui/templates/tmp.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/tmp.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,102 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13257,9 +13261,9 @@ diff -up policycoreutils-2.1.10/gui/templates/tmp.py.gui policycoreutils-2.1.10/ + admin_pattern($1, TEMPLATETYPE_tmp_t) +""" diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2.1.10/gui/templates/unit_file.py ---- policycoreutils-2.1.10/gui/templates/unit_file.py.gui 2012-02-01 08:40:34.733252831 -0500 -+++ policycoreutils-2.1.10/gui/templates/unit_file.py 2012-02-01 08:40:28.444248042 -0500 -@@ -0,0 +1,69 @@ +--- policycoreutils-2.1.10/gui/templates/unit_file.py.gui 2012-02-01 08:40:34.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/unit_file.py 2012-03-21 10:26:36.038417308 -0400 +@@ -0,0 +1,72 @@ +# Copyright (C) 2012 Red Hat +# see file 'COPYING' for use and warranty information +# @@ -13286,7 +13290,7 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2 +########################### Type Enforcement File ############################# +te_types=""" +type TEMPLATETYPE_unit_file_t; -+files_type(TEMPLATETYPE_unit_file_t) ++systemd_unit_file(TEMPLATETYPE_unit_file_t) +""" + +te_rules="" @@ -13310,8 +13314,9 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2 + ') + + systemd_exec_systemctl($1) ++ systemd_read_fifo_file_password_run($1) + allow $1 TEMPLATETYPE_unit_file_t:file read_file_perms; -+ allow $1 TEMPLATETYPE_unit_file_t:service all_service_perms; ++ allow $1 TEMPLATETYPE_unit_file_t:service manage_service_perms; + + ps_process_pattern($1, TEMPLATETYPE_t) +') @@ -13319,10 +13324,12 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2 +""" + +if_admin_types=""" -+ type TEMPLATETYPE_unit_file_t;""" ++ type TEMPLATETYPE_unit_file_t;""" + +if_admin_rules=""" + TEMPLATETYPE_systemctl($1) ++ admin_pattern($1, TEMPLATETYPE_unit_file_t) ++ allow $1 TEMPLATETYPE_unit_file_t:service all_service_perms; +""" + +########################### File Context ################################## @@ -13330,8 +13337,8 @@ diff -up policycoreutils-2.1.10/gui/templates/unit_file.py.gui policycoreutils-2 +FILENAME -- gen_context(system_u:object_r:TEMPLATETYPE_unit_file_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/user.py.gui policycoreutils-2.1.10/gui/templates/user.py ---- policycoreutils-2.1.10/gui/templates/user.py.gui 2012-02-01 08:39:50.159218054 -0500 -+++ policycoreutils-2.1.10/gui/templates/user.py 2012-02-01 08:39:50.159218054 -0500 +--- policycoreutils-2.1.10/gui/templates/user.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/user.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,204 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13538,8 +13545,8 @@ diff -up policycoreutils-2.1.10/gui/templates/user.py.gui policycoreutils-2.1.10 +seutil_run_newrole(TEMPLATETYPE_t, TEMPLATETYPE_r) +""" diff -up policycoreutils-2.1.10/gui/templates/var_cache.py.gui policycoreutils-2.1.10/gui/templates/var_cache.py ---- policycoreutils-2.1.10/gui/templates/var_cache.py.gui 2012-02-01 08:39:50.159218054 -0500 -+++ policycoreutils-2.1.10/gui/templates/var_cache.py 2012-02-01 08:39:50.159218054 -0500 +--- policycoreutils-2.1.10/gui/templates/var_cache.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/var_cache.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,132 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13674,8 +13681,8 @@ diff -up policycoreutils-2.1.10/gui/templates/var_cache.py.gui policycoreutils-2 +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_cache_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/var_lib.py.gui policycoreutils-2.1.10/gui/templates/var_lib.py ---- policycoreutils-2.1.10/gui/templates/var_lib.py.gui 2012-02-01 08:39:50.160218055 -0500 -+++ policycoreutils-2.1.10/gui/templates/var_lib.py 2012-02-01 08:39:50.160218055 -0500 +--- policycoreutils-2.1.10/gui/templates/var_lib.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/var_lib.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,160 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13838,8 +13845,8 @@ diff -up policycoreutils-2.1.10/gui/templates/var_lib.py.gui policycoreutils-2.1 +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/var_log.py.gui policycoreutils-2.1.10/gui/templates/var_log.py ---- policycoreutils-2.1.10/gui/templates/var_log.py.gui 2012-02-01 08:39:50.160218055 -0500 -+++ policycoreutils-2.1.10/gui/templates/var_log.py 2012-02-01 08:39:50.161218056 -0500 +--- policycoreutils-2.1.10/gui/templates/var_log.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/var_log.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,114 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -13956,8 +13963,8 @@ diff -up policycoreutils-2.1.10/gui/templates/var_log.py.gui policycoreutils-2.1 +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/var_run.py.gui policycoreutils-2.1.10/gui/templates/var_run.py ---- policycoreutils-2.1.10/gui/templates/var_run.py.gui 2012-02-01 08:39:50.161218056 -0500 -+++ policycoreutils-2.1.10/gui/templates/var_run.py 2012-02-01 08:39:50.161218056 -0500 +--- policycoreutils-2.1.10/gui/templates/var_run.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/var_run.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,101 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -14061,8 +14068,8 @@ diff -up policycoreutils-2.1.10/gui/templates/var_run.py.gui policycoreutils-2.1 +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" diff -up policycoreutils-2.1.10/gui/templates/var_spool.py.gui policycoreutils-2.1.10/gui/templates/var_spool.py ---- policycoreutils-2.1.10/gui/templates/var_spool.py.gui 2012-02-01 08:39:50.162218057 -0500 -+++ policycoreutils-2.1.10/gui/templates/var_spool.py 2012-02-01 08:39:50.162218057 -0500 +--- policycoreutils-2.1.10/gui/templates/var_spool.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/templates/var_spool.py 2012-02-01 08:39:50.000000000 -0500 @@ -0,0 +1,131 @@ +# Copyright (C) 2007-2012 Red Hat +# see file 'COPYING' for use and warranty information @@ -14196,8 +14203,8 @@ diff -up policycoreutils-2.1.10/gui/templates/var_spool.py.gui policycoreutils-2 +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" diff -up policycoreutils-2.1.10/gui/usersPage.py.gui policycoreutils-2.1.10/gui/usersPage.py ---- policycoreutils-2.1.10/gui/usersPage.py.gui 2012-02-01 08:39:50.162218057 -0500 -+++ policycoreutils-2.1.10/gui/usersPage.py 2012-02-01 08:39:50.163218058 -0500 +--- policycoreutils-2.1.10/gui/usersPage.py.gui 2012-02-01 08:39:50.000000000 -0500 ++++ policycoreutils-2.1.10/gui/usersPage.py 2012-02-01 08:39:50.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 b1adc66..6fb7d54 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,3 +1,12 @@ +diff --git a/policycoreutils/.gitignore b/policycoreutils/.gitignore +index 50f8b82..aa1045a 100644 +--- a/policycoreutils/.gitignore ++++ b/policycoreutils/.gitignore +@@ -14,3 +14,4 @@ sestatus/sestatus + setfiles/restorecon + setfiles/setfiles + setsebool/setsebool ++gui diff --git a/policycoreutils/Makefile b/policycoreutils/Makefile index 9cfe3bc..e31f7d3 100644 --- a/policycoreutils/Makefile @@ -8,37 +17,144 @@ index 9cfe3bc..e31f7d3 100644 INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) +diff --git a/policycoreutils/audit2allow/sepolgen-ifgen b/policycoreutils/audit2allow/sepolgen-ifgen +index ef4bec3..9b313ec 100644 +--- a/policycoreutils/audit2allow/sepolgen-ifgen ++++ b/policycoreutils/audit2allow/sepolgen-ifgen +@@ -61,20 +61,10 @@ def parse_options(): + + return options + +-def get_policy(): +- i = selinux.security_policyvers() +- p = selinux.selinux_binary_policy_path() + "." + str(i) +- while i > 0 and not os.path.exists(p): +- i = i - 1 +- p = selinux.selinux_binary_policy_path() + "." + str(i) +- if i > 0: +- return p +- return None +- + def get_attrs(policy_path): + try: + if not policy_path: +- policy_path = get_policy() ++ policy_path = selinux.selinux_current_policy_path() + if not policy_path: + sys.stderr.write("No installed policy to check\n") + return None diff --git a/policycoreutils/load_policy/Makefile b/policycoreutils/load_policy/Makefile -index c90d4dd..37a7a7a 100644 +index 5da2e0d..0e9d66f 100644 --- a/policycoreutils/load_policy/Makefile +++ b/policycoreutils/load_policy/Makefile -@@ -18,8 +18,6 @@ install: all - install -m 755 $(TARGETS) $(SBINDIR) +@@ -19,7 +19,7 @@ install: all test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8 install -m 644 load_policy.8 $(MANDIR)/man8/ -- -mkdir -p $(USRSBINDIR) -- ln -sf /sbin/load_policy $(USRSBINDIR)/load_policy + -mkdir -p $(USRSBINDIR) +- -ln -sf /sbin/load_policy $(USRSBINDIR)/load_policy ++ -ln -s /sbin/load_policy $(USRSBINDIR)/load_policy clean: -rm -f $(TARGETS) *.o -diff --git a/policycoreutils/mcstrans/VERSION b/policycoreutils/mcstrans/VERSION -index d15723f..1c09c74 100644 ---- a/policycoreutils/mcstrans/VERSION -+++ b/policycoreutils/mcstrans/VERSION -@@ -1 +1 @@ --0.3.2 -+0.3.3 +diff --git a/policycoreutils/mcstrans/man/man8/mcstransd.8 b/policycoreutils/mcstrans/man/man8/mcstransd.8 +index 4c63965..718fd85 100644 +--- a/policycoreutils/mcstrans/man/man8/mcstransd.8 ++++ b/policycoreutils/mcstrans/man/man8/mcstransd.8 +@@ -3,7 +3,7 @@ + mcstransd \- MCS (Multiple Category System) daemon. Translates SELinux MCS/MLS labels to human readable form. + + .SH "SYNOPSIS" +-.B mcstransd ++.B mcstransd [-f] [-h] + .P + + .SH "DESCRIPTION" +@@ -12,6 +12,13 @@ This manual page describes the + program. + .P + This daemon reads /etc/selinux/{SELINUXTYPE}/setrans.conf configuration file, and communicates with libselinux via a socket in /var/run/setrans. ++.SH "OPTIONS" ++.TP ++-f ++Run mcstransd in the foreground. Do not run as a daemon. ++.TP ++-h ++Output a short summary of available command line options\&. + + .SH "AUTHOR" + This man page was written by Dan Walsh . +diff --git a/policycoreutils/mcstrans/src/mcstransd.c b/policycoreutils/mcstrans/src/mcstransd.c +index 26d9be8..a65076d 100644 +--- a/policycoreutils/mcstrans/src/mcstransd.c ++++ b/policycoreutils/mcstrans/src/mcstransd.c +@@ -1,5 +1,4 @@ + /* Copyright (c) 2006 Trusted Computer Solutions, Inc. */ +- + #include + #include + #include +@@ -13,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -556,9 +556,31 @@ void dropprivs(void) + cap_free(new_caps); + } + ++static void usage(char *program) ++{ ++ printf("%s [-f] [-h] \n", program); ++} ++ + int +-main(int UNUSED(argc), char *argv[]) ++main(int argc, char *argv[]) + { ++ int opt; ++ int do_fork = 1; ++ while ((opt = getopt(argc, argv, "hf")) > 0) { ++ switch (opt) { ++ case 'f': ++ do_fork = 0; ++ break; ++ case 'h': ++ usage(argv[0]); ++ exit(0); ++ break; ++ case '?': ++ usage(argv[0]); ++ exit(-1); ++ } ++ } ++ + #ifndef DEBUG + /* Make sure we are root */ + if (getuid() != 0) { +@@ -576,7 +598,7 @@ main(int UNUSED(argc), char *argv[]) + dropprivs(); + + /* run in the background as a daemon */ +- if (daemon(0, 0)) { ++ if (do_fork && daemon(0, 0)) { + syslog(LOG_ERR, "daemon() failed: %m"); + cleanup_exit(1); + } diff --git a/policycoreutils/newrole/newrole.c b/policycoreutils/newrole/newrole.c -index 99d0ed7..19e20a8 100644 +index 42f08d0..989817b 100644 --- a/policycoreutils/newrole/newrole.c +++ b/policycoreutils/newrole/newrole.c -@@ -543,13 +543,13 @@ static int restore_environment(int preserve_environment, +@@ -543,14 +543,14 @@ static int restore_environment(int preserve_environment, #if defined(AUDIT_LOG_PRIV) && !defined(NAMESPACE_PRIV) static int drop_capabilities(int full) { + uid_t uid = getuid(); + if (!uid) return 0; + + capng_setpid(getpid()); capng_clear(CAPNG_SELECT_BOTH); if (capng_lock() < 0) return -1; @@ -46,22 +162,108998 @@ index 99d0ed7..19e20a8 100644 - uid_t uid = getuid(); - if (!uid) return 0; - - /* Change uid */ - if (setresuid(uid, uid, uid)) { - fprintf(stderr, _("Error changing uid, aborting.\n")); -@@ -1030,10 +1030,11 @@ int main(int argc, char *argv[]) - * if it makes sense to continue to run newrole, and setting up - * a scrubbed environment. - */ -- if (drop_capabilities(FALSE)) { -+/* if (drop_capabilities(FALSE)) { - perror(_("Sorry, newrole failed to drop capabilities\n")); - return -1; - } -+*/ - if (set_signal_handles()) - return -1; - + /* Change uid */ + if (setresuid(uid, uid, uid)) { + fprintf(stderr, _("Error changing uid, aborting.\n")); +@@ -1032,10 +1032,11 @@ int main(int argc, char *argv[]) + * if it makes sense to continue to run newrole, and setting up + * a scrubbed environment. + */ +- if (drop_capabilities(FALSE)) { ++/* if (drop_capabilities(FALSE)) { + perror(_("Sorry, newrole failed to drop capabilities\n")); + return -1; + } ++*/ + if (set_signal_handles()) + return -1; + +diff --git a/policycoreutils/po/af.po b/policycoreutils/po/af.po +deleted file mode 100644 +index afeaa9f..0000000 +--- a/policycoreutils/po/af.po ++++ /dev/null +@@ -1,1270 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# FIRST AUTHOR , YEAR. +-# +-#, fuzzy +-msgid "" +-msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2012-03-27 10:49-0400\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" +-"Language-Team: LANGUAGE \n" +-"Language: \n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +- +-#: ../run_init/run_init.c:67 +-msgid "" +-"USAGE: run_init