Version 10.2.152.27 is released (Security bug #354207)

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

5 files changed, 108 insertions, 101 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 71c2329b8928..697286843cfd 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,27 @@
 # 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.59 2010/12/01 13:51:02 lack Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.60 2011/02/10 21:07:04 lack Exp $
+
+*adobe-flash-10.2.152.27_p201011173 (10 Feb 2011)
+*adobe-flash-10.2.152.27 (10 Feb 2011)
+
+  10 Feb 2011; Jim Ramsay <lack@gentoo.org> +adobe-flash-10.2.152.27.ebuild,
+  +adobe-flash-10.2.152.27_p201011173.ebuild,
+  -adobe-flash-10.2.161.23_pre20100927.ebuild,
+  -adobe-flash-10.2.161.23_pre20101117.ebuild, metadata.xml:
+  Version 10.2.152.27 is released (Security bug #354207)
+
+  Note: This also does a bit of a shuffle in where you may expect to see the
+  64-bit beta "square" release. Though the version number of the 64-bit plugin
+  is technically 10.3.162.29, this is part of the ebuild named
+  "adobe-flash-10.2.152.27_p201011173" This is mostly due to the fact that Adobe
+  does not have a corresponding 32-bit 10.3 beta release at this time, so I have
+  decided that until they do the main version number will correspond to the
+  32-bit release and the "patchlevel" will correspond to the date-tag of the
+  square beta release.
+
+  So while this may *look* like a downgrade, it's really an upgrade of the
+  32-bit plugin and a no-op for the 64-bit plugin.
 
 *adobe-flash-10.2.161.23_pre20101117 (01 Dec 2010)
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 94e0c18053b3..67fbdc02bcac 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,14 +1,12 @@
 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 flashplayer10_2_p2_32bit_linux_111710.tar.gz 4959364 RMD160 e8d2b05af00fc2ef613fdf297632b4081016e080 SHA1 81b6561ee2738a871dd3589d42eb15eb9181fcf1 SHA256 12a648979d16796ae4ee681b8fa90b31bf7c36c11ac7a3653548fce0339ba91f
+DIST flash-plugin-10.2.152.27-release.i386.rpm 4961334 RMD160 4fd7007ce17b0eeb37fad487c59dc9f9f02854be SHA1 3feeb3e941361b63ff9da0e08bfc202dfbc82da2 SHA256 dac2f8a19558db70f928e0c681cbbabbc27970aa58faccbe7f8b99096b62a915
 DIST flashplayer10_2_p3_64bit_linux_111710.tar.gz 4310219 RMD160 a57e8c4555545ca348f4b33e8c042c3f66e905f4 SHA1 a53ee83c02421f900fe25fd3738efd77932e542c SHA256 ef05f679f8977144621560587ffdf9bc81812e9941dea422e977070c9cd05ff0
-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 3065784 RMD160 a36518cecaa5ed20743aebb61224567e9cf9291f SHA1 e4c6c77061c0899743284a758480fee95cfb8601 SHA256 a19c1765c44e515c435a5ad3c2d3b9444926bfc771710b204f4bfdcf4868cf51
 EBUILD adobe-flash-10.1.102.64.ebuild 5420 RMD160 e0bbbe87ca4235bc18b04c859579d68de5ab6c6e SHA1 dd4b522423baf8fee8831c87077a14db1d325ca9 SHA256 cf7b0fc677882be410a7a71f25f0f25aa904c7ebcd99141a7ca145890018f85b
-EBUILD adobe-flash-10.2.161.23_pre20100927.ebuild 6115 RMD160 994c3a94db3101563e7c9c937e954f8602b5a9ee SHA1 0c840e8575d5c7efcb3c2ea2ed70aa2c81c4a6c1 SHA256 534188fdb9e1812b9f3877f22183550936ec60aca81327d51a7cbe39e9d29d3f
-EBUILD adobe-flash-10.2.161.23_pre20101117.ebuild 6109 RMD160 33da8204778888806dd36e9cff5e78c8b421bbab SHA1 23a405f20f4d77ef8f749b4ac2694a84b873e67e SHA256 9ba01ba46af2da058a65b27f22e6cc66e3b5c3875c0ca058777308a5fb226f89
+EBUILD adobe-flash-10.2.152.27.ebuild 5526 RMD160 323f29c411b1f21ba62043700b58315d281a7e32 SHA1 db1ecfde21af11c14fbea90009e53687e37a1668 SHA256 6e43a2926e66661c74ffbd7213ca5f4f6e1ec9dc7bb1a5097be0e242dd4d6d5d
+EBUILD adobe-flash-10.2.152.27_p201011173.ebuild 6747 RMD160 e92ed272fc2d14eb622cb15c7045133ea1624f79 SHA1 39ac8cf7d439b842a397ef280b8bf83b62af8369 SHA256 224ac2676d4f469902416031c8ece5b1c582727ab7dea5058267028b7dd3da99
 EBUILD adobe-flash-9.0.289.0.ebuild 1776 RMD160 8728945778e535c990e39605f87cc4bb2a6a3e0f SHA1 7376759096c387e77a2d880c4f3e136d6abed5fd SHA256 042a9bed40c3eda9f3c8e3955a5b841f2840bff438c3ac2c3c995375679d2aa1
-MISC ChangeLog 28285 RMD160 2efb245de3ba4b54a10002d9012e52162a7c636a SHA1 ba33aaa4647116afb052ee6ad4e64a0c3d357477 SHA256 48aaa9d84618b84490d0aa9aa58027d084e7b01e65751b8950051698941155b0
-MISC metadata.xml 762 RMD160 eb5dcd4ca6ad5e4bb661d0166bc03c2e1ed83bae SHA1 6560e0b9497f011033fbf08919a6c99de1a816c9 SHA256 d4cf7c284e2a031b7ca3abc2788a1a84ff1a1447e82928c6f20fcbe1eeb594c3
+MISC ChangeLog 29349 RMD160 d6098e1b359de1e009c05f8bb9d75a425fccfa18 SHA1 fb7201ec03a80b404b9055fa84672209581fd8e8 SHA256 5e099df16da24bbb189b9c59fbc7ee9ff822c2802a44b919f723f90c56406882
+MISC metadata.xml 871 RMD160 b50fc8e6c15c6927d2b9bde901a07f7d2d9d60f2 SHA1 428c6f860230298dedfc43e20a02ad27a9f4ff8e SHA256 3bfd601bdacea3455708800d5f7946db559ae91719b2c65f6379d4b15e54ed13
diff --git a/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20101117.ebuild b/www-plugins/adobe-flash/adobe-flash-10.2.152.27.ebuild
index f24b811b34f9..327a1d23fbed 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20101117.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.2.152.27.ebuild
@@ -1,30 +1,16 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2.161.23_pre20101117.ebuild,v 1.1 2010/12/01 13:51:02 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.152.27.ebuild,v 1.1 2011/02/10 21:07:04 lack Exp $
 
-EAPI=3
-inherit nsplugins multilib toolchain-funcs versionator
+EAPI=1
+inherit nsplugins rpm multilib toolchain-funcs
 
-# Specal version parsing for date-based 'square' releases
-# For proper date ordering in the ebuild we are using preCCYYMMDD whereas Adobe
-# uses MMDDYY
-EBUILD_DATE=$(get_version_component_range $(get_version_component_count))
-DATE_SUFFIX=${EBUILD_DATE: -4}${EBUILD_DATE:5:2}
-MY_32B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_${DATE_SUFFIX}.tar.gz"
-MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_${DATE_SUFFIX}.tar.gz"
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
 
 DESCRIPTION="Adobe Flash Player"
-SRC_URI="x86? ( ${MY_32B_URI} )
-amd64? (
-	multilib? (
-		32bit? ( ${MY_32B_URI} )
-		64bit? ( ${MY_64B_URI} )
-	)
-	!multilib? ( ${MY_64B_URI} )
-)"
-#HOMEPAGE="http://www.adobe.com/"
-HOMEPAGE="http://labs.adobe.com/technologies/flashplayer10/"
-IUSE="multilib nspluginwrapper +32bit +64bit"
+SRC_URI="${MY_32B_URI}"
+HOMEPAGE="http://www.adobe.com/"
+IUSE="multilib nspluginwrapper vdpau"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
@@ -37,21 +23,16 @@ NATIVE_DEPS="x11-libs/gtk+:2
 	media-libs/fontconfig
 	dev-libs/nss
 	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
 	>=sys-libs/glibc-2.4"
 
-EMUL_DEPS=">=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
 	app-emulation/emul-linux-x86-soundlibs"
 
-DEPEND="amd64? ( multilib? ( 32bit? ( nspluginwrapper? (
-	www-plugins/nspluginwrapper ) ) ) )"
+DEPEND="amd64? ( nspluginwrapper? ( www-plugins/nspluginwrapper ) )"
 RDEPEND="x86? ( $NATIVE_DEPS )
