[selinux-policy: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

[Daniel J Walsh]

commit 45852f5fe5ab93059886d50b66c8a21de495fcf0
Merge: b59d07a aab1932
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Jan 28 15:39:02 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy
    
    Conflicts:
    	selinux-policy.spec

 modules-mls-contrib.conf      |   15 +-
 modules-targeted-contrib.conf |   13 -
 policy-rawhide-base.patch     |201871 ++++++++++++++++++++++++++++++-----------
 policy-rawhide-contrib.patch  | 1617 +-
 selinux-policy.spec           |   71 +-
 5 files changed, 148993 insertions(+), 54594 deletions(-)
---
diff --cc selinux-policy.spec
index d8d87da,6a0ecae..d24a3c2
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@@ -252,7 -252,10 +252,7 @@@ 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 gnomeclock.pp matahari.pp xfs.pp kudzu.pp kerneloops.pp execmem.pp openoffice.pp ada.pp tzdata.pp hal.pp hotplug.pp howl.pp java.pp mono.pp moilscanner.pp gamin.pp audio_entropy.pp audioentropy.pp iscsid.pp polkit_auth.pp polkit.pp rtkit_daemon.pp ModemManager.pp telepathysofiasip.pp ethereal.pp passanger.pp qpidd.pp pyzor.pp razor.pp pki-selinux.pp phpfpm.pp consoletype.pp ctdbd.pp fcoemon.pp isnsd.pp l2tp.pp ) \
 -   (cd /etc/selinux/%2/modules/active/modules; rm -f amavis.pp clamav.pp gnomeclock.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 amavis clamav gnomeclock 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  2>/dev/null; \
 -   fi \
++   (cd /etc/selinux/%2/modules/active/modules; rm -f amavis.pp clamav.pp gnomeclock.pp matahari.pp xfs.pp kudzu.pp kerneloops.pp execmem.pp openoffice.pp ada.pp tzdata.pp hal.pp hotplug.pp howl.pp java.pp mono.pp moilscanner.pp gamin.pp audio_entropy.pp audioentropy.pp iscsid.pp polkit_auth.pp polkit.pp rtkit_daemon.pp ModemManager.pp telepathysofiasip.pp ethereal.pp passanger.pp qpidd.pp pyzor.pp razor.pp pki-selinux.pp phpfpm.pp consoletype.pp ctdbd.pp fcoemon.pp isnsd.pp l2tp.pp ) \
     /usr/sbin/semodule -B -n -s %2; \
  else \
      touch /etc/selinux/%2/modules/active/modules/sandbox.disabled \