From 3edde4840a3ac84a5eac95eab299927e3f7d3fa0 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sat, 21 Jan 2012 18:39:33 +0100 Subject: [PATCH] Remove module for KDE. --- policy/modules/admin/su.fc | 3 -- policy/modules/apps/gnome.fc | 3 -- policy/modules/apps/gnome.if | 44 --------------------------- policy/modules/apps/kde.fc | 1 - policy/modules/apps/kde.if | 22 -------------- policy/modules/apps/kde.te | 40 ------------------------ policy/modules/kernel/corecommands.fc | 4 --- policy/modules/services/gnomeclock.fc | 2 -- policy/modules/system/userdomain.fc | 1 - policy/modules/system/userdomain.if | 4 --- 10 files changed, 124 deletions(-) delete mode 100644 policy/modules/apps/kde.fc delete mode 100644 policy/modules/apps/kde.if delete mode 100644 policy/modules/apps/kde.te diff --git a/policy/modules/admin/su.fc b/policy/modules/admin/su.fc index 3d89250a..7488c723 100644 --- a/policy/modules/admin/su.fc +++ b/policy/modules/admin/su.fc @@ -1,6 +1,3 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) - -/usr/(local/)?bin/ksu -- gen_context(system_u:object_r:su_exec_t,s0) -/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) /usr/bin/su -- gen_context(system_u:object_r:su_exec_t,s0) diff --git a/policy/modules/apps/gnome.fc b/policy/modules/apps/gnome.fc index 9f6139c1..fba11e12 100644 --- a/policy/modules/apps/gnome.fc +++ b/policy/modules/apps/gnome.fc @@ -1,7 +1,6 @@ HOME_DIR/\.cache(/.*)? gen_context(system_u:object_r:cache_home_t,s0) HOME_DIR/\.color/icc(/.*)? gen_context(system_u:object_r:icc_data_home_t,s0) HOME_DIR/\.config(/.*)? gen_context(system_u:object_r:config_home_t,s0) -HOME_DIR/\.kde(/.*)? gen_context(system_u:object_r:config_home_t,s0) HOME_DIR/\.gconf(d)?(/.*)? gen_context(system_u:object_r:gconf_home_t,s0) HOME_DIR/\.gnome2(/.*)? gen_context(system_u:object_r:gnome_home_t,s0) HOME_DIR/\.gnome2/keyrings(/.*)? gen_context(system_u:object_r:gkeyringd_gnome_home_t,s0) @@ -17,7 +16,6 @@ HOME_DIR/\.xine(/.*)? gen_context(system_u:object_r:config_home_t,s0) /root/\.cache(/.*)? gen_context(system_u:object_r:cache_home_t,s0) /root/\.color/icc(/.*)? gen_context(system_u:object_r:icc_data_home_t,s0) /root/\.config(/.*)? gen_context(system_u:object_r:config_home_t,s0) -/root/\.kde(/.*)? gen_context(system_u:object_r:config_home_t,s0) /root/\.gconf(d)?(/.*)? gen_context(system_u:object_r:gconf_home_t,s0) /root/\.gnome2(/.*)? gen_context(system_u:object_r:gnome_home_t,s0) /root/\.gnome2/keyrings(/.*)? gen_context(system_u:object_r:gkeyringd_gnome_home_t,s0) @@ -42,4 +40,3 @@ HOME_DIR/\.xine(/.*)? gen_context(system_u:object_r:config_home_t,s0) /usr/libexec/gconf-defaults-mechanism -- gen_context(system_u:object_r:gconfdefaultsm_exec_t,s0) /usr/libexec/gnome-system-monitor-mechanism -- gen_context(system_u:object_r:gnomesystemmm_exec_t,s0) -/usr/libexec/kde(3|4)/ksysguardprocesslist_helper -- gen_context(system_u:object_r:gnomesystemmm_exec_t,s0) diff --git a/policy/modules/apps/gnome.if b/policy/modules/apps/gnome.if index 6ba6bbda..1be6bcd7 100644 --- a/policy/modules/apps/gnome.if +++ b/policy/modules/apps/gnome.if @@ -1149,48 +1149,6 @@ interface(`gnome_home_dir_filetrans',` userdom_search_user_home_dirs($1) ') -###################################### -## -## Allow read kde config content -## -## -## -## Domain allowed access. -## -## -# -interface(`gnome_read_usr_config',` - gen_require(` - type config_usr_t; - ') - - files_search_usr($1) - list_dirs_pattern($1, config_usr_t, config_usr_t) - read_files_pattern($1, config_usr_t, config_usr_t) - read_lnk_files_pattern($1, config_usr_t, config_usr_t) -') - -####################################### -## -## Allow manage kde config content -## -## -## -## Domain allowed access. -## -## -# -interface(`gnome_manage_usr_config',` - gen_require(` - type config_usr_t; - ') - - files_search_usr($1) - manage_dirs_pattern($1, config_usr_t, config_usr_t) - manage_files_pattern($1, config_usr_t, config_usr_t) - manage_lnk_files_pattern($1, config_usr_t, config_usr_t) -') - ######################################## ## ## Execute gnome-keyring in the user gkeyring domain @@ -1244,7 +1202,6 @@ 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, config_home_t, dir, ".kde") userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".gconf") userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".gconfd") userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".local") @@ -1284,7 +1241,6 @@ 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, 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") userdom_admin_home_dir_filetrans($1, gconf_home_t, dir, ".local") diff --git a/policy/modules/apps/kde.fc b/policy/modules/apps/kde.fc deleted file mode 100644 index 25e4b681..00000000 --- a/policy/modules/apps/kde.fc +++ /dev/null @@ -1 +0,0 @@ -#/usr/libexec/kde(3|4)/backlighthelper -- gen_context(system_u:object_r:kdebacklighthelper_exec_t,s0) diff --git a/policy/modules/apps/kde.if b/policy/modules/apps/kde.if deleted file mode 100644 index cf655776..00000000 --- a/policy/modules/apps/kde.if +++ /dev/null @@ -1,22 +0,0 @@ -## Policy for KDE components - -####################################### -## -## Send and receive messages from -## firewallgui over dbus. -## -## -## -## Domain allowed access. -## -## -# -interface(`kde_dbus_chat_backlighthelper',` - gen_require(` - type kdebacklighthelper_t; - class dbus send_msg; - ') - - allow $1 kdebacklighthelper_t:dbus send_msg; - allow kdebacklighthelper_t $1:dbus send_msg; -') diff --git a/policy/modules/apps/kde.te b/policy/modules/apps/kde.te deleted file mode 100644 index 169421f4..00000000 --- a/policy/modules/apps/kde.te +++ /dev/null @@ -1,40 +0,0 @@ -policy_module(kde,1.0.0) - -######################################## -# -# Declarations -# - -type kdebacklighthelper_t; -type kdebacklighthelper_exec_t; -dbus_system_domain(kdebacklighthelper_t, kdebacklighthelper_exec_t) - -######################################## -# -# backlighthelper local policy -# -allow kdebacklighthelper_t self:fifo_file rw_fifo_file_perms; - -kernel_read_system_state(kdebacklighthelper_t) - -# r/w brightness values -dev_rw_sysfs(kdebacklighthelper_t) - -files_read_etc_files(kdebacklighthelper_t) -files_read_etc_runtime_files(kdebacklighthelper_t) -files_read_usr_files(kdebacklighthelper_t) - -fs_getattr_all_fs(kdebacklighthelper_t) - -logging_send_syslog_msg(kdebacklighthelper_t) - -miscfiles_read_localization(kdebacklighthelper_t) - -optional_policy(` - consolekit_dbus_chat(kdebacklighthelper_t) -') - -optional_policy(` - policykit_dbus_chat(kdebacklighthelper_t) -') - diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc index 705efb3c..7441b558 100644 --- a/policy/modules/kernel/corecommands.fc +++ b/policy/modules/kernel/corecommands.fc @@ -68,9 +68,6 @@ ifdef(`distro_redhat',` /etc/init\.d/functions -- gen_context(system_u:object_r:bin_t,s0) -/etc/kde/env(/.*)? gen_context(system_u:object_r:bin_t,s0) -/etc/kde/shutdown(/.*)? gen_context(system_u:object_r:bin_t,s0) - /etc/mail/make -- gen_context(system_u:object_r:bin_t,s0) /etc/mcelog/cache-error-trigger -- gen_context(system_u:object_r:bin_t,s0) /etc/mcelog/triggers(/.*)? gen_context(system_u:object_r:bin_t,s0) @@ -348,7 +345,6 @@ ifdef(`distro_redhat', ` /usr/share/fedora-usermgmt/wrapper -- gen_context(system_u:object_r:bin_t,s0) /usr/share/hplip/[^/]* -- gen_context(system_u:object_r:bin_t,s0) /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0) -/usr/share/kde4/apps/kajongg/kajongg.py -- gen_context(system_u:object_r:bin_t,s0) /usr/share/pwlib/make/ptlib-config -- gen_context(system_u:object_r:bin_t,s0) /usr/share/pydict/pydict\.py -- gen_context(system_u:object_r:bin_t,s0) /usr/share/rhn/rhn_applet/applet\.py -- gen_context(system_u:object_r:bin_t,s0) diff --git a/policy/modules/services/gnomeclock.fc b/policy/modules/services/gnomeclock.fc index 5df751b6..71dcbba5 100644 --- a/policy/modules/services/gnomeclock.fc +++ b/policy/modules/services/gnomeclock.fc @@ -2,5 +2,3 @@ /usr/libexec/gnome-clock-applet-mechanism -- gen_context(system_u:object_r:gnomeclock_exec_t,s0) /usr/libexec/gsd-datetime-mechanism -- gen_context(system_u:object_r:gnomeclock_exec_t,s0) - -/usr/libexec/kde(3|4)/kcmdatetimehelper -- gen_context(system_u:object_r:gnomeclock_exec_t,s0) diff --git a/policy/modules/system/userdomain.fc b/policy/modules/system/userdomain.fc index ec851899..b66f611e 100644 --- a/policy/modules/system/userdomain.fc +++ b/policy/modules/system/userdomain.fc @@ -11,7 +11,6 @@ HOME_DIR/\.local/bin(/.*)? gen_context(system_u:object_r:home_bin_t,s0) HOME_DIR/Audio(/.*)? gen_context(system_u:object_r:audio_home_t,s0) HOME_DIR/Music(/.*)? gen_context(system_u:object_r:audio_home_t,s0) HOME_DIR/\.cert(/.*)? gen_context(system_u:object_r:home_cert_t,s0) -HOME_DIR/.kde/share/apps/networkmanagement/certificates(/.*)? gen_context(system_u:object_r:home_cert_t,s0) HOME_DIR/\.pki(/.*)? gen_context(system_u:object_r:home_cert_t,s0) HOME_DIR/\.gvfs/.* <> HOME_DIR/\.debug(/.*)? <> diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 10b54670..9ed42917 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -727,10 +727,6 @@ template(`userdom_common_user_template',` hal_dbus_chat($1_usertype) ') - optional_policy(` - kde_dbus_chat_backlighthelper($1_usertype) - ') - optional_policy(` modemmanager_dbus_chat($1_usertype) ') -- 2.47.3