Merge branch 'master-next'

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

1 files changed, 43 insertions, 0 deletions

diff --git a/recipes-security/refpolicy/refpolicy-2.20140311/poky-policy-fix-seutils-manage-config-files.patch b/recipes-security/refpolicy/refpolicy-2.20140311/poky-policy-fix-seutils-manage-config-files.patch
new file mode 100644
index 0000000..be33bf1
--- /dev/null
+++ b/recipes-security/refpolicy/refpolicy-2.20140311/poky-policy-fix-seutils-manage-config-files.patch
@@ -0,0 +1,43 @@
+From be8e015aec19553d3753af132861d24da9ed0265 Mon Sep 17 00:00:00 2001
+From: Xin Ouyang <Xin.Ouyang@windriver.com>
+Date: Thu, 22 Aug 2013 13:37:23 +0800
+Subject: [PATCH 2/2] refpolicy: fix selinux utils to manage config files
+
+Upstream-Status: Pending
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+---
+ policy/modules/system/selinuxutil.if |    1 +
+ policy/modules/system/userdomain.if  |    4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/policy/modules/system/selinuxutil.if b/policy/modules/system/selinuxutil.if
+index 3822072..db03ca1 100644
+--- a/policy/modules/system/selinuxutil.if
++++ b/policy/modules/system/selinuxutil.if
+@@ -680,6 +680,7 @@ interface(`seutil_manage_config',`
+        ')
+ 
+        files_search_etc($1)
++       manage_dirs_pattern($1, selinux_config_t, selinux_config_t)
+        manage_files_pattern($1, selinux_config_t, selinux_config_t)
+        read_lnk_files_pattern($1, selinux_config_t, selinux_config_t)
+ ')
+diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
+index b4a691d..20c8bf8 100644
+--- a/policy/modules/system/userdomain.if
++++ b/policy/modules/system/userdomain.if
+@@ -1277,6 +1277,10 @@ template(`userdom_security_admin_template',`
+        logging_read_audit_config($1)
+ 
+        seutil_manage_bin_policy($1)
++       seutil_manage_default_contexts($1)
++       seutil_manage_file_contexts($1)
++       seutil_manage_module_store($1)
++       seutil_manage_config($1)
+        seutil_run_checkpolicy($1, $2)
+        seutil_run_loadpolicy($1, $2)
+        seutil_run_semanage($1, $2)
+-- 
+1.7.9.5
+