[selinux-policy/f18] We adopted pki-selinux policy

[Miroslav Grepl]

commit 9ae9a22a3c771f91c8e1f74a71c4d63a4cb1c548
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Tue Oct 23 16:56:34 2012 +0200

    We adopted pki-selinux policy

 modules-targeted-contrib.conf |    7 +++++++
 selinux-policy.spec           |    8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index 80d21d0..7eaf10d 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -2264,3 +2264,10 @@ thin = module
 # Policy for mandb
 # 
 mandb = module
+
+# Layer: services
+# Module: pki
+#
+# policy for pki
+#
+pki = module
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 69f84f4..5be8f90 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -19,7 +19,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.11.1
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -251,7 +251,7 @@ fi;
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    rm /etc/selinux/%2/.rebuild; \
    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 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 2>/dev/null; \
    fi \
    rm -f  /etc/selinux/%2/modules/active/modules/qemu.pp /etc/selinux/%2/modules/active/modules/nsplugin.pp /etc/selinux/%2/modules/active/modules/razor.pp /etc/selinux/%2/modules/active/modules/pyzord.pp \
    /usr/sbin/semodule -B -n -s %2; \
@@ -410,6 +410,7 @@ Obsoletes: mod_fcgid-selinux <= %{version}-%{release}
 Obsoletes: cachefilesd-selinux <= 0.10-1
 Conflicts:  seedit
 Conflicts:  389-ds-base < 1.2.7, 389-admin < 1.1.12
+Conflicts:	pki-selinux < 10-0.0-0.45.b1
 
 %description targeted
 SELinux Reference policy targeted base module.
@@ -521,6 +522,9 @@ SELinux Reference policy mls base module.
 %endif
 
 %changelog
+* Tue Oct 23 2012 Miroslav Grepl <mgrepl at redhat.com> 3.11.1-43
+- Adopt pki-selinux policy
+
 * Mon Oct 22 2012 Miroslav Grepl <mgrepl at redhat.com> 3.11.1-42
 - pki is leaking which we dontaudit until a pki code fix
 - Allow setcap for arping