Version bump: 10.0.45.2 is released (security/stability fix)

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

5 files changed, 212 insertions, 10 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 4ef75d1310b8..5c5fd5805717 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/adobe-flash
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.14 2009/12/28 15:33:04 lack Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.15 2010/02/12 14:09:00 lack Exp $
+
+*adobe-flash-10.0.45.2 (12 Feb 2010)
+*adobe-flash-9.0.262.0 (12 Feb 2010)
+
+  12 Feb 2010; Jim Ramsay <lack@gentoo.org> -adobe-flash-9.0.260.0.ebuild,
+  +adobe-flash-9.0.262.0.ebuild, +adobe-flash-10.0.45.2.ebuild:
+  Version bump: 10.0.45.2 is released (security/stability fix)
 
   28 Dec 2009; Jim Ramsay <lack@gentoo.org> -adobe-flash-10.0.32.18.ebuild:
   Version Cleanup: 10.0.32.18 has security holes, bug 296407
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index f3f8a0b18c5c..c934a79cd366 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,9 +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.42.34-release.i386.rpm 4123908 RMD160 549c2c2e49472340faaf3fc51478d96aa16eab78 SHA1 5be2866609f5b478b776ab6cb869d5c5ed45c03f SHA256 68447ec9bc19fe4041845e889482fe65633b817b80e0fd5f1c246ff977acdbc1
-DIST install_flash_player_9.tar.gz 3056696 RMD160 dc434eeaf563befea6972e78ff0818ad2b0fa5c3 SHA1 7d2be03aa5cbccb2203c8696413a7f4cb92d9914 SHA256 60675a9a04d27fc9c8056b949939d714bb75ca22a5516602cac54883c46ef790
+DIST flash-plugin-10.0.45.2-release.i386.rpm 4121963 RMD160 67710d394ff7aaa44d35db44cd9d85fff4202c42 SHA1 2b9e1acff3af983d6f29f48014c77ed8c0ec998d SHA256 fd2a4427a0c801ce675736dcadbbaa4ff473418bb19edc7b5c1fd0f4f9a8c9b8
+DIST install_flash_player_9.tar.gz 3056624 RMD160 691de4c0b2b5ea3d6f7e3e07246dc7cee80ca902 SHA1 fd6da8b2afbcaf3213c772e7afc664030a50a683 SHA256 d934e3fdd49db84c346a0d501d6519e4cafe77bdb596f5af1e92e7e3eb93dab2
 DIST libflashplayer-10.0.42.34.linux-x86_64.so.tar.gz 3730595 RMD160 bc44de83d8d8b64d47993b4c3b449128fe8acadc SHA1 4a4f2e4dcf9857b83b7e0bac3e7476e2868cc027 SHA256 3833aaf5efbc2e5d57330e47a9f11b1e02b1f55741de148ec569d44b32ffe7e4
-EBUILD adobe-flash-10.0.42.34.ebuild 6101 RMD160 17fb401fac6977fd1f63ca2a6308a73c24413856 SHA1 0d487ea21bbea8b3ed842593c1dda1b4c633738f SHA256 e6d899b6df19494893d61009977ce4865857ff2a91d1bcf920588e2f0884787f
-EBUILD adobe-flash-9.0.260.0.ebuild 1622 RMD160 87d04c7816db083fae5245c3e44173f7fa1665a2 SHA1 4af40c3b636ef925568ea06fedd7dbc06ea8164f SHA256 04cfd9a31250d32f720160410e8aed236ab72dbf24a9f0ec052c1a119c69eee1
-MISC ChangeLog 19477 RMD160 d95048243586e959f1eb2ea1437a89c64733b978 SHA1 0283cfcdfc13bb420e3928f60b982a00a31a7c80 SHA256 71398ef8165a76b1afa7b8dbe1e8823f08f380049fccf4fb9c6d8b80d33856a1
+DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6
+EBUILD adobe-flash-10.0.42.34.ebuild 6101 RMD160 c0b669d31e4e7611ed56f34f34850f3c0eb7ba05 SHA1 a7a1f203e20a58120b075078a62559510f0a181d SHA256 700234b6bf01ea3f9fcee8ecb7edbdd978c7a31c7939a3d9249f39c62ae68d30
+EBUILD adobe-flash-10.0.45.2.ebuild 6102 RMD160 1d2edf6e412f66f4fe530f3ae0892d5a53afdc86 SHA1 bd9ae980b6436fcd7e31e9c1b9730d318f598958 SHA256 726289b07f53463af8463c02231a2acb2530f3d53a87c88f8de365309e39aedb
+EBUILD adobe-flash-9.0.262.0.ebuild 1622 RMD160 02b252b43b5bd9db27c5feb2666ae0506aa84a39 SHA1 08df88361364ee8fe8d82f7c61617d9168e0d46e SHA256 ef0402228921e6c4679cd8fdf22eeaa661e3ad406d8d41f02fa403b0d29bf972
+MISC ChangeLog 19755 RMD160 b9f580161abbd0f2a1ffec440379fa71206ad2ab SHA1 1fad7f84e938d36b812af2d962254bc9dbef2b91 SHA256 e105b776dd5fe7476cd9fb31253311da0c0e59710b9fc152e5c92e76f750fbb7
 MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.42.34.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.42.34.ebuild
