[gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     88da74f57a97d87fbae51288dd689b979955cb98
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 20:28:39 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 20:28:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88da74f5

www-plugins/adobe-flash: Security bump to v26.0.0.137 (bug #624620)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-26.0.0.137.ebuild      | 133 +++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 994ad696873..fd1a9a1bef8 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-26.0.0.131-npapi.i386.tar.gz 8490534 SHA256 ae301d3885c96a07d34
 DIST adobe-flash-26.0.0.131-npapi.x86_64.tar.gz 9003017 SHA256 1ca9a708413a418f94c912ac240b33d9229191df7f7e6c415ba5a630ca24ff29 SHA512 2f984b75374bba1335e3a3e386d87d1ef4b8c550acd7565d23a73aed0c33d13816c10b32d146e0d4e75481fb2d9b810a1926a66f5e9691da96ea43283711a16b WHIRLPOOL ec0c57c5b8a5f64e55931aa929d7cd36d2c22c3ebe39dfc746e223cf5c7b7c92ecf0f0757d7f36f4f24585d974796992018f615b6967427e2f27b9e0263d6dea
 DIST adobe-flash-26.0.0.131-ppapi.i386.tar.gz 8536468 SHA256 25497127c725442ab327c6f5bd63b8c44696c9e1427ce7f249f89de86416142f SHA512 99f57751877572615587a7928f61f3c24cff094067e49114126ef01c166f7f063206a29840c85c5c9dc973dc08d0e1aa89d0e0e87b6baa9b269994e22d389627 WHIRLPOOL 8d81024d8393de359613d957ed00afadba92cd96f2bef115f5e7508df7dd10eab8e074a9d8bc750d761c235e9ae1870140eec741a6449f1685b8374462fe8bef
 DIST adobe-flash-26.0.0.131-ppapi.x86_64.tar.gz 9449172 SHA256 de696e2bc2cc3025d0158b8d3d74908eb5740ba4cd33d3f2841f0146933b076c SHA512 97739726cd93306eccefb5fc896cee9efd4f6c3cdd8196937b5b90af0cc714dcc0e43e04c0fa2d581b5215ebf3b9f50b2ea880a035a27d39dc492e03d3c1bb10 WHIRLPOOL a106837968be072d206890f2b80389a3798490008b5323dba27a2ffaffd807fdff77aaf95888518ef25f3b79726f64cbff770abf59f6327e773dffbd113ed918
+DIST adobe-flash-26.0.0.137-npapi.i386.tar.gz 8490349 SHA256 bc703c55973fe79c32a9968450d46162d1db04663b099529c8fe0ec342baa6ba SHA512 b53a6d4ef3ff1c1d2b0b17c1c445f1af01407b181961a50ec29b1b8195fca7828ee6bba5a2020c8514e3d884fdb223bd7ac9d6fbf03fc56d41cda2c7edef65ac WHIRLPOOL 296b66d4149dd09cbe9a81bce6312ac3c71ff1e9b687a659ddb2a5f80bbdca133e56215f91ca55418e653a05ab58b1c2d6efeb71fc7cbcf42dcd5a75610a6dd0
+DIST adobe-flash-26.0.0.137-npapi.x86_64.tar.gz 9002947 SHA256 9af20d48fe0f05cead8f6de6c3464e5dfbb1e3d296be69044ee71eaa306b6635 SHA512 c3db9bbf1e4d448f44ac484ee8492d9a041cc9b3a9f883084ec40f95eafe1a9815622316e28d85a2d37d05dcd067fea899014e7f62e8e1fc76f7d24f456d193f WHIRLPOOL 2c86c9c6c737cfa087d3a23823d3a340286ba2343717e0a525261fa7afe748cfa792cc353b4e846144e4d414dbedec88d34cd65565829721e23568b9fc60117a
+DIST adobe-flash-26.0.0.137-ppapi.i386.tar.gz 8536466 SHA256 68a4b486e6e127df5bb006667086a0168d9bfa8c2583b9e4136e157cd7e12967 SHA512 3de31779aac262395951b2a2c2a837705f78a3db4b0345e1fb9ad897f62ea352898400ecef02080e58dd423dfe3009eb22aa40e9dd976f0244015f5b3322bed5 WHIRLPOOL 5ed3e31a10dea3a336ca576221b3b9f20e150e818cf759019ff5ad61d0e1ec4c8e7548ac9f381052d1ba304187d41204a10a9c1e9fe26d40c9ef1f64a5aa597d
+DIST adobe-flash-26.0.0.137-ppapi.x86_64.tar.gz 9449400 SHA256 4fc8ce66561a39fdcffbcd72f6129ebc3fd1f9ab05324d898f6676bdf2c6cde8 SHA512 637573c0f021c1968aa8aa5cc9c527c191581076bf03b395768144936f3f74228534c1ba5692eeb72f3076cd958bf2e7899e82d67281703745d4b460e5b35c99 WHIRLPOOL 3640cd3997f8f57b2604f5a2042a277746629d971c28a9ac05ed4f247424bc7de346be014c53332d4f29fe7e6ac2031c81d4475dac62edfb1701568ea182019f

diff --git a/www-plugins/adobe-flash/adobe-flash-26.0.0.137.ebuild b/www-plugins/adobe-flash/adobe-flash-26.0.0.137.ebuild
new file mode 100644
index 00000000000..d8189defa27
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-26.0.0.137.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit nsplugins multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	http://www.adobe.com/products/flashplayer.html
+	http://get.adobe.com/flashplayer/
+	https://helpx.adobe.com/security/products/flash-player.html
+"
+
+AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
+AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
+AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
+AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
+AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
+
+IUSE="+nsplugin +ppapi"
+REQUIRED_USE="
+	|| ( nsplugin ppapi )
+"
+
+SRC_URI="
+	nsplugin? (
+		abi_x86_32? ( ${AF_NP_32_URI} )
+		abi_x86_64? ( ${AF_NP_64_URI} )
+	)
+	ppapi? (
+		abi_x86_32? ( ${AF_PP_32_URI} )
+		abi_x86_64? ( ${AF_PP_64_URI} )
+	)
+"
+SLOT="22"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+NPAPI_RDEPEND="
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	>=sys-libs/glibc-2.4
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	!www-plugins/chrome-binary-plugins[flash(-)]
+	nsplugin? (
+		${NPAPI_RDEPEND}
+		!www-plugins/adobe-flash:0
+	)
+"
+
+S="${WORKDIR}"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="usr/*"
+
+src_unpack() {
+	local files=( ${A} )
+
+	multilib_src_unpack() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		# we need to filter out the other archive(s)
+		local other_abi
+		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
+		unpack ${files[@]//*${other_abi}*/}
+	}
+
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_install() {
+	local pkglibdir=lib
+	[[ -d usr/lib64 ]] && pkglibdir=lib64
+
+	if use nsplugin; then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe libflashplayer.so
+
+		if multilib_is_native_abi; then
+			# 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
+
+			# The userland 'flash-player-properties' standalone app:
+			dobin usr/bin/flash-player-properties
+
+			# Icon and .desktop for 'flash-player-properties'
+			insinto /usr/share
+			doins -r usr/share/{icons,applications}
+			dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+				/usr/share/pixmaps/flash-player-properties.png
+		fi
+
+		# The magic config file!
+		insinto "/etc/adobe"
+		doins "${FILESDIR}/mms.cfg"
+	fi
+
+	if use ppapi; then
+		exeinto /usr/$(get_libdir)/chromium/PepperFlash
+		doexe libpepflashplayer.so
+		insinto /usr/$(get_libdir)/chromium/PepperFlash
+		doins manifest.json
+
+		if multilib_is_native_abi; then
+			dodir /etc/chromium
+			sed "${FILESDIR}"/pepper-flash-r1 \
+				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
+				-e "s|@FP_PV@|${PV}|g" \
+				> "${D}"/etc/chromium/pepper-flash \
+				|| die
+		fi
+	fi
+}