diff options
author | Ian Stakenvicius <axs@gentoo.org> | 2014-10-18 15:55:44 +0000 |
---|---|---|
committer | Ian Stakenvicius <axs@gentoo.org> | 2014-10-18 15:55:44 +0000 |
commit | f7432cd3a65160412f8c2199e173aefe0af27071 (patch) | |
tree | b11983ca5c32ef238acb78cfac911e9d79cdaec7 /www-client | |
parent | Stable on arm, ppc and ppc64. Bug #525746 (diff) | |
download | gentoo-2-f7432cd3a65160412f8c2199e173aefe0af27071.tar.gz gentoo-2-f7432cd3a65160412f8c2199e173aefe0af27071.tar.bz2 gentoo-2-f7432cd3a65160412f8c2199e173aefe0af27071.zip |
cleanup old, security bug 525474
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/firefox-bin/ChangeLog | 6 | ||||
-rw-r--r-- | www-client/firefox-bin/firefox-bin-24.8.1.ebuild | 177 |
2 files changed, 5 insertions, 178 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog index 427924017b5c..78d990ebfac2 100644 --- a/www-client/firefox-bin/ChangeLog +++ b/www-client/firefox-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/firefox-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.212 2014/10/18 13:55:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.213 2014/10/18 15:55:44 axs Exp $ + + 18 Oct 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> + -firefox-bin-24.8.1.ebuild: + cleanup old, security bug 525474 18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> firefox-bin-31.2.0-r1.ebuild: Stable for x86, wrt bug #525474 diff --git a/www-client/firefox-bin/firefox-bin-24.8.1.ebuild b/www-client/firefox-bin/firefox-bin-24.8.1.ebuild deleted file mode 100644 index b215df4defa9..000000000000 --- a/www-client/firefox-bin/firefox-bin-24.8.1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-24.8.1.ebuild,v 1.3 2014/10/06 19:01:58 ago Exp $ - -EAPI="5" -MOZ_ESR="1" - -# Can be updated using scripts/get_langs.sh from mozilla overlay -MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en -en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl -gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO -nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK -te th tr uk vi zh-CN zh-TW zu) - -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas -MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI -MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI -MOZ_PN="${PN/-bin}" -MOZ_P="${MOZ_PN}-${MOZ_PV}" - -if [[ ${MOZ_ESR} == 1 ]]; then - # ESR releases have slightly version numbers - MOZ_PV="${MOZ_PV}esr" -fi -MOZ_P="${MOZ_PN}-${MOZ_PV}" - -# Upstream ftp release URI that's used by mozlinguas.eclass -# We don't use the http mirror because it deletes old tarballs. -MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" - -inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins - -DESCRIPTION="Firefox Web Browser" -MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases" -SRC_URI="${SRC_URI} - amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 ) - x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )" -HOMEPAGE="http://www.mozilla.com/firefox" -RESTRICT="strip mirror" - -KEYWORDS="-* amd64 x86" -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="selinux startup-notification" - -DEPEND="app-arch/unzip - selinux? ( sec-policy/selinux-mozilla )" -RDEPEND="dev-libs/dbus-glib - virtual/freedesktop-icon-theme - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXmu - - selinux? ( sec-policy/selinux-mozilla ) - >=x11-libs/gtk+-2.2:2 - >=media-libs/alsa-lib-1.0.16 -" - -QA_PREBUILT=" - opt/${MOZ_PN}/*.so - opt/${MOZ_PN}/${MOZ_PN} - opt/${MOZ_PN}/${PN} - opt/${MOZ_PN}/crashreporter - opt/${MOZ_PN}/webapprt-stub - opt/${MOZ_PN}/plugin-container - opt/${MOZ_PN}/mozilla-xremote-client - opt/${MOZ_PN}/updater -" - -S="${WORKDIR}/${MOZ_PN}" - -src_unpack() { - unpack ${A} - - # Unpack language packs - mozlinguas_src_unpack -} - -src_install() { - declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN} - - local size sizes icon_path icon name - sizes="16 32 48" - icon_path="${S}/browser/chrome/icons/default" - icon="${PN}" - name="Mozilla Firefox" - - # Install icons and .desktop for menu entry - for size in ${sizes}; do - insinto "/usr/share/icons/hicolor/${size}x${size}/apps" - newins "${icon_path}/default${size}.png" "${icon}.png" || die - done - # The 128x128 icon has a different name - insinto "/usr/share/icons/hicolor/128x128/apps" - newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die - # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png - domenu "${FILESDIR}"/${PN}.desktop - sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ - "${ED}/usr/share/applications/${PN}.desktop" || die - - # Add StartupNotify=true bug 237317 - if use startup-notification; then - echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop - fi - - # Install firefox in /opt - dodir ${MOZILLA_FIVE_HOME%/*} - mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die - - # Fix prefs that make no sense for a system-wide install - insinto ${MOZILLA_FIVE_HOME}/defaults/pref/ - doins "${FILESDIR}"/local-settings.js - insinto ${MOZILLA_FIVE_HOME}/ - doins "${FILESDIR}"/all-gentoo.js - - # Install language packs - mozlinguas_src_install - - local LANG=${linguas%% *} - if [[ -n ${LANG} && ${LANG} != "en" ]]; then - elog "Setting default locale to ${LANG}" - echo "pref(\"general.useragent.locale\", \"${LANG}\");" \ - >> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \ - die "sed failed to change locale" - fi - - # Create /usr/bin/firefox-bin - dodir /usr/bin/ - cat <<-EOF >"${D}"/usr/bin/${PN} - #!/bin/sh - unset LD_PRELOAD - LD_LIBRARY_PATH="/opt/firefox/" - GTK_PATH=/usr/lib/gtk-2.0/ - exec /opt/${MOZ_PN}/${MOZ_PN} "\$@" - EOF - fperms 0755 /usr/bin/${PN} - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - doins "${FILESDIR}"/10${PN} || die - - # Plugins dir - share_plugins_dir - - # Required in order to use plugins and even run firefox on hardened. - pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container} -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ - || ! has_version 'net-misc/curl'; then - einfo - einfo "For using the crashreporter, you need gnome-base/gconf," - einfo "gnome-base/orbit and net-misc/curl emerged." - einfo - fi - # Drop requirement of curl not built with nss as it's not necessary anymore - #if has_version 'net-misc/curl[nss]'; then - # einfo - # einfo "Crashreporter won't be able to send reports" - # einfo "if you have curl emerged with the nss USE-flag" - # einfo - #fi - - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} |