Security bump bug #414603

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

3 files changed, 289 insertions, 17 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index a469d0ae3834..da0d53d74fdd 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.129 2012/05/02 18:44:27 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.130 2012/05/05 02:40:47 lack Exp $
+
+*adobe-flash-11.2.202.235 (05 May 2012)
+
+  05 May 2012; Jim Ramsay <lack@gentoo.org> +adobe-flash-11.2.202.235.ebuild:
+  Security bump bug #414603
 
 *adobe-flash-11.2.202.233 (02 May 2012)
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 00b271455e19..28bde915d400 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SHA1 72ee58862db06ee235055123137604619273819f SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096
@@ -9,25 +9,28 @@ DIST adobe-flash-11.2.202.228.i386.tar.gz 6917230 RMD160 60ee451496c048d71fd9bc4
 DIST adobe-flash-11.2.202.228.x86_64.tar.gz 7224876 RMD160 cbf525ea7c6580537719cf5c2d705edd9e0835bb SHA1 7e54bf4271b2696480eb999100e506e511306fd0 SHA256 92c9758d347d05c284dcafccbc8370d8ba9a52f039ce1dbe558be66560476681
 DIST adobe-flash-11.2.202.233.i386.tar.gz 6916591 RMD160 6a433ffbb756e789e8af5525dafe76fe84bee5aa SHA1 71dba8513d4272329794fff0ea98c8a696c398cd SHA256 96b65d9b0dd5fca3f49fa13565fc2583f9254e605ecaf708363ad08b2a58ecc9
 DIST adobe-flash-11.2.202.233.x86_64.tar.gz 7224826 RMD160 a29071d436d2a4bd3138ba85cb7ad70e1506d800 SHA1 93bd258740ce8fa78242beb987c191f95625cd22 SHA256 9ebada855742f2169a3e4aabce0947a4b586ee9ab9cbfce638f665e63df01962
+DIST adobe-flash-11.2.202.235.i386.tar.gz 6916435 RMD160 72a06d7fd754b7e04e382ee5e368b88d1ac9415a SHA1 ac3d96f6b5335add2c50abc98c2245149908d1aa SHA256 3c687f0f05eaad30c7f034c107df2b692ea7494d5515c2238dbe10ea0735d56d
+DIST adobe-flash-11.2.202.235.x86_64.tar.gz 7224725 RMD160 13087670847bac251a1b1199f90b804fd1075e7d SHA1 314b39640ce2371c69e6936e747ab82c8b2adb94 SHA256 43f5d076948eb4f9ef8c91e86ec18eb6c0ca931901e660b034ad769cb4361990
 EBUILD adobe-flash-10.3.183.18.ebuild 3724 RMD160 ca627d7d59c25e3ad0e3bbfb03c80b401d93f968 SHA1 8022579166364ed078a446898032bccbc0d768c6 SHA256 ec1871d25cce1e25f5acfba686eb9e96fc89c0b26b0127ec57a265af75620def
 EBUILD adobe-flash-11.2.202.228.ebuild 8304 RMD160 eff44cc09a08ba65caf771f79b8e3513330a1d82 SHA1 2587f6fd34df83250d42c2dc0ef405e7014dd9ba SHA256 54cde1e6fc388afba5dd1421dfb998a728b296cce23381bc1b92108ce9fa173b
 EBUILD adobe-flash-11.2.202.233.ebuild 8301 RMD160 9182eb0fb1cdce226e57a5cbf856a31c6d9dc2ce SHA1 cbe5228e9a4a12e78fdb8765c51d42a608e329df SHA256 228ffb7c287fb0cf1ed1f5765f4e9236e4bbea729db2c79a4efaf21f6b43d224
