Bumping to revision 8

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

4 files changed, 55 insertions, 6 deletions

diff --git a/sec-policy/selinux-mplayer/ChangeLog b/sec-policy/selinux-mplayer/ChangeLog
index 525c9ab1dfb1..279548aab6a5 100644
--- a/sec-policy/selinux-mplayer/ChangeLog
+++ b/sec-policy/selinux-mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/ChangeLog,v 1.16 2012/11/18 15:18:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/ChangeLog,v 1.17 2012/12/03 08:52:23 swift Exp $
+
+*selinux-mplayer-2.20120725-r8 (03 Dec 2012)
+
+  03 Dec 2012; Sven Vermeulen +files/fix-alsa-is-optional-r8.patch,
+  +selinux-mplayer-2.20120725-r8.ebuild:
+  Bumping to revision 8
 
 *selinux-mplayer-2.20120725-r7 (18 Nov 2012)
 
@@ -73,4 +79,3 @@
   07 Jan 2011; <swift@gentoo.org> +selinux-mplayer-2.20101213.ebuild,
   +files/fix-mplayer.patch:
   Adding mplayer module
-
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 9eebd08caa23..e9fc519b501e 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,12 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fix-alsa-is-optional-r8.patch 535 SHA256 161cd474e06c50cf9b8c03f996c47a5ea9e41a0f0613afff611703403546e220 SHA512 743e85b52d63025b2bc04a4c5134b24a8ff79897f026112ad634b3bebf8a1ef0d94c2cd4cf8a00619effb74f3b71953276c0e51d01fe0bb91c76b12d2ad8875c WHIRLPOOL 080858658291a63d3d16c7cfb4c459d16efb8bb3bb9067c635082830df06bd3588103d589374f96944fc4c2ebf382a76f57ca31067cc1568fa6e6c8c962ab15a
 DIST patchbundle-selinux-base-policy-2.20120215-r1.tar.bz2 25134 SHA256 708f6f4a284453ae6ed73f78b6e27b88d0bed09f541292f619e67a4ab6510aa7 SHA512 438d0d93e9d053a15259ab7ad0dec8ae5415929e68563a9b3a3838f418bc4decfb0ad0c4fab57d3537928088a84d1f69c9b4d8de1f2e9ab34d339121fe6f529e WHIRLPOOL 24fd16803c88220cb09c24428b3435250b5821e6025f52b298deed919ac202d4f174ef76c3cd780033f031e8ddb536c075201921f3be9322a68e5c0bd30edb71
 DIST patchbundle-selinux-base-policy-2.20120215-r13.tar.bz2 53237 SHA256 c95f132542332b4f2853df97b0c2ab6b9b2cb2a234c58687eab252ee7ae70f62 SHA512 0a9b2c265f322334f0d51a48fb1b19256ae6cf400545d615a9a945e32a15b391faf4db71fc26708d6d8abb0272653b3e0f84972eaccada78e417709020efc9f5 WHIRLPOOL 8b37ceda89525bb254c088e6bee5fdfb7113765a2dd1b405d6d4248b47312621fec145d5a705e0f31cae12f12d6bfa01b040a3ab99414458f4ded4251f26cdf5
 DIST patchbundle-selinux-base-policy-2.20120215-r14.tar.bz2 55867 SHA256 1327b2e24c3eeaab957f483e99f3b03961dc508bea58a936a898407a03d2f88a SHA512 8895d71ac7662bd1e4d99826f8eb99bb24ab4b79270fc7944d0a8d1681dd0c87cd4c689662d19802ceaf1357493c602414708c61bc29aa8e777d204aad7992a9 WHIRLPOOL b9b16ee1ed7fb138d97b9b74808834b2aa1c1cea12b63e3ef7e49436e91f7e9eb7d69852b1c18ce7fbfbfaffe56fb7cf2114e67b3f973503a4b1ef79de761213
 DIST patchbundle-selinux-base-policy-2.20120215-r15.tar.bz2 56466 SHA256 ba0af4572f849c5cb5616c5264a74a1727ee10d290066be478be953d80a3d78e SHA512 dd6a394b09e480f5d7ee6dfef5d68697bce18dbd4b4d4b3f5f6eecf9c356a436022dc77a25c007fc6b6245f21f6cd2abd59c6acf720a5130739616637c003fb5 WHIRLPOOL 99637709a3d8a982532372c69d0974c3702722a207f9c9aec7e3a278e71d87a66403529d5847c4674503fcdd3b0186e64518fae4365909d4ef260af0ae090fe0
 DIST patchbundle-selinux-base-policy-2.20120725-r5.tar.bz2 46546 SHA256 ac46f21fd5be9588f7462b9ec41a9033f1c0347f46e01b6f9477fb381779ec92 SHA512 3ac3f06cdf7ff645d5b1db7430e9857eb2b55cc6e522ab96300e5120f390f905f3ce614973eb3fd03f0f28e25eebad53517c91b69bba191dc7ddc4e97a3f1756 WHIRLPOOL ed75b62a29a5c9aba2b4da87b2845609ce89ce288f245430bb7dc34504dfa84a7261e40c3f6b776af041d219ac6ba7ef501bdacda56488451b2cb6d8b5051b9e
 DIST patchbundle-selinux-base-policy-2.20120725-r7.tar.bz2 334263 SHA256 f96436d819f6905c8f604488d309795874eb0fa884933c706851b4021a8c158a SHA512 9a17101e2a623e171f9ae203b1892801873f60c64be5a06077b04c1c7edb7c0639f4943c67f9df5f5790fde9d7f1456cd06b849ecd5915ce849353d6069dac6e WHIRLPOOL cd0b8f412c4b64a561d563a1132f986254d9c7d895772d2977988a8c7fb8dd41c53b5d7f2a69d99db85916c00a6de9eb9a35231ca4bd8759c86a58891e070705
