Bug #268336 -> Check for the lahf_lm flag in /proc/cpuinfo. If it is not present, instruct the user to install the 32-bit version only.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 190 insertions, 96 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 0a94affae256..5d1fa05dcbdd 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/adobe-flash
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.1 2009/04/10 13:14:04 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.2 2009/07/15 13:39:03 lack Exp $
+
+*adobe-flash-10.0.22.87-r1 (14 Jul 2009)
+
+  14 Jul 2009; Jim Ramsay <lack@gentoo.org> -adobe-flash-10.0.15.3.ebuild,
+  +adobe-flash-10.0.22.87-r1.ebuild, metadata.xml:
+  Bug #268336 -> Check for the lahf_lm flag in /proc/cpuinfo. If it is not
+  present, instruct the user to install the 32-bit version only.
 
 *adobe-flash-10.0.22.87 (10 Apr 2009)
 *adobe-flash-10.0.15.3 (10 Apr 2009)
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.15.3.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.15.3.ebuild
deleted file mode 100644
index 2be93b99d886..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-10.0.15.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 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.15.3.ebuild,v 1.1 2009/04/10 13:14:04 ulm Exp $
-
-inherit nsplugins rpm
-
-DESCRIPTION="Adobe Flash Player"
-SRC_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm
-amd64? ( mirror://gentoo/flash-libcompat-0.2.tar.bz2 )"
-HOMEPAGE="http://www.adobe.com/"
-IUSE=""
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-10"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
-			app-emulation/emul-linux-x86-gtklibs
-			app-emulation/emul-linux-x86-soundlibs
-			app-emulation/emul-linux-x86-xlibs )
-	x86? ( x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXt
-		=x11-libs/gtk+-2*
-		media-libs/freetype
-		media-libs/fontconfig
-		dev-libs/nss
-		net-misc/curl
-		>=sys-libs/glibc-2.4 )
-	media-fonts/corefonts"
-
-# 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/plugins/libflashplayer.so"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	pushd "${S}/usr/lib/flash-plugin"
-	exeinto /opt/netscape/plugins
-	doexe libflashplayer.so
-	inst_plugin /opt/netscape/plugins/libflashplayer.so
-	popd
-
-	pushd "${S}/usr/share/doc/flash-plugin-${PV}/"
-	dodoc readme.txt
-	popd
-
-	# 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
-	if use amd64; then
-		exeinto /opt/flash-libcompat
-		pushd "${WORKDIR}/flash-libcompat-0.2/"
-		doexe *
-		popd
-		echo 'LDPATH="/opt/flash-libcompat"' > 99flash-libcompat
-		doenvd 99flash-libcompat
-	fi
-
-	# The magic config file!
-	insinto "/etc/adobe"
-	doins "${FILESDIR}/mms.cfg"
-}
-
-pkg_postinst() {
-	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."
-
-	if has_version 'www-client/mozilla-firefox'; then
-		elog "The firefox 'flashblock' extension may help:"
-		elog "  https://addons.mozilla.org/en-US/firefox/addon/433"
-	fi
-
-	if has_version 'kde-base/konqueror'; then
-		elog "Konqueror users:  You may need to follow the instructions here:"
-		elog "  http://dev.gentoo.org/~lack/konqueror-flash.xml"
-		elog "For flash to work with your browser."
-	fi
-}
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.22.87-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.22.87-r1.ebuild
new file mode 100644
index 000000000000..e3cb2048bbed
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.0.22.87-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2009 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.22.87-r1.ebuild,v 1.1 2009/07/15 13:39:03 lack Exp $
+
+EAPI=1
+inherit nsplugins rpm multilib
+
+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 )
+	)"
+
+# 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"
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 may unselect the native 64bit install in some circumstances
+		if ! use multilib || use 64bit; then
+			export native_install=1
+		else
+			unset native_install
+		fi
+
+		if [[ $native_install ]]; then
+			# Bug 268336: Some AMD processors fail with native 64-bit flash
+			if ! grep -q lahf_lm /proc/cpuinfo; then
+				eerror "Your processor does not support the 'lahf' instruction which is used"
+				eerror "by Adobe's 64-bit flash binary."
+
+				if use multilib; then
+					eerror "Adjust your USE flags to install only the 32-bit version:"
+					eerror "  ${CATEGORY}/$PN[+32bit -64bit]"
+					die "Incompatible processor for true 64-bit flash, install 32-bit only"
+				else
+					die "Incompatible processor for true 64-bit flash, multilib profile required for 32-bit version"
+				fi
+			fi
+		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_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 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
+			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"
+
+	if has_version 'kde-base/konqueror'; then
+		elog "Konqueror users - You may need to follow the instructions here:"
+		elog "  http://www.gentoo.org/proj/en/desktop/kde/kde-flash.xml"
+		elog "For flash to work with your browser."
+	fi
+}
diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index 8be16fe08e9e..d7a439dbf734 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -7,7 +7,8 @@
 		<name>Jim Ramsay</name>
 	</maintainer>
 	<use>
-		<flag name='32bit'>For amd64-multilib, installs the 32-bit plugin
-			alongside the native 64-bit plugin</flag>
+		<flag name='64bit'>For amd64-multilib, installs the native 64-bit
+			plugin</flag>
+		<flag name='32bit'>For amd64-multilib, installs the 32-bit plugin</flag>
 	</use>
 </pkgmetadata>