-MISC ChangeLog 42139 RMD160 9b21b6679414293f400766ffe034c9234064dfea SHA1 d8f8234342863a71672a32fed513d0fbacfb51cb SHA256 ac52909b02f17878190dba654912132db2ce1fef4851df6c59230d644479853e
+EBUILD adobe-flash-11.2.202.235.ebuild 8301 RMD160 dee563a847452553375bbd507d01d620588a4503 SHA1 c9dfe1ab4c1ce86ecdfcc5a319aeeeeb193744de SHA256 241b8bcb441cd0a01f60c09b24baa04dd99eeda6d7b163d3b63ddd4386c3f807
+MISC ChangeLog 42287 RMD160 5027f2110e081876cd38b45feeaed4b7e3f415cf SHA1 94f7ab0e9fdd853c380bbfec9b7722385e5b8714 SHA256 d76d3d9265a4df5148b2e771e60418c9314cecf242322aa8e49b517a8fccefca
 MISC metadata.xml 1084 RMD160 01945abbb11a137e8ad64088f16ba4368c241878 SHA1 94a7b3fdfe2e35e2eb6233f326ae8391f48c8fc7 SHA256 20d7dd4b855c8a6d441febca72a4c5ed1605db2fe884c11dbf3b129b02556552
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPoYCRAAoJEA8o5SF9Rr6qP6sQAJGhxsUIw1FxNV2c+pCDlNsy
-pQ/2L0bsjL0p/Zoi0ei24Jzya42DMoDO2Y5xZdFRLVGGwB9H1lZjZfrU3kKnRDWX
-ORLcVB5j1q0vJUovqBMOvK37qugtEUd78dmVA0g06AKrYb6qKR6aJqN+Gz1IerUH
-lZNQmEHkzZiv93QH8JZp1I/PQ+2FV+88+GN/aveYwIM6rIfQJnRrc6lg0DWrcHCY
-j5hKSYRd2MQ90P5bvb5LErYn4c4SH4F5oAb1yjc1CNgEhjIL6JwDMjjyFsuAXc1a
-CfVZ9HaDt4ixfttEe5H+KNizymSKFIGx1MqzO9DYehlpImkae7jG4bJQMtU3wBwN
-m6LoO8HwDqol4cf2Bl1+lHo5PnSM9SxkzZ/QqDIIhkLZX7v8sX39Hg5sJQygsr1m
-xHWm4Bh5+81Kb5l3FxMtq79Nc4bs6H7JCnEcy7gCYdpSVPrD5DahgTb2TXcuUJYy
-7jSll2st/8yGqxO4f+wbqfIa7mZEMI6oEJqesBEgtRSdRBgY0EIL2s6jOi7sL4Wq
-FHed6ADZc2OVvDqSduQCehAlMFH6e3kIJp7Sahw7pFhgfSfO6DMG+89pFSrOuJFp
-5tS4JVMYbk5cjoY0oA4F0IcpdMkODwY86kkQxz3WqSDtGSOHHe7h4QIYFwm+Ok/e
-EbSprs+FtBf1XxOnlU9Y
-=Zdpc
+iQIcBAEBCAAGBQJPpTuoAAoJEA8o5SF9Rr6qvlUP/jeUI8sHs/EvAD2Brp1NRvkL
+OqKermG6QjM/25NKC9cH7k92IlfwBC70OpiGXbIxVNm2artnY8D4EcjRcaJecjdO
+10tjcMIByoVOEYkDZaU5MfWwuCmP4fHqcUvfDp0qBEtbi+dRcsrg92vrAS/IQrrC
+Dpunpo73T8XAVUxLTYbkS5PcL0zKiup4hntzQG1yxJB05i383XgsmDEp8r3GPUJD
+Qvo3aCW3/EV7N1Cb9HtdMKA/sieoezKLMJ/VbAl35XZdnA2FFz9Zhekjm4jcY6hV
+O+ZkDaHm1G7F6NBvi8wBgEfIaGoYP9WegdtTE/Z3cwSSB+SuEaeJPwFr3kBU2YQZ
+qqZpN+gC8jdV6niSIa81a6y4bPOXVUBiMaNTzpuYthd2v9Go+DFKnPlelRzNDFvp
+RonDekzl+tY7j4lhT0TV3cJkRJey7/+qkxar16sJC5+ZTjTqO0x87jbnA/mLYLZb
+uyZ0aD/wqdenTfTk27XarIkv7LBDVZGLH2lLcfoIYpIbTOqT+ugj+eEC2HmKqu6D
+Y6xwbefK9q4W3TLijcIJJPwdAT7FgLgbzNdq+lMsY9EwFB0tYc2rUEKsdTS1tgtT
+Im/WJqFUNFUiitM2PIwNaEVHFonQGrFn+OynmHKMyhkNXCxGmtgnJDOJtO7sOclC
+W4MBr1UxNu3aDtkGvwWG
+=bxXr
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.235.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.235.ebuild
new file mode 100644
index 000000000000..7d360006be60
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.235.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2012 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.2.202.235.ebuild,v 1.1 2012/05/05 02:40:47 lack Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+
+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 +sse2check"
+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/*"
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_pretend() {
+	if any_cpu_missing_flag 'sse2'; then
+		eerror "This version of adobe-flash requires a CPU that supports the"
+		eerror "SSE2 instruction set, and at least one of your CPUs does not"
+		eerror "support this feature."
+		eerror ""
+		if use sse2check; then
+			eerror "You should mask this version and use adobe-flash-10.3.* instead."
+			eerror "To do so, add the following line to your package.mask file:"
+			eerror "  =${CATEGORY}/${P}"
+			eerror ""
+			eerror "Or if you are trying to build a binary package for another host"
+			eerror "that does support SSE2 instructions, you may override this"
+			eerror "check by setting USE=\"-sse2check\""
+			eerror ""
+			die "${P} requires CPU with SSE2"
+		else
+			eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
+			eerror "will not function unless all of the CPUs on the system where it"
+			eerror "is installed support the SSE2 instruction set."
+		fi
+	fi
+}
+
+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)
+			if any_cpu_missing_flag '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
+			unpack $my_64b_src
+		fi
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		unpack $my_32b_src
+		popd >/dev/null
+	else
+		default_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 PKGLIB=lib
+		else
+			local PKGLIB=lib64
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/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
+		dosym /${BASE}/bin/flash-player-properties \
+			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
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
+		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
+	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 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"
+}