Disable PaX memory protection only when USE=orc (bug #421579, requested by Magnus Granberg); pax-mark gst-launch-0.10 as well as gst-plugin-scanner to allow constructing orc-using pipelines on the command line.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 25 insertions, 15 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 1fdc5d6c6857..063e15f11688 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.311 2012/10/21 07:49:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.312 2012/10/24 04:42:50 tetromino Exp $
+
+  24 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gstreamer-0.10.36.ebuild, metadata.xml:
+  Disable PaX memory protection only when USE=orc (bug #421579, requested by
+  Magnus Granberg); pax-mark gst-launch-0.10 as well as gst-plugin-scanner to
+  allow constructing orc-using pipelines on the command line.
 
 *gstreamer-0.10.36 (21 Oct 2012)
 
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 31bd498fe043..b806be41a76e 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -8,17 +8,17 @@ DIST gstreamer-0.10.35.tar.bz2 3606254 SHA256 817bfea2cd46e2487b97e2ed9218f0299b
 DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8 WHIRLPOOL 03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93
 EBUILD gstreamer-0.10.32-r1.ebuild 2048 SHA256 9e98ac29056e5a6997830266cfacdca4c99c001aa8516be19c09cef8bacf1004 SHA512 fd7ed7d4190460b49946bbb0f1417f06e7f4a015655352d1fbaf4f62c4c7b01fd0326fffdc5c283135056bc1b220446b4205dc67d496bdb33fd6c740ce34e855 WHIRLPOOL a3ac36324725a9607601c45abea43c18ad50be5d819e58b94ba8b9f6be76df6f1c101dacc137e92cfea422453cc517a20cfd8d634f0b5df4be4b164a2daeb541
 EBUILD gstreamer-0.10.35.ebuild 2554 SHA256 db61d509f35647541b3112e586771cb095d9c8ee86255098b8cabf1ca89d3640 SHA512 00843f00cd9ae88f08415f2c79659f836c89422fda40d019cb3743be3afa6d4e9cf5db265d7e41f06bf863fedb1c977b099e744ecf8796e1fe3217b2f3ade720 WHIRLPOOL 74f0cdbe447b5d2c17166dea3e94d5007ed50eb06d135a4bbf7301568a355b93159a93e1ff4e0abfab2601b29b03055163d415d045e418fe83ac38c479b65915
-EBUILD gstreamer-0.10.36.ebuild 2909 SHA256 1bad660a1a11553f21666b6227f794fb43b6782a897365dc10c7badd0ad3c6c5 SHA512 c7d17acbbc027831eb8a548c2bafca6c53c8abd4c2a0bf775bd242d654d3d040a8eee646ff0c06f6aa6d0351cf3f08832f9673674a32298aed99ed65d82925cf WHIRLPOOL a6bc4137f810b22e6dda5d471eec2f83720c02dd2f73eb6e2cb0108946c8dcd2eeca56a61cbf99d90ac0eed51157682e60e485e80c6a44b6bfcbe407a9f27af0
-MISC ChangeLog 41618 SHA256 07bb93e3ef58054951d30149073eb51e0afec8bb1f13a7a94a39c89c6f4f8886 SHA512 7dba23d41052c90def67996fc238041041c4a0d0215235d5419fdd4630d9199926dc9f05e87eb715e2fbe85f32396db91dd88390d06722039ca37a160779f0c0 WHIRLPOOL ee1530291e56e0ed2ec4b020246c801dc15683c2ae0610436a631f2a0d72d40dcfc7057c1913f89eef538c7d76801d61251ca5a448891b5b7c9941fd7d014d10
-MISC metadata.xml 281 SHA256 cc5d9611f69fa72b3f8343018cd16fa524706c336ff7b436ebb9bbffc3c40090 SHA512 0871f0101bdac3738c617a89bdfbc7eb4cb5e4602eeba8de78c83cb111070da2ed458745fe76aaa635ddceaec2bec0d20bd5203a2943fe4968211cc9ff9a4aa9 WHIRLPOOL 33c24b2d816a31026d17c0e3dfc8aba8c075682a0ef092871bd30f0b81815c8d018ea61aa26f59dbaf4249e37a21b35ecb76927d43ce0ccd664a51cb1f103d0c
+EBUILD gstreamer-0.10.36.ebuild 2962 SHA256 902471e6cc9574c015c9cdc12d580318574fed75410fd91739e4c64ea6d239cd SHA512 0623c99fa71a5fc6af0e19d5c9b7404c3f966a81268d69ecb13fc4baceb125375bad2daf25bd132bd63b93779b8123038884844b40fa3377965005f9eb814835 WHIRLPOOL 638b2fd0bc468fb4ceee1e0c693598d7446d2cbfb900cca71046ec88ed564976f44d4c1044fe680b6d00ba638d9ab857e1917d086bd24f16316d6cd4625d8935
+MISC ChangeLog 41937 SHA256 3f5fc90b526db398c207fa54f4a21d4eea40d1044d088b344bcfbe736f06eac6 SHA512 e02fabceb78d0d58810d90db0ed6b98e39c2de1fdfdcb9b4173d81d20328bf2afcf8c363a9fc55daf2a396cb46a26e667fa031fe494ecdaa7ddbe8d157ab75ea WHIRLPOOL d0d98203dbc620508c357d3cb627b4b17e4b3f87b99ab40bb53b92c2e19fb5885b16c3d720ad63018aa65526d4a1cb7a594e09ba94b5c855d220d9b6cd9dbeba
+MISC metadata.xml 459 SHA256 85831e8c58a2ac6aa3c44f3a97afdb33752c90c42380a4ec38620e2fd368fdc9 SHA512 4f445ed34be609c32db432012e90d33a361068abd2d0b8552603ae6f7a1d2a1fe1e619e2d0042bd2a2f41d50c9d52706c45e7479021cbcf30b9187cc1b263b08 WHIRLPOOL 8f6f7638b1d6df2ba3971165c32805794918ff18547e0ba10c404e6b24e7c4df52793531d7b458bacb2ab0db201aad208242f19d0c47b9f8f7df08d36ce1e556
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQg6kgAAoJEJ0WA1zPCt1h3O4H/jDKrNX2tsluRifqf4mUobAT
-5G/orIZXAD5IHIxBnUpThKeWMj3r0nFXOZIuoDz7vhN4oDVU4eCf1ltbmcaVSCn1
-ugcCcSwuugiTZhY7aIhQhS+pWxq6p2iaV7WZZ+zyl7lUrUvfGVsoeHorlmMvdpTr
-BxcpI1mvS96ytEE1eXenc4Dfv2+QtmQkM5l8nls8He81c9GV9wt0osLkTFwVWg1L
-a03/yStu76j6Lv0z/HAbU815uj1ICOrCjlT58zLGGBZ7Tp5ovbzkHiiiJxk0g/RY
-m8AQIjB+fDQlbyYVgeL3Bqp6GGuS0urSgWVsGV8qtFgKtSLHDIUBE0zD2PXj2Q8=
-=31d8
+iQEcBAEBCAAGBQJQh3HRAAoJEJ0WA1zPCt1hgnIIALQMS/R38HSEPPw/kNywTnfs
+wQgO2pVimFzakb/iX07DKr+ehpQ7rTNhzK0LBh8ikct3dC7imxpTTmlCGL3zWiJm
+vn6Lv3PYKIUv1HVqk+jCzQ8v1ESg+95wIZAW9VANv1KoGf/Z/vtqwwkOU94f4zjN
+UdmN5IhwclDh5eXyEF8KG7F7Fp8g+6HJoSXbmP/HBjT95H5SKrtqChF7WhZSwzIf
+Z+Gub3vEddh+LSLtjExgfcLhV5VmwQWRBU3UL2Mki6IXYjLV7/wLQDCCT4VII4u9
+LR47Ndb+HDVgSp5WJ7H/IOqzgCuHR2OAAZBZBMPrAIxWQzJ5b6V30o8ZKEIZay8=
+=jZns
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gstreamer/gstreamer-0.10.36.ebuild b/media-libs/gstreamer/gstreamer-0.10.36.ebuild
index 64d50849d708..b94c878aa926 100644
--- a/media-libs/gstreamer/gstreamer-0.10.36.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.36.ebuild,v 1.1 2012/10/21 07:49:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.36.ebuild,v 1.2 2012/10/24 04:42:50 tetromino Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2+"
 SLOT=${PV_MAJ_MIN}
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection nls test"
+IUSE="+introspection nls +orc test"
 
 RDEPEND=">=dev-libs/glib-2.24:2
 	dev-libs/libxml2
@@ -80,6 +80,7 @@ src_install() {
 	# Punt useless .la files
 	prune_libtool_files --modules
 
-	# Needed for certain gst plugins on hardened/PaX systems, bug #421579
-	pax-mark -m "${ED}usr/libexec/gstreamer-0.10/gst-plugin-scanner"
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-0.10" \
+		"${ED}usr/libexec/gstreamer-0.10/gst-plugin-scanner"
 }
diff --git a/media-libs/gstreamer/metadata.xml b/media-libs/gstreamer/metadata.xml
index 10aab2c8eff9..cee6ae072b90 100644
--- a/media-libs/gstreamer/metadata.xml
+++ b/media-libs/gstreamer/metadata.xml
@@ -5,5 +5,8 @@
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
+		<flag name="orc">Disable some PaX memory protections to allow plugins
+			that use <pkg>dev-lang/orc</pkg> for runtime optimization to be
+			used on hardened PaX systems</flag>
 	</use>
 </pkgmetadata>