Fix buffer overflow, bug #105396.
authorMartin Schlemmer <azarah@gentoo.org>
Thu, 15 Sep 2005 12:08:32 +0000 (12:08 +0000)
committerMartin Schlemmer <azarah@gentoo.org>
Thu, 15 Sep 2005 12:08:32 +0000 (12:08 +0000)
Package-Manager: portage-2.0.52-r1

www-client/mozilla/ChangeLog
www-client/mozilla/Manifest
www-client/mozilla/files/digest-mozilla-1.7.11-r3 [new file with mode: 0644]
www-client/mozilla/files/mozilla-1.7.11-GLSA105396.patch [new file with mode: 0644]
www-client/mozilla/mozilla-1.7.11-r3.ebuild [new file with mode: 0644]

index 26c40dab840fb6f9b282910108bb16f183658f42..64e3ce50c80d8055e5139258725baa98f6fe77a6 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.64 2005/08/16 04:45:21 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.65 2005/09/15 12:08:32 azarah Exp $
+
+*mozilla-1.7.11-r3 (15 Sep 2005)
+
+  15 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mozilla-1.7.11-GLSA105396.patch, +mozilla-1.7.11-r3.ebuild:
+  Fix buffer overflow, bug #105396.
 
 *mozilla-1.7.11-r2 (16 Aug 2005)
 
index fa56eb45aaf1f02f837a77ce7d000011f581a857..abf13beb66a0dad9402e632220a87774a9e3ff29 100644 (file)
@@ -1,31 +1,44 @@
-MD5 d0ca088daa19d96301e82f461121cac0 ChangeLog 49988
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
-MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
-MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
-MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
 MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
+MD5 f1a66a6c1bc9f4683f283465e450a777 ChangeLog 50179
 MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
-MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
+MD5 7387ac118f94754859305bf8a65e0455 mozilla-1.7.11-r3.ebuild 12322
+MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
+MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
+MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
 MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
-MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049
+MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
 MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
+MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428
+MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
+MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
+MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
-MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKWSd1ZcsMnZjRyIRAj21AKCo6iplJsQD2I7KoYWK1CbR5B0slwCcC6fl
+FQq/U2nlZh0RiestEwR7aoQ=
+=3yfM
+-----END PGP SIGNATURE-----
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.11-r3 b/www-client/mozilla/files/digest-mozilla-1.7.11-r3
new file mode 100644 (file)
index 0000000..1567530
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 c40e4d1a445cc31897462982c2aec333 mozilla-1.7.11-source.tar.bz2 29818300
+MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
+MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
diff --git a/www-client/mozilla/files/mozilla-1.7.11-GLSA105396.patch b/www-client/mozilla/files/mozilla-1.7.11-GLSA105396.patch
new file mode 100644 (file)
index 0000000..30839e8
--- /dev/null
@@ -0,0 +1,104 @@
+Index: nsStandardURL.cpp
+===================================================================
+RCS file: /cvs/mozilla/netwerk/base/src/nsStandardURL.cpp,v
+retrieving revision 1.60.16.2
+diff -p -u -1 -2 -r1.60.16.2 nsStandardURL.cpp
+--- 1/netwerk/base/src/nsStandardURL.cpp       17 Feb 2005 23:40:53 -0000      1.60.16.2
++++ 2/netwerk/base/src/nsStandardURL.cpp       9 Sep 2005 16:34:46 -0000
+@@ -403,24 +403,25 @@ nsStandardURL::AppendToBuf(char *buf, PR
+ //  4- update url segment positions and lengths
+ nsresult
+ nsStandardURL::BuildNormalizedSpec(const char *spec)
+ {
+     // Assumptions: all member URLSegments must be relative the |spec| argument
+     // passed to this function.
+ 
+     // buffers for holding escaped url segments (these will remain empty unless
+     // escaping is required).
+     nsCAutoString encUsername;
+     nsCAutoString encPassword;
+     nsCAutoString encHost;
++    PRBool useEncHost;
+     nsCAutoString encDirectory;
+     nsCAutoString encBasename;
+     nsCAutoString encExtension;
+     nsCAutoString encParam;
+     nsCAutoString encQuery;
+     nsCAutoString encRef;
+ 
+     //
+     // escape each URL segment, if necessary, and calculate approximate normalized
+     // spec length.
+     //
+     PRInt32 approxLen = 3; // includes room for "://"
+@@ -440,34 +441,36 @@ nsStandardURL::BuildNormalizedSpec(const
+         approxLen += encoder.EncodeSegmentCount(spec, mBasename,  esc_FileBaseName,  encBasename);
+         approxLen += encoder.EncodeSegmentCount(spec, mExtension, esc_FileExtension, encExtension);
+         approxLen += encoder.EncodeSegmentCount(spec, mParam,     esc_Param,         encParam);
+         approxLen += encoder.EncodeSegmentCount(spec, mQuery,     esc_Query,         encQuery);
+         approxLen += encoder.EncodeSegmentCount(spec, mRef,       esc_Ref,           encRef);
+     }
+ 
+     // do not escape the hostname, if IPv6 address literal, mHost will
+     // already point to a [ ] delimited IPv6 address literal.
+     // However, perform Unicode normalization on it, as IDN does.
+     mHostEncoding = eEncoding_ASCII;
+     if (mHost.mLen > 0) {
++        useEncHost = PR_FALSE;
+         const nsCSubstring& tempHost =
+             Substring(spec + mHost.mPos, spec + mHost.mPos + mHost.mLen);
+         if (IsASCII(tempHost))
+             approxLen += mHost.mLen;
+         else {
+             mHostEncoding = eEncoding_UTF8;
+             if (gIDNService &&
+-                NS_SUCCEEDED(gIDNService->Normalize(tempHost, encHost)))
++                NS_SUCCEEDED(gIDNService->Normalize(tempHost, encHost))) {
+                 approxLen += encHost.Length();
+-            else {
++                useEncHost = PR_TRUE;
++            } else {
+                 encHost.Truncate();
+                 approxLen += mHost.mLen;
+             }
+         }
+     }
+ 
+     //
+     // generate the normalized URL string
+     //
+     mSpec.SetLength(approxLen + 32);
+     char *buf;
+     mSpec.BeginWriting(buf);
+@@ -483,25 +486,30 @@ nsStandardURL::BuildNormalizedSpec(const
+     mAuthority.mPos = i;
+ 
+     // append authority
+     if (mUsername.mLen > 0) {
+         i = AppendSegmentToBuf(buf, i, spec, mUsername, &encUsername);
+         if (mPassword.mLen >= 0) {
+             buf[i++] = ':';
+             i = AppendSegmentToBuf(buf, i, spec, mPassword, &encPassword);
+         }
+         buf[i++] = '@';
+     }
+     if (mHost.mLen > 0) {
+-        i = AppendSegmentToBuf(buf, i, spec, mHost, &encHost);
++        if (useEncHost) {
++            mHost.mPos = i;
++            mHost.mLen = encHost.Length();
++            i = AppendToBuf(buf, i, encHost.get(), mHost.mLen);
++        } else
++            i = AppendSegmentToBuf(buf, i, spec, mHost);
+         net_ToLowerCase(buf + mHost.mPos, mHost.mLen);
+         if (mPort != -1 && mPort != mDefaultPort) {
+             nsCAutoString portbuf;
+             portbuf.AppendInt(mPort);
+             buf[i++] = ':';
+             i = AppendToBuf(buf, i, portbuf.get(), portbuf.Length());
+         }
+     }
+ 
+     // record authority length
+     mAuthority.mLen = i - mAuthority.mPos;
+ 
diff --git a/www-client/mozilla/mozilla-1.7.11-r3.ebuild b/www-client/mozilla/mozilla-1.7.11-r3.ebuild
new file mode 100644 (file)
index 0000000..36f070a
--- /dev/null
@@ -0,0 +1,396 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.11-r3.ebuild,v 1.1 2005/09/15 12:08:32 azarah Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+EMVER="0.92.0"
+IPCVER="1.1.3"
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a}   # handle alpha
+MY_PV=${MY_PV/_beta/b} # handle beta
+MY_PV=${MY_PV/_rc/rc}  # handle rc
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
+       crypt? ( !moznomail? (
+               http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
+               http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
+       ) )
+       mirror://gentoo/mozilla-jslibmath-alpha.patch
+       mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
+       http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
+
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.  #71504
+RDEPEND="java? ( virtual/jre )
+       mozsvg? (
+               !<x11-base/xorg-x11-6.7.0-r2
+               x11-libs/cairo
+       )
+       crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
+       >=www-client/mozilla-launcher-1.42"
+
+DEPEND="${RDEPEND}
+       ~sys-devel/autoconf-2.13
+       java? ( >=dev-java/java-config-0.2.0 )
+       dev-lang/perl
+       postgres? ( >=dev-db/postgresql-7.2.0 )"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+#
+# NB: We can't export these vars until enigmail is installed separately instead
+# of integrated into this ebuild.
+#
+#export BUILD_OFFICIAL=1
+#export MOZILLA_OFFICIAL=1
+
+src_unpack() {
+       declare x
+
+       unpack mozilla-${MY_PV}-source.tar.bz2
+       cd ${S} || die
+
+       # Unpack the enigmail plugin
+       if use crypt && ! use moznomail; then
+               cd ${S}/extensions || die
+               unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
+               for x in ipc enigmail; do
+                       cd ${S}/extensions/${x} || die "cd failed"
+                       makemake        # from mozconfig.eclass
+               done
+       fi
+       cd ${S}
+
+       ####################################
+       #
+       # architecture patches
+       #
+       ####################################
+
+       if [[ $(gcc-major-version) -eq 3 ]]; then
+               # ABI Patch for alpha/xpcom for gcc-3.x
+               if [[ ${ARCH} == alpha ]]; then
+                       epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+               fi
+       fi
+
+       # HPPA patches from Ivar <orskaug@stud.ntnu.no>
+       # <gmsoft@gentoo.org> (22 Dec 2004)
+       epatch ${FILESDIR}/mozilla-hppa.patch
+
+       # patch to fix math operations on alpha, makes maps.google.com work!
+       epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+       # Patch to allow compilation on ppc64 - bug #54843
+       use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
+
+       # Fix building on amd64 with gcc4 (patch from Debian)
+       epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
+
+       ####################################
+       #
+       # general compilation and run-time fixes
+       #
+       ####################################
+
+       # GCC4 compile fix, bug #87800
+       epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
+
+       # Fix stack growth logic
+       epatch ${FILESDIR}/${PN}-stackgrowth.patch
+
+       # patch out ft caching code since the API changed between releases of
+       # freetype; this enables freetype-2.1.8+ compat.
+       # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+       epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
+
+       # Patch for newer versions of cairo #80301
+       if has_version '>=x11-libs/cairo-0.3.0'; then
+               epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
+       fi
+
+       ####################################
+       #
+       # behavioral fixes
+       #
+       ####################################
+
+       # Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
+       # Mozilla crashes under some rare cases when plugin.default_plugin_disabled
+       # is true. This patch fixes that. Backported by hansmi@gentoo.org.
+       epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
+
+       # Fix scripts that call for /usr/local/bin/perl #51916
+       ebegin "Patching smime to call perl from /usr/bin"
+       sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
+       eend $? || die "sed failed"
+
+       # look in /usr/lib/nsplugins for plugins, in addition to the usual places
+       epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+
+       ####################################
+       #
+       # security fixes
+       #
+       ####################################
+
+       epatch ${FILESDIR}/${P}-GLSA105396.patch
+
+       WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
+}
+
+src_compile() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+       declare x
+
+       ####################################
+       #
+       # mozconfig, CFLAGS and CXXFLAGS setup
+       #
+       ####################################
+
+       mozconfig_init
+
+       # Bug 60668: Galeon doesn't build without oji enabled, so enable it
+       # regardless of java setting.
+       mozconfig_annotate '' --enable-oji --enable-mathml
+
+       # Other moz-specific settings
+       mozconfig_use_enable mozdevelop jsd
+       mozconfig_use_enable mozdevelop xpctools
+       mozconfig_use_extension mozdevelop venkman
+       mozconfig_use_enable gnome gnomevfs
+       mozconfig_use_extension gnome gnomevfs
+       mozconfig_use_extension !moznoirc irc
+       mozconfig_use_extension postgres sql
+       if use postgres ; then
+               export MOZ_ENABLE_PGSQL=1
+               export MOZ_PGSQL_INCLUDES=/usr/include
+               export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+       fi
+       mozconfig_use_enable mozcalendar calendar
+       mozconfig_use_enable ldap
+       mozconfig_use_enable ldap ldap-experimental
+       mozconfig_use_enable mozsvg svg
+       mozconfig_use_enable mozsvg svg-renderer-cairo
+       mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+       mozconfig_annotate '' --with-user-appdir=.mozilla
+
+       if use moznomail && ! use mozcalendar; then
+               mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+       fi
+       if use moznocompose && use moznomail; then
+               mozconfig_annotate "+moznocompose +moznomail" --disable-composer
+       fi
+
+       # Finalize and report settings
+       mozconfig_final
+
+       # hardened GCC uses -fstack-protector-all by default, which breaks us
+       has_hardened && append-flags -fno-stack-protector-all
+       replace-flags -fstack-protector-all -fstack-protector
+
+       ####################################
+       #
+       #  Configure and build
+       #
+       ####################################
+
+       CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+       econf || die
+
+       # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+       # to econf, but the quotes cause configure to fail.
+       grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
+       's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
+
+       # This removes extraneous CFLAGS from the Makefiles to reduce RAM
+       # requirements while compiling
+       edit_makefiles
+
+       emake || die
+
+       ####################################
+       #
+       #  Build Mozilla NSS
+       #
+       ####################################
+
+       # Build the NSS/SSL support
+       if use ssl; then
+               einfo "Building Mozilla NSS..."
+
+               # Fix #include problem
+               cd ${S}/security/coreconf || die "cd coreconf failed"
+               echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+                       >>headers.mk
+               emake -j1 || die "make security headers failed"
+
+               cd ${S}/security/nss || die "cd nss failed"
+               emake -j1 moz_import || die "make moz_import failed"
+               emake -j1 || die "make nss failed"
+       fi
+
+       ####################################
+       #
+       #  Build Enigmail extension
+       #
+       ####################################
+
+       if use crypt && ! use moznomail; then
+               for x in ipc enigmail; do
+                       emake -C ${S}/extensions/${x} || die "emake ${x} failed"
+               done
+       fi
+}
+
+src_install() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Most of the installation happens here
+       dodir ${MOZILLA_FIVE_HOME}
+       cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+       # Create directory structure to support portage-installed extensions.
+       # See update_chrome() in mozilla-launcher
+       keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+       keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+       cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+               ${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+       # Create /usr/bin/mozilla
+       install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
+
+       # Install icon and .desktop for menu entry
+       insinto /usr/share/pixmaps
+       doins ${FILESDIR}/icon/mozilla-icon.png
+
+       # Fix bug 54179: Install .desktop file into /usr/share/applications
+       # instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+       insinto /usr/share/applications
+       doins ${FILESDIR}/icon/mozilla.desktop
+
+       # Fix icons to look the same everywhere
+       insinto ${MOZILLA_FIVE_HOME}/icons
+       doins ${S}/widget/src/gtk/mozicon16.xpm
+       doins ${S}/widget/src/gtk/mozicon50.xpm
+
+       ####################################
+       #
+       # Install files necessary for applications to build against mozilla
+       #
+       ####################################
+
+       einfo "Installing includes and idl files..."
+       dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
+       cd ${S}/dist
+       cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
+       cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
+
+       # Install the NSS/SSL libs, headers and tools
+       if use ssl; then
+               einfo "Installing Mozilla NSS..."
+               # Install the headers ('make install' do not work for headers ...)
+               insinto ${MOZILLA_FIVE_HOME}/include/nss
+               [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
+               [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
+               [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
+               # These come with zlib ...
+               rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
+
+               cd ${S}/security/nss
+
+               mkdir -p ${WORKDIR}/nss/{bin,lib}
+               export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+               export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+               make install || die "make failed"
+               # Gets installed as symbolic links ...
+               cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+               cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
+
+               # Need to unset these incase we want to rebuild, else the build
+               # gets newked.
+               unset SOURCE_LIB_DIR
+               unset SOURCE_BIN_DIR
+       fi
+
+       # Fix mozilla-config and install it
+       sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
+               s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
+               ${S}/build/unix/mozilla-config
+       exeinto ${MOZILLA_FIVE_HOME}
+       doexe ${S}/build/unix/mozilla-config
+
+       # Fix pkgconfig files and install them
+       insinto /usr/$(get_libdir)/pkgconfig
+       for x in ${S}/build/unix/*.pc; do
+               sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
+                       s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
+               doins ${x}
+       done
+
+       # Install env.d snippet, which isn't necessary for running mozilla, but
+       # might be necessary for programs linked against firefox
+       insinto /etc/env.d
+       doins ${FILESDIR}/10mozilla
+       dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
+
+       # Install rebuild script since mozilla-bin doesn't support registration yet
+       exeinto ${MOZILLA_FIVE_HOME}
+       doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+       # Install docs
+       dodoc LEGAL LICENSE
+
+       # Update Google search plugin to use UTF8 charset ...
+       insinto ${MOZILLA_FIVE_HOME}/searchplugins
+       doins ${FILESDIR}/google.src
+}
+
+pkg_preinst() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Remove entire installed instance to solve various problems,
+       # for example see bug 27719
+       rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Update the component registry
+       MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
+               /usr/libexec/mozilla-launcher -register
+
+       # This should be called in the postinst and postrm of all the
+       # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+       # thunderbird-bin ebuilds.
+       update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Update the component registry
+       if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
+               MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
+                       /usr/libexec/mozilla-launcher -register
+       fi
+
+       update_mozilla_launcher_symlinks
+}