+DIST patchbundle-selinux-base-policy-2.20120725-r8.tar.bz2 335267 SHA256 17e5534f966b46ef101e452082d8349636d38e1850cdf55cd7c268e14bdb0124 SHA512 f167e5691a3769d7eb66ddba6a000df860387a3df2cc581df60e924e51495fe94247acfbc9991cd815f05ade747f7806a67c965929fe12994e8b362ab4da15df WHIRLPOOL 533a98fc8860aa8e91d738c2e4d932f2c16dddf02966716649e78d74126bc949524653e0a5443ca6e1e073ae37265ca3b0e28f1ceea510b7adfd510cf3167ac4
 DIST refpolicy-2.20120215.tar.bz2 589917 SHA256 6df77faf62f73bd1f6e3bfca3fa2f77cdfd2cada94a7dcc4816ed9bbcf3545dc SHA512 47c84e29bd4f9f24b20d7ad86ccc9ef6619af3256b3d8590239165e9ea3b1fb45ceb105517b46a969bff2009b5f34d50c2f2d244e80080d9b667c51b11dcaf81 WHIRLPOOL ec038e60cda6dedea008347b6b5dd82d07b242d5b30921cb0912dc8712aa3db8a108c9f374bb3690328cef3cd531b251761cddb5410c1a09d7ab20654a06e551
 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89
 EBUILD selinux-mplayer-2.20120215-r14.ebuild 393 SHA256 475e502e0f381fff7dd26f35fabe449a83d3c8418c2731d9e5c820082e0f9763 SHA512 0ff471389a46936f0f93a36dc40aed67e862ff5d148e01b7a32f63d4a49f0abeb5b11d83b352ff8fb25b45320e7caeb81a76c9da7ab58c4761ce353cb6ae4dd3 WHIRLPOOL 5082d45a2675333a4ee6497e5b2f10c120af2ffee7dc8fdcc70a038af20a298c0109fcfc6d0c463105fada010f3477cd7188375b92a96583c3e9d78cf2955420
@@ -15,13 +17,14 @@ EBUILD selinux-mplayer-2.20120215-r2.ebuild 394 SHA256 ce78f1c67ef3174e4e08f28ef
 EBUILD selinux-mplayer-2.20120215.ebuild 388 SHA256 1b0cec8062011e61632b5844908a14b46ef104620205d176ec2eadbcb2926c06 SHA512 a27dea2a7cb19a58389e8264d3fa4ccb52dd1c56a06f078a6fb6019a04d788625a2a6b8522f8c574c2ddda4f60b45f11df16696f2a503617de97185a5f17c5fc WHIRLPOOL d584dd062bbfd0cf359ed9249d0755e85165561e6f5311ce459760456b723a892d35376fd93d2cc2e8647aae75397683a9907f9a42380ea2c894b2eeca4c8b8a
 EBUILD selinux-mplayer-2.20120725-r5.ebuild 391 SHA256 00cf42da4393b9316b2906e1e48a1313f08a67c329516476122d904c370e4474 SHA512 8eeba1ee76850d829d49108e736d684b5eca69c951217d790d5082a7381b33f19ba4d4aae8c0f26e898805ddd95fcf638624fa60f4c86002662c64ba51ed36c1 WHIRLPOOL a45badf82419bb30a4e54e7741fd5ec58390e49b3c2906e7947a6a9a78b3c891c9129121bde60924e4e9f12634edba5f8eedf832548b73089f5d8587fce87fc4
 EBUILD selinux-mplayer-2.20120725-r7.ebuild 393 SHA256 6a4074ba98afbbbb057f5a82951dfe44e67f2f58a7c28b9ff057a20960dabca4 SHA512 95164c6fdf0c0c7c85de87f02e26cfa4a046b7da7be53177ecc112e07438b4467d853442ed434579d990242930a3373d86f5dc60810b2e38b54e24432ba9e907 WHIRLPOOL b0c15477bf294af55d51814b1fd13c6c9a9bc90f1e907598bb6cd8e80bbbb4eedd926e753a0fbc234a2f86a3cb11a0dc5aec9f2997663f87f35cadd996372a97
