Update to upstream

2.1.4 2011-08-17 * run_init: clarification of the usage in the * semanage: fix usage header around booleans * semanage: remove useless empty lines * semanage: update man page with new examples * semanage: update usage text * semanage: introduce file context equivalencies * semanage: enable and disable modules * semanage: output all local modifications * semanage: introduce extraction of local configuration * semanage: cleanup error on invalid operation * semanage: handle being called with no arguments * semanage: return sooner to save CPU time * semanage: surround getopt with try/except * semanage: use define/raise instead of lots of * semanage: some options are only valid for * semanage: introduce better deleteall support * semanage: do not allow spaces in file * semanage: distinguish between builtin and local permissive * semanage: centralized ip node handling * setfiles: make the restore function exclude() non-static * setfiles: use glob to handle ~ and * fixfiles: do not hard code types * fixfiles: stop trying to be smart about * fixfiles: use new kernel seclabel option * fixfiles: pipe everything to cat before sending * fixfiles: introduce /etc/selinux/fixfiles_exclude_dirs * semodule: support for alternative root paths
2011-08-18 07:23:59 -04:00 · 2011-08-18 07:23:59 -04:00 · 831d6fd46c
commit 831d6fd46c
parent a648c6f239
5 changed files with 714 additions and 2218 deletions
--- a/.gitignore
+++ b/.gitignore
@ -224,3 +224,4 @@ policycoreutils-2.0.83.tgz
 /policycoreutils-2.0.84.tgz
 /policycoreutils-2.0.85.tgz
 /policycoreutils-2.0.86.tgz
+/policycoreutils-2.1.4.tgz
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@ -1,6 +1,6 @@
 diff -up policycoreutils-2.0.86/gui/booleansPage.py.gui policycoreutils-2.0.86/gui/booleansPage.py
--- policycoreutils-2.0.86/gui/booleansPage.py.gui	2011-04-12 10:52:07.463643555 -0400
-+++ policycoreutils-2.0.86/gui/booleansPage.py	2011-04-12 10:52:07.463643555 -0400
+--- policycoreutils-2.0.86/gui/booleansPage.py.gui	2011-06-13 13:35:38.766854582 -0400
+++ policycoreutils-2.0.86/gui/booleansPage.py	2011-06-13 13:35:38.766854582 -0400
@@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@ -250,8 +250,8 @@ diff -up policycoreutils-2.0.86/gui/booleansPage.py.gui policycoreutils-2.0.86/g
 +        return True
 +        
 diff -up policycoreutils-2.0.86/gui/domainsPage.py.gui policycoreutils-2.0.86/gui/domainsPage.py
--- policycoreutils-2.0.86/gui/domainsPage.py.gui	2011-04-12 10:52:07.464643571 -0400
-+++ policycoreutils-2.0.86/gui/domainsPage.py	2011-04-12 10:52:07.464643571 -0400
+--- policycoreutils-2.0.86/gui/domainsPage.py.gui	2011-06-13 13:35:38.767854591 -0400
+++ policycoreutils-2.0.86/gui/domainsPage.py	2011-06-13 13:35:38.767854591 -0400
@@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@ -408,8 +408,8 @@ diff -up policycoreutils-2.0.86/gui/domainsPage.py.gui policycoreutils-2.0.86/gu
 +        except ValueError, e:
 +            self.error(e.args[0])
 diff -up policycoreutils-2.0.86/gui/fcontextPage.py.gui policycoreutils-2.0.86/gui/fcontextPage.py
--- policycoreutils-2.0.86/gui/fcontextPage.py.gui	2011-04-12 10:52:07.468643633 -0400
-+++ policycoreutils-2.0.86/gui/fcontextPage.py	2011-04-12 10:52:07.468643633 -0400
+--- policycoreutils-2.0.86/gui/fcontextPage.py.gui	2011-06-13 13:35:38.768854600 -0400
+++ policycoreutils-2.0.86/gui/fcontextPage.py	2011-06-13 13:35:38.768854600 -0400
@@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -635,8 +635,8 @@ diff -up policycoreutils-2.0.86/gui/fcontextPage.py.gui policycoreutils-2.0.86/g
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
 diff -up policycoreutils-2.0.86/gui/html_util.py.gui policycoreutils-2.0.86/gui/html_util.py
--- policycoreutils-2.0.86/gui/html_util.py.gui	2011-04-12 10:52:07.469643648 -0400
-+++ policycoreutils-2.0.86/gui/html_util.py	2011-04-12 10:52:07.470643663 -0400
+--- policycoreutils-2.0.86/gui/html_util.py.gui	2011-06-13 13:35:38.768854600 -0400
+++ policycoreutils-2.0.86/gui/html_util.py	2011-06-13 13:35:38.769854608 -0400
@@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis@redhat.com>
 +#