index 1286e54092e7..d8ad90c0ce2f 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.0.42.34.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.0.42.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.0.42.34.ebuild,v 1.4 2009/12/28 15:33:04 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.42.34.ebuild,v 1.5 2010/02/12 14:09:00 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild
new file mode 100644
index 000000000000..52b7bce7ff9c
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild
@@ -0,0 +1,192 @@
+# 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.0.45.2.ebuild,v 1.1 2010/02/12 14:09:00 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"
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${PV}.linux-x86_64.so.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2 )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+HOMEPAGE="http://www.adobe.com/"
+IUSE="multilib +32bit +64bit"
+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
+	|| ( media-fonts/freefont-ttf media-fonts/corefonts )"
+
+EMUL_DEPS="app-emulation/emul-linux-x86-baselibs
+	app-emulation/emul-linux-x86-gtklibs
+	app-emulation/emul-linux-x86-soundlibs
+	app-emulation/emul-linux-x86-xlibs"
+
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)
+	!www-plugins/libflashsupport"
+
+# Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto
+# from app-text/acroread, so tell QA to ignore it.
+# Apparently the flash library itself also suffers from this issue
+QA_EXECSTACK="opt/flash-libcompat/libcrypto.so.0.9.7
+	opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/libflashplayer.so"
+
+QA_DT_HASH="opt/flash-libcompat/lib.*
+	opt/netscape/plugins32/libflashplayer.so
+	opt/netscape/plugins/libflashplayer.so"
+
+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
+		if ! use multilib || use 64bit; then
+			export native_install=1
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			if ! grep -q lahf_lm /proc/cpuinfo; then
+				export need_lahf_wrapper=1
+			else
+				unset need_lahf_wrapper
+			fi
+		else
+			unset native_install
+		fi
+
+		if use multilib && ! use 32bit && ! use 64bit; then
+			eerror "You must select at least one library USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+	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 use amd64 && has_multilib_profile && use 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
+
+		# 32b library compatibility:
+		#
+		# libcurl and libnss are not currently available in any emul-linux-x86
+		# packages, so for amd64 we provide these snarfed out of other binary
+		# packages.  libcurl and its ssl dependencies come from
+		# app-text/acroread; libnss and its friends come from
+		# net-libs/xulrunner-bin
+		exeinto /opt/flash-libcompat
+		pushd "${WORKDIR}/flash-libcompat-0.2/"
+			doexe *
+		popd
+		echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat
+		doenvd 99flash-libcompat
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		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"
+}
diff --git a/www-plugins/adobe-flash/adobe-flash-9.0.260.0.ebuild b/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild
index 6a538d2def7b..ae1d5c53ccf9 100644
--- a/www-plugins/adobe-flash/adobe-flash-9.0.260.0.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-9.0.260.0.ebuild,v 1.1 2009/12/09 12:26:21 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild,v 1.1 2010/02/12 14:09:00 lack Exp $
 
 inherit nsplugins