[selinux-policy/f18] phpfpm module is no longer used

[Miroslav Grepl]

commit eb5d1e3e168953da6ec5c4821f4fdde7849dbb9e
Author: Miroslav Grepl <mgrepl at redhat.com>
Date:   Mon Nov 5 14:17:35 2012 +0100

    phpfpm module is no longer used

 modules-targeted-contrib.conf |    8 --------
 permissivedomains.pp          |  Bin 88272 -> 86444 bytes
 permissivedomains.te          |    8 --------
 selinux-policy.spec           |    4 ++--
 4 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index e1cf241..a12c309 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -1334,14 +1334,6 @@ pcscd = module
 # 
 pegasus = module
 
-# Layer: contrib
-# Module: php-fpm
-#  
-#  PHP-FPM is an alternative PHP FastCGI implementation
-#
-phpfpm = module
-
-
 # Layer: services
 # Module: pingd
 #
diff --git a/permissivedomains.pp b/permissivedomains.pp
index b268740..89b972c 100644
Binary files a/permissivedomains.pp and b/permissivedomains.pp differ
diff --git a/permissivedomains.te b/permissivedomains.te
index eec6ff3..8533af0 100644
--- a/permissivedomains.te
+++ b/permissivedomains.te
@@ -99,14 +99,6 @@ optional_policy(`
 
 optional_policy(`
     gen_require(`
-                type phpfpm_t;
-        ')
-
-        permissive phpfpm_t;
-')
-
-optional_policy(`
-    gen_require(`
 				type virt_qemu_ga_t;
 	')
 		permissive virt_qemu_ga_t;
diff --git a/selinux-policy.spec b/selinux-policy.spec
index e2228f3..8020aed 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -252,9 +252,9 @@ 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 pki-selinux 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 \
-   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 \
+   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 /etc/selinux/%2/modules/active/modules/phpfpm.pp \
    /usr/sbin/semodule -B -n -s %2; \
 else \
     touch /etc/selinux/%2/modules/active/modules/sandbox.disabled \