Version bump. Fixes 23 security vulnerabilities. CVE-2010-2883, CVE-2010-2884, CVE-2010-2887, CVE-2010-2888, CVE-2010-2889, CVE-2010-2890, CVE-2010-3619, CVE-2010-3620, CVE-2010-3621, CVE-2010-3622, CVE-2010-3623, CVE-2010-3624, CVE-2010-3625, CVE-2010-3626, CVE-2010-3627, CVE-2010-3628, CVE-2010-3629, CVE-2010-3630, CVE-2010-3631, CVE-2010-3632, CVE-2010-3656, CVE-2010-3657, and CVE-2010-3658.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

3 files changed, 259 insertions, 12 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 631817cd1881..9f926c02096c 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.155 2010/09/24 08:03:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.156 2010/10/08 13:21:12 scarabeus Exp $
+
+*acroread-9.4.0 (08 Oct 2010)
+
+  08 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +acroread-9.4.0.ebuild:
+  Version bump. Fixes 23 security vulnerabilities. CVE-2010-2883,
+  CVE-2010-2884, CVE-2010-2887, CVE-2010-2888, CVE-2010-2889, CVE-2010-2890,
+  CVE-2010-3619, CVE-2010-3620, CVE-2010-3621, CVE-2010-3622, CVE-2010-3623,
+  CVE-2010-3624, CVE-2010-3625, CVE-2010-3626, CVE-2010-3627, CVE-2010-3628,
+  CVE-2010-3629, CVE-2010-3630, CVE-2010-3631, CVE-2010-3632, CVE-2010-3656,
+  CVE-2010-3657, and CVE-2010-3658.
 
   24 Sep 2010; Zac Medico <zmedico@gentoo.org> acroread-9.3.3.ebuild,
   acroread-9.3.4.ebuild:
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 96f9007a155c..81a537ba50ab 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoo_config 356 RMD160 fde2e1f78d39d39611ea91fc94f8c31bc8634425 SHA1 ce38b7160e842d970804216e156d5edbcbfd3e1d SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f
 DIST AdbeRdr9.3.3-1_i486linux_deu.tar.bz2 65858598 RMD160 22e8242d34068b434dcdc9b211f21117934b5cbe SHA1 72b7cbed6d83f97ffbe742c04fa62ecc80d5c8c9 SHA256 1cddd90450ba6b93d4d73e99aaea7ee9aa1c9d533926925a59744cd51f61836b
 DIST AdbeRdr9.3.3-1_i486linux_enu.tar.bz2 60167826 RMD160 f1ad9ead9a254823240e0a3c85af686f34ef7e4e SHA1 7b7f027a49cffbb9f8e211cb1a5928d2125ee1f3 SHA256 0720fdc4da77f119c500bc9906875e094ff577d5709502fd5307ece1655b5ae3
@@ -10,14 +7,12 @@ DIST AdbeRdr9.3.4-1_i486linux_deu.tar.bz2 65859958 RMD160 896417a9722f41fa10e374
 DIST AdbeRdr9.3.4-1_i486linux_enu.tar.bz2 60166581 RMD160 76448b49218f4da2cde3252a3767053acb9d28dd SHA1 9df49f9fdd7f4a9babf37810615d23f84a5daeb9 SHA256 122b3636b0db55acef6c2f68270dd9c1bb43eb79aa061e53d15d779bd26b7fd2
 DIST AdbeRdr9.3.4-1_i486linux_fra.tar.bz2 64533887 RMD160 2b858afed19bccaa188932f543979f127703871f SHA1 3b55192d058ad1fe6753f4d033b0f0faf0fb070d SHA256 8d6c94776f4956f78c72cd9e7b9c66868d6932c50bea98aa50cbecccf0af156d
 DIST AdbeRdr9.3.4-1_i486linux_jpn.tar.bz2 68330257 RMD160 c7642a1429eef1109c0919a2fa0fa6a39c65c979 SHA1 dce03759761af410c65dec8331eb9d235f0726d3 SHA256 6134c1dc304c899a305d70687c84fad1dd57cc3e9e333b6ff4ddd96382db12fd
