[selinux-policy/f18: 1/6] Turn back on consolekit policy since it has not been eliminated

[Daniel J Walsh]

commit 119bf19233c2b7873668720e46b7c35e41b3b445
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Nov 30 07:23:37 2012 -0500

    Turn back on consolekit policy since it has not been eliminated

 modules-mls-contrib.conf      |    7 +++++++
 modules-targeted-contrib.conf |    7 +++++++
 selinux-policy.spec           |    4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/modules-mls-contrib.conf b/modules-mls-contrib.conf
index e4bbb96..858f1eb 100644
--- a/modules-mls-contrib.conf
+++ b/modules-mls-contrib.conf
@@ -286,6 +286,13 @@ colord = module
 comsat = module
 
 # Layer: services
+# Module: consolekit
+#
+# ConsoleKit is a system daemon for tracking what users are logged
+# 
+consolekit = module
+
+# Layer: services
 # Module: corosync
 #
 # Corosync Cluster Engine Executive
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index 6e04a59..4e522bb 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -391,6 +391,13 @@ comsat = module
 condor = module 
 
 # Layer: services
+# Module: consolekit
+#
+# ConsoleKit is a system daemon for tracking what users are logged
+# 
+consolekit = module
+
+# Layer: services
 # Module: corosync
 #
 # Corosync Cluster Engine Executive
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 1792497..482c6d6 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -252,9 +252,9 @@ fi;
 . %{_sysconfdir}/selinux/config; \
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    rm /etc/selinux/%2/.rebuild; \
-   (cd /etc/selinux/%2/modules/active/modules; rm -f qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp consolekit.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
+   (cd /etc/selinux/%2/modules/active/modules; rm -f qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
    if [ %1 -ne 1 ]; then \
-	/usr/sbin/semodule -n -s %2 -r consolekit matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm 2>/dev/null; \
+	/usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm 2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -n -s %2; \
 else \