Support proxy plugins and tor

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 102 insertions, 5 deletions

diff --git a/sec-policy/selinux-mozilla/ChangeLog b/sec-policy/selinux-mozilla/ChangeLog
index 3014c9f2224d..1c826d20f297 100644
--- a/sec-policy/selinux-mozilla/ChangeLog
+++ b/sec-policy/selinux-mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2011/06/04 17:20:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.5 2011/07/10 02:34:32 blueness Exp $
+
+*selinux-mozilla-2.20101213-r3 (10 Jul 2011)
+
+  10 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +files/fix-apps-mozilla-r3.patch, +selinux-mozilla-2.20101213-r3.ebuild:
+  Support proxy plugins and tor
 
   04 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   -selinux-mozilla-2.20101213.ebuild, -selinux-mozilla-2.20101213-r1.ebuild:
diff --git a/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r3.patch b/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r3.patch
new file mode 100644
index 000000000000..04d667d6bbf2
--- /dev/null
+++ b/sec-policy/selinux-mozilla/files/fix-apps-mozilla-r3.patch
@@ -0,0 +1,74 @@
+--- 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/selinux-mozilla-2.20101213-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r3.ebuild
new file mode 100644
index 000000000000..882a163e2ff4
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20101213-r3.ebuild
@@ -0,0 +1,15 @@
+# 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-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 28616bb03f94..8fd351246173 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fix-services-rpc-r1.patch 451 RMD160 253fa3208b8a8901674a13467eec5cad70354544 SHA1 6ab0b8864c9ea60dd96cf81f6b14509d25b698d9 SHA256 d1204563a76e817ce1b12e114af30914f1919632d61b8b454db8dd47b31500ac
 DIST refpolicy-2.20101213.tar.bz2 559450 RMD160 4858f792f4db5b179de6fb8419a626c29d59bdd3 SHA1 0e881e99b8950a358eadc44633551ca10f12eaee SHA256 b691ee8f6066cc19bb0d4384fe3be277d97d22e9d4ac2db0c252065e8c3535de
+EBUILD selinux-rpc-2.20101213-r1.ebuild 418 RMD160 33378b8f583cf7dddd982c363cb27c6981952315 SHA1 9ab1f05ca1f07032a0f7529e2e80565951a15353 SHA256 afced1cffd17f8155e4089986183399811890a37b0ff213f85a1afd2bf803d18
 EBUILD selinux-rpc-2.20101213.ebuild 360 RMD160 a4178b789547e916a030cfafde931f41831ea359 SHA1 08d541022c81df57e229227ae192676bd8a89c5a SHA256 991dd1f73e143be007f5da429a959b6cc478c18b7117680e09619fa01d3f3faa
-MISC ChangeLog 423 RMD160 00b2aee3c7567143667d6b3805bf70599ea3286b SHA1 4df502819a803fc9908b8fe46bea6f82eedcd1c9 SHA256 6d0fd6014cc0fd2ad7c152c4bcf5fde5a29478cee4fedf21a678cbdf49fc75e4
+MISC ChangeLog 656 RMD160 f8a4461610f0ddbfa01c2dda5c53eaece64a56c4 SHA1 07363f1014dfb54af58412b4e60e6ddaa9978217 SHA256 ba86a85cccd10dac672208d45dfdb4483c1b11d9db06cad7153c35374642a312
 MISC metadata.xml 227 RMD160 66bea9425535b21202ff92cd311dc45d11d0c377 SHA1 0dc3cc3d9465b2bcb219f6347f52c205d925cd02 SHA256 95b91861ac1519b5e8c55a6623380479181f07c58c6ea6091761c45c65028f36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3nh7AACgkQl5yvQNBFVTWFmACfa/fdVdE4pep8axsrg9SPkhQc
-wWsAoKTJbFUGWGyg/KnVJWrZDMzdu9k1
-=5fVE
+iEYEAREIAAYFAk4ZENAACgkQl5yvQNBFVTWfiQCdE8HA39kt5dwU9eYQ3rX0HghD
+BtsAn2nr0JtSWEpurjteqMGmfbex9125
+=nM7t
 -----END PGP SIGNATURE-----