Bug #390149: Flash player 11.1.102.55 is released

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

3 files changed, 262 insertions, 15 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index fcd5139d11d0..14124a0d5086 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.109 2011/10/05 12:32:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.110 2011/11/28 15:54:34 lack Exp $
+
+*adobe-flash-11.1.102.55 (28 Nov 2011)
+
+  28 Nov 2011; Jim Ramsay <jim_ramsay@gentoo.org>
+  +adobe-flash-11.1.102.55.ebuild:
+  Bug #390149: Flash player 11.1.102.55 is released
 
   05 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   adobe-flash-11.0.1.152.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index f40ff6439986..bc5979b4e13e 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,27 +6,30 @@ AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SH
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
 DIST adobe-flash-11.0.1.152.i386.tar.gz 6742944 RMD160 453259b677d5a799d0443ae81d0cf07e8e3bc147 SHA1 051f7974e4152a225e18c963f638e71090ec20ea SHA256 3532ee49eda0845597084a805e11985f9fd9c5f7b5b72f592ceb18529da918c1
 DIST adobe-flash-11.0.1.152.x86_64.tar.gz 7042512 RMD160 9dad755ef66d2c7784f92a33e4d9aa3345ab30ea SHA1 d081c36e2a25ab2da9be6e54d9121808af5679e7 SHA256 5756a4ac9811e0362da2b0c208a458b417883e9f9c3773c70e61c935609b64dc
+DIST adobe-flash-11.1.102.55.i386.rpm 6733489 RMD160 6279dd624579a0eaaeabe66fe976b6b580728fe8 SHA1 6e837e30e8bac2b02738476179d6b4c67e49919d SHA256 902aeffae418676edf1c417a663db37f3b7fb65ffddf1ad5c6af7f27bde04178
+DIST adobe-flash-11.1.102.55.x86_64.rpm 7035287 RMD160 253961386b60cc66373d3607b9c6f1c2ac513b0e SHA1 7ac28b2a68b36323f73ddc0b3f7e0623d31eebf6 SHA256 6483d4842a3fdb05f3666d06a7c151646d60c4b6dd5f9205e1ea9fa18ebdf511
 DIST flash-plugin-10.3.183.10-release.i386.rpm 5450351 RMD160 e84e71ba5fc88ac2c3557b7848c3bf2f988a890d SHA1 98f159698fa1a5a85b8d5210ad551da5ba5d9af7 SHA256 9969a0ebb53d42f195785aee2253d58cbd7960be861f3f981293f5ebcb4a0a70
 DIST flash-plugin-10.3.183.7-release.i386.rpm 5450066 RMD160 914484cb463eae2c0fb81237be77a695bd36e1b1 SHA1 7ad5f80e8d2a94773645948d54d5350c4745f9c4 SHA256 5cc902ceb437dcf81402f749f5e3ed0bed66cf68358699c7a9de256ee28f5789
 EBUILD adobe-flash-10.3.183.10.ebuild 3829 RMD160 1ace45fe7d355f78df08147fe88fbbb003adfe90 SHA1 2915fa055a176bb240ad1148911a8c602de59bf5 SHA256 d419ebb59106ce25f6c49987c77f2fed59eb170297b83221c052205d70765c62
 EBUILD adobe-flash-10.3.183.7.ebuild 3829 RMD160 2ded4b2755a57d0d7e9feebd177b61d7da786ba2 SHA1 176c90a878cba6094756ad07672549602de59f26 SHA256 d81ba600d8b37cb637c086cf12c65ae35e61eb3aad44d606ba6f67013524b4f0
 EBUILD adobe-flash-11.0.1.152.ebuild 6878 RMD160 2fc2fe5ed46ee3d64b3ce80e593c46b487333c55 SHA1 dba6bed0907b94d0a7a8b150e9ac4afd7fe743e6 SHA256 3c74883d64be05cecbbfb4ebf0195f7793725b61424cfd73d0f5e6eadbc27e8f
-MISC ChangeLog 38741 RMD160 44fced20e5180ff373e681b432938a8c8f9eadac SHA1 4bf061f6998a9146368cf2515f2848809925d18c SHA256 3c3f6f8e7a74159a3d759cf0c93c38621b7f3db648075855b3fad367129ea943
+EBUILD adobe-flash-11.1.102.55.ebuild 7304 RMD160 63742bea31c7bc39bff8a3454fc1800e706bebe5 SHA1 f338dc486178c0349003a0f2f8e466a26131ffb5 SHA256 6d68477fa23d42f4d90d76e64580906dcaafbfb342f9d160856c048825b77207
+MISC ChangeLog 38914 RMD160 5a53d19f990fbed27d77b432a6c0d6f3b5163874 SHA1 ce9bdf7e34eb6631bd1cb233dcaa054d63b87655 SHA256 811983e27ec211954d950b27d08ba1ce9bd9a8966343378ea68c31c97f17fcbb
 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOjE5DAAoJEOSiRoyO7jvooFUP+wSGP7MeAXVwv62rf8Exao65
