[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     90fdaec48345fc4dc6065fdf4537b5b3f6606b03
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 14:36:11 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon May 21 14:36:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=90fdaec4

ensure we pax-mark plugin-container no matter what for plugins such as
adobe-flash

---
 mail-client/thunderbird/Manifest                  |    2 +-
 mail-client/thunderbird/thunderbird-12.0.1.ebuild |    7 ++++++-
 www-client/firefox/Manifest                       |    2 +-
 www-client/firefox/firefox-12.0.ebuild            |    6 +++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index a936697..e432867 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -57,4 +57,4 @@ DIST thunderbird-12.0.1-vi.xpi 436847 RMD160 e40c7ea3c9be776fabad47daaa3980f0eb2
 DIST thunderbird-12.0.1-zh-CN.xpi 431545 RMD160 bd8ea0294775358f1125984417c3ac2190349b4e SHA1 a26aed0508e24f92aa2a51120e0507191c65b1e4 SHA256 267ece6fcafc4886908e80693853be28c745b59b7c57376521f6630ccc8741cd
 DIST thunderbird-12.0.1-zh-TW.xpi 432164 RMD160 4efb04c31feb828d86df5a3b649718f98281e37d SHA1 6d4eff3e899d4d3c5ec34996b264c4660e2182b6 SHA256 e0cb1c64a3b33ba741d46daeeaf3287a1c7d4551dafcda09134d7eb049cee104
 DIST thunderbird-12.0.1.source.tar.bz2 101253776 RMD160 5df12513dd8d3554e666ff938b84a67b18a78144 SHA1 b5fcfe23834722eaa441274e0e2882adf9ed7575 SHA256 d8914f27b0ec71d940475a8942c951b106ecda69fd3a2954047584663a6ab183
-EBUILD thunderbird-12.0.1.ebuild 9374 RMD160 a25bba4eb6613f09de246f6c4fe4cc649e832d9a SHA1 344b2a969735c2c39627bda55d63fe36095b0d06 SHA256 a85c76db8e8d3d6b2da319e831fd46dd2278a66d35c2ad6a69ca74b88db09ab1
+EBUILD thunderbird-12.0.1.ebuild 9551 RMD160 a39457aea204bd3d448939707566bc384167378a SHA1 a91c85bf845159649572ebb2ba07d61fc00daa6c SHA256 5a316cb4d49d26d5a2225f3341d77163ec5531ccf62f652bbc13fdf7247e1b93

diff --git a/mail-client/thunderbird/thunderbird-12.0.1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1.ebuild
index 5f88451..bd7e250 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1.ebuild
@@ -288,9 +288,14 @@ src_install() {
 	fi
 
 	if use jit ; then
-		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,plugin-container}
+		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin}
 	fi
 
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	# Plugins dir
 	share_plugins_dir
 
 	if use minimal; then

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 96e7ef2..636466a 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -86,4 +86,4 @@ DIST firefox-12.0-zh-CN.xpi 266860 RMD160 f376ac78c45b1306aa9a0a48af18033c294e04
 DIST firefox-12.0-zh-TW.xpi 267735 RMD160 937efdf1bdefffcfb514247bd2779fa66fb1a26a SHA1 f4142fa1a449d62402aacf3c49b01a17cd86f1de SHA256 b1fc8db556c8f6724e0b1798edcfea03f5c140aaa89e2d5078fd9c05cfdcb27f
 DIST firefox-12.0-zu.xpi 255708 RMD160 42b5013ff842ed74bcb70bacf338b6239340a1c6 SHA1 4ac34cc274ad7a94904f05bb768d8b412bf72ce6 SHA256 8491b0e6c1f4b5dff38f715d38c44ed267816bb053149193d958c43b6ca65bbb
 DIST firefox-12.0.source.tar.bz2 78956707 RMD160 d83eb97543fc09f84b30a46ba8217c17f30bd572 SHA1 0177185e54b7d63dc36bd5bd5c80ba6afd52e199 SHA256 9a232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d
-EBUILD firefox-12.0.ebuild 10963 RMD160 23221a844511949ec0dc7b6e233672373c6d4e9c SHA1 4b8574c03d89f1372e05a0f55665ada1e75e28b3 SHA256 25be300806047540a3c8e8d2cee01d4581d0a2ec7c12a29aae478e14d61c96e9
+EBUILD firefox-12.0.ebuild 11125 RMD160 624b74361ec2077fa8ee5a3ef61e8797168705b8 SHA1 9f4e8088b480a70a0e014702b1ccb79639335d6b SHA256 89441e66e8a8746fbc8694f7a899b8b89c9a525ea60650e91ec9d6754728dd2b

diff --git a/www-client/firefox/firefox-12.0.ebuild b/www-client/firefox/firefox-12.0.ebuild
index 03311dd..083ef3c 100644
--- a/www-client/firefox/firefox-12.0.ebuild
+++ b/www-client/firefox/firefox-12.0.ebuild
@@ -325,9 +325,13 @@ src_install() {
 	# Without methodjit and tracejit there's no conflict with PaX
 	if use jit; then
 		# Required in order to use plugins and even run firefox on hardened.
-		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin}
 	fi
 
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
 	# Plugins dir
 	share_plugins_dir