[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/, policy/modules/services/, policy/modules/admin/, ...

["Jason Zaman" <gentoo@perfinion.com>]

commit:     8253183963f78c69d401d0740f2f35d4cc7726b4
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Dec  2 21:20:40 2014 +0000
Commit:     Jason Zaman <gentoo <AT> perfinion <DOT> com>
CommitDate: Tue Dec  2 21:20:40 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=82531839

remove things that have been upstreamed

---
 policy/modules/admin/bootloader.fc    |  4 ----
 policy/modules/admin/sudo.if          |  7 -------
 policy/modules/kernel/corecommands.fc |  2 --
 policy/modules/services/xserver.fc    |  7 -------
 policy/modules/system/authlogin.if    | 34 ----------------------------------
 policy/modules/system/fstools.fc      |  2 --
 policy/modules/system/ipsec.fc        |  4 ----
 7 files changed, 60 deletions(-)

diff --git a/policy/modules/admin/bootloader.fc b/policy/modules/admin/bootloader.fc
index 6bd044c..d908d56 100644
--- a/policy/modules/admin/bootloader.fc
+++ b/policy/modules/admin/bootloader.fc
@@ -11,7 +11,3 @@
 /usr/sbin/grub2?-install	--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 /usr/sbin/grub2?-mkconfig	--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 /usr/sbin/grub2?-probe	--	gen_context(system_u:object_r:bootloader_exec_t,s0)
-
-ifdef(`distro_gentoo',`
-/usr/sbin/grub2?-mkconfig	--	gen_context(system_u:object_r:bootloader_exec_t,s0)
-')

diff --git a/policy/modules/admin/sudo.if b/policy/modules/admin/sudo.if
index c6140e3..56ce11c 100644
--- a/policy/modules/admin/sudo.if
+++ b/policy/modules/admin/sudo.if
@@ -160,13 +160,6 @@ template(`sudo_role_template',`
 	optional_policy(`
 		fprintd_dbus_chat($1_sudo_t)
 	')
-
-	ifdef(`distro_gentoo',`
-		# Set ownership of ts directory (timestamp keeping)
-		allow $1_sudo_t self:capability { chown };
-		# Create /var/run/sudo
-		auth_pid_filetrans_pam_var_run($1_sudo_t, dir, "sudo")
-	')
 ')
 
 ########################################

diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc
index e61b52b..fdf1915 100644
--- a/policy/modules/kernel/corecommands.fc
+++ b/policy/modules/kernel/corecommands.fc
@@ -422,6 +422,4 @@ ifdef(`distro_suse',`
 ifdef(`distro_gentoo',`
 /usr/lib/python-exec/python-exec2	--	gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/python-exec/python.*/.*	--	gen_context(system_u:object_r:bin_t,s0)
-
-/usr/lib/xfce4/notifyd/xfce4-notifyd	--	gen_context(system_u:object_r:bin_t,s0)
 ')

diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc
index 49eeac1..5ef36fb 100644
--- a/policy/modules/services/xserver.fc
+++ b/policy/modules/services/xserver.fc
@@ -128,11 +128,4 @@ ifdef(`distro_suse',`
 
 ifdef(`distro_gentoo',`
 HOME_DIR/\.local/share/xorg(/.*)?	gen_context(system_u:object_r:xserver_xdg_data_home_t,s0)
-
-/etc/lightdm/Xsession	--	gen_context(system_u:object_r:xsession_exec_t,s0)
-
-/var/cache/lightdm(/.*)?	gen_context(system_u:object_r:xdm_var_lib_t,s0)
-/var/lib/lightdm(/.*)?	gen_context(system_u:object_r:xdm_var_lib_t,s0)
-/var/log/lightdm(/.*)?	gen_context(system_u:object_r:xserver_log_t,s0)
-/var/run/lightdm(/.*)?	gen_context(system_u:object_r:xdm_var_run_t,s0)
 ')

diff --git a/policy/modules/system/authlogin.if b/policy/modules/system/authlogin.if
index 41004c5..f05d7bf 100644
--- a/policy/modules/system/authlogin.if
+++ b/policy/modules/system/authlogin.if
@@ -1836,37 +1836,3 @@ interface(`auth_unconfined',`
 	typeattribute $1 can_write_shadow_passwords;
 	typeattribute $1 can_relabelto_shadow_passwords;
 ')
-
-# Should be in an ifdef distro_gentoo but that is not supported in the global if file
-
-########################################
-## <summary>
-##	Create specified objects in
-##	pid directories with the pam var
-##      run file type using a
-##      file type transition.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="object_class">
-##	<summary>
-##	Class of the object being created.
-##	</summary>
-## </param>
-## <param name="name" optional="true">
-##	<summary>
-##	The name of the object being created.
-##	</summary>
-## </param>
-#
-interface(`auth_pid_filetrans_pam_var_run',`
-	gen_require(`
-		type pam_var_run_t;
-	')
-
-	files_pid_filetrans($1, pam_var_run_t, $2, $3)
-')
-

diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc
index fb132f9..be77216 100644
--- a/policy/modules/system/fstools.fc
+++ b/policy/modules/system/fstools.fc
@@ -66,6 +66,4 @@
 ifdef(`distro_gentoo',`
 /sbin/mkfs\.f2fs	--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 /usr/sbin/mkfs\.f2fs	--	gen_context(system_u:object_r:fsadm_exec_t,s0)
-/usr/sbin/gdisk		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
-/usr/sbin/efibootmgr	--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 ')

diff --git a/policy/modules/system/ipsec.fc b/policy/modules/system/ipsec.fc
index 47f9327..0f1e351 100644
--- a/policy/modules/system/ipsec.fc
+++ b/policy/modules/system/ipsec.fc
@@ -41,7 +41,3 @@
 
 /var/run/pluto(/.*)?			gen_context(system_u:object_r:ipsec_var_run_t,s0)
 /var/run/racoon\.pid		--	gen_context(system_u:object_r:ipsec_var_run_t,s0)
-
-ifdef(`distro_gentoo',`
-/var/lib/racoon(/.*)?			gen_context(system_u:object_r:ipsec_var_run_t,s0)
-')