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

[Daniel J Walsh]

commit afbf138ed97932c9a3d370482cf5db040cf0ca6e
Merge: 3ba9511 fa970c3
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Tue Jan 15 11:54:07 2013 -0500

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

 modules-mls-contrib.conf      |    2 +-
 modules-targeted-contrib.conf |   16 +-
 modules-targeted.conf         |    2 +-
 permissivedomains.te          |   16 +
 policy-rawhide-base.patch     | 3694 +-
 policy-rawhide-contrib.patch  |82895 +++++++++++++++++++++++------------------
 selinux-policy.spec           |   19 +-
 sources                       |    4 +-
 8 files changed, 49215 insertions(+), 37433 deletions(-)
---
diff --cc modules-targeted-contrib.conf
index 78f2ed6,9e07238..edd3768
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@@ -1140,6 -1139,6 +1139,13 @@@ munin = modul
  # 
  mysql = module
  
++# Layer: contrib
++# Module: mythtv
++#
++# Policy for Mythtv (Web Server)
++# 
++mythtv = module
++
  # Layer: services
  # Module: nagios
  #
diff --cc permissivedomains.te
index 9d026f3,9d026f3..fb6ceb6
--- a/permissivedomains.te
+++ b/permissivedomains.te
@@@ -1,1 -1,1 +1,17 @@@
  policy_module(permissivedomains,19)
++
++optional_policy(`
++    gen_require(`
++                type systemd_localed_t;
++        ')
++
++        permissive systemd_localed_t;
++')
++
++optional_policy(`
++    gen_require(`
++                type httpd_mythtv_script_t;
++        ')
++
++        permissive httpd_mythtv_script_t;
++')
diff --cc selinux-policy.spec
index a7c5fa8,01824b3..48e08c1
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@@ -13,8 -13,8 +13,16 @@@
  %if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
  %define BUILD_MLS 1
  %endif
++<<<<<<< HEAD
 +%define POLICYVER 29
 +%define POLICYCOREUTILSVER 2.1.13-34
++||||||| merged common ancestors
++%define POLICYVER 28
++%define POLICYCOREUTILSVER 2.1.13-34
++=======
+ %define POLICYVER 29
+ %define POLICYCOREUTILSVER 2.1.13-53
++>>>>>>> fa970c32f1409d9b0322c292f1e89b2028368e3b
  %define CHECKPOLICYVER 2.1.11-3
  Summary: SELinux policy configuration
  Name: selinux-policy