Version bump, wrt security bug #322857.
authorTimo Gurr <tgurr@gentoo.org>
Thu, 1 Jul 2010 20:52:02 +0000 (20:52 +0000)
committerTimo Gurr <tgurr@gentoo.org>
Thu, 1 Jul 2010 20:52:02 +0000 (20:52 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

app-text/acroread/ChangeLog
app-text/acroread/Manifest
app-text/acroread/acroread-9.3.3.ebuild [new file with mode: 0644]

index 4789c59465adb10210afb8297b5b7d0a9c60f97e..ef47130ef41535fe7c1b3fa007fff060dfc41cc3 100644 (file)
@@ -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.147 2010/06/26 14:21:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.148 2010/07/01 20:52:02 tgurr Exp $
+
+*acroread-9.3.3 (01 Jul 2010)
+
+  01 Jul 2010; Timo Gurr <tgurr@gentoo.org> +acroread-9.3.3.ebuild:
+  Version bump, wrt security bug #322857.
 
   26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> acroread-9.3.2.ebuild:
   Remove support for vulnerable seamonkey (#305789) and xulrunner (#324953).
index 0961b0d17b4dca5c7e8c1d112754a7866ba5cd7d..19591a8be2a8384db948cdeea277b8134af31ca7 100644 (file)
@@ -3,6 +3,11 @@ DIST AdbeRdr9.3.2-1_i486linux_deu.tar.bz2 65857336 RMD160 72fb7cd7772ef9723638f8
 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
+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
+DIST AdbeRdr9.3.3-1_i486linux_fra.tar.bz2 64533478 RMD160 49cd7e27bd20e0676c03f223f972f259f33b36e6 SHA1 6527e49cc87448067bc87d2b776f6ab6227cb046 SHA256 4c66058fa73d8db4d5c9e505667c62935b555b75ab7ca8f8c9a2e73dc0230a2f
+DIST AdbeRdr9.3.3-1_i486linux_jpn.tar.bz2 68333798 RMD160 9603cc8a776fe2c969271e1cc9361583aa580eb9 SHA1 1133a0ef11d0f69969bfbdb2ca5d43d7850db629 SHA256 b91aae2d06a48527c955c0348445925412538b07c812d626ebd60ca654f57818
 EBUILD acroread-9.3.2.ebuild 7362 RMD160 b2782990a912df3b36c8e07e68a3b04de0d2774c SHA1 f9da83a70d54e1e0dd25f33f04abc8367350f5e8 SHA256 d0da11fe7451d3fc538c7999830a143e2a1e253382f08dd36105fbed8fd865bf
-MISC ChangeLog 25380 RMD160 ee28c9e6c75b767d65ff5f218b6369da452ad238 SHA1 de871944d5fc6458f03d5acc5ecaa6fded8feea3 SHA256 539132f70953387b2aa686d24acd952a6fb1915f677e7bfe910fedf3a5de8b32
+EBUILD acroread-9.3.3.ebuild 7360 RMD160 0dcb35b9736950dd049229c0b78b78f3525e5b35 SHA1 36fffab0afa87598c24bc3376d08e242a4bac4c8 SHA256 ca3225d8294d1988fc7ee7abb5144d51be5f87651c3bc5398654358b6eb01c26
+MISC ChangeLog 25518 RMD160 c85fc235eb22d644a01587cf4b827e0fb084ed73 SHA1 48dd9035ff8c076ad06654ad1306d43de190ddf5 SHA256 274b4bc83578bb220c317febba43d623dc6d7cac633ba30a79d33fa0bee3c906
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/acroread/acroread-9.3.3.ebuild b/app-text/acroread/acroread-9.3.3.ebuild
new file mode 100644 (file)
index 0000000..0f2a645
--- /dev/null
@@ -0,0 +1,238 @@
+# 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.3.ebuild,v 1.1 2010/07/01 20:52:02 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
+                                               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
+}