-	amd64? (
-		multilib? (
-			64bit? ( $NATIVE_DEPS )
-			32bit? ( $EMUL_DEPS )
-		)
-		!multilib? ( $NATIVE_DEPS )
-	)
+	amd64? ( $EMUL_DEPS )
 	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
 	${DEPEND}"
 
@@ -67,50 +48,13 @@ QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so
 	${INSTALL_BASE}/libflashplayer.so"
 
 pkg_setup() {
-	einfo "Date is $EBUILD_DATE suffix is $DATE_SUFFIX"
 	if use x86; then
 		export native_install=1
 	elif use amd64; then
-		# amd64 users may unselect the native 64bit binary, if they choose
-		if ! use multilib || use 64bit; then
-			export native_install=1
-		else
-			unset native_install
-		fi
-
-		if use multilib && use 32bit; then
-			export amd64_32bit=1
-		else
-			unset amd64_32bit
-		fi
-
-		if use multilib && ! use 32bit && ! use 64bit; then
-			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
-			die "No library version selected [-32bit -64bit]"
-		fi
-
+		# As of 10.1, no more native 64b version *grumble grumble*
+		unset native_install
 		unset need_lahf_wrapper
-		if [[ $native_install ]]; then
-			# 64bit flash requires the 'lahf' instruction (bug #268336)
-			# Also, check if *any* of the processors are affected (bug #286159)
-			if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
-				export need_lahf_wrapper=1
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	# In this pre-release version, both tarballs have just 'libflashplayer.so'
-	# and no prefix directory, so put the 32-bit one somewhere else.
-	if [[ $amd64_32bit ]]; then
-		mkdir 32bit
-		pushd "${S}/32bit"
-			unpack $(basename $MY_32B_URI)
-		popd
-		unpack $(basename $MY_64B_URI)
-	else
-		default_src_unpack
+		export amd64_32bit=1
 	fi
 }
 
