Adobe-flash 10.1.53.64 is released, and fixes security exploit CVE-2010-1297 (Bug #322855)

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

3 files changed, 166 insertions, 2 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 47f8ac3105a9..9a7b3c8f3353 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,14 @@
 # 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.23 2010/05/03 15:09:00 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.24 2010/06/11 19:33:58 lack Exp $
+
+*adobe-flash-10.1.53.64 (11 Jun 2010)
+
+  11 Jun 2010; Jim Ramsay <lack@gentoo.org> +adobe-flash-10.1.53.64.ebuild:
+  Adobe-flash 10.1.53.64 is released, and fixes security exploit
+  CVE-2010-1297 (Bug #322855). Unfortunately there is no native 64bit
+  version, so amd64 users are going back to a 32bit plugin plus
+  nspluginwrapper.
 
   03 May 2010; Jim Ramsay <lack@gentoo.org> adobe-flash-10.0.45.2.ebuild:
   Removing libflashsupport block (Bug #300294)
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 9f24d733e908..428cd0956a46 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,10 +2,12 @@ AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74
 AUX mms.cfg 4409 RMD160 bf6407b5c785b45b76ca323712d44f925ccf20ae SHA1 7f6eb9e4224ab70522a21b894f7f334c2cde8ce0 SHA256 f0f2c7f20653cc9f275eb84c853f2695dd9b0531ce8c037d56ae7ae94cb0ca6c
 DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e00fb5a19f SHA1 8fe47ef587ae679a37757038710750eb6a3c393e SHA256 aa96a25420f6527f5c2a467222bccf5c54a5f8001edfa0ec274864fc3e94faea
 DIST flash-plugin-10.0.45.2-release.i386.rpm 4121963 RMD160 67710d394ff7aaa44d35db44cd9d85fff4202c42 SHA1 2b9e1acff3af983d6f29f48014c77ed8c0ec998d SHA256 fd2a4427a0c801ce675736dcadbbaa4ff473418bb19edc7b5c1fd0f4f9a8c9b8
+DIST flash-plugin-10.1.53.64-release.i386.rpm 4755181 RMD160 95156082a79115ad2a94886a4d144bdf7015a884 SHA1 22a2a775e83472f66c9a9dee1f2e5d779cfb7796 SHA256 022b8749c88b65745f3a395d9f657c05d97393aa0e725d15227379dd1cec0c73
 DIST install_flash_player_9.tar.gz 3056624 RMD160 691de4c0b2b5ea3d6f7e3e07246dc7cee80ca902 SHA1 fd6da8b2afbcaf3213c772e7afc664030a50a683 SHA256 d934e3fdd49db84c346a0d501d6519e4cafe77bdb596f5af1e92e7e3eb93dab2
 DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6
 EBUILD adobe-flash-10.0.45.2-r1.ebuild 5461 RMD160 02a3725518a770455b5116045b2c2475d16048ab SHA1 af5a1a7d093a85c14e024ef375790b94c8f98d0c SHA256 9c6be7aed21ca23ed9a4c61705e43d1e805b14a0ce418feb18fa4c0d4e627cd2
 EBUILD adobe-flash-10.0.45.2.ebuild 6074 RMD160 ca068dab0d5ecdfabfac9a6b0f55de311ac14556 SHA1 1f676cb43064b4e4a2d7d6805426558608fc47c5 SHA256 f78288d8d5ce42271b9f01e3fae34a689d5db70f7b3e49784f6f0763cbb612b0
+EBUILD adobe-flash-10.1.53.64.ebuild 4928 RMD160 1d5aa3a98274217de610e8ea90596cd84d5d045c SHA1 22d2b72fe02cdd62bd657bb6863079310fa51eb2 SHA256 988dd4027a48e03418184750b6a033dd6e28b1df8694e6e94da44604711efb0c
 EBUILD adobe-flash-9.0.262.0.ebuild 1626 RMD160 48ba674008e5478041c1dadfab46819eb0935416 SHA1 d41ad80b47f8a580e5b441a6f1ff0855b54d778a SHA256 8a9653b06ac03adbda4783a581ecae9a4613ad4f6fb344ab45f81047396cb4f7
-MISC ChangeLog 21023 RMD160 00122b307f7c472c857b2ac8337c6ba1ab91c4bf SHA1 6a8ef4690ede56f63fbec32342bdd43e415a5132 SHA256 8f1f5d7e62a2d13d072946a65cf528710dfcbb2b11ac51a2b657555e27947da4
+MISC ChangeLog 21357 RMD160 1ac6a9306182549bd2145dd6f826f676979ea84f SHA1 d525f87ccff3f2209819e3739a1589dc496e845a SHA256 f71a5821ede7163adfe9f6cff0950c7bcaf84b6100d8d651691b2ba875b2f57a
 MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
diff --git a/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild b/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild
new file mode 100644
index 000000000000..7eee27bb0aa2
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.1.53.64.ebuild
@@ -0,0 +1,154 @@
+# 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.53.64.ebuild,v 1.1 2010/06/11 19:33:58 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"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10"
+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-baselibs-20100220
+	app-emulation/emul-linux-x86-gtklibs
+	app-emulation/emul-linux-x86-soundlibs
+	app-emulation/emul-linux-x86-xlibs"
+
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? ( $EMUL_DEPS
+		www-plugins/nspluginwrapper )
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
+
+# Ignore QA warnings in these binary closed-source libraries, since we can't fix
+# them:
+QA_EXECSTACK="opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/libflashplayer.so"
+
+QA_DT_HASH="opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/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 /opt/netscape/plugins
+		doexe libflashplayer.so
+		inst_plugin /opt/netscape/plugins/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 /opt/netscape/plugins
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /opt/netscape/plugins/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/usr/lib/flash-plugin"
+			exeinto /opt/netscape/plugins32/
+			doexe libflashplayer.so
+			inst_plugin /opt/netscape/plugins32/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 so far and"
+		elog "upgrading is required to close a major security exploit[1]."
+		elog "You will be going back to a 32-bit plugin with nswrapper until"
+		elog "Adobe decides otherwise."
+		elog "  [1] http://bugs.gentoo.org/322855"
+		elog
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# 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
+				oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}/libflashplayer.so"
+
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			einfo "To use the 32-bit flash player in a native 64-bit firefox,"
+			einfo "you must install www-plugins/nspluginwrapper"
+		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"
+}