Block www-plugins/libflashsupport which is only required for adobe-flash-9 (Plus version cleanup)

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

4 files changed, 12 insertions, 209 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 2815e778f0e0..4ef75d1310b8 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.13 2009/12/27 22:59:15 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.14 2009/12/28 15:33:04 lack Exp $
+
+  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
+
+  28 Dec 2009; Jim Ramsay <lack@gentoo.org> adobe-flash-10.0.42.34.ebuild:
+  Block www-plugins/libflashsupport which is only required for adobe-flash-9
 
   27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
   adobe-flash-10.0.42.34.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 832d654ef36f..f3f8a0b18c5c 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,23 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 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.32.18-release.i386.rpm 4118891 RMD160 0e1f0c3c355cdf919c5f3c845d5a5c1369b3c193 SHA1 5061dcb50a744a13f107e2c214fc2b3af6377597 SHA256 450f05012f71673cef6d80aa5d43bda2f45419530bb81f41ff878f744de26c9f
 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 libflashplayer-10.0.32.18.linux-x86_64.so.tar.gz 3727613 RMD160 a29f07e969a1861d13970409b42297a70417bea5 SHA1 222d35952ed7ecbbe37f8ad4c01d4c8046c4607e SHA256 fc423a7ffa3e45208274c9b4a6af361e7e06dff1c2d582c9d80253a8b61cd300
 DIST libflashplayer-10.0.42.34.linux-x86_64.so.tar.gz 3730595 RMD160 bc44de83d8d8b64d47993b4c3b449128fe8acadc SHA1 4a4f2e4dcf9857b83b7e0bac3e7476e2868cc027 SHA256 3833aaf5efbc2e5d57330e47a9f11b1e02b1f55741de148ec569d44b32ffe7e4
-EBUILD adobe-flash-10.0.32.18.ebuild 6071 RMD160 3cab6f9d439a2bb2792b054b7a3ccbfe481ac84f SHA1 c1a64d7e11aa0505669fdd3c87df719ff1c083b0 SHA256 968168a53778809d910f9689622714660578f5ba8fceac88515f1754b93a1b1c
-EBUILD adobe-flash-10.0.42.34.ebuild 6072 RMD160 eb4ce41376dc930eb4046318a87ee053a7aa3156 SHA1 9733868abcc2a7976e9a7e7e50c47bdcf9d3c024 SHA256 de839b0038fdceddb1b87d64530cf2d208db8ee8b73a7945839f8183a507beb8
+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 19187 RMD160 6ccbe1ad7c6995981077c6c4ebaed569d006ad94 SHA1 0d48d11e862edf8d2efea6336e6437c028370e77 SHA256 8e3c8fefb454dca8a4b7e5c284b1330754af9e49a1e722a4554f6bb76b3259ea
+MISC ChangeLog 19477 RMD160 d95048243586e959f1eb2ea1437a89c64733b978 SHA1 0283cfcdfc13bb420e3928f60b982a00a31a7c80 SHA256 71398ef8165a76b1afa7b8dbe1e8823f08f380049fccf4fb9c6d8b80d33856a1
 MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks35soACgkQNQqtfCuFneMwawCfRuIdSZiQUd8/94fyeyrnHb4T
-8wsAn2V+AofKAdni2pbruOsHW0UGxIjy
-=frNx
------END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.32.18.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.32.18.ebuild
deleted file mode 100644
index a741f02163f5..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-10.0.32.18.ebuild
+++ /dev/null
@@ -1,191 +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.32.18.ebuild,v 1.4 2009/12/08 18:54:41 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 )
-	)"
-
-# 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-10.0.42.34.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.42.34.ebuild
index 4ec0b211791c..1286e54092e7 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
 # 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.3 2009/12/27 22:59:15 fauli Exp $
+# $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 $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
@@ -46,7 +46,8 @@ RDEPEND="x86? ( $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.