+DIST AdbeRdr9.4-1_i486linux_deu.tar.bz2 65880998 RMD160 08d6a173a9601742f254fe853ce3e6ff8291af89 SHA1 9e34909c3041f6b2c28e7bf5a62c362148379e74 SHA256 fbb956e28bcca56694902f6e0e196f14994661db736c9a64291aee86c2bc1af2
+DIST AdbeRdr9.4-1_i486linux_enu.tar.bz2 60172172 RMD160 ce33d6a66b175dce79ecdf820831b915ddacc9fb SHA1 a5ee3f94bb5027e1b3842ff373c953fb2ca5665a SHA256 ae2944c3b974cb12cd01556feba9d0a1dcee02b204aeb337586accb200d77524
+DIST AdbeRdr9.4-1_i486linux_fra.tar.bz2 64514677 RMD160 3a47596793633826044404c44abef16e50f2cc77 SHA1 6a25ed2663763e1df10a7f285f11b5992a779171 SHA256 f090d27062cef605440c8583231914d14d6ba30b9959e1f110b8c75be88156ab
+DIST AdbeRdr9.4-1_i486linux_jpn.tar.bz2 68336537 RMD160 95353188d07898d33fb317281293f2249a0e6b98 SHA1 4898034a5bf1fd14265a45e0fc0d83acae7888e2 SHA256 762266e1049b27010177faabda8028874a2675e3242eeff3a52cccd780d35b02
 EBUILD acroread-9.3.3.ebuild 7395 RMD160 bee13faa980ebb85152ed9d5bf61570b33a5312f SHA1 c8b2230393095f31802dc65c536483cbea8c9d80 SHA256 ed0b1869524cc67b4bdfb5cbd4d1dc376c3b02ed9da7100ac9f4715077a402e4
 EBUILD acroread-9.3.4.ebuild 7395 RMD160 246681a36cdddfa92b1e0c43aae70bf2728c2d0e SHA1 9272b7d22c45777f6da1030f0e879ec3b0a44297 SHA256 3d00ae9e7a36c0f81aff3c663cf099139b405773d3a74f8d768349b804914b25
-MISC ChangeLog 26574 RMD160 cf04efe4f07a0e43ad5983416b537bf90829d3b7 SHA1 15c10449a5c935b2dac5e34efc4776680f40c434 SHA256 8515f21ebde272b09010fc7a47e0ac4b500d8fbbacee82accbfb1d6e65afd0c0
+EBUILD acroread-9.4.0.ebuild 7476 RMD160 b11d878b2fdf8922ce3747b735f4b04a2f92e89e SHA1 f1677a64a7b186238a1e953b00dc256a6166fb6c SHA256 6886f62838e7fa26cb3d33ec41fc3c890f2d46d6aa579ddf9362f4fefa2406cf
+MISC ChangeLog 27099 RMD160 e6fa57ed2e7ef227bb274a3a018296258d2659f4 SHA1 6c3574f99542cf25e056cb914d8eab6abf464405 SHA256 312e722bb7dc3d8e5672b43578d66a133d2ef085c3f00b0a68343830a9b2a630
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkycWzgACgkQ/ejvha5XGaP5bgCfeNpxJGgDu5J5IDTWS1vN9Y5j
-TQ0AoK6hnuqt2+KqAidGGDfHjVeZv8bf
-=vwP3
------END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.4.0.ebuild b/app-text/acroread/acroread-9.4.0.ebuild
new file mode 100644
index 000000000000..a935bf2cc299
--- /dev/null
+++ b/app-text/acroread/acroread-9.4.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.0.ebuild,v 1.1 2010/10/08 13:21:12 scarabeus Exp $
+
+inherit eutils gnome2-utils nsplugins versionator
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+IUSE="cups ldap minimal nsplugin"
+
+SRC_HEAD="ftp://ftp.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
+LINGUA_LIST="de:deu en:enu fr:fra ja:jpn"
+# idiots, seriously...
+FIX_PV=$(get_version_component_range 1-2)
+DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${FIX_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${FIX_PV}-1_i486linux_${src_l}${SRC_FOOT} )"
+done
+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.0
+			ldap? ( net-nds/openldap )
+			!minimal? ( || ( net-libs/xulrunner
+						www-client/mozilla-firefox
+						www-client/seamonkey ) ) )
+	amd64? ( app-emulation/emul-linux-x86-gtklibs )"
+
+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"
+
+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"
+
+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
+}
+
+src_install() {
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop || die "Installing desktop files failed."
+
+	# 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}/* || die "Installing icons failed."
+	done
+
+	dodir /opt || die "Creating directory failed."
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${D}"opt/
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz || die "Installing manpage failed."
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin || die "Creating directory failed."
+	for launcher in ${LAUNCHERS} ; do
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} || die "Installing launcher symlinks failed."
+	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
+}