From 6feb6cfa012fd724423f2384809b197a58d414e0 Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Nov 09 2012 14:41:58 +0000
Subject: Merge branch 'master_contrib' of ssh://git.fedorahosted.org/git/selinux-policy into master_contrib


---

diff --git a/accountsd.te b/accountsd.te
index f4d7d4d..5fe3889 100644
--- a/accountsd.te
+++ b/accountsd.te
@@ -75,6 +75,7 @@ optional_policy(`
 ')
 
 optional_policy(`
+	xserver_read_xdm_tmp_files(accountsd_t)
 	xserver_read_state_xdm(accountsd_t)
 	xserver_dbus_chat_xdm(accountsd_t)
 	xserver_manage_xdm_etc_files(accountsd_t)
diff --git a/chrome.te b/chrome.te
index d4d04d0..da41141 100644
--- a/chrome.te
+++ b/chrome.te
@@ -51,6 +51,7 @@ kernel_read_kernel_sysctls(chrome_sandbox_t)
 fs_manage_cgroup_dirs(chrome_sandbox_t)
 fs_manage_cgroup_files(chrome_sandbox_t)
 fs_read_dos_files(chrome_sandbox_t)
+fs_read_hugetlbfs_files(chrome_sandbox_t)
 
 corecmd_exec_bin(chrome_sandbox_t)
 
diff --git a/gnome.if b/gnome.if
index 8973bed..71ec3f4 100644
--- a/gnome.if
+++ b/gnome.if
@@ -1408,6 +1408,7 @@ interface(`gnome_filetrans_home_content',`
 gen_require(`
 	type config_home_t;
 	type cache_home_t;
+	type dbus_home_t;
 	type gconf_home_t;
 	type gnome_home_t;
 	type data_home_t, icc_data_home_t;
@@ -1418,6 +1419,7 @@ gen_require(`
 	userdom_user_home_dir_filetrans($1, config_home_t, file, ".Xdefaults")
 	userdom_user_home_dir_filetrans($1, config_home_t, dir, ".xine")
 	userdom_user_home_dir_filetrans($1, cache_home_t, dir, ".cache")
+	userdom_user_home_dir_filetrans($1, dbus_home_t, dir, ".dbus")
 	userdom_user_home_dir_filetrans($1, cache_home_t, dir, ".nv")
 	userdom_user_home_dir_filetrans($1, config_home_t, dir, ".kde")
 	userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".gconf")
@@ -1450,6 +1452,7 @@ interface(`gnome_filetrans_admin_home_content',`
 gen_require(`
 	type config_home_t;
 	type cache_home_t;
+	type dbus_home_t;
 	type gstreamer_home_t;
 	type gconf_home_t;
 	type gnome_home_t;
@@ -1460,6 +1463,7 @@ gen_require(`
 	userdom_admin_home_dir_filetrans($1, config_home_t, file, ".Xdefaults")
 	userdom_admin_home_dir_filetrans($1, config_home_t, dir, ".xine")
 	userdom_admin_home_dir_filetrans($1, cache_home_t, dir, ".cache")
+	userdom_admin_home_dir_filetrans($1, dbus_home_t, dir, ".dbus")
 	userdom_admin_home_dir_filetrans($1, config_home_t, dir, ".kde")
 	userdom_admin_home_dir_filetrans($1, gconf_home_t, dir, ".gconf")
 	userdom_admin_home_dir_filetrans($1, gconf_home_t, dir, ".gconfd")
diff --git a/mozilla.te b/mozilla.te
index 91e3d11..0d722d7 100644
--- a/mozilla.te
+++ b/mozilla.te
@@ -421,6 +421,7 @@ fs_rw_inherited_tmpfs_files(mozilla_plugin_t)
 fs_getattr_all_fs(mozilla_plugin_t)
 fs_list_dos(mozilla_plugin_t)
 fs_read_noxattr_fs_files(mozilla_plugin_t)
+fs_read_hugetlbfs_files(mozilla_plugin_t)
 
 application_exec(mozilla_plugin_t)
 application_dontaudit_signull(mozilla_plugin_t)