diff options
| -rw-r--r-- | app-text/acroread/ChangeLog | 9 | ||||
| -rw-r--r-- | app-text/acroread/acroread-8.1.2-r1.ebuild | 271 | ||||
| -rw-r--r-- | app-text/acroread/acroread-8.1.2-r3.ebuild (renamed from app-text/acroread/acroread-8.1.2.ebuild) | 111 |
3 files changed, 57 insertions, 334 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 8039045adef4..b1fe83e695ca 100644 --- a/app-text/acroread/ChangeLog +++ b/app-text/acroread/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/acroread # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.115 2008/04/27 13:56:39 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.116 2008/08/01 18:06:47 tgurr Exp $ + +*acroread-8.1.2-r3 (01 Aug 2008) + + 01 Aug 2008; Timo Gurr <tgurr@gentoo.org> -acroread-8.1.2.ebuild, + -acroread-8.1.2-r1.ebuild, +acroread-8.1.2-r3.ebuild: + Bump for Adobe Reader 8.1.2 Security Update 1, fixing security issue + CVE-2008-2641 bug #233383. Remove older versions. 27 Apr 2008; Markus Meier <maekke@gentoo.org> acroread-8.1.2-r2.ebuild: amd64/x86 stable, bug #219207 diff --git a/app-text/acroread/acroread-8.1.2-r1.ebuild b/app-text/acroread/acroread-8.1.2-r1.ebuild deleted file mode 100644 index 37bd382b9be0..000000000000 --- a/app-text/acroread/acroread-8.1.2-r1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2-r1.ebuild,v 1.5 2008/03/18 10:35:29 armin76 Exp $ - -inherit eutils nsplugins - -DESCRIPTION="Adobe's PDF reader" -HOMEPAGE="http://www.adobe.com/products/acrobat/" -IUSE="cups ldap minimal nsplugin" - -SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}" -SRC_FOOT="-${PV}-1.i486.tar.bz2" - -LINGUA_LIST="da:dan de:deu en:enu es:esp fi:suo fr:fra it:ita ja:jpn ko:kor nb:nor nl:nld pt:ptb sv:sve zh_CN:chs zh_TW:cht" -DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_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}/AdobeReader_${src_l}${SRC_FOOT} )" -done -SRC_URI="${SRC_URI} - ${DEFAULT_URI}" - -LICENSE="Adobe" -SLOT="0" -KEYWORDS="-* amd64 x86" -RESTRICT="strip mirror" - -# Needs libgtkembedmoz.so, which can come from xulrunner, mozilla-firefox or -# seamonkey. In the case of mozilla-firefox and seamonkey, we need to create -# /etc/gre.d/gre.conf with GRE_PATH set. On amd64 currently only seamonkey-bin -# provides a 32bit libgtkembedmoz.so. -RDEPEND="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 - www-client/seamonkey-bin ) ) ) - amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2 - >=app-emulation/emul-linux-x86-gtklibs-2.0 - !minimal? ( www-client/seamonkey-bin ) )" -QA_TEXTRELS="opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api - opt/Adobe/Reader8/Browser/intellinux/nppdf.so - opt/netscape/plugins/nppdf.so" -QA_EXECSTACK="opt/Adobe/Reader8/Reader/intellinux/plug_ins/Annots.api - opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api - opt/Adobe/Reader8/Reader/intellinux/bin/acroread - opt/Adobe/Reader8/Reader/intellinux/bin/SynchronizerApp-binary - opt/Adobe/Reader8/Reader/intellinux/lib/libsccore.so - opt/Adobe/Reader8/Reader/intellinux/lib/libcrypto.so.0.9.7" - -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/Reader8/bin/acroread" -# Adobe/HelpViewer/1.0/intellinux/bin/ahv" - -pkg_setup() { - # x86 binary package, ABI=x86 - # Danny van Dyk <kugelfang@gentoo.org> 2005/03/25 - 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}" - if [[ ${pkg} =~ ^AdobeReader_ ]] ; then - tar xf ILINXR.TAR || - die "Failed to unpack ILINXR.TAR; is distfile corrupt?" - tar xf COMMON.TAR || - die "Failed to unpack COMMON.TAR; is distfile corrupt?" - 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 - 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). - # - # This is a bit premature at the moment on 8.1.1, for two reasons: - # 1) The only language issued so far by Adobe is English, and the - # provided launcher doesn't bring out its strings separately - # (indicating internationalisation hasn't yet begin for 8.1.1) - # 2) HelpViewer is new - I don't know if Adobe are likely to - # internationalise it or not. - for launcher in ${LAUNCHERS} ; do - cat > ${launcher} <<-EOF - #!/bin/bash - # Copyright 1999-2007 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 particualr for LANG=C) - cat >> ${launcher} <<-EOF - *) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";; - esac - EOF - chmod 755 ${launcher} - done - fi - - # remove cruft - rm "${S}"/Adobe/Reader8/bin/UNINSTALL - rm "${S}"/Adobe/Reader8/Resource/Support/vnd.*.desktop - - # fix CVE-2008-0883 the sed way, see bug #212367 - local binfile - for binfile in "${S}"/Adobe/Reader8/bin/* ; do - sed -i -e '/MkTemp()/,+17d' \ - -e 's/MkTemp/mktemp/g' \ - "${binfile}" || die "sed failed" - done -} - -src_install() { - local dir - - # Install desktop files - domenu Adobe/Reader8/Resource/Support - # Install Icons - choose 48x48 since that's what the previous versions - # supplied. - doicon Adobe/Reader8/Resource/Icons/48x48 - - dodir /opt - chown -R --dereference -L root:0 Adobe - cp -dpR Adobe "${D}"opt/ - - # The Browser_Plugin_HowTo.txt is now in a subdirectory, which - # is named according to the language the user is using. - # Ie. for German, it is in a DEU directory. See bug #118015 - dodoc Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt - - if use nsplugin ; then - exeinto /opt/netscape/plugins - doexe Adobe/Reader8/Browser/intellinux/nppdf.so - inst_plugin /opt/netscape/plugins/nppdf.so - fi - - if ! use ldap ; then - rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api - fi - - dodir /opt/bin - for launcher in ${LAUNCHERS} ; do - dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} - done -} - -pkg_postinst () { - if ! use minimal ; then - local ll lc - grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null - if [[ $? != "0" ]] ; then - if use x86 ; then - for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do - if [[ -f ${lib}/libgtkembedmoz.so ]] ; then - mkdir -p /etc/gre.d - cat > /etc/gre.d/gre.conf <<-EOF - GRE_PATH=${lib} - EOF - elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on" - elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf." - 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 - mkdir -p /etc/gre.d - cat > /etc/gre.d/gre.conf <<-EOF - GRE_PATH=${lib} - EOF - elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on" - elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf." - break # don't search any more libraries - fi - done - fi - fi - fi - - use ldap || - elog "The Adobe Reader security plugin can be enabled with USE=ldap" - - use nsplugin || - elog "The Adobe Reader browser plugin can be enabled with USE=nsplugin" - - lc=0 - for ll in ${LINGUA_LIST} ; do - use linguas_${ll/:*} && (( lc = ${lc} + 1 )) - done - if [[ ${lc} > 1 ]] ; then - 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." - fi - - if ! use minimal ; then - grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null - if [[ $? != "0" ]] ; then - ewarn "Adobe Reader depends dynamically on libgtkembedmoz.so, which should come" - ewarn "with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't be found." - ewarn "The first time you start acroread, it will complain about this, telling you" - ewarn "to add the path to it to your preferences. Clear the error dialog, close the" - ewarn "beyond Adobe Reader dialog, go to Edit -> Preferences -> Internet and set the" - ewarn "libgtkembedmoz directory to the place where it exists, then close and restart" - ewarn "acroread." - fi - else - ewarn "If you want html support and/or view the help you have to re-emerge" - ewarn "acroread with USE=\"-minimal\"." - fi -} diff --git a/app-text/acroread/acroread-8.1.2.ebuild b/app-text/acroread/acroread-8.1.2-r3.ebuild index 42d2cae372c5..af315473c35a 100644 --- a/app-text/acroread/acroread-8.1.2.ebuild +++ b/app-text/acroread/acroread-8.1.2-r3.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2.ebuild,v 1.5 2008/03/18 10:35:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2-r3.ebuild,v 1.1 2008/08/01 18:06:47 tgurr Exp $ inherit eutils nsplugins DESCRIPTION="Adobe's PDF reader" HOMEPAGE="http://www.adobe.com/products/acrobat/" -IUSE="cups ldap nsplugin" +IUSE="cups ldap minimal nsplugin" SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}" -SRC_FOOT="-${PV}-1.i486.tar.bz2" +SRC_FOOT="-${PV}_SU1-1.i486.tar.bz2" LINGUA_LIST="da:dan de:deu en:enu es:esp fi:suo fr:fra it:ita ja:jpn ko:kor nb:nor nl:nld pt:ptb sv:sve zh_CN:chs zh_TW:cht" DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}" @@ -22,28 +22,26 @@ for ll in ${LINGUA_LIST} ; do ${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdobeReader_${src_l}${SRC_FOOT} )" done SRC_URI="${SRC_URI} - ${DEFAULT_URI} - x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )" + ${DEFAULT_URI}" LICENSE="Adobe" SLOT="0" -KEYWORDS="-* amd64 x86" +KEYWORDS="-* ~amd64 ~x86" RESTRICT="strip mirror" -# Needs libgtkembedmoz.so, which can come from xulrunner, mozilla-firefox or -# seamonkey. In the case of mozilla-firefox and seamonkey, we need to create -# /etc/gre.d/gre.conf with GRE_PATH set. On amd64 currently only seamonkey-bin -# provides a 32bit libgtkembedmoz.so. -RDEPEND="x86? ( >=x11-libs/gtk+-2.0 - cups? ( net-print/cups ) +RDEPEND="media-libs/fontconfig + cups? ( net-print/cups ) + x86? ( >=x11-libs/gtk+-2.0 ldap? ( net-nds/openldap ) - || ( net-libs/xulrunner - www-client/mozilla-firefox - www-client/seamonkey - www-client/seamonkey-bin ) ) + !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 - www-client/seamonkey-bin )" + !minimal? ( || ( net-libs/xulrunner-bin + www-client/seamonkey-bin ) ) )" QA_TEXTRELS="opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api opt/Adobe/Reader8/Browser/intellinux/nppdf.so opt/netscape/plugins/nppdf.so" @@ -83,7 +81,7 @@ acroread_get_ll() { return fi done - die "Failed to match file $1 to a LINGUA; please report" + die "Failed to match file $1 to a LINGUA; please report." } src_unpack() { @@ -115,23 +113,19 @@ src_unpack() { # 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" + 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). # - # This is a bit premature at the moment on 8.1.1, for two reasons: - # 1) The only language issued so far by Adobe is English, and the - # provided launcher doesn't bring out its strings separately - # (indicating internationalisation hasn't yet begin for 8.1.1) - # 2) HelpViewer is new - I don't know if Adobe are likely to - # internationalise it or not. + # 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-2007 Gentoo Foundation + # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # Automatically generated by ${CATEGORY}/${PF} @@ -146,7 +140,7 @@ src_unpack() { for ll in ${linguas} ; do echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher} done - # default to English (in particualr for LANG=C) + # default to English (in particular for LANG=C) cat >> ${launcher} <<-EOF *) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";; esac @@ -154,6 +148,17 @@ src_unpack() { chmod 755 ${launcher} done fi + + # remove cruft + rm "${S}"/Adobe/Reader8/bin/UNINSTALL + rm "${S}"/Adobe/Reader8/Resource/Support/vnd.*.desktop + + # replace some configuration sections + for binfile in "${S}"/Adobe/Reader8/bin/* ; do + sed -i -e '/Font-config/,+10d' \ + -e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \ + "${binfile}" || die "sed failed" + done } src_install() { @@ -184,33 +189,21 @@ src_install() { rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api fi - # libcups is needed for printing support (bug 118417) - if use x86 && ! use cups ; then - mv "${WORKDIR}"/libcups.so-i386 "${WORKDIR}"/libcups.so.2 - exeinto ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib - doexe "${WORKDIR}"/libcups.so.2 - dosym libcups.so.2 ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib/libcups.so - fi - dodir /opt/bin for launcher in ${LAUNCHERS} ; do dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} done -} -pkg_postinst () { - local ll lc - grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null - if [[ $? != "0" ]] ; then + # 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 - mkdir -p /etc/gre.d - cat > /etc/gre.d/gre.conf <<-EOF - GRE_PATH=${lib} - EOF + echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/GlobalPrefs/mozilla_config elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on" - elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf." + elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader8/Reader/GlobalPrefs/mozilla_config." break # don't search any more libraries fi done @@ -218,24 +211,24 @@ pkg_postinst () { if use amd64 ; then for lib in /opt/seamonkey ; do if [[ -f ${lib}/libgtkembedmoz.so ]] ; then - mkdir -p /etc/gre.d - cat > /etc/gre.d/gre.conf <<-EOF - GRE_PATH=${lib} - EOF + echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/GlobalPrefs/mozilla_config elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on" - elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf." + elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader8/Reader/GlobalPrefs/mozilla_config." break # don't search any more libraries fi done fi fi +} +pkg_postinst () { use ldap || - elog "The Adobe Reader security plugin can be enabled with USE=ldap" + elog "The Adobe Reader security plugin can be enabled with USE=\"ldap\"." use nsplugin || - elog "The Adobe Reader browser plugin can be enabled with USE=nsplugin" + elog "The Adobe Reader browser plugin can be enabled with USE=\"nsplugin\"." + local ll lc lc=0 for ll in ${LINGUA_LIST} ; do use linguas_${ll/:*} && (( lc = ${lc} + 1 )) @@ -244,18 +237,12 @@ pkg_postinst () { 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 "version is installed). Users may need to remove their preferences in" elog "~/.adobe to switch languages." fi - grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null - if [[ $? != "0" ]] ; then - ewarn "Adobe Reader depends dynamically on libgtkembedmoz.so, which should come" - ewarn "with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't be found." - ewarn "The first time you start acroread, it will complain about this, telling you" - ewarn "to add the path to it to your preferences. Clear the error dialog, close the" - ewarn "beyond Adobe Reader dialog, go to Edit -> Preferences -> Internet and set the" - ewarn "libgtkembedmoz directory to the place where it exists, then close and restart" - ewarn "acroread." + if use minimal ; then + ewarn "If you want html support and/or view the Adobe Reader help you have" + ewarn "to re-emerge acroread with USE=\"-minimal\"." fi } |