diff options
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/adobe-flash/ChangeLog | 8 | ||||
| -rw-r--r-- | www-plugins/adobe-flash/Manifest | 19 | ||||
| -rw-r--r-- | www-plugins/adobe-flash/adobe-flash-11.1.102.63.ebuild | 234 |
3 files changed, 259 insertions, 2 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index 3d189c685bd7..e232e34923eb 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.116 2012/02/20 09:26:03 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.117 2012/03/06 03:46:43 radhermit Exp $ + +*adobe-flash-11.1.102.63 (06 Mar 2012) + + 06 Mar 2012; Tim Harder <radhermit@gentoo.org> + +adobe-flash-11.1.102.63.ebuild: + Version bump for security (bug #407023). 20 Feb 2012; Jeff Horelick <jdhore@gentoo.org> adobe-flash-11.1.102.62.ebuild: x86 stable wrt security bug 404101 diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index d20ab22b0d42..ddb5a4996162 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SHA1 72ee58862db06ee235055123137604619273819f SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a @@ -7,10 +10,24 @@ DIST adobe-flash-11.1.102.55.i386.tar.gz 6748255 RMD160 48030f8c4c091dcab81a6e87 DIST adobe-flash-11.1.102.55.x86_64.tar.gz 7043207 RMD160 a7a6d880e167d0df0905a7fdd4729858935f6ec7 SHA1 5fd769d2b5ff166757480b50f55ca40bf2540122 SHA256 345818f97e4d2e974a70d7f5bcd6a0131304f8ec2ef91eed1de2931376a35c27 DIST adobe-flash-11.1.102.62.i386.tar.gz 6747720 RMD160 1d9716d93cf4c09f9b54c589fd28b7449ab1b5c8 SHA1 c9331b7b9710c24532bf14c3ea76fc58ccac283a SHA256 142f78bb1e28854fbb819b86cd4a5397b3da16435ae1f904a2e1594981cc0b67 DIST adobe-flash-11.1.102.62.x86_64.tar.gz 7042811 RMD160 62f29d1ac5d470baf33aecb5a2cf4c80789bb7bb SHA1 a1cad9899e33dcaf45489287ee031adbf212ba6e SHA256 f0a7323237e42a3a27e91c71ea09e3d4281caaf4ad1e2beb05f2b1774bc4edf0 +DIST adobe-flash-11.1.102.63.i386.tar.gz 6746733 RMD160 19b10bbb6e507adfa0a43a10f112c4b544133c93 SHA1 2893aeb9b53e34a4e8a878a0158c39e5a6cb308d SHA256 dff9d475b3e8900e5c9a5d1d69ba766d0cdf9471217ef35c931ccefdf7b68246 +DIST adobe-flash-11.1.102.63.x86_64.tar.gz 7042923 RMD160 f8b134fb5a62a2c8ab997ff02fa61d6d41661e8f SHA1 e210a4bb31f1b9eba9f0898842660617715dd376 SHA256 8e78ecf8262f318d26934a6a731cefa97b9cbd40e2312c1ab2e5b8634e600190 DIST flash-plugin-10.3.183.10-release.i386.rpm 5450351 RMD160 e84e71ba5fc88ac2c3557b7848c3bf2f988a890d SHA1 98f159698fa1a5a85b8d5210ad551da5ba5d9af7 SHA256 9969a0ebb53d42f195785aee2253d58cbd7960be861f3f981293f5ebcb4a0a70 EBUILD adobe-flash-10.3.183.10.ebuild 3827 RMD160 b734c9451f147b9dc493497027a5d3af19a326f7 SHA1 bfb026c3c7cf5236ce978c0a0c5b2aa3c508f2df SHA256 a7b3943889d5d26437764a10d2deb45c4b5ecd806c327de68b31462fc65c4054 EBUILD adobe-flash-11.0.1.152.ebuild 6878 RMD160 2fc2fe5ed46ee3d64b3ce80e593c46b487333c55 SHA1 dba6bed0907b94d0a7a8b150e9ac4afd7fe743e6 SHA256 3c74883d64be05cecbbfb4ebf0195f7793725b61424cfd73d0f5e6eadbc27e8f EBUILD adobe-flash-11.1.102.55.ebuild 7262 RMD160 c143bad2e5541fc7eff089b1cdb1f3ae84ffa8f9 SHA1 ecb5803e85441412dc326c8ee2ccb96a4b55165f SHA256 82ccbf56dedf4dc64cd89768523990a5845384ce306fe3fa47f3e4824b2e5390 EBUILD adobe-flash-11.1.102.62.ebuild 7261 RMD160 42d07d391b262b4d953ad43e03637eab70ea228b SHA1 e6b05062fbf2957db1cd73f9e402e8c3cd90531d SHA256 e874da783435a03010ab9749e1b510b1f927fb1d01f59cd75925d6e82b4ffc9b -MISC ChangeLog 39836 RMD160 782cf174db17b553e8b3317484f783a5ca15ea8d SHA1 8700cbaf99b9a44c591972333c504ada3a5e61bb SHA256 4876b6d35309d5b9d42521836adf185d79a8c1b579ae411debd0c10dad2c60f5 +EBUILD adobe-flash-11.1.102.63.ebuild 7266 RMD160 95e1352dd22cded5bcdfb0c1eacf12f7540dad9c SHA1 e4a422e0c1422d451dc4fc862c275a8bd63b07ad SHA256 d8ca9130bfdb1a5aed03a901642a74dcfddee0e54039c86b38516fa9a6623eb5 +MISC ChangeLog 40007 RMD160 19cb5fcc713c707bb69e39c7446ee6522d584719 SHA1 784c38ad22dfe9055b2cdc639c9e4b6e4ebffaf0 SHA256 743651e49d7897b172af4bbb17ea15f5135290beef62ae66c0cd75ccb9d4b4e8 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQEcBAEBCgAGBQJPVYitAAoJEEqz6FtPBkyjjd8IAKTRSdRDOgSzKi1dwP4ywCpk +iYrHdzTfrfuI20P8MXF1xj064JTfk2Pkn4MzJ7Q2dL/tHBFsogqFamCipJXOHb22 +nyhOkOdp1TcKuAhyiIMtjgGpCYv/yNjxAf4WEB/Zamx3XrQuflNdtUzx5b7hNfVU +8O+MNsYgK3YXZ6Bg1kTLIWH5bvVqZmLyHph0f51RxI5JuRqYVxUTV04zDGO5e92L +ZINjm8kB60VTWCXpwGKgTN9KNkOLmsFIrXkrxQJD87Q+mTzUv5yWSrRb3SohKIDW +V3CBY8cVDEn5Uaip05sB3R3Qk0++jyijxwgpyEWT3KbGlvV2nIn/zhMrgpynFX0= +=ho6n +-----END PGP SIGNATURE----- diff --git a/www-plugins/adobe-flash/adobe-flash-11.1.102.63.ebuild b/www-plugins/adobe-flash/adobe-flash-11.1.102.63.ebuild new file mode 100644 index 000000000000..36a091f095b7 --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-11.1.102.63.ebuild @@ -0,0 +1,234 @@ +# 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.1.102.63.ebuild,v 1.1 2012/03/06 03:46:43 radhermit 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" +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/*" + +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) + # 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 + 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 + + # 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" +} |