-lcFyv3OKdvP56Pcl9fr1nt+MJgp5eTOCQSbVo2Z9Z4Lp0+yKv5XZP6IazQjg9W/X
-4PRfuXIA+JPOFKgGuqVVk4QTvRUlvVO4hmX+HA0uPiZsCvnAATZc3hjQWRCMqRie
-Gs+ebNusM4YqZGZO96GrBj2L8aosyAlX3bN0US6XNAJwFplWtUqfsgSKbtw5b9LU
-iQGysXcxJGx7H00Os0fazJOPTlXf+/PU63fKoQIRWITShpgpbv3ZBSROUdHIY4/a
-Aem9x4x4/++xZfox4INqx/ITs0Mf0BRlMeF/nGnPOY+2lijdStuVfd2uwqkjteHk
-tUq416Oy8eRJkQSBjwgrYsl7aWKfQK3yIvQxC29YMFMCPVH6axNVP7LygRVRzYTG
-FFSNVFpVqsad72VQDzP/Q8MKSOWW9KW2sodgMTeoakYzSZyqJ29uIUIPZtUjRryo
-ntpFtAIoev8Uz/bWvzERut3RXBmTh+Gpr4tGr4HIsnWhdOJ4wHDSZQ2qLtGKueRC
-klWPss+a80iBqx6DvuSx5b2tT+lYzpxDoK+1WoTBgZMyk34gth0Z0Pom9UO9HnoF
-aX8tfiqzEjpbKLO+KIHA5S5qJor8FiAS/ds2lCgUHRYhk/m2jTQ1gcH7m6+aV5B9
-7/Smh5taZWEwyNK8dxuR
-=Ekft
+iQIcBAEBAgAGBQJO067IAAoJEA8o5SF9Rr6q3AMQAJNGVVdDOxk+OpiUnTpFJ8sN
+Mf00E4F0oEZD2InTL7HNxvrP9mhQHSq5lX+mm3QD4kE78LDXrNdztMU6xDdhKyEL
+uHorzNPjBDInv/hF5a+g0ZHl/QBIXz7etaeQy0bGoZ7Sip/qNNS/sbCunsx2fGHK
+j95/6RtN9uWN0WAmvZezhWiYbonNLj1NUEkeZPZ10040bV5YFroK1fshJSJnb/+i
+rfiyZP8PYuWRcCOj3Yz6XVQiNKbSmTCDn28YZJFKwtk+J5eTmGItYPNaXiOm6dQ7
+QVeopx7ozvahfp59pXWYZO+CBmjv2/kBZI1dhz009USPAW8cfAJH9XoN49v6Z6UU
+KN7Z6aj/Ho3c8/I3kB5xpHK5wVXaj+8JdkMxrLg40b2hhzYPkJeEZUQu6u9nFb+a
+Rm6fCT/9JageyLg9NnGOoM1okeBWsAk3+SAW0XM29k/bJZoy0LfHdIp/5WTS55t3
+UkKXCDZXLHXlwmMppFBSttogFQeRLL/Kg6O/BS2Kf6HWuehMjzjBnor0Wg/ao9Lb
+Vt3vk9ll0VJrZc2Xm/cwsJgnvLNUysgIs4IyMuERk4nvXtZiF5wnSBdXWiYDE9HD
+Zl4UeOHA2hh345lEJ8WHXp0qU9aMB3u6d9TAiajOBqOrr4AYJ3Cf2GX2AY2F7CtI
+sB8tNCgrx9qDYyY4etXI
+=cqqd
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild b/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild
new file mode 100644
index 000000000000..4438cde12cd0
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.1.102.55.ebuild
@@ -0,0 +1,238 @@
+# 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-11.1.102.55.ebuild,v 1.1 2011/11/28 15:54:34 lack Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator rpm
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.i386.rpm -> ${P}.i386.rpm"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/flash-plugin-${PV}-release.x86_64.rpm -> ${P}.x86_64.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/products/flashplayer.html"
+IUSE="multilib -32bit +64bit vdpau kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+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? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_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 closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		# TODO: In future revisions, remove this ability now that 64-bit
+		# binaries are officially released and working.
+		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
+
+		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() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*>}
+		local my_64b_src=${MY_64B_URI##*>}
+		if [[ $native_install ]]; then
+			rpm_unpack $my_64b_src
+		fi
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		rpm_unpack $my_32b_src
+		popd >/dev/null
+	else
+		rpm_src_unpack
+	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
+		if use x86; then
+			local RPMLIB="lib"
+		else
+			local RPMLIB="lib64"
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe usr/${RPMLIB}/flash-plugin/libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# Also install the 'homecleanup' script:
+		doexe usr/${RPMLIB}/flash-plugin/homecleanup
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4/
+			doexe usr/${RPMLIB}/kde4/kcm_adobe_flash_player.so
+			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+				/usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+			insinto /usr/share/kde4/services
+			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+		else
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed -i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+		fi
+
+		# The userland 'flash-player-properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		insinto usr/share/applications
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+		doins usr/share/applications/flash-player-properties.desktop
+
+		# Documentation:
+		dodoc usr/${RPMLIB}/flash-plugin/README
+	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
+		# Only install the plugin, nothing else for 32-bit.
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe usr/lib/flash-plugin/libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+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
+		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
+			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}"
+			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"
+		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"
+}