@ -803,8 +803,8 @@ diff -up policycoreutils-2.0.86/gui/html_util.py.gui policycoreutils-2.0.86/gui/
 +    return doc
 +
 diff -up policycoreutils-2.0.86/gui/lockdown.glade.gui policycoreutils-2.0.86/gui/lockdown.glade
--- policycoreutils-2.0.86/gui/lockdown.glade.gui	2011-04-12 10:52:07.471643678 -0400
-+++ policycoreutils-2.0.86/gui/lockdown.glade	2011-04-12 10:52:07.477643771 -0400
+--- policycoreutils-2.0.86/gui/lockdown.glade.gui	2011-06-13 13:35:38.770854616 -0400
+++ policycoreutils-2.0.86/gui/lockdown.glade	2011-06-13 13:35:38.770854616 -0400
@@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@ -1578,8 +1578,8 @@ diff -up policycoreutils-2.0.86/gui/lockdown.glade.gui policycoreutils-2.0.86/gu
 +
 +</glade-interface>
 diff -up policycoreutils-2.0.86/gui/lockdown.gladep.gui policycoreutils-2.0.86/gui/lockdown.gladep
--- policycoreutils-2.0.86/gui/lockdown.gladep.gui	2011-04-12 10:52:07.482643847 -0400
-+++ policycoreutils-2.0.86/gui/lockdown.gladep	2011-04-12 10:52:07.483643863 -0400
+--- policycoreutils-2.0.86/gui/lockdown.gladep.gui	2011-06-13 13:35:38.770854616 -0400
+++ policycoreutils-2.0.86/gui/lockdown.gladep	2011-06-13 13:35:38.771854624 -0400
@@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@ -1589,8 +1589,8 @@ diff -up policycoreutils-2.0.86/gui/lockdown.gladep.gui policycoreutils-2.0.86/g
 +  <program_name></program_name>
 +</glade-project>
 diff -up policycoreutils-2.0.86/gui/lockdown.py.gui policycoreutils-2.0.86/gui/lockdown.py
--- policycoreutils-2.0.86/gui/lockdown.py.gui	2011-04-12 10:52:07.484643879 -0400
-+++ policycoreutils-2.0.86/gui/lockdown.py	2011-04-12 10:52:07.484643879 -0400
+--- policycoreutils-2.0.86/gui/lockdown.py.gui	2011-06-13 13:35:38.773854641 -0400
+++ policycoreutils-2.0.86/gui/lockdown.py	2011-06-13 13:35:38.773854641 -0400
@@ -0,0 +1,382 @@
 +#!/usr/bin/python -Es
 +#
@ -1975,8 +1975,8 @@ diff -up policycoreutils-2.0.86/gui/lockdown.py.gui policycoreutils-2.0.86/gui/l
 +    app = booleanWindow()
 +    app.stand_alone()
 diff -up policycoreutils-2.0.86/gui/loginsPage.py.gui policycoreutils-2.0.86/gui/loginsPage.py
--- policycoreutils-2.0.86/gui/loginsPage.py.gui	2011-04-12 10:52:07.485643894 -0400
-+++ policycoreutils-2.0.86/gui/loginsPage.py	2011-04-12 10:52:07.486643909 -0400
+--- policycoreutils-2.0.86/gui/loginsPage.py.gui	2011-06-13 13:35:38.775854659 -0400
+++ policycoreutils-2.0.86/gui/loginsPage.py	2011-06-13 13:35:38.775854659 -0400
@@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -2164,8 +2164,8 @@ diff -up policycoreutils-2.0.86/gui/loginsPage.py.gui policycoreutils-2.0.86/gui
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
 diff -up policycoreutils-2.0.86/gui/Makefile.gui policycoreutils-2.0.86/gui/Makefile
--- policycoreutils-2.0.86/gui/Makefile.gui	2011-04-12 10:52:07.486643909 -0400
-+++ policycoreutils-2.0.86/gui/Makefile	2011-04-12 10:52:07.487643924 -0400
+--- policycoreutils-2.0.86/gui/Makefile.gui	2011-06-13 13:35:38.776854668 -0400
+++ policycoreutils-2.0.86/gui/Makefile	2011-06-13 13:35:38.776854668 -0400
@@ -0,0 +1,40 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@ -2208,8 +2208,8 @@ diff -up policycoreutils-2.0.86/gui/Makefile.gui policycoreutils-2.0.86/gui/Make
 +
 +relabel:
 diff -up policycoreutils-2.0.86/gui/mappingsPage.py.gui policycoreutils-2.0.86/gui/mappingsPage.py