@@ -126,9 +70,17 @@ src_compile() {
 
 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
@@ -144,10 +96,11 @@ src_install() {
 		ABI="x86"
 
 		# 32b plugin
-		pushd "${S}/32bit"
+		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}"
@@ -160,16 +113,17 @@ src_install() {
 
 pkg_postinst() {
 	if use amd64; then
-		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
+		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.
@@ -178,6 +132,14 @@ pkg_postinst() {
 					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}"
@@ -185,10 +147,18 @@ pkg_postinst() {
 				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 browser,"
-			elog "you must install www-plugins/nspluginwrapper"
+			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
 
diff --git a/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild b/www-plugins/adobe-flash/adobe-flash-10.2.152.27_p201011173.ebuild
index df9d0c00995b..7f2c273b6a56 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.2.152.27_p201011173.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2.161.23_pre20100927.ebuild,v 1.2 2010/10/09 19:50:18 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.152.27_p201011173.ebuild,v 1.1 2011/02/10 21:07:04 lack Exp $
 
 EAPI=3
 inherit nsplugins multilib toolchain-funcs versionator
 
+# Note: There is no "square" for 32-bit!  Just use the current 32-bit release:
+PV_REL=$(get_version_component_range 1-4)
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV_REL}-release.i386.rpm"
+
 # Specal version parsing for date-based 'square' releases
-# For proper date ordering in the ebuild we are using preCCYYMMDD whereas Adobe
-# uses MMDDYY
+# For proper date ordering in the ebuild we are using CCYYMMDD,  whereas Adobe
+# uses MMDDYY in their filename.  Plus we tack on the release number, too.
 EBUILD_DATE=$(get_version_component_range $(get_version_component_count))
-DATE_SUFFIX=${EBUILD_DATE: -4}${EBUILD_DATE:5:2}
-MY_32B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_linux_${DATE_SUFFIX}.tar.gz"
-MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_64bit_linux_${DATE_SUFFIX}.tar.gz"
+DATE_SUFFIX=${EBUILD_DATE: -5:4}${EBUILD_DATE:3:2}
+REL_SUFFIX=${EBUILD_DATE: -1}
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p${REL_SUFFIX}_64bit_linux_${DATE_SUFFIX}.tar.gz"
 
 DESCRIPTION="Adobe Flash Player"
 SRC_URI="x86? ( ${MY_32B_URI} )
@@ -24,7 +28,7 @@ amd64? (
 )"
 #HOMEPAGE="http://www.adobe.com/"
 HOMEPAGE="http://labs.adobe.com/technologies/flashplayer10/"
-IUSE="multilib nspluginwrapper +32bit +64bit"
+IUSE="multilib nspluginwrapper +32bit +64bit vdpau"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
@@ -37,9 +41,11 @@ NATIVE_DEPS="x11-libs/gtk+:2
 	media-libs/fontconfig
 	dev-libs/nss
 	net-misc/curl
+	32bit? ( vdpau? ( x11-libs/libvdpau ) )
 	>=sys-libs/glibc-2.4"
 
-EMUL_DEPS=">=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
 	app-emulation/emul-linux-x86-soundlibs"
 
 DEPEND="amd64? ( multilib? ( 32bit? ( nspluginwrapper? (
@@ -96,6 +102,15 @@ pkg_setup() {
 			if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
 				export need_lahf_wrapper=1
 			fi
+
+			if use vdpau; then
+				ewarn "You have tried to enable VDPAU acceleration, but this is only"
+				ewarn "available for the 32-bit flash plugin at this time."
+				ewarn "Continuing with an unaccelerated 64-bit plugin."
+				if [[ $amd64_32bit ]]; then
+					ewarn "The 32-bit plugin will be accelerated."
+				fi
+			fi
 		fi
 	fi
 }
diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index b94ab0277312..7558a1b68605 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -16,5 +16,8 @@
 		<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>
+
+		<flag name='vdpau'>Enables VDPAU support to offload video processing
+			(32-bit flash player only)</flag>
 	</use>
 </pkgmetadata>