+EBUILD selinux-mplayer-2.20120725-r8.ebuild 518 SHA256 b3e3d83c1d235f7ac91d6068575b33abe5b546c88e54466275b7b2e37e4bb77d SHA512 970b6be927e74bb366380ce7947a22e2f1a2e1a09d1378f36823836136244bfbcd6a06d16d25d876bc8a5d7cc4bb8d24e747157ab6d12dda0cfdbb0293022660 WHIRLPOOL 3fa06dc4c40e51f83534960fcf2abad13da0b049f09c65f206ac0e2a93277f31428823b342a428a201b2a08e356ed1adb36044697c42b34c15e5222719d5e4b7
 EBUILD selinux-mplayer-9999.ebuild 364 SHA256 61930f5c13840fbed45d37ad4855c98aa2986e4739852dc5c408a3145f9eea28 SHA512 595fc6cc6dec663b36ef6efb6665e0ef4b9e081bf823fff39fcbc0e4b3a541b7fc6cd79d3dd97d3a859b9f4ee979e4905629992435b5e60f1c4b64408aea35fe WHIRLPOOL d1f702b4a8a435afe68a9602ff525617ef53b9a4db52390eab98012a5fd2c7e93532394dbfd84a38563c24cf09776d37bf9aedb14fdcf6a55f9d8283b7201a24
-MISC ChangeLog 2407 SHA256 10e1e8d52c10304466176719f37541f039d073ad46d7e4354cc9bba96977e763 SHA512 16bb408020f075db7b8bf8a9e8c4e5eb0ab4ccd886ec1fb8f293c36c127ba01b8fa128b4e5df8feb3f869b262cf4748a6bb42a03cf89d7c096805bd65f804c86 WHIRLPOOL 5c25f622a6b857e6ca42b88360bae1609d42304d6e5742f11a59f33bbdc1503db643ae9b84ede6154f00bfc5f218aa6fe65836ad2b517dbce18d1449fbcd3dca
+MISC ChangeLog 2586 SHA256 26c4041d64fb299bedf75416279c8f0c23c4035e01771398570724f5fb27564f SHA512 e6f0a78c05787fbb0116caa1fbe3d6e86a1aecea0a32d8cdc4ea06526508b7f135a9c7d30b53bcf73324d696860111355caa742affb4ef979b2aee75a7ffb377 WHIRLPOOL 909646b88df8e4067d83f0bfd97737314418ccb1b7f143c816c9a4f1a298baec0b30d4a74af9cf56e0a898820c11e451af7316abee4008ee6a81625c14f6852a
 MISC metadata.xml 231 SHA256 be24cc9864578122304949e5d4807a043b21bc214f8f7145a273fec08be1120c SHA512 c9cf83ccc6dded6ff87d02897eca325a363d41c20558fa61eadf0be3de40627ed8b6a67fb6922a903a9725a06c3e0d2a2062a1dc282dfbc6975938d6a5579229 WHIRLPOOL 87866b29d820781f8721833cc3b9d473822dc8295ea06e6cfb55c46650a83d88eb2b22edacfc2a4234bb0967af098814d8cdc5fce5ed16102cb30026b6d649e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCo/HMACgkQXfqz7M26L9tUEQCfaURdk75yvKCsaESPuRS3sdHf
-SA0AmgJplc3CRMp4QfBkKCrZjI7O+rgG
-=qqOj
+iEYEAREIAAYFAlC8aMUACgkQXfqz7M26L9uQYgCeK9x1NQpclBPj+/dsuCRfZS1f
+OW4AmgLB82Xs1Ip6CN+fQp7/OHM3US6N
+=lGbC
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mplayer/files/fix-alsa-is-optional-r8.patch b/sec-policy/selinux-mplayer/files/fix-alsa-is-optional-r8.patch
new file mode 100644
index 000000000000..de6a559cacbf
--- /dev/null
+++ b/sec-policy/selinux-mplayer/files/fix-alsa-is-optional-r8.patch
@@ -0,0 +1,22 @@
+--- contrib/mplayer.te	2012-11-25 21:02:45.896073761 +0100
++++ contrib/mplayer.te	2012-11-25 21:02:14.847042646 +0100
+@@ -207,8 +207,6 @@
+ xserver_user_x_domain_template(mplayer, mplayer_t, mplayer_tmpfs_t)
+ 
+ ifdef(`distro_gentoo',`
+-	alsa_domain(mplayer_t, mplayer_tmpfs_t)
+-
+ 	xdg_manage_videos_home(mplayer_t)
+ 
+ 	tunable_policy(`mplayer_read_user_content',`
+@@ -226,6 +224,10 @@
+ 
+ 		userdom_write_user_tmp_sockets(mplayer_t)
+ 	')
++
++	optional_policy(`
++		alsa_domain(mplayer_t, mplayer_tmpfs_t)
++	')
+ ')
+ 
+ ifndef(`enable_mls',`
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r8.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r8.ebuild
new file mode 100644
index 000000000000..179281cf2547
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/selinux-mplayer-2.20120725-r8.ebuild,v 1.1 2012/12/03 08:52:23 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mplayer"
+BASEPOL="2.20120725-r8"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
+POLICY_PATCH="${FILESDIR}/fix-alsa-is-optional-r8.patch"