--- policycoreutils-2.0.86/gui/mappingsPage.py.gui	2011-04-12 10:52:07.487643924 -0400
-+++ policycoreutils-2.0.86/gui/mappingsPage.py	2011-04-12 10:52:07.492644000 -0400
+--- policycoreutils-2.0.86/gui/mappingsPage.py.gui	2011-06-13 13:35:38.776854668 -0400
+++ policycoreutils-2.0.86/gui/mappingsPage.py	2011-06-13 13:35:38.777854677 -0400
@@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -2268,8 +2268,8 @@ diff -up policycoreutils-2.0.86/gui/mappingsPage.py.gui policycoreutils-2.0.86/g
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
 diff -up policycoreutils-2.0.86/gui/modulesPage.py.gui policycoreutils-2.0.86/gui/modulesPage.py
--- policycoreutils-2.0.86/gui/modulesPage.py.gui	2011-04-12 10:52:07.493644016 -0400
-+++ policycoreutils-2.0.86/gui/modulesPage.py	2011-04-12 10:52:07.493644016 -0400
+--- policycoreutils-2.0.86/gui/modulesPage.py.gui	2011-06-13 13:35:38.778854686 -0400
+++ policycoreutils-2.0.86/gui/modulesPage.py	2011-06-13 13:35:38.778854686 -0400
@@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@ -2462,8 +2462,8 @@ diff -up policycoreutils-2.0.86/gui/modulesPage.py.gui policycoreutils-2.0.86/gu
 +        except ValueError, e:
 +            self.error(e.args[0])
 diff -up policycoreutils-2.0.86/gui/polgen.glade.gui policycoreutils-2.0.86/gui/polgen.glade
--- policycoreutils-2.0.86/gui/polgen.glade.gui	2011-04-12 10:52:07.505644201 -0400
-+++ policycoreutils-2.0.86/gui/polgen.glade	2011-04-12 10:52:07.507644232 -0400
+--- policycoreutils-2.0.86/gui/polgen.glade.gui	2011-06-13 13:35:38.782854720 -0400
+++ policycoreutils-2.0.86/gui/polgen.glade	2011-06-13 13:35:38.783854728 -0400
@@ -0,0 +1,3432 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@ -5898,8 +5898,8 @@ diff -up policycoreutils-2.0.86/gui/polgen.glade.gui policycoreutils-2.0.86/gui/
 +
 +</glade-interface>
 diff -up policycoreutils-2.0.86/gui/polgen.gladep.gui policycoreutils-2.0.86/gui/polgen.gladep
--- policycoreutils-2.0.86/gui/polgen.gladep.gui	2011-04-12 10:52:07.508644247 -0400
-+++ policycoreutils-2.0.86/gui/polgen.gladep	2011-04-12 10:52:07.508644247 -0400
+--- policycoreutils-2.0.86/gui/polgen.gladep.gui	2011-06-13 13:35:38.784854736 -0400
+++ policycoreutils-2.0.86/gui/polgen.gladep	2011-06-13 13:35:38.784854736 -0400
@@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@ -5909,8 +5909,8 @@ diff -up policycoreutils-2.0.86/gui/polgen.gladep.gui policycoreutils-2.0.86/gui
 +  <program_name></program_name>
 +</glade-project>
 diff -up policycoreutils-2.0.86/gui/polgengui.py.gui policycoreutils-2.0.86/gui/polgengui.py
--- policycoreutils-2.0.86/gui/polgengui.py.gui	2011-04-12 10:52:07.513644322 -0400
-+++ policycoreutils-2.0.86/gui/polgengui.py	2011-05-23 17:04:16.377786536 -0400
+--- policycoreutils-2.0.86/gui/polgengui.py.gui	2011-06-13 13:35:38.786854754 -0400
+++ policycoreutils-2.0.86/gui/polgengui.py	2011-06-13 13:35:38.786854754 -0400
@@ -0,0 +1,750 @@
 +#!/usr/bin/python -Es
 +#
@ -6663,8 +6663,8 @@ diff -up policycoreutils-2.0.86/gui/polgengui.py.gui policycoreutils-2.0.86/gui/
 +    app = childWindow()
 +    app.stand_alone()
 diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/polgen.py
--- policycoreutils-2.0.86/gui/polgen.py.gui	2011-04-12 10:52:07.516644368 -0400
-+++ policycoreutils-2.0.86/gui/polgen.py	2011-05-23 17:04:04.539689964 -0400
+--- policycoreutils-2.0.86/gui/polgen.py.gui	2011-06-13 13:35:38.789854781 -0400
+++ policycoreutils-2.0.86/gui/polgen.py	2011-07-26 10:08:47.330188867 -0400
@@ -0,0 +1,1346 @@
 +#!/usr/bin/python -Es
 +#
@ -6982,7 +6982,7 @@ diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/pol
 +		if name == "":
 +			raise ValueError(_("You must enter a name for your confined process/user"))
 +                if not name.isalnum():
