Revbump: Bring back nspluginwrapper for amd64, with warnings and a USE flag

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

4 files changed, 179 insertions, 3 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index fcd403ffec58..0ee8ce45da99 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.42 2010/08/12 02:27:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.43 2010/08/12 12:36:51 lack Exp $
+
+*adobe-flash-10.1.82.76-r1 (12 Aug 2010)
+
+  12 Aug 2010; Jim Ramsay <lack@gentoo.org> +adobe-flash-10.1.82.76-r1.ebuild,
+  metadata.xml:
+  Bring back nspluginwrapper for amd64, with warnings and a USE flag.
 
   12 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   adobe-flash-9.0.208.0.ebuild, adobe-flash-10.1.82.76.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index c5f48fe96655..e38f43af5d7f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -8,7 +8,8 @@ DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b8
 EBUILD adobe-flash-10.0.45.2-r2.ebuild 5606 RMD160 b78a0161a874c6121d9de87263b51c54f937f953 SHA1 61f477b751699bdaf0f10276d4e68dae200fba3c SHA256 e7501c56ad0667b7adb950c22b6345b3b718ffe28fe1977dc41c3e55f2374153
 EBUILD adobe-flash-10.1.53.64-r1.ebuild 5172 RMD160 09cc02c16a055965dcbea967874bf3e3ee8915fe SHA1 b245c11be2e89341d17955f2c3d86644a0337a31 SHA256 542458407e92f22999162857b6b38872beadc41f1626db4ae2d479a41e946a00
 EBUILD adobe-flash-10.1.53.64.ebuild 5140 RMD160 6fcfa2d0943cf620d31de8db015f68359193a206 SHA1 5f76339b792577989a561df3c9c92341cd185f93 SHA256 bb8521e72ec99803b6b19b650ed8d47aca6bcfc8fd587c2c4f06bf620da08c2f
+EBUILD adobe-flash-10.1.82.76-r1.ebuild 5378 RMD160 61c0507946c0180e6d3dbcaadd789e1defa04003 SHA1 f2e64c0fff2bd4ae065d58fc04676ed91d82440a SHA256 9c8f484e31730d2e15807c633308f428a386d85520ab18c228b34e1f30968379
 EBUILD adobe-flash-10.1.82.76.ebuild 5174 RMD160 ad4f2f2d572bc26d48031adc2a2658a79dae6c35 SHA1 82b43faee089e843e78b09780d65d86367002bd5 SHA256 b591a558d0ac109d1bb1c4f35bef2397f8926969399f0b9a276dd4b582e00823
 EBUILD adobe-flash-9.0.208.0.ebuild 1701 RMD160 2d7b899a48ca26685c26094ceb07495ac13524a6 SHA1 2a7d5510e196a4bebe31c3b05c872ca85675f3a8 SHA256 00f3f0779e7b9d059eb7df3c79ccaee5587b2f8d265f140b39570a44b7b22f80
