Version bump: adobe-flash-10.1.102.64 is released (Security Bug #343089)

Package-Manager: portage-2.1.9.14/cvs/Linux i686

3 files changed, 176 insertions, 2 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 10607b3d2608..fdf8c1ba4f56 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.54 2010/10/13 16:44:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.55 2010/11/05 17:35:06 lack Exp $
+
+*adobe-flash-10.1.102.64 (05 Nov 2010)
+
+  05 Nov 2010; Jim Ramsay <lack@gentoo.org> +adobe-flash-10.1.102.64.ebuild:
+  Version bump: adobe-flash-10.1.102.64 is released (Security Bug #343089)
 
   13 Oct 2010; Jim Ramsay <lack@gentoo.org>
   adobe-flash-10.1.85.3.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 87b11c66c468..0d1b2851d713 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,11 +1,13 @@
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
+DIST flash-plugin-10.1.102.64-release.i386.rpm 4902583 RMD160 5646d4dadf7b77145bac33c789aa3e66bd3bf67c SHA1 2387409833b5bfae70f59cf33e7b6e1ad15a76dd SHA256 45e6f7feadde7113ccf9360488f4f7e2bb15ae66c2f596c92a3677a09cd0a532
 DIST flash-plugin-10.1.85.3-release.i386.rpm 4901599 RMD160 7c72ea72c816d33985bdc71450f47ef4f3be6ab3 SHA1 4e6c275b1ce0982eaf5318ebadbda6f00cb4f182 SHA256 064bae6641beecc5949441691152250f1fc4869a2dbd64e460f9fd91223af961
 DIST flashplayer_square_p2_32bit_linux_092710.tar.gz 4263232 RMD160 5b301be5701a08c9d244419b61071340726534af SHA1 93ca107a3de296b83c3e52890ba27754048d290c SHA256 9d821c3619a0a7f1f5769d6a7c57684d83a1c565896c354f9fcd7fb3f3620eec
 DIST flashplayer_square_p2_64bit_linux_092710.tar.gz 4307850 RMD160 278067e783021f4dee86b89410102b08abbff602 SHA1 b862dcee9ac2118d2836e76b8a4f56e6cc241593 SHA256 fdaaed681883636a3bba59a189986f5dda72e3c65613fce1e066e56111b00da1
 DIST install_flash_player_9.tar.gz 3064686 RMD160 64cdf3f583a991eb255a9bcfbc03ecb769f7053f SHA1 5ee9429d401aeb83d793dd0e9df250343a5b6ed5 SHA256 890f07d8ff5102851ede499bdcbf74983bb77e49408d4e44e2749a0d2583b408
+EBUILD adobe-flash-10.1.102.64.ebuild 5421 RMD160 ca28e8d2d10893bc7ff664b6c3ccbc69164930e8 SHA1 cab3d6a164e9a071d268be3720f99dd0a0803c6d SHA256 3333321a96f5b8763b6a907fd292f385ff3761b277ec64e5a4155e34ec99eb8b
 EBUILD adobe-flash-10.1.85.3.ebuild 5417 RMD160 ab6c3b778ac725e0575ff8246e362368e2938c61 SHA1 f2f9f7577673774545219ea70b21664e8fab2c8c SHA256 7eef3340d275294192818cf90cd3225a184414d5329416a29ab9b05729be87b2
 EBUILD adobe-flash-10.2.161.23_pre20100927.ebuild 6115 RMD160 994c3a94db3101563e7c9c937e954f8602b5a9ee SHA1 0c840e8575d5c7efcb3c2ea2ed70aa2c81c4a6c1 SHA256 534188fdb9e1812b9f3877f22183550936ec60aca81327d51a7cbe39e9d29d3f
 EBUILD adobe-flash-9.0.283.0.ebuild 1776 RMD160 011c5b3b46b42b43cf54dfda847ee386399b595c SHA1 1f7232459c1146d60e9effbc59c12fc8b96962f6 SHA256 b6444eb624e7f2f4150dbdaab0b4381516ec31e0cf84304909816a27e021f2bd
-MISC ChangeLog 27104 RMD160 bde07661bc1ca2de065e15afc546af990c251aae SHA1 66a335248feb952134d29882224e2375edf3c30e SHA256 09a01595fb6103ee60996ee2030652fd42db6208862c262e1cf00752601d3d31
+MISC ChangeLog 27297 RMD160 efdc47d17277b5b8d570fe8da5cb1de5dd648c6a SHA1 d069476f6e798a6a31af55efbcfe3db3e6a9c939 SHA256 b99ff85b955edc2ef4982dcefa8d8119e4612add3977a2bef835955fab8473ef
 MISC metadata.xml 762 RMD160 eb5dcd4ca6ad5e4bb661d0166bc03c2e1ed83bae SHA1 6560e0b9497f011033fbf08919a6c99de1a816c9 SHA256 d4cf7c284e2a031b7ca3abc2788a1a84ff1a1447e82928c6f20fcbe1eeb594c3
diff --git a/www-plugins/adobe-flash/adobe-flash-10.1.102.64.ebuild b/www-plugins/adobe-flash/adobe-flash-10.1.102.64.ebuild
new file mode 100644
index 000000000000..d01fd14cdf6b
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.1.102.64.ebuild
@@ -0,0 +1,167 @@
+# 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.102.64.ebuild,v 1.1 2010/11/05 17:35:06 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"
+
+DEPEND="nspluginwrapper? ( www-plugins/nspluginwrapper )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? ( $EMUL_DEPS )
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# 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"
+		elog
+		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]"
+					elog
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/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"
+				elog
+			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"
+			elog
+		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"
+}