-+                    raise ValueError(_("Name must be alpha numberic with no spaces."))
+                    raise ValueError(_("Name must be alpha numberic with no spaces. Consider using option \"-n MODULENAME\""))
 +
 +		if type == CGI:
 +			self.name = "httpd_%s_script" % name
@ -7950,7 +7950,7 @@ diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/pol
 +    print _("""
 +%s
 +
-+sepolgen [ -m ] [ -t type ] [ executable | Name ]
+sepolgen [ -n moduleName ] [ -m ] [ -t type ] [ executable | Name ]
 +valid Types:
 +""") % msg
 +    keys=poltype.keys()
@ -7966,7 +7966,7 @@ diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/pol
 +                                    ["type=", 
 +                                     "mount",
 +                                     "test",
-+                                     "name",
+                                     "name=",
 +                                     "help"])
 +        for o, a in gopts:
 +            if o == "-t" or o == "--type":
@ -8013,8 +8013,8 @@ diff -up policycoreutils-2.0.86/gui/polgen.py.gui policycoreutils-2.0.86/gui/pol
 +    except ValueError, e:
 +        usage(e)
 diff -up policycoreutils-2.0.86/gui/portsPage.py.gui policycoreutils-2.0.86/gui/portsPage.py
--- policycoreutils-2.0.86/gui/portsPage.py.gui	2011-04-12 10:52:07.518644400 -0400
-+++ policycoreutils-2.0.86/gui/portsPage.py	2011-04-12 10:52:07.521644446 -0400
+--- policycoreutils-2.0.86/gui/portsPage.py.gui	2011-06-13 13:35:38.790854790 -0400
+++ policycoreutils-2.0.86/gui/portsPage.py	2011-06-13 13:35:38.791854799 -0400
@@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -8276,8 +8276,8 @@ diff -up policycoreutils-2.0.86/gui/portsPage.py.gui policycoreutils-2.0.86/gui/
 +        return True
 +        
 diff -up policycoreutils-2.0.86/gui/selinux.tbl.gui policycoreutils-2.0.86/gui/selinux.tbl
--- policycoreutils-2.0.86/gui/selinux.tbl.gui	2011-04-12 10:52:07.522644461 -0400
-+++ policycoreutils-2.0.86/gui/selinux.tbl	2011-04-12 10:52:07.522644461 -0400
+--- policycoreutils-2.0.86/gui/selinux.tbl.gui	2011-06-13 13:35:38.792854808 -0400
+++ policycoreutils-2.0.86/gui/selinux.tbl	2011-06-13 13:35:38.793854816 -0400
@@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@ -8514,8 +8514,8 @@ diff -up policycoreutils-2.0.86/gui/selinux.tbl.gui policycoreutils-2.0.86/gui/s
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
 diff -up policycoreutils-2.0.86/gui/semanagePage.py.gui policycoreutils-2.0.86/gui/semanagePage.py
--- policycoreutils-2.0.86/gui/semanagePage.py.gui	2011-04-12 10:52:07.523644476 -0400
-+++ policycoreutils-2.0.86/gui/semanagePage.py	2011-04-12 10:52:07.524644491 -0400
+--- policycoreutils-2.0.86/gui/semanagePage.py.gui	2011-06-13 13:35:38.794854824 -0400
+++ policycoreutils-2.0.86/gui/semanagePage.py	2011-06-13 13:35:38.794854824 -0400
@@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@ -8686,8 +8686,8 @@ diff -up policycoreutils-2.0.86/gui/semanagePage.py.gui policycoreutils-2.0.86/g
 +        return True
 +        
 diff -up policycoreutils-2.0.86/gui/statusPage.py.gui policycoreutils-2.0.86/gui/statusPage.py
--- policycoreutils-2.0.86/gui/statusPage.py.gui	2011-04-12 10:52:07.530644584 -0400
-+++ policycoreutils-2.0.86/gui/statusPage.py	2011-04-12 10:52:07.530644584 -0400
+--- policycoreutils-2.0.86/gui/statusPage.py.gui	2011-06-13 13:35:38.795854832 -0400
+++ policycoreutils-2.0.86/gui/statusPage.py	2011-06-13 13:35:38.795854832 -0400
@@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@ -8880,8 +8880,8 @@ diff -up policycoreutils-2.0.86/gui/statusPage.py.gui policycoreutils-2.0.86/gui
 +
 +
 diff -up policycoreutils-2.0.86/gui/system-config-selinux.glade.gui policycoreutils-2.0.86/gui/system-config-selinux.glade
--- policycoreutils-2.0.86/gui/system-config-selinux.glade.gui	2011-04-12 10:52:07.534644645 -0400
-+++ policycoreutils-2.0.86/gui/system-config-selinux.glade	2011-04-12 10:52:07.539644720 -0400
+--- policycoreutils-2.0.86/gui/system-config-selinux.glade.gui	2011-06-13 13:35:38.799854868 -0400
+++ policycoreutils-2.0.86/gui/system-config-selinux.glade	2011-06-13 13:35:38.800854877 -0400
@@ -0,0 +1,3024 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@ -11908,8 +11908,8 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.glade.gui policycoreut
 +
 +</glade-interface>
 diff -up policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui policycoreutils-2.0.86/gui/system-config-selinux.gladep
--- policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui	2011-04-12 10:52:07.540644736 -0400
-+++ policycoreutils-2.0.86/gui/system-config-selinux.gladep	2011-04-12 10:52:07.541644752 -0400
+--- policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui	2011-06-13 13:35:38.801854886 -0400
+++ policycoreutils-2.0.86/gui/system-config-selinux.gladep	2011-06-13 13:35:38.801854886 -0400
@@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@ -11919,8 +11919,8 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.gladep.gui policycoreu
 +  <program_name></program_name>
 +</glade-project>
 diff -up policycoreutils-2.0.86/gui/system-config-selinux.py.gui policycoreutils-2.0.86/gui/system-config-selinux.py
--- policycoreutils-2.0.86/gui/system-config-selinux.py.gui	2011-04-12 10:52:07.542644768 -0400
-+++ policycoreutils-2.0.86/gui/system-config-selinux.py	2011-04-12 10:52:07.542644768 -0400
+--- policycoreutils-2.0.86/gui/system-config-selinux.py.gui	2011-06-13 13:35:38.802854894 -0400
+++ policycoreutils-2.0.86/gui/system-config-selinux.py	2011-06-13 13:35:38.802854894 -0400
@@ -0,0 +1,187 @@
 +#!/usr/bin/python -Es
 +#
@ -12110,8 +12110,8 @@ diff -up policycoreutils-2.0.86/gui/system-config-selinux.py.gui policycoreutils
 +    app = childWindow()
 +    app.stand_alone()
 diff -up policycoreutils-2.0.86/gui/templates/boolean.py.gui policycoreutils-2.0.86/gui/templates/boolean.py
--- policycoreutils-2.0.86/gui/templates/boolean.py.gui	2011-04-12 10:52:07.543644784 -0400
-+++ policycoreutils-2.0.86/gui/templates/boolean.py	2011-05-23 16:59:42.369598714 -0400
+--- policycoreutils-2.0.86/gui/templates/boolean.py.gui	2011-06-13 13:35:38.804854910 -0400
+++ policycoreutils-2.0.86/gui/templates/boolean.py	2011-06-13 13:35:38.804854910 -0400
@@ -0,0 +1,40 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12154,8 +12154,8 @@ diff -up policycoreutils-2.0.86/gui/templates/boolean.py.gui policycoreutils-2.0
 +"""
 +
 diff -up policycoreutils-2.0.86/gui/templates/etc_rw.py.gui policycoreutils-2.0.86/gui/templates/etc_rw.py
--- policycoreutils-2.0.86/gui/templates/etc_rw.py.gui	2011-04-12 10:52:07.546644829 -0400
-+++ policycoreutils-2.0.86/gui/templates/etc_rw.py	2011-05-23 16:59:53.369684469 -0400
+--- policycoreutils-2.0.86/gui/templates/etc_rw.py.gui	2011-06-13 13:35:38.805854919 -0400
+++ policycoreutils-2.0.86/gui/templates/etc_rw.py	2011-06-13 13:35:38.806854928 -0400
@@ -0,0 +1,112 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12270,8 +12270,8 @@ diff -up policycoreutils-2.0.86/gui/templates/etc_rw.py.gui policycoreutils-2.0.
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/executable.py.gui policycoreutils-2.0.86/gui/templates/executable.py
--- policycoreutils-2.0.86/gui/templates/executable.py.gui	2011-04-12 10:52:07.548644859 -0400
-+++ policycoreutils-2.0.86/gui/templates/executable.py	2011-05-23 17:03:10.575251921 -0400
+--- policycoreutils-2.0.86/gui/templates/executable.py.gui	2011-06-13 13:35:38.807854937 -0400
+++ policycoreutils-2.0.86/gui/templates/executable.py	2011-06-13 13:35:38.807854937 -0400
@@ -0,0 +1,451 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12725,8 +12725,8 @@ diff -up policycoreutils-2.0.86/gui/templates/executable.py.gui policycoreutils-
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/__init__.py.gui policycoreutils-2.0.86/gui/templates/__init__.py
--- policycoreutils-2.0.86/gui/templates/__init__.py.gui	2011-04-12 10:52:07.549644874 -0400
-+++ policycoreutils-2.0.86/gui/templates/__init__.py	2011-05-23 17:02:40.424008790 -0400
+--- policycoreutils-2.0.86/gui/templates/__init__.py.gui	2011-06-13 13:35:38.808854946 -0400
+++ policycoreutils-2.0.86/gui/templates/__init__.py	2011-06-13 13:35:38.808854946 -0400
@@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007-2011 Red Hat
@ -12747,8 +12747,8 @@ diff -up policycoreutils-2.0.86/gui/templates/__init__.py.gui policycoreutils-2.
 +#
 +
 diff -up policycoreutils-2.0.86/gui/templates/network.py.gui policycoreutils-2.0.86/gui/templates/network.py
--- policycoreutils-2.0.86/gui/templates/network.py.gui	2011-04-12 10:52:07.556644982 -0400
-+++ policycoreutils-2.0.86/gui/templates/network.py	2011-05-23 17:03:09.237241107 -0400
+--- policycoreutils-2.0.86/gui/templates/network.py.gui	2011-06-13 13:35:38.809854955 -0400
+++ policycoreutils-2.0.86/gui/templates/network.py	2011-06-13 13:35:38.810854964 -0400
@@ -0,0 +1,102 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12853,8 +12853,8 @@ diff -up policycoreutils-2.0.86/gui/templates/network.py.gui policycoreutils-2.0
 +"""
 +
 diff -up policycoreutils-2.0.86/gui/templates/rw.py.gui policycoreutils-2.0.86/gui/templates/rw.py
