Version bump, wrt security bug 411499

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 302 insertions, 15 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index b5288bff70e4..dd2f51df40af 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.178 2012/01/31 00:08:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.179 2012/04/10 18:41:40 dilfridge Exp $
+
+*acroread-9.5.1 (10 Apr 2012)
+
+  10 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +acroread-9.5.1.ebuild:
+  Version bump, wrt security bug 411499
 
   31 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> acroread-9.4.7.ebuild:
   Added lingua-dependent RDEPEND on asian fontpack, bug 212625
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 69c32adbb8d0..80e700092829 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -3,23 +3,25 @@ Hash: SHA512
 
 AUX gentoo_config 356 RMD160 fde2e1f78d39d39611ea91fc94f8c31bc8634425 SHA1 ce38b7160e842d970804216e156d5edbcbfd3e1d SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f
 DIST AdbeRdr9.4.7-1_i486linux_enu.tar.bz2 57112529 RMD160 fcbb3397a063387eaee0af02f89f844a51c9f0fd SHA1 83ff5262523216a087206cb6f8e9815eaa1ac35e SHA256 65b91a1d925d5690050515d233fadeb47f52c692103904a72c7125c6590efd2f
+DIST AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 57138807 RMD160 ba457c98384af6223a4bc11c28e8b5ce8a542325 SHA1 02985c18abbe7f530f7a29e76061c5bd362f5e42 SHA256 a6bcb881d5de4fb58c00fe24c3541122123881a3148a9feb0f62eda8dd82bca6
 EBUILD acroread-9.4.7.ebuild 8774 RMD160 2ec8f53850dda30c6db45accec9b23f7f0982297 SHA1 d4f024b091ea14da529f3d40701c50436c5c99fe SHA256 56dc464a7ce084df87a8d7c08586606ccbe6ce98bc5402cabeeede18f5d44c73