-MISC ChangeLog 24544 RMD160 f2e9e8e47f3a2dca07582a1efcd7d10ddefb5b4b SHA1 5cc212b19ef632edb05800661149dfbde3504c06 SHA256 3ce4067ece03162387371ac618739d5126ad7aa57eaab31478cb882d8243112b
-MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
+MISC ChangeLog 24746 RMD160 f2626f5f06b83ae1ddfc423a989537e3d48ceff4 SHA1 f71083d269bbf4372342f54d921cd12d27c44404 SHA256 25224e367085b57fcd5dffe6d9a0a35422d4bab6010d76d918ddb3b83420c1a9
+MISC metadata.xml 762 RMD160 eb5dcd4ca6ad5e4bb661d0166bc03c2e1ed83bae SHA1 6560e0b9497f011033fbf08919a6c99de1a816c9 SHA256 d4cf7c284e2a031b7ca3abc2788a1a84ff1a1447e82928c6f20fcbe1eeb594c3
diff --git a/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild
new file mode 100644
index 000000000000..9ed5283274e2
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.1.82.76-r1.ebuild,v 1.1 2010/08/12 12:36:51 lack Exp $
+
+EAPI=1
+inherit nsplugins rpm multilib toolchain-funcs
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="${MY_32B_URI}"
+HOMEPAGE="http://www.adobe.com/"
+IUSE="multilib nspluginwrapper"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.1"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS=">=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? ( $EMUL_DEPS )
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
+DEPEND="nspluginwrapper? ( www-plugins/nspluginwrapper )"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these binary closed-source libraries, since we can't fix
+# them:
+QA_EXECSTACK="${INSTALL_BASE}32/libflashplayer.so
+	${INSTALL_BASE}/libflashplayer.so"
+
+QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so
+	${INSTALL_BASE}/libflashplayer.so"
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# As of 10.1, no more native 64b version *grumble grumble*
+		unset native_install
+		unset need_lahf_wrapper
+		export amd64_32bit=1
+	fi
+}
+
+src_compile() {
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+			"${FILESDIR}/flashplugin-lahf-fix.c" \
+			|| die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+src_install() {
+	if [[ $native_install ]]; then
+		# 32b RPM has things hidden in funny places
+		use x86 && pushd "${S}/usr/lib/flash-plugin"
+
+		exeinto /${INSTALL_BASE}
+		doexe libflashplayer.so
+		inst_plugin /${INSTALL_BASE}/libflashplayer.so
+
+		use x86 && popd
+
+		# 64b tarball has no readme file.
+		use x86 && dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /${INSTALL_BASE}
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/usr/lib/flash-plugin"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+			dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt"
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		elog "Adobe has released 10.1 in only a 32-bit version and upgrading"
+		elog "is required to close a major security vulnerability:"
+		elog "  http://bugs.gentoo.org/322855"
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# Note: This code branch is dead (no native 64-bit flash player
+				# available yet for 10.1), but I'm keeping it around in the hope
+				# that some day it will be back...
+				#  - Jim Ramsay <lack@gentoo.org>
+
+				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+				#       However, the 64b flash plugin makes 
+				#       'nspluginwrapper -l' segfault.
+				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+				if [[ -f ${FLASH_WRAPPER} ]]; then
+					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+					nspluginwrapper -r "${FLASH_WRAPPER}"
+				fi
+				if [[ $need_lahf_wrapper ]]; then
+					ewarn "Your processor does not support the 'lahf' instruction which is used"
+					ewarn "by Adobe's 64-bit flash binary.  We have installed a wrapper which"
+					ewarn "should allow this plugin to run.  If you encounter problems, please"
+					ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+					ewarn "  ${CATEGORY}/$PN[+32bit -64bit]"
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+
+				ewarn "Using adobe-flash-10.1 in a 64-bit browser is unstable:"
+				ewarn "  http://bugs.gentoo.org/324365"
+				ewarn "The recommended configuration is to use the 32-bit plugin"
+				ewarn "in a 32-bit browser such as www-client/firefox-bin"
+			fi
+		elif [[ ! $native_install ]]; then
+			elog "To use the 32-bit flash player in a native 64-bit firefox,"
+			elog "you must install www-plugins/nspluginwrapper, though this"
+			elog "configuration is not recommended:"
+			elog "  http://bugs.gentoo.org/324365"
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}
diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index d7a439dbf734..b94ab0277312 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -7,8 +7,14 @@
 		<name>Jim Ramsay</name>
 	</maintainer>
 	<use>
+		<!-- =www-plugins/adobe-flash-10.0* has both 32- and 64-bit versions -->
 		<flag name='64bit'>For amd64-multilib, installs the native 64-bit
 			plugin</flag>
 		<flag name='32bit'>For amd64-multilib, installs the 32-bit plugin</flag>
+
+		<!-- =www-plugins/adobe-flash-10.1* has 32-bit only -->
+		<flag name='nspluginwrapper'>For amd64-multilib, installs
+			<pkg>www-plugins/nspluginwrapper</pkg> to allow use in a 64-bit
+			browser. (Not recommended, see http://bugs.gentoo.org/324365)</flag>
 	</use>
 </pkgmetadata>