[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/roles/, policy/modules/apps/

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

commit:     90ed6629790f8ed980e3419b017c49dc6b6bdce9
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 23:32:17 2021 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 01:09:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=90ed6629

pulseaudio: Remove gentoo-specific interfaces

pulseaudio_client_domain and pulseaudio_role were changed upstream to
have more args. pulseaudio_client_domain was previously deprecated and
unused in gentoo.

Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 policy/modules/apps/pulseaudio.if  | 26 --------------------------
 policy/modules/roles/staff.te      |  4 ----
 policy/modules/roles/unprivuser.te |  4 ----
 3 files changed, 34 deletions(-)

diff --git a/policy/modules/apps/pulseaudio.if b/policy/modules/apps/pulseaudio.if
index 1796b771..b2d2f1d4 100644
--- a/policy/modules/apps/pulseaudio.if
+++ b/policy/modules/apps/pulseaudio.if
@@ -427,29 +427,3 @@ interface(`pulseaudio_rw_tmpfs_files',`
 	fs_search_tmpfs($1)
 	rw_files_pattern($1, pulseaudio_tmpfs_t, pulseaudio_tmpfs_t)
 ')
-
-# Below are Gentoo specifics but ifdef distro_gentoo cannot be used in interfaces
-
-########################################
-## <summary>
-##	Mark the specified domain as a PulseAudio client domain
-##	and the related tmpfs file type as a (shared) PulseAudio tmpfs
-##	file type used for the shared memory access
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain to become a PulseAudio client domain
-##	</summary>
-## </param>
-## <param name="tmpfstype">
-##	<summary>
-##	Tmpfs type used for shared memory of the given domain
-##	</summary>
-## </param>
-#
-interface(`pulseaudio_client_domain',`
-	refpolicywarn(`$0($*) has been deprecated')
-
-	pulseaudio_domtrans($1)
-	pulseaudio_tmpfs_content($2)
-')

diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index 3ac0650c..29f68027 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -260,10 +260,6 @@ ifdef(`distro_gentoo',`
 		pan_role(staff_r, staff_t)
 	')
 
-	optional_policy(`
-		pulseaudio_role(staff_r, staff_t)
-	')
-
 	optional_policy(`
 		rtorrent_role(staff_r, staff_t)
 	')

diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
index 249215b4..32c928d7 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -239,10 +239,6 @@ ifdef(`distro_gentoo',`
 		pan_role(user_r, user_t)
 	')
 
-	optional_policy(`
-		pulseaudio_role(user_r, user_t)
-	')
-
 	optional_policy(`
 		rtorrent_role(user_r, user_t)
 	')