-MISC ChangeLog 29974 RMD160 574de65c3fa283991d729897e5e8a18bf3387ebd SHA1 da139c3abf8ffa652b0ac77a4e6896285e5bc3ad SHA256 9137c4531aa473f327b1088966b6ded83b6aa32a7bb8ec29a1f992ad6dd6c715
+EBUILD acroread-9.5.1.ebuild 8776 RMD160 1f538df1f2b377e5c5ed59e61334e9a6172f4d82 SHA1 b589df1adbc408f2bf08c2b76b99474b2be30525 SHA256 4b2ea0b627eb8ba1a1bca68b02271f5c8b1e68cf5c9047ef26a773b9aee5831e
+MISC ChangeLog 30129 RMD160 df22a29cef5eef43d5b86d37aa74040a4e9ef39d SHA1 aa1249b13c31d6468a37cf8db23c5adedea0cf1b SHA256 6c779254eba756fdd426bd96b34e801e7a6c30809e22623074c081529feeb234
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPJzFaAAoJENwGBM22xffeuTQP/23Ahi8sq2GT+4qDdFe3iX2w
-0gD2bkl/BPgd+k8yJW2vV5uulfeqo+W5eIrme0rfa1CMRcuImC3mbgZimyWBJlJH
-/+s5IqOl1ho7LR5WkgEiupAt8/A8/bIBLzqHMsIIC+/zkFi+l3/8GlEyVJYBG6E7
-/zqsU3ZeMOHRcih1VimyF99au7rgf5BpP+JSLRk05X1/rbcSDMZoYnLLAKVH/DvJ
-zewg/2WQ0tU7WilxfJz2US+/cWe6inmZHZLaTWSzI6v7P0NBsc5M85EJuJZCCysS
-J0rMsUkooZNod3Xf4PzkU8GCZpCOt4HHie/AlI8/W8h9lYxX6ySpW/rYX2oaQ1mO
-6kQQOosCywztuq0c0criX88HwRPFEyqHzFEbSeI9neS9ux/2/8QGjgeqA19hZdc/
-6eWEN6Hay5O+c60olAK8w3t5EcubrRnrCvsWVcLA6xW0yLN/stUwMTzgmDFjg6zj
-nqv2OCajMSIZCkpyWDiFxpgu5tVUaBGakMVI0i1U+Dj745bSQgwvSnd5OdIEL8Z7
-omaEc22qNlcjk80lwX2SkaOjQFIF71GZuBhog4mHcG9zC6DW2G1gcoAn7lN+mWGI
-anmgV9G+K9ALsDKan1NdtI5TBgUUPbhEkZQQjBU7ucaJpvgLtu1t+beFL44/k+1p
-Nx3oOK3LCcWI2wjov3Ui
-=ns38
+iQIcBAEBCgAGBQJPhH74AAoJENwGBM22xffeCo8P/2+wp0rN0VOTUaYeUHvcF5y4
+pXld2bFMjEykUIr4xmbYj+hVQRONclkLL0a4CSgG3kbFvEgDFn5aZqDnWeUL/byQ
+HspT9dkydq7azHk8WbuGZx9E1jSNwbkagnoBiahgYIyzy8uYIfdhC3xJ4v8zw0M3
+0lMcWRwum9QNSLAacnuNXGsEpWSjE1tLhWLa0Vr4r7CgzFTTtfKDJXa3HGYbWKUP
+ILVZ2dDS9cPjNCgYvjxsPw7p2OV7ssPR8QgsmRS6ebHv9QwkReqIxbagBJ4jIUHy
+h7THffvywOcZWxY/vVt+24dK3ttwf87Vgu5L3bVBVTpZ76sbBCtSkbyjucryrMtn
+IqblKRTI/e0FnRkqWqzRdQrMSJOVJn4JkBCBJwocxorqnt13eF0yjAu0kVz9sKy/
+1QZMQ+iUWPTeuz//FO4qpk2aTUXkR7v3qSkOa2ajYb4eaGsYm3nRwz067yNVKJQq
+9s/JR+XmvaKjmDSEoxyRDmNTWSztdvL9CWBxkK8iwk/jYvkYdzfcgYQv/nMU9v8U
+u0IWoO94g7zl6dFMPIVx3bSkjhYYp7cVjH8xOqRHGBjOpu1qEFiPDASlPXYHfFfe
+pjgrtOHQ0nqO2sIKX2/LqNIY4f3SHKZropBA7tMa0tjEaG93yEFvYCGIhHdtkzm8
+FeOC3Imw3l71danjxIwd
+=Opnp
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.5.1.ebuild b/app-text/acroread/acroread-9.5.1.ebuild
new file mode 100644
index 000000000000..c439671d08ea
--- /dev/null
+++ b/app-text/acroread/acroread-9.5.1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1.ebuild,v 1.1 2012/04/10 18:41:40 dilfridge Exp $
+
+EAPI=4
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+IUSE="cups ldap minimal nsplugin"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}"
+SRC_FOOT=".tar.bz2"
+
+# languages not available yet: it:ita es:esp pt:ptb sv:sve zh_CN:chs zh_TW:cht fi:suo nb:nor nl:nld ko:kor da:dan de:deu fr:fra ja:jpn
+# asian fonts are handled separately
+LINGUA_LIST="en:enu"
+DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${PV}-1_i486linux_enu${SRC_FOOT}"
+for ll in ${LINGUA_LIST} ; do
+	iuse_l="linguas_${ll/:*}"
+	src_l=${ll/*:}
+	IUSE="${IUSE} ${iuse_l}"
+	DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
+	SRC_URI="${SRC_URI}
+		${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdbeRdr${PV}-1_i486linux_${src_l}${SRC_FOOT} )"
+done
+
+# asian fonts from separate package:
+IUSE="${IUSE} linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+SRC_URI="${SRC_URI}
+	${DEFAULT_URI}"
+
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip mirror"
+
+# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
+RDEPEND="media-libs/fontconfig
+	x86? ( =dev-libs/openssl-0.9.8* )
+	cups? ( net-print/cups )
+	x86? ( x11-libs/gtk+:2 net-dns/libidn
+			ldap? ( net-nds/openldap )
+			!minimal? ( || ( net-libs/xulrunner
+						www-client/firefox
+						www-client/seamonkey ) ) )
+	amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )
+	linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
+	linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
+	linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
+	linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
+
+QA_EXECSTACK="opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+	opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+	opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api"
+
+QA_DT_HASH="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
+	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
+	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
+	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
+	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
+	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
+	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	opt/netscape/plugins/nppdf.so"
+
+QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so"
+
+INSTALLDIR=/opt
+
+S="${WORKDIR}/AdobeReader"
+
+# Actually, ahv segfaults when run standalone so presumably
+# it isn't intended for direct use - so the only launcher is
+# acroread after all.
+LAUNCHERS="Adobe/Reader9/bin/acroread"
+#	Adobe/HelpViewer/1.0/intellinux/bin/ahv"
+
+# remove bundled libs to force use of system version, bug 340527
+REMOVELIBS="libcrypto libssl"
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	has_multilib_profile && ABI="x86"
+}
+
+# Determine lingua from filename
+acroread_get_ll() {
+	local f_src_l ll lingua src_l
+	f_src_l=${1/${SRC_FOOT}}
+	f_src_l=${f_src_l/*_}
+	for ll in ${LINGUA_LIST} ; do
+		lingua=${ll/:*}
+		src_l=${ll/*:}
+		if [[ ${src_l} == ${f_src_l} ]] ; then
+			echo ${lingua}
+			return
+		fi
+	done
+	die "Failed to match file $1 to a LINGUA; please report."
+}
+
+src_unpack() {
+	local ll linguas fl launcher
+	# Unpack all into the same place; overwrite common files.
+	fl=""
+	for pkg in ${A} ; do
+		cd "${WORKDIR}"
+		unpack ${pkg}
+		cd "${S}"
+		tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
+		tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
+		ll=$(acroread_get_ll ${pkg})
+		for launcher in ${LAUNCHERS} ; do
+			mv ${launcher} ${launcher}.${ll}
+		done
+		if [[ -z ${fl} ]] ; then
+			fl=${ll}
+			linguas="${ll}"
+		else
+			linguas="${linguas} ${ll}"
+		fi
+	done
+	if [[ ${linguas} == ${fl} ]] ; then
+		# Only one lingua selected - skip building the wrappers
+		for launcher in ${LAUNCHERS} ; do
+			mv ${launcher}.${fl} ${launcher} ||
+				die "Failed to put ${launcher}.${fl} back to ${launcher}; please report."
+		done
+	else
+		# Build wrappers.  Launch the acroread for the environment variable
+		# LANG (matched with a trailing * so that for example 'de_DE' matches
+		# 'de', 'en_GB' matches 'en' etc).
+		#
+		# HelpViewer is new - We don't know if Adobe are likely to
+		# internationalize it or not.
+		for launcher in ${LAUNCHERS} ; do
+			cat > ${launcher} <<-EOF
+				#!/bin/bash
+				# Copyright 1999-2009 Gentoo Foundation
+				# Distributed under the terms of the GNU General Public License v2
+				#
+				# Automatically generated by ${CATEGORY}/${PF}
+
+				# Exec the acroread script for the language chosen in
+				# LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
+				L=\${LC_ALL}
+				L=\${L:-\${LC_MESSAGES}}
+				L=\${L:-\${LANG}}
+				case \${L} in
+			EOF
+			for ll in ${linguas} ; do
+				echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher}
+			done
+			# default to English (in particular for LANG=C)
+			cat >> ${launcher} <<-EOF
+				*) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
+				esac
+			EOF
+			chmod 755 ${launcher}
+		done
+	fi
+
+	# remove cruft
+	rm "${S}"/Adobe/Reader9/bin/UNINSTALL
+	rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
+	rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
+
+	# replace some configuration sections
+	for binfile in "${S}"/Adobe/Reader9/bin/* ; do
+		sed -i -e '/Font-config/,+9d' \
+			-e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
+			"${binfile}" || die "sed configuration settings failed."
+	done
+
+	# fix erroneous Exec entry in .desktop
+	sed -i -e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
+		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
+		||die "sed .desktop fix failed"
+}
+
+src_install() {
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader9/Resource/Icons/${res}/*
+	done
+
+	dodir /opt
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${D}"opt/ || die
+
+	# remove some bundled libs
+	for mylib in ${REMOVELIBS} ; do
+		einfo Removing bundled ${mylib}
+		rm -v "${D}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
+	done
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin
+	for launcher in ${LAUNCHERS} ; do
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
+	done
+
+	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
+	# they don't install a configuration file for libgtkembedmoz.so
+	# detection in /etc/gre.d/ like xulrunner does.
+	if ! use minimal ; then
+		if use x86 ; then
+			for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+				if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+					echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+					elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+					break # don't search any more libraries
+				fi
+			done
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst () {
+	local ll lc
+	lc=0
+	for ll in ${LINGUA_LIST} ; do
+		use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
+	done
+	if [[ ${lc} > 1 ]] ; then
+		echo
+		elog "Multiple languages have been installed, selected via a wrapper script."
+		elog "The language is selected according to the LANG environment variable"
+		elog "(defaulting to English if LANG is not set, or no matching language"
+		elog "version is installed). Users may need to remove their preferences in"
+		elog "~/.adobe to switch languages."
+		echo
+	fi
+
+	if use minimal ; then
+		echo
+		ewarn "If you want html support and/or view the Adobe Reader help you have"
+		ewarn "to re-emerge acroread with USE=\"-minimal\"."
+		echo
+	fi
+
+	if use nsplugin ; then
+		echo
+		elog "If you're running a 64bit browser you may also want to install"
+		elog "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
+		elog "browser plugin."
+		echo
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}