From 15b7d99edf4dbf240c3f0af4251ea4ce992a237f Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Mon, 19 Apr 2010 20:49:28 +0000 Subject: [PATCH] Version bump, wrt security bug #313343. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-text/acroread/ChangeLog | 7 +- app-text/acroread/Manifest | 7 +- app-text/acroread/acroread-9.3.2.ebuild | 253 ++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 2 deletions(-) create mode 100644 app-text/acroread/acroread-9.3.2.ebuild diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 8f9cafd710d2..c98d8d3c779b 100644 --- a/app-text/acroread/ChangeLog +++ b/app-text/acroread/ChangeLog @@ -1,6 +1,11 @@ # 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.143 2010/03/07 01:38:13 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.144 2010/04/19 20:49:28 tgurr Exp $ + +*acroread-9.3.2 (19 Apr 2010) + + 19 Apr 2010; Timo Gurr +acroread-9.3.2.ebuild: + Version bump, wrt security bug #313343. 07 Mar 2010; Timo Gurr -acroread-9.3.ebuild: Remove vulnerable version wrt bug #306429. diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest index 7d9148ada9fa..df4d21da706b 100644 --- a/app-text/acroread/Manifest +++ b/app-text/acroread/Manifest @@ -3,6 +3,11 @@ DIST AdbeRdr9.3.1-1_i486linux_deu.tar.bz2 65917500 RMD160 5f6f4094457850a1bea0dd DIST AdbeRdr9.3.1-1_i486linux_enu.tar.bz2 60275889 RMD160 41fe1b8da25ccedfef2881fb0668e9a531fc1ab2 SHA1 2473652af21ea3718ad74f31ebd198c9b1c95ccb SHA256 10e8c8abc427e5609ed2891dde072fd1f35cd828b13c968d853ec5b27f4d9667 DIST AdbeRdr9.3.1-1_i486linux_fra.tar.bz2 64534236 RMD160 1671518a127d50f02b03756a33a8725ca26dc457 SHA1 9eb67b289e0d67c8379719521fd33e4737479378 SHA256 ccd866658fe44bd30613c114c058bbe2699d1997b34fd3d188003e7887b81df4 DIST AdbeRdr9.3.1-1_i486linux_jpn.tar.bz2 68431169 RMD160 f77898479a2bdf02b4fdb67b544f1b8747b8aebb SHA1 95668e96868da618a6473852008cc3338d28e8f7 SHA256 f8d0c6595c899c7ef11dc4c848dbcc860e53fe3a9c49a05674885c4432d2ec8b +DIST AdbeRdr9.3.2-1_i486linux_deu.tar.bz2 65857336 RMD160 72fb7cd7772ef9723638f8b7ab976e7280ac9d3c SHA1 4a03482311712f9d2a74c7439e595be2419e6f8d SHA256 76e2f0a71c13b77341f140594f1da7ac51f163b5e692bae65d4c71bf9e7dae3d +DIST AdbeRdr9.3.2-1_i486linux_enu.tar.bz2 60210433 RMD160 8cae12012c104b9515d81ee28d059344f3e61ec6 SHA1 5849892c613c6ae4deacab57c7edbf1ee03276f5 SHA256 61beab723bbb584c473a8e4ca7700ad13e196f7ea5308dc2d22c66c4ec335f0f +DIST AdbeRdr9.3.2-1_i486linux_fra.tar.bz2 64553411 RMD160 c07a4cf20e10b6845bb4e3904a97790ad1992696 SHA1 92bb9aee637b2137f0218387d855a497375c6a85 SHA256 d7031c75c3423085e9fa7cfd55bb7caf31582f2354e086d862718ab8b46386aa +DIST AdbeRdr9.3.2-1_i486linux_jpn.tar.bz2 68422530 RMD160 24a917782190d245bcb4ac758ef64318563dcd23 SHA1 41cd50c99b8e5cced7c0a4f15807840bebcd1023 SHA256 c4c4cd79261fac8f6ce579f67e3e53b2413f0b863c68474ef347394b6a17b90f EBUILD acroread-9.3.1.ebuild 8019 RMD160 194783a74cbfbe079101957e48471e4d44a96754 SHA1 65912072897dc585949be0ac589c4f223aeecba3 SHA256 3d5f99737c40ded4c166b64502c7f961307b361f02ab796ea5981507f52b5e16 -MISC ChangeLog 24860 RMD160 88eec1d17acfa67ba2173a7c1362c322c2e7d6c6 SHA1 99de981982d11406b6c9e60e4d52133cfea22746 SHA256 47ac267a6414c0f01a8cc1b831f946a10176a0a08f8adaca32843d918411eaef +EBUILD acroread-9.3.2.ebuild 8021 RMD160 9cb272b28813e0728e899ba8d0928bfd50856a5a SHA1 5b98f37b4056c5d170a25c5af7a584a1234960b2 SHA256 f12a2719df60d286721baadee27c9dbb36de2195ec11c5f34769ad20a50ffa09 +MISC ChangeLog 25002 RMD160 76fad0387d7270221b853733f11e4562897f5300 SHA1 7c6930d2cca224c8b4d29e516f9302e8b793b13c SHA256 8ad3e3f5e28781fb35366fbcae6bc764d5360331f9fe2d81bb3915ee3524990e MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/app-text/acroread/acroread-9.3.2.ebuild b/app-text/acroread/acroread-9.3.2.ebuild new file mode 100644 index 000000000000..eab2f50eba21 --- /dev/null +++ b/app-text/acroread/acroread-9.3.2.ebuild @@ -0,0 +1,253 @@ +# 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.3.2.ebuild,v 1.1 2010/04/19 20:49:28 tgurr Exp $ + +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 +LINGUA_LIST="de:deu en:enu fr:fra ja:jpn" +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 +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 + cups? ( net-print/cups ) + x86? ( >=x11-libs/gtk+-2.0 + ldap? ( net-nds/openldap ) + !minimal? ( || ( net-libs/xulrunner + net-libs/xulrunner-bin + www-client/mozilla-firefox + www-client/seamonkey + www-client/seamonkey-bin ) ) ) + amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2 + >=app-emulation/emul-linux-x86-gtklibs-2.0 + !minimal? ( || ( net-libs/xulrunner-bin + www-client/seamonkey-bin ) ) )" + +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 + if use amd64 ; then + for lib in /opt/seamonkey ; 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 +} -- 2.26.2