Removing the SELinux 2.20101213 policies

(Portage version: 2.1.10.11/cvs/Linux x86_64)

9 files changed, 8 insertions, 327 deletions

diff --git a/sec-policy/selinux-mozilla/ChangeLog b/sec-policy/selinux-mozilla/ChangeLog
index a521ba0ad027..b8c5625a1e5f 100644
--- a/sec-policy/selinux-mozilla/ChangeLog
+++ b/sec-policy/selinux-mozilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-mozilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.10 2011/10/23 12:42:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.11 2011/11/12 20:53:31 swift Exp $
+
+  12 Nov 2011; <swift@gentoo.org> -files/fix-apps-mozilla-r2.patch,
+  -files/fix-apps-mozilla-r3.patch, -files/fix-apps-mozilla-r4.patch,
+  -selinux-mozilla-2.20101213-r2.ebuild, -selinux-mozilla-2.20101213-r3.ebuild,
+  -selinux-mozilla-2.20101213-r4.ebuild, -selinux-mozilla-2.20110726-r1.ebuild,
+  -files/fix-mozilla.patch:
+  Removing old policies
 
   23 Oct 2011; <swift@gentoo.org> selinux-mozilla-2.20110726-r2.ebuild:
   Stabilization (tracker #384231)
diff --git a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r2.patch b/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r2.patch
deleted file mode 100644
index 46cf887fa1da..000000000000
--- a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- apps/mozilla.te	2010-12-13 15:11:01.000000000 +0100
-+++ apps/mozilla.te	2011-05-02 22:35:19.305000083 +0200
-@@ -33,6 +33,10 @@
- files_tmpfs_file(mozilla_tmpfs_t)
- ubac_constrained(mozilla_tmpfs_t)
- 
-+type mozilla_tmp_t;
-+files_tmp_file(mozilla_tmp_t)
-+ubac_constrained(mozilla_tmp_t)
-+
- ########################################
- #
- # Local policy
-@@ -68,6 +72,10 @@
- manage_sock_files_pattern(mozilla_t, mozilla_tmpfs_t, mozilla_tmpfs_t)
- fs_tmpfs_filetrans(mozilla_t, mozilla_tmpfs_t, { file lnk_file sock_file fifo_file })
- 
-+manage_files_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+manage_dirs_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+files_tmp_filetrans(mozilla_t, mozilla_tmp_t, { file dir } )
-+
- kernel_read_kernel_sysctls(mozilla_t)
- kernel_read_network_state(mozilla_t)
- # Access /proc, sysctl
-@@ -143,6 +151,7 @@
- 
- userdom_use_user_ptys(mozilla_t)
- 
-+
- xserver_user_x_domain_template(mozilla, mozilla_t, mozilla_tmpfs_t)
- xserver_dontaudit_read_xdm_tmp_files(mozilla_t)
- xserver_dontaudit_getattr_xdm_tmp_sockets(mozilla_t)
-@@ -266,3 +275,7 @@
- optional_policy(`
- 	thunderbird_domtrans(mozilla_t)
- ')
-+
-+optional_policy(`
-+	alsa_read_rw_config(mozilla_t)
-+')
---- apps/mozilla.fc	2010-08-03 15:11:03.000000000 +0200
-+++ apps/mozilla.fc	2011-01-02 22:23:34.407000019 +0100
-@@ -27,3 +27,12 @@
- /usr/lib(64)?/[^/]*firefox[^/]*/firefox-bin -- gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib/[^/]*firefox[^/]*/firefox --	gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
-+
-+ifdef(`distro_gentoo',`
-+/usr/bin/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/libxul\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/firefox/firefox	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/run-mozilla.sh	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/plugin-container	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+')
diff --git a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r3.patch b/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r3.patch
deleted file mode 100644
index 04d667d6bbf2..000000000000
--- a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r3.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- apps/mozilla.te	2010-12-13 15:11:01.000000000 +0100
-+++ apps/mozilla.te	2011-07-03 12:35:17.181000404 +0200
-@@ -33,6 +33,10 @@
- files_tmpfs_file(mozilla_tmpfs_t)
- ubac_constrained(mozilla_tmpfs_t)
- 
-+type mozilla_tmp_t;
-+files_tmp_file(mozilla_tmp_t)
-+ubac_constrained(mozilla_tmp_t)
-+
- ########################################
- #
- # Local policy
-@@ -68,6 +72,10 @@
- manage_sock_files_pattern(mozilla_t, mozilla_tmpfs_t, mozilla_tmpfs_t)
- fs_tmpfs_filetrans(mozilla_t, mozilla_tmpfs_t, { file lnk_file sock_file fifo_file })
- 
-+manage_files_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+manage_dirs_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+files_tmp_filetrans(mozilla_t, mozilla_tmp_t, { file dir } )
-+
- kernel_read_kernel_sysctls(mozilla_t)
- kernel_read_network_state(mozilla_t)
- # Access /proc, sysctl
-@@ -89,15 +97,18 @@
- corenet_raw_sendrecv_generic_node(mozilla_t)
- corenet_tcp_sendrecv_http_port(mozilla_t)
- corenet_tcp_sendrecv_http_cache_port(mozilla_t)
-+corenet_tcp_sendrecv_tor_port(mozilla_t)
- corenet_tcp_sendrecv_ftp_port(mozilla_t)
- corenet_tcp_sendrecv_ipp_port(mozilla_t)
- corenet_tcp_connect_http_port(mozilla_t)
- corenet_tcp_connect_http_cache_port(mozilla_t)
-+corenet_tcp_connect_tor_port(mozilla_t)
- corenet_tcp_connect_ftp_port(mozilla_t)
- corenet_tcp_connect_ipp_port(mozilla_t)
- corenet_tcp_connect_generic_port(mozilla_t)
- corenet_tcp_connect_soundd_port(mozilla_t)
- corenet_sendrecv_http_client_packets(mozilla_t)
-+corenet_sendrecv_tor_client_packets(mozilla_t)
- corenet_sendrecv_http_cache_client_packets(mozilla_t)
- corenet_sendrecv_ftp_client_packets(mozilla_t)
- corenet_sendrecv_ipp_client_packets(mozilla_t)
-@@ -143,6 +154,7 @@
- 
- userdom_use_user_ptys(mozilla_t)
- 
-+
- xserver_user_x_domain_template(mozilla, mozilla_t, mozilla_tmpfs_t)
- xserver_dontaudit_read_xdm_tmp_files(mozilla_t)
- xserver_dontaudit_getattr_xdm_tmp_sockets(mozilla_t)
-@@ -266,3 +278,7 @@
- optional_policy(`
- 	thunderbird_domtrans(mozilla_t)
- ')
-+
-+optional_policy(`
-+	alsa_read_rw_config(mozilla_t)
-+')
---- apps/mozilla.fc	2010-08-03 15:11:03.000000000 +0200
-+++ apps/mozilla.fc	2011-01-02 22:23:34.407000019 +0100
-@@ -27,3 +27,12 @@
- /usr/lib(64)?/[^/]*firefox[^/]*/firefox-bin -- gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib/[^/]*firefox[^/]*/firefox --	gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
-+
-+ifdef(`distro_gentoo',`
-+/usr/bin/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/libxul\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/firefox/firefox	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/run-mozilla.sh	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/plugin-container	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+')
diff --git a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r4.patch b/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r4.patch
deleted file mode 100644
index beef75d4a880..000000000000
--- a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r4.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- apps/mozilla.te	2010-12-13 15:11:01.000000000 +0100
-+++ apps/mozilla.te	2011-07-24 16:48:16.221000672 +0200
-@@ -33,6 +33,10 @@
- files_tmpfs_file(mozilla_tmpfs_t)
- ubac_constrained(mozilla_tmpfs_t)
- 
-+type mozilla_tmp_t;
-+files_tmp_file(mozilla_tmp_t)
-+ubac_constrained(mozilla_tmp_t)
-+
- ########################################
- #
- # Local policy
-@@ -68,6 +72,10 @@
- manage_sock_files_pattern(mozilla_t, mozilla_tmpfs_t, mozilla_tmpfs_t)
- fs_tmpfs_filetrans(mozilla_t, mozilla_tmpfs_t, { file lnk_file sock_file fifo_file })
- 
-+manage_files_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+manage_dirs_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+files_tmp_filetrans(mozilla_t, mozilla_tmp_t, { file dir } )
-+
- kernel_read_kernel_sysctls(mozilla_t)
- kernel_read_network_state(mozilla_t)
- # Access /proc, sysctl
-@@ -89,15 +97,18 @@
- corenet_raw_sendrecv_generic_node(mozilla_t)
- corenet_tcp_sendrecv_http_port(mozilla_t)
- corenet_tcp_sendrecv_http_cache_port(mozilla_t)
-+corenet_tcp_sendrecv_tor_port(mozilla_t)
- corenet_tcp_sendrecv_ftp_port(mozilla_t)
- corenet_tcp_sendrecv_ipp_port(mozilla_t)
- corenet_tcp_connect_http_port(mozilla_t)
- corenet_tcp_connect_http_cache_port(mozilla_t)
-+corenet_tcp_connect_tor_port(mozilla_t)
- corenet_tcp_connect_ftp_port(mozilla_t)
- corenet_tcp_connect_ipp_port(mozilla_t)
- corenet_tcp_connect_generic_port(mozilla_t)
- corenet_tcp_connect_soundd_port(mozilla_t)
- corenet_sendrecv_http_client_packets(mozilla_t)
-+corenet_sendrecv_tor_client_packets(mozilla_t)
- corenet_sendrecv_http_cache_client_packets(mozilla_t)
- corenet_sendrecv_ftp_client_packets(mozilla_t)
- corenet_sendrecv_ipp_client_packets(mozilla_t)
-@@ -143,6 +154,7 @@
- 
- userdom_use_user_ptys(mozilla_t)
- 
-+
- xserver_user_x_domain_template(mozilla, mozilla_t, mozilla_tmpfs_t)
- xserver_dontaudit_read_xdm_tmp_files(mozilla_t)
- xserver_dontaudit_getattr_xdm_tmp_sockets(mozilla_t)
-@@ -193,6 +205,7 @@
- 	userdom_list_user_tmp(mozilla_t)
- 	userdom_read_user_tmp_files(mozilla_t)
- 	userdom_read_user_tmp_symlinks(mozilla_t)
-+	userdom_list_user_home_content(mozilla_t)
- 	userdom_read_user_home_content_files(mozilla_t)
- 	userdom_read_user_home_content_symlinks(mozilla_t)
- 
-@@ -266,3 +279,7 @@
- optional_policy(`
- 	thunderbird_domtrans(mozilla_t)
- ')
-+
-+optional_policy(`
-+	alsa_read_rw_config(mozilla_t)
-+')
---- apps/mozilla.fc	2010-08-03 15:11:03.000000000 +0200
-+++ apps/mozilla.fc	2011-07-21 10:08:43.909000256 +0200
-@@ -27,3 +27,12 @@
- /usr/lib(64)?/[^/]*firefox[^/]*/firefox-bin -- gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib/[^/]*firefox[^/]*/firefox --	gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
-+
-+ifdef(`distro_gentoo',`
-+/usr/bin/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/libxul\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/firefox/firefox	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/run-mozilla.sh	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/plugin-container	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+')
diff --git a/sec-policy/selinux-mozilla/files/fix-mozilla.patch b/sec-policy/selinux-mozilla/files/fix-mozilla.patch
deleted file mode 100644
index bfa24856170a..000000000000
--- a/sec-policy/selinux-mozilla/files/fix-mozilla.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- apps/mozilla.te	2010-12-13 15:11:01.000000000 +0100
-+++ ../../../refpolicy/policy/modules/apps/mozilla.te	2011-01-15 16:27:48.031000003 +0100
-@@ -33,6 +33,10 @@
- files_tmpfs_file(mozilla_tmpfs_t)
- ubac_constrained(mozilla_tmpfs_t)
- 
-+type mozilla_tmp_t;
-+files_tmp_file(mozilla_tmp_t)
-+ubac_constrained(mozilla_tmp_t)
-+
- ########################################
- #
- # Local policy
-@@ -68,6 +72,12 @@
- manage_sock_files_pattern(mozilla_t, mozilla_tmpfs_t, mozilla_tmpfs_t)
- fs_tmpfs_filetrans(mozilla_t, mozilla_tmpfs_t, { file lnk_file sock_file fifo_file })
- 
-+manage_files_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+manage_dirs_pattern(mozilla_t, mozilla_tmp_t, mozilla_tmp_t)
-+files_tmp_filetrans(mozilla_t, mozilla_tmp_t, { file dir } )
-+userdom_manage_user_tmp_files(mozilla_t)
-+userdom_manage_user_tmp_sockets(mozilla_t)
-+
- kernel_read_kernel_sysctls(mozilla_t)
- kernel_read_network_state(mozilla_t)
- # Access /proc, sysctl
-@@ -143,6 +153,7 @@
- 
- userdom_use_user_ptys(mozilla_t)
- 
-+
- xserver_user_x_domain_template(mozilla, mozilla_t, mozilla_tmpfs_t)
- xserver_dontaudit_read_xdm_tmp_files(mozilla_t)
- xserver_dontaudit_getattr_xdm_tmp_sockets(mozilla_t)
-@@ -266,3 +277,7 @@
- optional_policy(`
- 	thunderbird_domtrans(mozilla_t)
- ')
-+
-+optional_policy(`
-+	alsa_read_rw_config(mozilla_t)
-+')
---- apps/mozilla.fc	2010-08-03 15:11:03.000000000 +0200
-+++ ../../../refpolicy/policy/modules/apps/mozilla.fc	2011-01-02 22:23:34.407000019 +0100
-@@ -27,3 +27,12 @@
- /usr/lib(64)?/[^/]*firefox[^/]*/firefox-bin -- gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib/[^/]*firefox[^/]*/firefox --	gen_context(system_u:object_r:mozilla_exec_t,s0)
- /usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
-+
-+ifdef(`distro_gentoo',`
-+/usr/bin/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/libxul\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/opt/firefox/firefox	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/run-mozilla.sh	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/firefox-bin	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+/opt/firefox/plugin-container	--	gen_context(system_u:object_r:mozilla_exec_t,s0)
-+')
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r2.ebuild
deleted file mode 100644
index 41a16fd5d92b..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r2.ebuild,v 1.2 2011/06/02 12:36:56 blueness Exp $
-
-IUSE=""
-
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for general applications"
-
-KEYWORDS="amd64 x86"
-
-POLICY_PATCH="${FILESDIR}/fix-apps-mozilla-r2.patch"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r3.ebuild
deleted file mode 100644
index 882a163e2ff4..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r3.ebuild,v 1.1 2011/07/10 02:34:32 blueness Exp $
-
-IUSE=""
-
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for general applications"
-
-KEYWORDS="~amd64 ~x86"
-
-POLICY_PATCH="${FILESDIR}/fix-apps-mozilla-r3.patch"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r4.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r4.ebuild
deleted file mode 100644
index cc0a1de15411..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r4.ebuild,v 1.1 2011/08/07 10:57:06 blueness Exp $
-
-IUSE=""
-
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for general applications"
-
-KEYWORDS="~amd64 ~x86"
-
-POLICY_PATCH="${FILESDIR}/fix-apps-mozilla-r4.patch"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r1.ebuild
deleted file mode 100644
index 19d6eaf8b9b3..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r1.ebuild,v 1.1 2011/08/28 21:12:42 swift Exp $
-EAPI="4"
-
-IUSE=""
-MODS="mozilla"
-BASEPOL="2.20110726-r1"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-KEYWORDS="~amd64 ~x86"