diff options
author | Jim Ramsay <lack@gentoo.org> | 2010-08-11 11:47:37 +0000 |
---|---|---|
committer | Jim Ramsay <lack@gentoo.org> | 2010-08-11 11:47:37 +0000 |
commit | 012b8d4d35cbb689506e3f0cdd49682210006049 (patch) | |
tree | 82492b408f7e63667fa439c2f8108e6da28818a5 /www-plugins/adobe-flash | |
parent | Respect LDFLAGS wrt bug 331891. Thanks to Diego for report. (diff) | |
download | historical-012b8d4d35cbb689506e3f0cdd49682210006049.tar.gz historical-012b8d4d35cbb689506e3f0cdd49682210006049.tar.bz2 historical-012b8d4d35cbb689506e3f0cdd49682210006049.zip |
Version/security bump: Adobe flash 10.1.82.76 and 9.0.208.0 is released, bug #332205
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'www-plugins/adobe-flash')
-rw-r--r-- | www-plugins/adobe-flash/ChangeLog | 12 | ||||
-rw-r--r-- | www-plugins/adobe-flash/Manifest | 22 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild | 178 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild | 194 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-10.1.82.76.ebuild | 161 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-9.0.208.0.ebuild (renamed from www-plugins/adobe-flash/adobe-flash-9.0.277.0-r1.ebuild) | 4 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-9.0.277.0.ebuild | 54 |
7 files changed, 179 insertions, 446 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index e737b8b15745..48658a70d6a3 100644 --- a/www-plugins/adobe-flash/ChangeLog +++ b/www-plugins/adobe-flash/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for www-plugins/adobe-flash # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.39 2010/07/26 15:47:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.40 2010/08/11 11:47:37 lack Exp $ + +*adobe-flash-10.1.82.76 (11 Aug 2010) +*adobe-flash-9.0.208.0 (11 Aug 2010) + + 11 Aug 2010; Jim Ramsay <lack@gentoo.org> +adobe-flash-9.0.208.0.ebuild, + -adobe-flash-9.0.277.0.ebuild, -adobe-flash-9.0.277.0-r1.ebuild, + -adobe-flash-10.0.45.2.ebuild, -adobe-flash-10.0.45.2-r1.ebuild, + +adobe-flash-10.1.82.76.ebuild: + Version/security bump: Adobe flash 10.1.82.76 and 9.0.208.0 is released, + bug #332205. 26 Jul 2010; Pacho Ramos <pacho@gentoo.org> adobe-flash-10.1.53.64-r1.ebuild: diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index f06b6b8fd9f0..4a0b7558d490 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,26 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a -DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e00fb5a19f SHA1 8fe47ef587ae679a37757038710750eb6a3c393e SHA256 aa96a25420f6527f5c2a467222bccf5c54a5f8001edfa0ec274864fc3e94faea DIST flash-plugin-10.0.45.2-release.i386.rpm 4121963 RMD160 67710d394ff7aaa44d35db44cd9d85fff4202c42 SHA1 2b9e1acff3af983d6f29f48014c77ed8c0ec998d SHA256 fd2a4427a0c801ce675736dcadbbaa4ff473418bb19edc7b5c1fd0f4f9a8c9b8 DIST flash-plugin-10.1.53.64-release.i386.rpm 4755181 RMD160 95156082a79115ad2a94886a4d144bdf7015a884 SHA1 22a2a775e83472f66c9a9dee1f2e5d779cfb7796 SHA256 022b8749c88b65745f3a395d9f657c05d97393aa0e725d15227379dd1cec0c73 -DIST install_flash_player_9.tar.gz 3064514 RMD160 6adde6cafc02ddef8e7698e31d9e1f5657d250bc SHA1 e61053914f38a4530fccd13e821758d1b6f77a72 SHA256 0612dff19a8547550520ca4996575011c129281b03bbaa3c70edaaed0a109d3c +DIST flash-plugin-10.1.82.76-release.i386.rpm 4901493 RMD160 be2f14dfae030c5cbfea38799aa2128e5c5aa11a SHA1 f8604dc68c9f063429e1185e627120640ed4ffba SHA256 76551552f864c2b37414bf244dd693758d351a004d9b0877b329c70e750e6c92 +DIST install_flash_player_9.tar.gz 3064515 RMD160 3789d59f8586bef05e0fbf180f7af095ffe6b5b4 SHA1 2eacd5ad186f1b90bab2999cca3f9cd3b039459c SHA256 f18b60b79e1501d095a6cb7f9d91de737dce6a5c9905348607c22b82d7cd0fda DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6 -EBUILD adobe-flash-10.0.45.2-r1.ebuild 5581 RMD160 1044c5f96bbec983783cf59cd5db3805be5f7732 SHA1 a428af6af287df999d703e72f1cd1dd9a2969e27 SHA256 9aa9065cee1b0bfb6dfbc2b749a12cf6cc03e0808254807460dd6a58ba4c3df7 EBUILD adobe-flash-10.0.45.2-r2.ebuild 5606 RMD160 b78a0161a874c6121d9de87263b51c54f937f953 SHA1 61f477b751699bdaf0f10276d4e68dae200fba3c SHA256 e7501c56ad0667b7adb950c22b6345b3b718ffe28fe1977dc41c3e55f2374153 -EBUILD adobe-flash-10.0.45.2.ebuild 6194 RMD160 00662f640b877c595aed6ca3d259c8edc6af7a0d SHA1 d800c3692bc85d653c86b37e939d61af8c7a9595 SHA256 2d96547ffa788f65b7a862ae35296cb6d5e4827598e0ff1734837d5bc8f4159a EBUILD adobe-flash-10.1.53.64-r1.ebuild 5172 RMD160 09cc02c16a055965dcbea967874bf3e3ee8915fe SHA1 b245c11be2e89341d17955f2c3d86644a0337a31 SHA256 542458407e92f22999162857b6b38872beadc41f1626db4ae2d479a41e946a00 EBUILD adobe-flash-10.1.53.64.ebuild 5140 RMD160 6fcfa2d0943cf620d31de8db015f68359193a206 SHA1 5f76339b792577989a561df3c9c92341cd185f93 SHA256 bb8521e72ec99803b6b19b650ed8d47aca6bcfc8fd587c2c4f06bf620da08c2f -EBUILD adobe-flash-9.0.277.0-r1.ebuild 1696 RMD160 2aad24028ac1912585aa1cd912ebd020cc7cd937 SHA1 16a24f65332febee5b9ff129bb8be6de89832187 SHA256 6eb98d2080d46bfdec44664931be88866f6ed8bc9fdf367ca8c8aa8f7a169c6f -EBUILD adobe-flash-9.0.277.0.ebuild 1622 RMD160 02a0b0313f2e6ad76b311a15893c2fb4d1e7e131 SHA1 59d25fcbe65124d6e368b009a54583436b915a4c SHA256 aab5e168736c47aec7e186b3b883e4b5af83f6d91c4ff7511b09d0def96fbae5 -MISC ChangeLog 23815 RMD160 4f932f171eac187fd9f7f62395b0e5b6f9d3424a SHA1 b91f6b5be1fc22a6de6a4ff3d556c7fe66916bd1 SHA256 13f4ce7ff983222349111238c86d96bdcd0eee480cf8b367dce101e0ac667db1 +EBUILD adobe-flash-10.1.82.76.ebuild 5170 RMD160 4800afb095c488f2e4981da1e224738106caedaf SHA1 e86f5c40430434afd3f1cb09b650e2cdaa9f3b72 SHA256 701f9dc4ef3ce9167dfbfba7408fdd38b8c5527b63edc389e7de819da619677c +EBUILD adobe-flash-9.0.208.0.ebuild 1697 RMD160 3c99b3932847f6312f531eeddd0af053b39a812b SHA1 4e822ebf29e5535f279a1f3a412be844cc5cfea3 SHA256 5210d6c9c8bea3b74ff89b869baca87d69861a9d6d5768dcdacfe25cc33703b2 +MISC ChangeLog 24224 RMD160 6ba2efe0dc495a91b712021360c0063b291a91aa SHA1 89e7db3acf8a6e05a28c1d5aaa2f7b9fb0b190ca SHA256 93bc9789dcccefe3d9ea0b6e92117958fcfb705d6a0f75fcd8812f741b11c64f MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxNrjQACgkQCaWpQKGI+9STWgCfRrYfarpGPqh1IlEdJn7HUO5R -7xcAnRWr4c1yIaIdMaTC4B9tR0yxnKWb -=+9ke ------END PGP SIGNATURE----- diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild deleted file mode 100644 index 4dfc05a7fe01..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# 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-r1.ebuild,v 1.6 2010/06/20 16:54:41 keytoaster 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} ) - 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" - -EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220 - 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 ) - ) - || ( media-fonts/liberation-fonts media-fonts/corefonts )" - -# Ignore QA warnings in these binary closed-source libraries, since we can't fix -# them: -QA_EXECSTACK="opt/netscape/plugins32/libflashplayer.so - opt/netscape/plugins/libflashplayer.so" - -QA_DT_HASH="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) - # 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 - 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 - - 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, and this version has a known major" - ewarn "security vulnerability[1]. Please consider only running flash applets" - ewarn "you know to be safe. The 'flashblock' extension may help for" - ewarn "mozilla users:" - ewarn " https://addons.mozilla.org/en-US/firefox/addon/433" - ewarn - ewarn "[1] http://www.adobe.com/support/security/advisories/apsa10-01.html" -} 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 deleted file mode 100644 index 0e9e8fc7d497..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# 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.8 2010/06/20 16:54:41 keytoaster 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" - -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 ) - ) - || ( media-fonts/liberation-fonts 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/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, and this version has a known major" - ewarn "security vulnerability[1]. Please consider only running flash applets" - ewarn "you know to be safe. The 'flashblock' extension may help for" - ewarn "mozilla users:" - ewarn " https://addons.mozilla.org/en-US/firefox/addon/433" - ewarn - ewarn "[1] http://www.adobe.com/support/security/advisories/apsa10-01.html" -} diff --git a/www-plugins/adobe-flash/adobe-flash-10.1.82.76.ebuild b/www-plugins/adobe-flash/adobe-flash-10.1.82.76.ebuild new file mode 100644 index 000000000000..d7f6d2c16896 --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-10.1.82.76.ebuild @@ -0,0 +1,161 @@ +# 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.1.82.76.ebuild,v 1.1 2010/08/11 11:47:37 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" + +DESCRIPTION="Adobe Flash Player" +SRC_URI="${MY_32B_URI}" +HOMEPAGE="http://www.adobe.com/" +IUSE="multilib" +SLOT="0" + +KEYWORDS="-* ~amd64 ~x86" +LICENSE="AdobeFlash-10.1" +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" + +EMUL_DEPS=">=app-emulation/emul-linux-x86-gtklibs-20100409-r1 + app-emulation/emul-linux-x86-soundlibs" + +RDEPEND="x86? ( $NATIVE_DEPS ) + amd64? ( $EMUL_DEPS ) + || ( media-fonts/liberation-fonts media-fonts/corefonts )" + +# Where should this all go? (Bug #328639) +INSTALL_BASE="opt/Adobe/flash-player" + +# Ignore QA warnings in these binary closed-source libraries, since we can't fix +# them: +QA_EXECSTACK="${INSTALL_BASE}32/libflashplayer.so + ${INSTALL_BASE}/libflashplayer.so" + +QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so + ${INSTALL_BASE}/libflashplayer.so" + +pkg_setup() { + if use x86; then + export native_install=1 + elif use amd64; then + # As of 10.1, no more native 64b version *grumble grumble* + unset native_install + unset need_lahf_wrapper + export amd64_32bit=1 + 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 /${INSTALL_BASE} + doexe libflashplayer.so + inst_plugin /${INSTALL_BASE}/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 /${INSTALL_BASE} + doexe flashplugin-lahf-fix.so + inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so + fi + + if [[ $amd64_32bit ]]; then + oldabi="${ABI}" + ABI="x86" + + # 32b plugin + pushd "${S}/usr/lib/flash-plugin" + exeinto /${INSTALL_BASE}32 + doexe libflashplayer.so + inst_plugin /${INSTALL_BASE}32/libflashplayer.so + dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt" + popd + + ABI="${oldabi}" + fi + + # The magic config file! + insinto "/etc/adobe" + doins "${FILESDIR}/mms.cfg" +} + +pkg_postinst() { + if use amd64; then + elog "Adobe has released 10.1 in only a 32-bit version and upgrading" + elog "is required to close a major security vulnerability:" + elog " http://bugs.gentoo.org/322855" + elog + elog "Furthermore, there are stability problems when running 10.1 in a" + elog "64-bit browser with nspluginwrapper. The current recommended" + elog "configuration is to use a 32-bit browser such as" + elog "www-client/firefox-bin:" + elog " http://bugs.gentoo.org/324365" + elog + # Temporarily skip automatic nspluginwrapper stuff, since it is fraught + # with peril (Bug #324365): + # + #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.277.0-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-9.0.208.0.ebuild index e63b7f4d3784..a39f4cf331ad 100644 --- a/www-plugins/adobe-flash/adobe-flash-9.0.277.0-r1.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-9.0.208.0.ebuild @@ -1,6 +1,6 @@ # 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.277.0-r1.ebuild,v 1.2 2010/07/25 19:10:37 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-9.0.208.0.ebuild,v 1.1 2010/08/11 11:47:37 lack Exp $ inherit nsplugins @@ -50,7 +50,7 @@ pkg_postinst() { ewarn "issues. Please consider only running flash applets you know to" ewarn "be safe." - if has_version 'www-client/firefox'; then + 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 diff --git a/www-plugins/adobe-flash/adobe-flash-9.0.277.0.ebuild b/www-plugins/adobe-flash/adobe-flash-9.0.277.0.ebuild deleted file mode 100644 index a0569df862db..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-9.0.277.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# 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.277.0.ebuild,v 1.2 2010/07/25 19:10:37 nirbheek Exp $ - -inherit nsplugins - -DESCRIPTION="Adobe Flash Player" -SRC_URI="http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz" -HOMEPAGE="http://www.adobe.com/go/kb406791" -IUSE="" -SLOT="0" - -KEYWORDS="-* ~amd64 ~x86" -LICENSE="AdobeFlash-9.0.31.0" -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 ) - || ( media-fonts/liberation-fonts media-fonts/corefonts )" - -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() { - cd "${S}/install_flash_player_9_linux/" - exeinto /opt/netscape/plugins - doexe libflashplayer.so - inst_plugin /opt/netscape/plugins/libflashplayer.so -} - -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/firefox'; then - elog "The firefox 'flashblock' extension may help:" - elog " https://addons.mozilla.org/en-US/firefox/addon/433" - fi -} |