--- policycoreutils-2.0.86/gui/templates/rw.py.gui	2011-04-12 10:52:07.557644997 -0400
-+++ policycoreutils-2.0.86/gui/templates/rw.py	2011-05-23 16:59:48.308644991 -0400
+--- policycoreutils-2.0.86/gui/templates/rw.py.gui	2011-06-13 13:35:38.811854972 -0400
+++ policycoreutils-2.0.86/gui/templates/rw.py	2011-06-13 13:35:38.811854972 -0400
@@ -0,0 +1,129 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -12986,8 +12986,8 @@ diff -up policycoreutils-2.0.86/gui/templates/rw.py.gui policycoreutils-2.0.86/g
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/script.py.gui policycoreutils-2.0.86/gui/templates/script.py
--- policycoreutils-2.0.86/gui/templates/script.py.gui	2011-04-12 10:52:07.558645012 -0400
-+++ policycoreutils-2.0.86/gui/templates/script.py	2011-05-23 17:02:13.796795073 -0400
+--- policycoreutils-2.0.86/gui/templates/script.py.gui	2011-06-13 13:35:38.812854980 -0400
+++ policycoreutils-2.0.86/gui/templates/script.py	2011-06-13 13:35:38.813854988 -0400
@@ -0,0 +1,126 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13116,8 +13116,8 @@ diff -up policycoreutils-2.0.86/gui/templates/script.py.gui policycoreutils-2.0.
 +fi
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/semodule.py.gui policycoreutils-2.0.86/gui/templates/semodule.py
--- policycoreutils-2.0.86/gui/templates/semodule.py.gui	2011-04-12 10:52:07.560645042 -0400
-+++ policycoreutils-2.0.86/gui/templates/semodule.py	2011-05-23 17:02:07.466744404 -0400
+--- policycoreutils-2.0.86/gui/templates/semodule.py.gui	2011-06-13 13:35:38.814854997 -0400
+++ policycoreutils-2.0.86/gui/templates/semodule.py	2011-06-13 13:35:38.814854997 -0400
@@ -0,0 +1,41 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13161,8 +13161,8 @@ diff -up policycoreutils-2.0.86/gui/templates/semodule.py.gui policycoreutils-2.
 +"""
 +
 diff -up policycoreutils-2.0.86/gui/templates/tmp.py.gui policycoreutils-2.0.86/gui/templates/tmp.py
--- policycoreutils-2.0.86/gui/templates/tmp.py.gui	2011-04-12 10:52:07.561645058 -0400
-+++ policycoreutils-2.0.86/gui/templates/tmp.py	2011-05-23 17:01:55.736650663 -0400
+--- policycoreutils-2.0.86/gui/templates/tmp.py.gui	2011-06-13 13:35:38.815855006 -0400
+++ policycoreutils-2.0.86/gui/templates/tmp.py	2011-06-13 13:35:38.815855006 -0400
@@ -0,0 +1,102 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13267,8 +13267,8 @@ diff -up policycoreutils-2.0.86/gui/templates/tmp.py.gui policycoreutils-2.0.86/
 +	admin_pattern($1, TEMPLATETYPE_tmp_t)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/user.py.gui policycoreutils-2.0.86/gui/templates/user.py
--- policycoreutils-2.0.86/gui/templates/user.py.gui	2011-04-12 10:52:07.562645074 -0400
-+++ policycoreutils-2.0.86/gui/templates/user.py	2011-05-23 17:01:46.816579501 -0400
+--- policycoreutils-2.0.86/gui/templates/user.py.gui	2011-06-13 13:35:38.816855015 -0400
+++ policycoreutils-2.0.86/gui/templates/user.py	2011-06-13 13:35:38.817855024 -0400
@@ -0,0 +1,204 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13475,8 +13475,8 @@ diff -up policycoreutils-2.0.86/gui/templates/user.py.gui policycoreutils-2.0.86
 +seutil_run_newrole(TEMPLATETYPE_t, TEMPLATETYPE_r)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/var_cache.py.gui policycoreutils-2.0.86/gui/templates/var_cache.py
--- policycoreutils-2.0.86/gui/templates/var_cache.py.gui	2011-04-12 10:52:07.566645136 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_cache.py	2011-05-23 17:01:38.793515591 -0400
+--- policycoreutils-2.0.86/gui/templates/var_cache.py.gui	2011-06-13 13:35:38.818855033 -0400
+++ policycoreutils-2.0.86/gui/templates/var_cache.py	2011-06-13 13:35:38.818855033 -0400
@@ -0,0 +1,132 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13611,8 +13611,8 @@ diff -up policycoreutils-2.0.86/gui/templates/var_cache.py.gui policycoreutils-2
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_cache_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/var_lib.py.gui policycoreutils-2.0.86/gui/templates/var_lib.py
--- policycoreutils-2.0.86/gui/templates/var_lib.py.gui	2011-04-12 10:52:07.567645151 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_lib.py	2011-05-23 17:01:31.516457701 -0400
+--- policycoreutils-2.0.86/gui/templates/var_lib.py.gui	2011-06-13 13:35:38.819855042 -0400
+++ policycoreutils-2.0.86/gui/templates/var_lib.py	2011-06-13 13:35:38.819855042 -0400
@@ -0,0 +1,160 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13775,8 +13775,8 @@ diff -up policycoreutils-2.0.86/gui/templates/var_lib.py.gui policycoreutils-2.0
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/var_log.py.gui policycoreutils-2.0.86/gui/templates/var_log.py
--- policycoreutils-2.0.86/gui/templates/var_log.py.gui	2011-04-12 10:52:07.568645166 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_log.py	2011-05-23 17:01:22.948389639 -0400
+--- policycoreutils-2.0.86/gui/templates/var_log.py.gui	2011-06-13 13:35:38.821855059 -0400
+++ policycoreutils-2.0.86/gui/templates/var_log.py	2011-06-13 13:35:38.821855059 -0400
@@ -0,0 +1,114 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13893,8 +13893,8 @@ diff -up policycoreutils-2.0.86/gui/templates/var_log.py.gui policycoreutils-2.0
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/var_run.py.gui policycoreutils-2.0.86/gui/templates/var_run.py
--- policycoreutils-2.0.86/gui/templates/var_run.py.gui	2011-04-12 10:52:07.569645181 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_run.py	2011-05-23 17:01:11.639299961 -0400
+--- policycoreutils-2.0.86/gui/templates/var_run.py.gui	2011-06-13 13:35:38.822855067 -0400
+++ policycoreutils-2.0.86/gui/templates/var_run.py	2011-06-13 13:35:38.822855067 -0400
@@ -0,0 +1,101 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -13998,8 +13998,8 @@ diff -up policycoreutils-2.0.86/gui/templates/var_run.py.gui policycoreutils-2.0
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/templates/var_spool.py.gui policycoreutils-2.0.86/gui/templates/var_spool.py
--- policycoreutils-2.0.86/gui/templates/var_spool.py.gui	2011-04-12 10:52:07.573645242 -0400
-+++ policycoreutils-2.0.86/gui/templates/var_spool.py	2011-05-25 16:09:23.350352658 -0400
+--- policycoreutils-2.0.86/gui/templates/var_spool.py.gui	2011-06-13 13:35:38.823855075 -0400
+++ policycoreutils-2.0.86/gui/templates/var_spool.py	2011-06-13 13:35:38.824855083 -0400
@@ -0,0 +1,131 @@
 +# Copyright (C) 2007-2011 Red Hat
 +# see file 'COPYING' for use and warranty information
@ -14133,8 +14133,8 @@ diff -up policycoreutils-2.0.86/gui/templates/var_spool.py.gui policycoreutils-2
 +FILENAME(/.*)?		gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
 diff -up policycoreutils-2.0.86/gui/usersPage.py.gui policycoreutils-2.0.86/gui/usersPage.py
--- policycoreutils-2.0.86/gui/usersPage.py.gui	2011-04-12 10:52:07.578645320 -0400
-+++ policycoreutils-2.0.86/gui/usersPage.py	2011-04-12 10:52:07.578645320 -0400
+--- policycoreutils-2.0.86/gui/usersPage.py.gui	2011-06-13 13:35:38.825855092 -0400
+++ policycoreutils-2.0.86/gui/usersPage.py	2011-06-13 13:35:38.825855092 -0400
@@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@ -1,13 +1,13 @@
 %define	libauditver	1.4.2-1
-%define libsepolver 	2.0.44-2
-%define	libsemanagever	2.0.46-6
-%define	libselinuxver	2.0.90-3
+%define libsepolver 	2.1.0-1
+%define	libsemanagever	2.1.0-0
+%define	libselinuxver	2.1.0-1
 %define	sepolgenver	1.0.23

 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.86
-Release: 18%{?dist}
+Version: 2.1.4
+Release: 1%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@ -184,7 +184,7 @@ The policycoreutils-sandbox package contains the scripts to create graphical san
 %{_datadir}/sandbox/start
 %attr(0755,root,root) %caps(cap_setpcap,cap_setuid,cap_fowner,cap_dac_override,cap_sys_admin,cap_sys_nice=pe) %{_sbindir}/seunshare
 %{_mandir}/man8/seunshare.8*
-%{_mandir}/man5/sandbox.conf.5*
+%{_mandir}/man5/sandbox.5*

 %triggerin python -- selinux-policy
 selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null
@ -349,6 +349,83 @@ fi
 /bin/systemctl try-restart restorecond.service >/dev/null 2>&1 || :

 %changelog
+* Thu Aug 18 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.4-1
+-Update to upstream
+2.1.4 2011-08-17
+	* run_init: clarification of the usage in the
+	* semanage: fix usage header around booleans
+	* semanage: remove useless empty lines
+	* semanage: update man page with new examples
+	* semanage: update usage text
+	* semanage: introduce file context equivalencies
+	* semanage: enable and disable modules
+	* semanage: output all local modifications
+	* semanage: introduce extraction of local configuration
+	* semanage: cleanup error on invalid operation
+	* semanage: handle being called with no arguments
+	* semanage: return sooner to save CPU time
+	* semanage: surround getopt with try/except
+	* semanage: use define/raise instead of lots of
+	* semanage: some options are only valid for
+	* semanage: introduce better deleteall support
+	* semanage: do not allow spaces in file
+	* semanage: distinguish between builtin and local permissive
+	* semanage: centralized ip node handling
+	* setfiles: make the restore function exclude() non-static
+	* setfiles: use glob to handle ~ and
+	* fixfiles: do not hard code types
+	* fixfiles: stop trying to be smart about
+	* fixfiles: use new kernel seclabel option
+	* fixfiles: pipe everything to cat before sending
+	* fixfiles: introduce /etc/selinux/fixfiles_exclude_dirs
+	* semodule: support for alternative root paths
+
+2.1.3 2011-08-03
+	* semanage: fix indention
+	* semodule_package: fix man page typo
+	* semodule_expand: update man page with -a
+	* semanage: handle os errors
+	* semanage: fix traceback with bad options
+	* semanage: show usage on -h or --help
+	* semanage: introduce more deleteall options
+	* semanage: verify ports < 65536
+	* transaction into semanageRecords
+	* make get_handle a method of semanageRecords
+	* remove a needless blank line
+	* make process_one error if not initialized correctly
+	* fixfiles: correct usage for r_opts.rootpath
+	* put -p in help for restorecon and
+	* fixfiles: do not try to only label
+	* fixfiles clean up /var/run and /var/lib/debug
+	* fixfiles delete tmp sockets and pipes rather
+	* fixfile use find -delete instead of pipe
+	* chcat man page typo
+	* add man page for genhomedircon
+	* setfiles fix typo
+	* setsebool should inform users they need to
+	* setsebool typos
+	* open_init_tty man page typos
+	* Don't add user site directory to sys.path
+	* newrole retain CAP_SETPCAP
+
+2.1.2 2011-08-02
+	* seunshare: define _GNU_SOURCE earlier
+	* make ignore_enoent do something
+	* restorecond: first user logged in is not noticed
+	* Repo: update .gitignore
+
+2.1.1 2011-08-01
+	* Man page updates
+	* restorecon fix for bad inotify assumptions
+
+2.1.0 2011-07-27
+	* Release, minor version bump
+
+* Tue Jul 26 2011 Dan Walsh <dwalsh@redhat.com> 2.0.86-20
+- Fix sepolgen usage statement
+- Stop using -k insandbox
+- Fix seunshare usage statement
+
 * Thu Jul 7 2011 Dan Walsh <dwalsh@redhat.com> 2.0.86-18
 - Change seunshare to send kill signals to the childs session. 
 - Also add signal handler to catch sigint, so if user enters ctrl-C sandbox will shutdown.
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 49faa2e5f343317bcfcf34d7286f6037  sepolgen-1.0.23.tgz
 59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2
-13d864a8a6f8a933ef7aee7baf4a9662  policycoreutils-2.0.86.tgz
+7e1e18c09798ffb44913bce3d60c667d  policycoreutils-2.1.4.tgz