* Tue Jun 24 2008 Dan Walsh <dwalsh@redhat.com> 2.0.49-9
- Fix spelling of enforcement
This commit is contained in:
parent
70545b8b95
commit
9bc066f4e5
|
@ -1,6 +1,6 @@
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.49/gui/Makefile
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.49/gui/Makefile
|
||||||
--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/Makefile 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/Makefile 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,34 @@
|
@@ -0,0 +1,34 @@
|
||||||
+# Installation directories.
|
+# Installation directories.
|
||||||
+PREFIX ?= ${DESTDIR}/usr
|
+PREFIX ?= ${DESTDIR}/usr
|
||||||
|
@ -38,7 +38,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu
|
||||||
+relabel:
|
+relabel:
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.49/gui/booleansPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.49/gui/booleansPage.py
|
||||||
--- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/booleansPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/booleansPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,230 @@
|
@@ -0,0 +1,230 @@
|
||||||
+#
|
+#
|
||||||
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
|
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
|
||||||
|
@ -272,7 +272,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py poli
|
||||||
+
|
+
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.49/gui/fcontextPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.49/gui/fcontextPage.py
|
||||||
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/fcontextPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/fcontextPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,217 @@
|
@@ -0,0 +1,217 @@
|
||||||
+## fcontextPage.py - show selinux mappings
|
+## fcontextPage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -493,7 +493,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli
|
||||||
+ self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
|
+ self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.49/gui/lockdown.glade
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.49/gui/lockdown.glade
|
||||||
--- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/lockdown.glade 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/lockdown.glade 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,2065 @@
|
@@ -0,0 +1,2065 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||||
|
@ -2562,7 +2562,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade polic
|
||||||
+</glade-interface>
|
+</glade-interface>
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak policycoreutils-2.0.49/gui/lockdown.glade.bak
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak policycoreutils-2.0.49/gui/lockdown.glade.bak
|
||||||
--- nsapolicycoreutils/gui/lockdown.glade.bak 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/lockdown.glade.bak 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/lockdown.glade.bak 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/lockdown.glade.bak 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,2065 @@
|
@@ -0,0 +1,2065 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||||
|
@ -4631,7 +4631,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade.bak p
|
||||||
+</glade-interface>
|
+</glade-interface>
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.49/gui/lockdown.gladep
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.49/gui/lockdown.gladep
|
||||||
--- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/lockdown.gladep 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/lockdown.gladep 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,7 @@
|
@@ -0,0 +1,7 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
|
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
|
||||||
|
@ -4642,7 +4642,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep poli
|
||||||
+</glade-project>
|
+</glade-project>
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak policycoreutils-2.0.49/gui/lockdown.gladep.bak
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak policycoreutils-2.0.49/gui/lockdown.gladep.bak
|
||||||
--- nsapolicycoreutils/gui/lockdown.gladep.bak 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/lockdown.gladep.bak 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/lockdown.gladep.bak 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/lockdown.gladep.bak 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,7 @@
|
@@ -0,0 +1,7 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
|
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
|
||||||
|
@ -4653,7 +4653,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep.bak
|
||||||
+</glade-project>
|
+</glade-project>
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.49/gui/lockdown.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.49/gui/lockdown.py
|
||||||
--- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/lockdown.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/lockdown.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,331 @@
|
@@ -0,0 +1,331 @@
|
||||||
+#!/usr/bin/python
|
+#!/usr/bin/python
|
||||||
+#
|
+#
|
||||||
|
@ -4988,7 +4988,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policyco
|
||||||
+ app.stand_alone()
|
+ app.stand_alone()
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.49/gui/loginsPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.49/gui/loginsPage.py
|
||||||
--- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/loginsPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/loginsPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,185 @@
|
@@ -0,0 +1,185 @@
|
||||||
+## loginsPage.py - show selinux mappings
|
+## loginsPage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -5177,7 +5177,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy
|
||||||
+
|
+
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.49/gui/mappingsPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.49/gui/mappingsPage.py
|
||||||
--- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/mappingsPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/mappingsPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,56 @@
|
@@ -0,0 +1,56 @@
|
||||||
+## mappingsPage.py - show selinux mappings
|
+## mappingsPage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -5237,7 +5237,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.49/gui/modulesPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.49/gui/modulesPage.py
|
||||||
--- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/modulesPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/modulesPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,195 @@
|
@@ -0,0 +1,195 @@
|
||||||
+## modulesPage.py - show selinux mappings
|
+## modulesPage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -5436,7 +5436,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic
|
||||||
+
|
+
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.49/gui/polgen.glade
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.49/gui/polgen.glade
|
||||||
--- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/polgen.glade 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/polgen.glade 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,3284 @@
|
@@ -0,0 +1,3284 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||||
|
@ -8724,7 +8724,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc
|
||||||
+</glade-interface>
|
+</glade-interface>
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.49/gui/polgen.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.49/gui/polgen.py
|
||||||
--- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/polgen.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/polgen.py 2008-06-24 06:09:56.000000000 -0400
|
||||||
@@ -0,0 +1,923 @@
|
@@ -0,0 +1,923 @@
|
||||||
+#!/usr/bin/python
|
+#!/usr/bin/python
|
||||||
+#
|
+#
|
||||||
|
@ -9553,7 +9553,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
|
||||||
+
|
+
|
||||||
+ def generate(self, out_dir = "."):
|
+ def generate(self, out_dir = "."):
|
||||||
+ out = "Created the following files:\n"
|
+ out = "Created the following files:\n"
|
||||||
+ out += "%-25s %s\n" % (_("Type Enforcment file"), self.write_te(out_dir))
|
+ 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" % (_("Interface file"), self.write_if(out_dir))
|
||||||
+ out += "%-25s %s\n" % (_("File Contexts file"), self.write_fc(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))
|
+ out += "%-25s %s\n" % (_("Setup Script"),self.write_sh(out_dir))
|
||||||
|
@ -9651,7 +9651,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
|
||||||
+
|
+
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.49/gui/polgengui.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.49/gui/polgengui.py
|
||||||
--- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/polgengui.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/polgengui.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,623 @@
|
@@ -0,0 +1,623 @@
|
||||||
+#!/usr/bin/python -E
|
+#!/usr/bin/python -E
|
||||||
+#
|
+#
|
||||||
|
@ -10278,7 +10278,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
|
||||||
+ app.stand_alone()
|
+ app.stand_alone()
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.49/gui/portsPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.49/gui/portsPage.py
|
||||||
--- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/portsPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/portsPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,258 @@
|
@@ -0,0 +1,258 @@
|
||||||
+## portsPage.py - show selinux mappings
|
+## portsPage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -10540,7 +10540,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.49/gui/selinux.tbl
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.49/gui/selinux.tbl
|
||||||
--- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/selinux.tbl 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/selinux.tbl 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,234 @@
|
@@ -0,0 +1,234 @@
|
||||||
+acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
|
+acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
|
||||||
+allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
|
+allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
|
||||||
|
@ -10778,7 +10778,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.49/gui/semanagePage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.49/gui/semanagePage.py
|
||||||
--- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/semanagePage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/semanagePage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,170 @@
|
@@ -0,0 +1,170 @@
|
||||||
+## semanagePage.py - show selinux mappings
|
+## semanagePage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -10952,7 +10952,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.49/gui/statusPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.49/gui/statusPage.py
|
||||||
--- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/statusPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/statusPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,191 @@
|
@@ -0,0 +1,191 @@
|
||||||
+# statusPage.py - show selinux status
|
+# statusPage.py - show selinux status
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -11147,7 +11147,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.49/gui/system-config-selinux.glade
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.49/gui/system-config-selinux.glade
|
||||||
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/system-config-selinux.glade 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/system-config-selinux.glade 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,3203 @@
|
@@ -0,0 +1,3203 @@
|
||||||
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||||
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||||
|
@ -14354,7 +14354,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
|
||||||
+</glade-interface>
|
+</glade-interface>
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.49/gui/system-config-selinux.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.49/gui/system-config-selinux.py
|
||||||
--- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/system-config-selinux.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/system-config-selinux.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,187 @@
|
@@ -0,0 +1,187 @@
|
||||||
+#!/usr/bin/python
|
+#!/usr/bin/python
|
||||||
+#
|
+#
|
||||||
|
@ -14545,7 +14545,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu
|
||||||
+ app.stand_alone()
|
+ app.stand_alone()
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.49/gui/templates/__init__.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.49/gui/templates/__init__.py
|
||||||
--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/__init__.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/__init__.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,18 @@
|
@@ -0,0 +1,18 @@
|
||||||
+#
|
+#
|
||||||
+# Copyright (C) 2007 Red Hat, Inc.
|
+# Copyright (C) 2007 Red Hat, Inc.
|
||||||
|
@ -14567,7 +14567,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.p
|
||||||
+
|
+
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.49/gui/templates/boolean.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.49/gui/templates/boolean.py
|
||||||
--- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/boolean.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/boolean.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,40 @@
|
@@ -0,0 +1,40 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -14611,7 +14611,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.49/gui/templates/etc_rw.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.49/gui/templates/etc_rw.py
|
||||||
--- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/etc_rw.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/etc_rw.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,129 @@
|
@@ -0,0 +1,129 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -14744,7 +14744,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.49/gui/templates/executable.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.49/gui/templates/executable.py
|
||||||
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/executable.py 2008-06-22 09:31:21.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/executable.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,327 @@
|
@@ -0,0 +1,327 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15075,7 +15075,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable
|
||||||
+
|
+
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.49/gui/templates/network.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.49/gui/templates/network.py
|
||||||
--- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/network.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/network.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,80 @@
|
@@ -0,0 +1,80 @@
|
||||||
+te_port_types="""
|
+te_port_types="""
|
||||||
+type TEMPLATETYPE_port_t;
|
+type TEMPLATETYPE_port_t;
|
||||||
|
@ -15159,7 +15159,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.49/gui/templates/rw.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.49/gui/templates/rw.py
|
||||||
--- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/rw.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/rw.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,128 @@
|
@@ -0,0 +1,128 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15291,7 +15291,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.49/gui/templates/script.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.49/gui/templates/script.py
|
||||||
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/script.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/script.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,105 @@
|
@@ -0,0 +1,105 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15400,7 +15400,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.49/gui/templates/semodule.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.49/gui/templates/semodule.py
|
||||||
--- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/semodule.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/semodule.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,41 @@
|
@@ -0,0 +1,41 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15445,7 +15445,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.49/gui/templates/tmp.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.49/gui/templates/tmp.py
|
||||||
--- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/tmp.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/tmp.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,97 @@
|
@@ -0,0 +1,97 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15546,7 +15546,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.49/gui/templates/user.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.49/gui/templates/user.py
|
||||||
--- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/user.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/user.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,182 @@
|
@@ -0,0 +1,182 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15732,7 +15732,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_lib.py policycoreutils-2.0.49/gui/templates/var_lib.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.49/gui/templates/var_lib.py
|
||||||
--- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/var_lib.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/var_lib.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,158 @@
|
@@ -0,0 +1,158 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -15894,7 +15894,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.49/gui/templates/var_log.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.49/gui/templates/var_log.py
|
||||||
--- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/var_log.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/var_log.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,110 @@
|
@@ -0,0 +1,110 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -16008,7 +16008,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.49/gui/templates/var_run.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.49/gui/templates/var_run.py
|
||||||
--- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/var_run.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/var_run.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,118 @@
|
@@ -0,0 +1,118 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -16130,7 +16130,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.49/gui/templates/var_spool.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.49/gui/templates/var_spool.py
|
||||||
--- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/templates/var_spool.py 2008-06-22 09:30:55.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/templates/var_spool.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,129 @@
|
@@ -0,0 +1,129 @@
|
||||||
+# Copyright (C) 2007 Red Hat
|
+# Copyright (C) 2007 Red Hat
|
||||||
+# see file 'COPYING' for use and warranty information
|
+# see file 'COPYING' for use and warranty information
|
||||||
|
@ -16263,7 +16263,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.
|
||||||
+"""
|
+"""
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.49/gui/translationsPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.49/gui/translationsPage.py
|
||||||
--- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/translationsPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/translationsPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,118 @@
|
@@ -0,0 +1,118 @@
|
||||||
+## translationsPage.py - show selinux translations
|
+## translationsPage.py - show selinux translations
|
||||||
+## Copyright (C) 2006 Red Hat, Inc.
|
+## Copyright (C) 2006 Red Hat, Inc.
|
||||||
|
@ -16385,7 +16385,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py
|
||||||
+ self.store.set_value(iter, 1, translation)
|
+ self.store.set_value(iter, 1, translation)
|
||||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.49/gui/usersPage.py
|
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.49/gui/usersPage.py
|
||||||
--- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.49/gui/usersPage.py 2008-06-12 23:37:37.000000000 -0400
|
+++ policycoreutils-2.0.49/gui/usersPage.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -0,0 +1,150 @@
|
@@ -0,0 +1,150 @@
|
||||||
+## usersPage.py - show selinux mappings
|
+## usersPage.py - show selinux mappings
|
||||||
+## Copyright (C) 2006,2007,2008 Red Hat, Inc.
|
+## Copyright (C) 2006,2007,2008 Red Hat, Inc.
|
||||||
|
|
|
@ -1,15 +1,56 @@
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.49/Makefile
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.49/Makefile
|
||||||
--- nsapolicycoreutils/Makefile 2008-05-22 14:01:49.000000000 -0400
|
--- nsapolicycoreutils/Makefile 2008-06-12 23:25:24.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/Makefile 2008-05-16 11:27:02.000000000 -0400
|
+++ policycoreutils-2.0.49/Makefile 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,4 +1,4 @@
|
||||||
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
|
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
|
||||||
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
|
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
|
||||||
|
|
||||||
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
|
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
|
||||||
|
|
||||||
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.49/audit2allow/audit2allow
|
||||||
|
--- nsapolicycoreutils/audit2allow/audit2allow 2008-06-12 23:25:21.000000000 -0400
|
||||||
|
+++ policycoreutils-2.0.49/audit2allow/audit2allow 2008-06-23 07:03:50.000000000 -0400
|
||||||
|
@@ -152,12 +152,13 @@
|
||||||
|
|
||||||
|
def __process_input(self):
|
||||||
|
if self.__options.type:
|
||||||
|
- avcfilter = audit.TypeFilter(self.__options.type)
|
||||||
|
+ avcfilter = audit.AVCTypeFilter(self.__options.type)
|
||||||
|
self.__avs = self.__parser.to_access(avcfilter)
|
||||||
|
- self.__selinux_errs = self.__parser.to_role(avcfilter)
|
||||||
|
+ csfilter = audit.ComputeSidTypeFilter(self.__options.type)
|
||||||
|
+ self.__role_types = self.__parser.to_role(csfilter)
|
||||||
|
else:
|
||||||
|
self.__avs = self.__parser.to_access()
|
||||||
|
- self.__selinux_errs = self.__parser.to_role()
|
||||||
|
+ self.__role_types = self.__parser.to_role()
|
||||||
|
|
||||||
|
def __load_interface_info(self):
|
||||||
|
# Load interface info file
|
||||||
|
@@ -310,6 +311,7 @@
|
||||||
|
|
||||||
|
# Generate the policy
|
||||||
|
g.add_access(self.__avs)
|
||||||
|
+ g.add_role_types(self.__role_types)
|
||||||
|
|
||||||
|
# Output
|
||||||
|
writer = output.ModuleWriter()
|
||||||
|
@@ -328,12 +330,6 @@
|
||||||
|
fd = sys.stdout
|
||||||
|
writer.write(g.get_module(), fd)
|
||||||
|
|
||||||
|
- if len(self.__selinux_errs) > 0:
|
||||||
|
- fd.write("\n=========== ROLES ===============\n")
|
||||||
|
-
|
||||||
|
- for role in self.__selinux_errs:
|
||||||
|
- fd.write(role.output())
|
||||||
|
-
|
||||||
|
def main(self):
|
||||||
|
try:
|
||||||
|
self.__parse_options()
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.49/restorecond/restorecond.c
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.49/restorecond/restorecond.c
|
||||||
--- nsapolicycoreutils/restorecond/restorecond.c 2008-05-22 14:01:42.000000000 -0400
|
--- nsapolicycoreutils/restorecond/restorecond.c 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/restorecond/restorecond.c 2008-05-16 11:27:02.000000000 -0400
|
+++ policycoreutils-2.0.49/restorecond/restorecond.c 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -210,9 +210,10 @@
|
@@ -210,9 +210,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,8 +78,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
|
||||||
free(scontext);
|
free(scontext);
|
||||||
close(fd);
|
close(fd);
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.49/restorecond/restorecond.init
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.49/restorecond/restorecond.init
|
||||||
--- nsapolicycoreutils/restorecond/restorecond.init 2008-05-22 14:01:42.000000000 -0400
|
--- nsapolicycoreutils/restorecond/restorecond.init 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/restorecond/restorecond.init 2008-05-16 11:27:02.000000000 -0400
|
+++ policycoreutils-2.0.49/restorecond/restorecond.init 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -2,7 +2,7 @@
|
@@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# restorecond: Daemon used to maintain path file context
|
# restorecond: Daemon used to maintain path file context
|
||||||
|
@ -49,8 +90,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
|
||||||
# listed in the /etc/selinux/restorecond.conf file, and restores the \
|
# listed in the /etc/selinux/restorecond.conf file, and restores the \
|
||||||
# correct security context.
|
# correct security context.
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.49/scripts/fixfiles
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.49/scripts/fixfiles
|
||||||
--- nsapolicycoreutils/scripts/fixfiles 2008-05-22 14:01:41.000000000 -0400
|
--- nsapolicycoreutils/scripts/fixfiles 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/scripts/fixfiles 2008-05-22 13:56:53.000000000 -0400
|
+++ policycoreutils-2.0.49/scripts/fixfiles 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -138,6 +138,9 @@
|
@@ -138,6 +138,9 @@
|
||||||
fi
|
fi
|
||||||
LogReadOnly
|
LogReadOnly
|
||||||
|
@ -81,8 +122,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
|
||||||
|
|
||||||
if [ $# = 0 ]; then
|
if [ $# = 0 ]; then
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.49/scripts/fixfiles.8
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.49/scripts/fixfiles.8
|
||||||
--- nsapolicycoreutils/scripts/fixfiles.8 2008-05-22 14:01:41.000000000 -0400
|
--- nsapolicycoreutils/scripts/fixfiles.8 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/scripts/fixfiles.8 2008-05-16 11:27:02.000000000 -0400
|
+++ policycoreutils-2.0.49/scripts/fixfiles.8 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -7,6 +7,8 @@
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ]
|
.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ]
|
||||||
|
@ -103,8 +144,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
|
||||||
.SH "OPTIONS"
|
.SH "OPTIONS"
|
||||||
.TP
|
.TP
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.49/semanage/semanage
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.49/semanage/semanage
|
||||||
--- nsapolicycoreutils/semanage/semanage 2008-05-22 14:01:41.000000000 -0400
|
--- nsapolicycoreutils/semanage/semanage 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/semanage/semanage 2008-06-12 14:34:26.499263000 -0400
|
+++ policycoreutils-2.0.49/semanage/semanage 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -43,49 +43,52 @@
|
@@ -43,49 +43,52 @@
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
|
@ -231,8 +272,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
|
||||||
|
|
||||||
if modify:
|
if modify:
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.49/semanage/semanage.8
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.49/semanage/semanage.8
|
||||||
--- nsapolicycoreutils/semanage/semanage.8 2008-05-22 14:01:41.000000000 -0400
|
--- nsapolicycoreutils/semanage/semanage.8 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/semanage/semanage.8 2008-06-11 16:18:48.000000000 -0400
|
+++ policycoreutils-2.0.49/semanage/semanage.8 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -17,6 +17,8 @@
|
@@ -17,6 +17,8 @@
|
||||||
.br
|
.br
|
||||||
.B semanage fcontext \-{a|d|m} [\-frst] file_spec
|
.B semanage fcontext \-{a|d|m} [\-frst] file_spec
|
||||||
|
@ -256,8 +297,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po
|
||||||
Examples by Thomas Bleher <ThomasBleher@gmx.de>.
|
Examples by Thomas Bleher <ThomasBleher@gmx.de>.
|
||||||
-
|
-
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.49/semanage/seobject.py
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.49/semanage/seobject.py
|
||||||
--- nsapolicycoreutils/semanage/seobject.py 2008-05-22 14:01:41.000000000 -0400
|
--- nsapolicycoreutils/semanage/seobject.py 2008-06-12 23:25:21.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/semanage/seobject.py 2008-06-12 14:34:36.038161000 -0400
|
+++ policycoreutils-2.0.49/semanage/seobject.py 2008-06-23 07:03:37.000000000 -0400
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,5 +1,5 @@
|
||||||
#! /usr/bin/python -E
|
#! /usr/bin/python -E
|
||||||
-# Copyright (C) 2005, 2006, 2007 Red Hat
|
-# Copyright (C) 2005, 2006, 2007 Red Hat
|
||||||
|
|
|
@ -1,28 +1,195 @@
|
||||||
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/access.py
|
||||||
|
--- nsasepolgen/src/sepolgen/access.py 2008-06-12 23:25:26.000000000 -0400
|
||||||
|
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/access.py 2008-06-23 07:04:21.000000000 -0400
|
||||||
|
@@ -295,3 +295,32 @@
|
||||||
|
perms[av.obj_class] = s
|
||||||
|
s.update(av.perms)
|
||||||
|
return perms
|
||||||
|
+
|
||||||
|
+class RoleTypeSet:
|
||||||
|
+ """A non-overlapping set of role type statements.
|
||||||
|
+
|
||||||
|
+ This clas allows the incremental addition of role type statements and
|
||||||
|
+ maintains a non-overlapping list of statements.
|
||||||
|
+ """
|
||||||
|
+ def __init__(self):
|
||||||
|
+ """Initialize an access vector set."""
|
||||||
|
+ self.role_types = {}
|
||||||
|
+
|
||||||
|
+ def __iter__(self):
|
||||||
|
+ """Iterate over all of the unique role allows statements in the set."""
|
||||||
|
+ for role_type in self.role_types.values():
|
||||||
|
+ yield role_type
|
||||||
|
+
|
||||||
|
+ def __len__(self):
|
||||||
|
+ """Return the unique number of role allow statements."""
|
||||||
|
+ return len(self.roles)
|
||||||
|
+
|
||||||
|
+ def add(self, role, type):
|
||||||
|
+ if self.role_types.has_key(role):
|
||||||
|
+ role_type = self.role_types[role]
|
||||||
|
+ else:
|
||||||
|
+ role_type = refpolicy.RoleType()
|
||||||
|
+ role_type.role = role
|
||||||
|
+ self.role_types[role] = role_type
|
||||||
|
+
|
||||||
|
+ role_type.types.add(type)
|
||||||
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/audit.py
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/audit.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/audit.py
|
||||||
--- nsasepolgen/src/sepolgen/audit.py 2008-01-23 14:36:29.000000000 -0500
|
--- nsasepolgen/src/sepolgen/audit.py 2008-06-12 23:25:26.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/audit.py 2008-05-28 10:11:36.373597000 -0400
|
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/audit.py 2008-06-23 07:05:23.000000000 -0400
|
||||||
@@ -241,14 +241,17 @@
|
@@ -235,20 +235,21 @@
|
||||||
|
"""
|
||||||
|
def __init__(self, message):
|
||||||
|
AuditMessage.__init__(self, message)
|
||||||
|
- self.type = ""
|
||||||
|
- self.role = ""
|
||||||
|
+ self.invalid_context = refpolicy.SecurityContext()
|
||||||
|
+ self.scontext = refpolicy.SecurityContext()
|
||||||
|
+ self.tcontext = refpolicy.SecurityContext()
|
||||||
|
+ self.tclass = ""
|
||||||
|
|
||||||
def from_split_string(self, recs):
|
def from_split_string(self, recs):
|
||||||
AuditMessage.from_split_string(self, recs)
|
AuditMessage.from_split_string(self, recs)
|
||||||
dict={}
|
- dict={}
|
||||||
+ ctr = 0
|
- for i in recs:
|
||||||
for i in recs:
|
- t = i.split('=')
|
||||||
+ ctr = ctr + 1
|
- if len(t) < 2:
|
||||||
t = i.split('=')
|
- continue
|
||||||
if len(t) < 2:
|
- dict[t[0]]=t[1]
|
||||||
+ if t[0] == "context":
|
+ if len(recs) < 10:
|
||||||
+ self.type = refpolicy.SecurityContext(recs[ctr]).type
|
+ raise ValueError("Split string does not represent a valid compute sid message")
|
||||||
continue
|
+
|
||||||
dict[t[0]]=t[1]
|
|
||||||
try:
|
try:
|
||||||
self.role = refpolicy.SecurityContext(dict["scontext"]).role
|
- self.role = refpolicy.SecurityContext(dict["scontext"]).role
|
||||||
- self.type = refpolicy.SecurityContext(dict["tcontext"]).type
|
- self.type = refpolicy.SecurityContext(dict["tcontext"]).type
|
||||||
|
+ self.invalid_context = refpolicy.SecurityContext(recs[5])
|
||||||
|
+ self.scontext = refpolicy.SecurityContext(recs[7].split("=")[1])
|
||||||
|
+ self.tcontext = refpolicy.SecurityContext(recs[8].split("=")[1])
|
||||||
|
+ self.tclass = recs[9].split("=")[1]
|
||||||
except:
|
except:
|
||||||
raise ValueError("Split string does not represent a valid compute sid message")
|
raise ValueError("Split string does not represent a valid compute sid message")
|
||||||
def output(self):
|
def output(self):
|
||||||
|
@@ -405,7 +406,7 @@
|
||||||
|
self.__post_process()
|
||||||
|
|
||||||
|
def to_role(self, role_filter=None):
|
||||||
|
- """Return list of SELINUX_ERR messages matching the specified filter
|
||||||
|
+ """Return RoleAllowSet statements matching the specified filter
|
||||||
|
|
||||||
|
Filter out types that match the filer, or all roles
|
||||||
|
|
||||||
|
@@ -416,13 +417,12 @@
|
||||||
|
Access vector set representing the denied access in the
|
||||||
|
audit logs parsed by this object.
|
||||||
|
"""
|
||||||
|
- roles = []
|
||||||
|
- if role_filter:
|
||||||
|
- for selinux_err in self.compute_sid_msgs:
|
||||||
|
- if role_filter.filter(selinux_err):
|
||||||
|
- roles.append(selinux_err)
|
||||||
|
- return roles
|
||||||
|
- return self.compute_sid_msgs
|
||||||
|
+ role_types = access.RoleTypeSet()
|
||||||
|
+ for cs in self.compute_sid_msgs:
|
||||||
|
+ if not role_filter or role_filter.filter(cs):
|
||||||
|
+ role_types.add(cs.invalid_context.role, cs.invalid_context.type)
|
||||||
|
+
|
||||||
|
+ return role_types
|
||||||
|
|
||||||
|
def to_access(self, avc_filter=None, only_denials=True):
|
||||||
|
"""Convert the audit logs access into a an access vector set.
|
||||||
|
@@ -454,7 +454,7 @@
|
||||||
|
avc.accesses, avc)
|
||||||
|
return av_set
|
||||||
|
|
||||||
|
-class TypeFilter:
|
||||||
|
+class AVCTypeFilter:
|
||||||
|
def __init__(self, regex):
|
||||||
|
self.regex = re.compile(regex)
|
||||||
|
|
||||||
|
@@ -465,4 +465,17 @@
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
+class ComputeSidTypeFilter:
|
||||||
|
+ def __init__(self, regex):
|
||||||
|
+ self.regex = re.compile(regex)
|
||||||
|
+
|
||||||
|
+ def filter(self, avc):
|
||||||
|
+ if self.regex.match(avc.invalid_context.type):
|
||||||
|
+ return True
|
||||||
|
+ if self.regex.match(avc.scontext.type):
|
||||||
|
+ return True
|
||||||
|
+ if self.regex.match(avc.tcontext.type):
|
||||||
|
+ return True
|
||||||
|
+ return False
|
||||||
|
+
|
||||||
|
|
||||||
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/output.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/output.py
|
||||||
|
--- nsasepolgen/src/sepolgen/output.py 2008-06-12 23:25:26.000000000 -0400
|
||||||
|
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/output.py 2008-06-23 07:04:31.000000000 -0400
|
||||||
|
@@ -101,6 +101,8 @@
|
||||||
|
else:
|
||||||
|
return id_set_cmp(a.src_types, [b.args[0]])
|
||||||
|
|
||||||
|
+def role_type_cmp(a, b):
|
||||||
|
+ return cmp(a.role, b.role)
|
||||||
|
|
||||||
|
def sort_filter(module):
|
||||||
|
"""Sort and group the output for readability.
|
||||||
|
@@ -146,6 +148,18 @@
|
||||||
|
|
||||||
|
c.extend(sep_rules)
|
||||||
|
|
||||||
|
+
|
||||||
|
+ ras = []
|
||||||
|
+ ras.extend(node.role_types())
|
||||||
|
+ ras.sort(role_type_cmp)
|
||||||
|
+ if len(ras):
|
||||||
|
+ comment = refpolicy.Comment()
|
||||||
|
+ comment.lines.append("============= ROLES ==============")
|
||||||
|
+ c.append(comment)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ c.extend(ras)
|
||||||
|
+
|
||||||
|
# Everything else
|
||||||
|
for child in node.children:
|
||||||
|
if child not in c:
|
||||||
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/policygen.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/policygen.py
|
||||||
|
--- nsasepolgen/src/sepolgen/policygen.py 2008-06-12 23:25:26.000000000 -0400
|
||||||
|
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/policygen.py 2008-06-23 07:04:36.000000000 -0400
|
||||||
|
@@ -167,6 +167,13 @@
|
||||||
|
if self.gen_requires:
|
||||||
|
gen_requires(self.module)
|
||||||
|
|
||||||
|
+ def add_role_types(self, role_type_set):
|
||||||
|
+ for role_type in role_type_set:
|
||||||
|
+ self.module.children.append(role_type)
|
||||||
|
+
|
||||||
|
+ # Generate the requires
|
||||||
|
+ if self.gen_requires:
|
||||||
|
+ gen_requires(self.module)
|
||||||
|
|
||||||
|
def explain_access(av, ml=None, verbosity=SHORT_EXPLANATION):
|
||||||
|
"""Explain why a policy statement was generated.
|
||||||
|
@@ -334,8 +341,12 @@
|
||||||
|
# can actually figure those out.
|
||||||
|
r.types.add(arg)
|
||||||
|
|
||||||
|
- r.types.discard("self")
|
||||||
|
+ for role_type in node.role_types():
|
||||||
|
+ r.roles.add(role_type.role)
|
||||||
|
+ r.types.update(role_type.types)
|
||||||
|
|
||||||
|
+ r.types.discard("self")
|
||||||
|
+
|
||||||
|
node.children.insert(0, r)
|
||||||
|
|
||||||
|
# FUTURE - this is untested on modules with any sort of
|
||||||
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refparser.py
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refparser.py
|
||||||
--- nsasepolgen/src/sepolgen/refparser.py 2008-01-23 14:36:29.000000000 -0500
|
--- nsasepolgen/src/sepolgen/refparser.py 2008-06-12 23:25:26.000000000 -0400
|
||||||
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refparser.py 2008-05-16 11:27:03.000000000 -0400
|
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refparser.py 2008-06-23 07:05:23.000000000 -0400
|
||||||
@@ -919,7 +919,7 @@
|
@@ -919,7 +919,7 @@
|
||||||
def list_headers(root):
|
def list_headers(root):
|
||||||
modules = []
|
modules = []
|
||||||
|
@ -32,3 +199,35 @@ diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py polic
|
||||||
|
|
||||||
for dirpath, dirnames, filenames in os.walk(root):
|
for dirpath, dirnames, filenames in os.walk(root):
|
||||||
for name in filenames:
|
for name in filenames:
|
||||||
|
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refpolicy.py policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refpolicy.py
|
||||||
|
--- nsasepolgen/src/sepolgen/refpolicy.py 2008-06-12 23:25:26.000000000 -0400
|
||||||
|
+++ policycoreutils-2.0.49/sepolgen-1.0.11/src/sepolgen/refpolicy.py 2008-06-23 07:04:47.000000000 -0400
|
||||||
|
@@ -122,6 +122,12 @@
|
||||||
|
def roles(self):
|
||||||
|
return itertools.ifilter(lambda x: isinstance(x, Role), walktree(self))
|
||||||
|
|
||||||
|
+ def role_allows(self):
|
||||||
|
+ return itertools.ifilter(lambda x: isinstance(x, RoleAllow), walktree(self))
|
||||||
|
+
|
||||||
|
+ def role_types(self):
|
||||||
|
+ return itertools.ifilter(lambda x: isinstance(x, RoleType), walktree(self))
|
||||||
|
+
|
||||||
|
def __str__(self):
|
||||||
|
if self.comment:
|
||||||
|
return str(self.comment) + "\n" + self.to_string()
|
||||||
|
@@ -494,6 +500,15 @@
|
||||||
|
return "allow %s %s;" % (self.src_roles.to_comma_str(),
|
||||||
|
self.tgt_roles.to_comma_str())
|
||||||
|
|
||||||
|
+class RoleType(Leaf):
|
||||||
|
+ def __init__(self, parent=None):
|
||||||
|
+ Leaf.__init__(self, parent)
|
||||||
|
+ self.role = ""
|
||||||
|
+ self.types = IdSet()
|
||||||
|
+
|
||||||
|
+ def to_string(self):
|
||||||
|
+ return "role %s types %s;" % (self.role, self.types.to_comma_str())
|
||||||
|
+
|
||||||
|
class ModuleDeclaration(Leaf):
|
||||||
|
def __init__(self, parent=None):
|
||||||
|
Leaf.__init__(self, parent)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
Summary: SELinux policy core utilities
|
Summary: SELinux policy core utilities
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 2.0.49
|
Version: 2.0.49
|
||||||
Release: 7%{?dist}
|
Release: 9%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
|
@ -21,7 +21,6 @@ Source7: selinux-polgengui.console
|
||||||
Source8: policycoreutils_man_ru2.tar.bz2
|
Source8: policycoreutils_man_ru2.tar.bz2
|
||||||
Patch: policycoreutils-rhat.patch
|
Patch: policycoreutils-rhat.patch
|
||||||
Patch1: policycoreutils-po.patch
|
Patch1: policycoreutils-po.patch
|
||||||
#Patch2: policycoreutils-sepolgen.patch
|
|
||||||
Patch3: policycoreutils-gui.patch
|
Patch3: policycoreutils-gui.patch
|
||||||
Patch4: policycoreutils-sepolgen.patch
|
Patch4: policycoreutils-sepolgen.patch
|
||||||
|
|
||||||
|
@ -52,7 +51,6 @@ context.
|
||||||
%setup -q -a 1
|
%setup -q -a 1
|
||||||
%patch -p1 -b .rhat
|
%patch -p1 -b .rhat
|
||||||
%patch1 -p1 -b .rhatpo
|
%patch1 -p1 -b .rhatpo
|
||||||
#%patch2 -p1 -b .sepolgen
|
|
||||||
%patch3 -p1 -b .gui
|
%patch3 -p1 -b .gui
|
||||||
%patch4 -p1 -b .sepolgen
|
%patch4 -p1 -b .sepolgen
|
||||||
|
|
||||||
|
@ -193,6 +191,12 @@ if [ "$1" -ge "1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 24 2008 Dan Walsh <dwalsh@redhat.com> 2.0.49-9
|
||||||
|
- Fix spelling of enforcement
|
||||||
|
|
||||||
|
* Mon Jun 23 2008 Dan Walsh <dwalsh@redhat.com> 2.0.49-8
|
||||||
|
- Fix sepolgen/audit2allow handling of roles
|
||||||
|
|
||||||
* Mon Jun 16 2008 Dan Walsh <dwalsh@redhat.com> 2.0.49-7
|
* Mon Jun 16 2008 Dan Walsh <dwalsh@redhat.com> 2.0.49-7
|
||||||
- Fix sepolgen-ifgen processing
|
- Fix sepolgen-ifgen processing
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue