* Wed Jan 9 2013 Miroslav Grepl <mgrepl@redhat.com> 3.12.1-1

- Mass merge with upstream

modules-mls-contrib.conf

@@ -290,7 +290,7 @@ comsat = module
 #
 # ConsoleKit is a system daemon for tracking what users are logged
 # 
-consolekit = module
+#consolekit = module
 
 # Layer: services
 # Module: corosync

modules-targeted-contrib.conf

@@ -395,7 +395,7 @@ condor = module
 #
 # ConsoleKit is a system daemon for tracking what users are logged
 # 
-consolekit = module
+#consolekit = module
 
 # Layer: services
 # Module: corosync
@@ -444,14 +444,7 @@ cron = module
 #
 # Cluster Daemon
 # 
-ctdbd = module
-
-# Layer: services
-# Module: ctdbd
-#
-# ctdbd - The CTDB cluster daemon
-#
-ctdbd = module
+ctdb = module
 
 # Layer: services
 # Module: cups
@@ -643,11 +636,11 @@ exim = module
 fail2ban = module
 
 # Layer: services
-# Module: fcoemon
+# Module: fcoe
 #
-# fcoemon
+# fcoe
 #
-fcoemon = module
+fcoe = module
 
 # Layer: services
 # Module: fetchmail
@@ -864,7 +857,7 @@ iscsi = module
 #
 # 
 # 
-isnsd = module
+isns = module
 
 # Layer: services
 # Module: jabber
@@ -948,7 +941,7 @@ ktalk = module
 #
 # Layer 2 Tunnelling Protocol Daemon
 # 
-l2tpd = module
+l2tp = module
 
 # Layer: services
 # Module: ldap

modules-targeted.conf

@@ -390,7 +390,7 @@ clock = module
 #
 # ConsoleKit is a system daemon for tracking what users are logged
 # 
-consolekit = module
+#consolekit = module
 
 # Layer: admin
 # Module: consoletype

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 hotplug.pp consoletype.pp kudzu.pp howl.pp) \
+   (cd /etc/selinux/%2/modules/active/modules; rm -f consolekit.pp ctdbd.pp fcoemon.pp isnsd.pp l2tpd.pp 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 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 consoletype 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 consoletype ctdbd fcoemon isnsd l2tp consolekit 2>/dev/null; \
    fi \
    /usr/sbin/semodule -B -n -s %2; \
 else \
@@ -524,6 +524,9 @@ SELinux Reference policy mls base module.
 %endif
 
 %changelog
+* Wed Jan 9 2013 Miroslav Grepl <mgrepl@redhat.com> 3.12.1-1
+- Mass merge with upstream
+
 * Sat Jan 5 2013 Dan Walsh <dwalsh@redhat.com> 3.11.1-69.1
 - Bump the policy version to 28 to match selinux userspace
 - Rebuild versus latest libsepol