- update to version 10.0 (bnc#744275)

* MFSA 2012-01/CVE-2012-0442/CVE-2012-0443 Miscellaneous memory safety hazards * MFSA 2012-03/CVE-2012-0445 (bmo#701071) <iframe> element exposed across domains via name attribute * MFSA 2012-04/CVE-2011-3659 (bmo#708198) Child nodes from nsDOMAttribute still accessible after removal of nodes * MFSA 2012-05/CVE-2012-0446 (bmo#705651) Frame scripts calling into untrusted objects bypass security checks * MFSA 2012-06/CVE-2012-0447 (bmo#710079) Uninitialized memory appended when encoding icon images may cause information disclosure * MFSA 2012-07/CVE-2012-0444 (bmo#719612) Potential Memory Corruption When Decoding Ogg Vorbis files * MFSA 2012-08/CVE-2012-0449 (bmo#701806, bmo#702466) Crash with malformed embedded XSLT stylesheets - update enigmail to 1.3.5 - added mozilla-disable-neon-option.patch to be able to disable neon on ARM - removed obsolete PPC64 patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=154
2012-02-01 14:14:46 +00:00 · 2012-02-01 14:14:46 +00:00 · 5548c5d89b
commit 5548c5d89b
parent 50b6f5531e
16 changed files with 284 additions and 127 deletions
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sun Jan 29 17:31:32 UTC 2012 - wr@rosenauer.org
+
+- update to version 10.0 (bnc#744275)
+  * MFSA 2012-01/CVE-2012-0442/CVE-2012-0443
+    Miscellaneous memory safety hazards
+  * MFSA 2012-03/CVE-2012-0445 (bmo#701071)
+    <iframe> element exposed across domains via name attribute
+  * MFSA 2012-04/CVE-2011-3659 (bmo#708198)
+    Child nodes from nsDOMAttribute still accessible after removal
+    of nodes
+  * MFSA 2012-05/CVE-2012-0446 (bmo#705651)
+    Frame scripts calling into untrusted objects bypass security
+    checks
+  * MFSA 2012-06/CVE-2012-0447 (bmo#710079)
+    Uninitialized memory appended when encoding icon images may
+    cause information disclosure
+  * MFSA 2012-07/CVE-2012-0444 (bmo#719612)
+    Potential Memory Corruption When Decoding Ogg Vorbis files
+  * MFSA 2012-08/CVE-2012-0449 (bmo#701806, bmo#702466)
+    Crash with malformed embedded XSLT stylesheets
+- update enigmail to 1.3.5
+- added mozilla-disable-neon-option.patch to be able to disable
+  neon on ARM
+- removed obsolete PPC64 patch
+
 -------------------------------------------------------------------
 Sun Dec 18 09:28:51 UTC 2011 - wr@rosenauer.org

--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@ -1,8 +1,8 @@
 #
 # spec file for package MozillaThunderbird
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#               2006-2011 Wolfgang Rosenauer <wr@rosenauer.org>
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#               2006-2012 Wolfgang Rosenauer <wr@rosenauer.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -37,10 +37,10 @@ BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  yasm
 BuildRequires:  zip
-%define mainversion 9.0
+%define mainversion 10.0
 Version:        %{mainversion}
 Release:        0
-%define releasedate 2011122000
+%define releasedate 2012012900
 Provides:       thunderbird = %{version}
 Summary:        The Stand-Alone Mozilla Mail Component
 License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
@ -55,7 +55,7 @@ Source4:        l10n-%{version}.tar.bz2
 Source6:        suse-default-prefs.js
 Source7:        find-external-requires.sh
 Source8:        MozillaThunderbird-rpmlintrc
-Source9:        enigmail-1.3.4.tar.gz
+Source9:        enigmail-1.3.5.tar.gz
 Source10:       create-tar.sh
 Source11:       compare-locales.tar.bz2
 # Gecko/Toolkit
@ -63,7 +63,7 @@ Patch1:         mozilla-shared-nss-db.patch
 Patch2:         mozilla-language.patch
 Patch3:         mozilla-linux3.patch
 Patch4:         mozilla-dump_syms-static.patch
-Patch5:         mozilla-ppc64.patch
+Patch5:         mozilla-disable-neon-option.patch
 Patch6:         mozilla-a11y.patch
 # Thunderbird/mail
 Patch10:        tb-ssldap.patch
@ -157,7 +157,7 @@ symbols meant for upload to Mozilla's crash collector database.

 %if %build_enigmail
 %package -n enigmail
-Version:        1.3.4+%{mainversion}
+Version:        1.3.5+%{mainversion}
 Release:        0
 Summary:        OpenPGP addon for Thunderbird and SeaMonkey
 License:        MPL-1.1 or GPL-2.0+
@ -256,6 +256,12 @@ cat << EOF >> $MOZCONFIG
 ac_add_options --disable-crashreporter
 EOF
 %endif
+# Disable neon for arm as it does not build correctly
+%ifarch %arm
+cat << EOF >> $MOZCONFIG
+ac_add_options --disable-neon
+EOF
+%endif
 make -f client.mk build
 #
 ### enigmail build
@ -287,7 +293,7 @@ rm -f %{_tmppath}/translations.*
 touch %{_tmppath}/translations.{common,other}
 for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/all-locales); do
  case $locale in
-   ja-JP-mac|en-US|ta-LK|tr)
+   ja-JP-mac|en-US) #|ta-LK|tr)
        # locales not to be included in translations package
 	;;
   *)
@ -477,10 +483,10 @@ exit 0
 %{progdir}/application.ini
 %{progdir}/blocklist.xml
 %{progdir}/chrome.manifest
-%{progdir}/distribution/
+#%{progdir}/distribution/
 %{progdir}/*.so
 %{progdir}/mozilla-xremote-client
-%{progdir}/omni.jar
+%{progdir}/omni.ja
 %{progdir}/platform.ini
 %{progdir}/plugin-container
 %{progdir}/run-mozilla.sh
@ -495,11 +501,11 @@ exit 0
 %dir %{progdir}/chrome/
 %{progdir}/chrome/icons/
 %dir %{progdir}/dictionaries/
-%{progdir}/hyphenation/
 %{progdir}/defaults/
 %dir %{progdir}/extensions/
 %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 %{progdir}/isp/
+%{progdir}/searchplugins/
 %{_datadir}/applications/%{desktop_file_name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{progname}.png
 %{_bindir}/%{progname}
--- a/compare-locales.tar.bz2
+++ b/compare-locales.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb64d68373985e71bdb8df7376ffd308f93a4ec312fbd3b5893c60281ae9c0b0
-size 25662
+oid sha256:8ce05d8955f9f8c3722c15d7784d05c22cac731b7e3421b44c953cf72797a69f
+size 25659
--- a/create-tar.sh
+++ b/create-tar.sh
@ -2,8 +2,8 @@

 CHANNEL="release"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_9_0_RELEASE"
-VERSION="9.0"
+RELEASE_TAG="THUNDERBIRD_10_0_RELEASE"
+VERSION="10.0"

 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird
--- a/enigmail-1.3.4.tar.gz
+++ b/enigmail-1.3.4.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:967b1c3ff24d87ab05207aff6f40adaa06b302f9e753c0012896e47f7ef75c39
-size 1369381
--- a/enigmail-1.3.5.tar.gz
+++ b/enigmail-1.3.5.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
+size 1348362
--- a/l10n-10.0.tar.bz2
+++ b/l10n-10.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:112565e38f82e7accd33b40d286f157ca8a8a45386e9380bb18c0788cfb0dd6f
+size 24781104
--- a/l10n-9.0.tar.bz2
+++ b/l10n-9.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1aef4a5343a3a8dc2a34d9b9e4be7719a00ed52a52d51156d6c95d1519f88f75
-size 24348161
--- a/mozilla-a11y.patch
+++ b/mozilla-a11y.patch
@ -1,6 +1,6 @@
 # HG changeset patch
 # User Michael Gorse <mgorse@suse.com>
-# Parent d02253d1e8217008dfa26e6e2a901b6a8b75e989
+# Parent 2c115988d04c0a0a8cb75b3a597ecdb2c4c001c9
 a11y only enabled from Gnome 2's GConf setting
 https://bugzilla.novell.com/show_bug.cgi?id=732898
 https://bugzilla.mozilla.org/show_bug.cgi?id=693343
@ -31,7 +31,7 @@ diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
 diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
 --- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp
 +++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
-@@ -47,29 +47,27 @@
+@@ -47,29 +47,29 @@
 #include "nsIPrefBranch.h"
 #include "nsIServiceManager.h"
 #include "nsAutoPtr.h"
@ -40,14 +40,15 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 
 #include <gtk/gtk.h>
 #include <atk/atk.h>
+#ifdef MOZ_ENABLE_DBUS
 +#include <dbus/dbus.h>
+#endif
 +
 +using namespace mozilla::a11y;
 
 typedef GType (* AtkGetTypeType) (void);
 GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
-static bool sATKChecked = false;
-+static PRBool sATKChecked = PR_FALSE;
+ static bool sATKChecked = false;
 static PRLibrary *sATKLib = nsnull;
 static const char sATKLibName[] = "libatk-1.0.so.0";
 static const char sATKHyperlinkImplGetTypeSymbol[] =
@ -65,13 +66,13 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 static void (* gail_remove_key_event_listener) (guint remove_listener);
 static AtkObject * (*gail_get_root) (void);
 
-@@ -609,36 +607,17 @@ toplevel_event_watcher(GSignalInvocation
+@@ -609,36 +609,17 @@ toplevel_event_watcher(GSignalInvocation
   }
 
   return TRUE;
 }
 
- PRBool
+ bool
 nsApplicationAccessibleWrap::Init()
 {
 -    // XXX following code is copied from widget/src/gtk2/nsWindow.cpp
@ -79,7 +80,7 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 -    // see bug 390761
 -
 -    // check if accessibility enabled/disabled by environment variable
-    PRBool isGnomeATEnabled = PR_FALSE;
+-    bool isGnomeATEnabled = false;
 -    const char *envValue = PR_GetEnv(sAccEnv);
 -    if (envValue) {
 -        isGnomeATEnabled = !!atoi(envValue);
@ -103,7 +104,7 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
         else {
             MAI_LOG_DEBUG(("Fail to load lib: %s\n", sGail.libName));
         }
-@@ -877,8 +856,129 @@ LoadGtkModule(GnomeAccessibilityModule& 
+@@ -877,8 +858,129 @@ LoadGtkModule(GnomeAccessibilityModule& 
                        aModule.init ? aModule.shutdownName : aModule.initName,
                        aModule.libName));
         PR_UnloadLibrary(aModule.lib);
@ -117,22 +118,22 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 +namespace a11y {
 +
 +#ifdef MOZ_ENABLE_DBUS
-+static DBusPendingCall *a11yPendingCall = NULL;
+  static DBusPendingCall *a11yPendingCall = NULL;
 +#endif
 +
 +void
 +PreInit()
 +{
-+  static PRBool sChecked = FALSE;
+  static bool sChecked = false;
 +  if (sChecked)
 +    return;
-+  sChecked = TRUE;
+  sChecked = true;
 +  DBusError error;
 +  dbus_error_init(&error);
 +  DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
 +  if (!bus)
 +    return;
-+  dbus_connection_set_exit_on_disconnect(bus, FALSE);
+  dbus_connection_set_exit_on_disconnect(bus, false);
 +
 +  DBusMessage *message;
 +  message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus",
@ -155,14 +156,14 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 +  dbus_error_free(&error);
 +}
 +
-+PRBool
+bool
 +ShouldA11yBeEnabled()
 +{
-+  static PRBool sChecked = PR_FALSE, sShouldEnable = PR_FALSE;
+  static bool sChecked = false, sShouldEnable = false;
 +  if (sChecked)
 +    return sShouldEnable;
 +
-+  sChecked = PR_TRUE;
+  sChecked = true;
 +
 +  // check if accessibility enabled/disabled by environment variable
 +  static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
@ -172,7 +173,7 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 +
 +#ifdef MOZ_ENABLE_DBUS
 +  PreInit();
-+  PRBool dbusSuccess = PR_FALSE;
+  bool dbusSuccess = false;
 +  DBusMessage *reply = nsnull;
 +  if (a11yPendingCall) {
 +    dbus_pending_call_block(a11yPendingCall);
@ -236,47 +237,44 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src
 diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
 --- a/accessible/src/base/nsAccessibilityService.h
 +++ b/accessible/src/base/nsAccessibilityService.h
-@@ -41,16 +41,36 @@
+@@ -46,16 +46,33 @@
 
- #include "nsIAccessibilityService.h"
- 
- #include "a11yGeneric.h"
- #include "nsAccDocManager.h"
+ #include "mozilla/a11y/FocusManager.h"
 
 #include "nsIObserver.h"
 
-+namespace mozilla {
-+namespace a11y {
+ namespace mozilla {
+ namespace a11y {
+ 
 +#ifdef MOZ_ACCESSIBILITY_ATK
 +/**
-+ * Perform initialization that should be done as soon as possible, in order
-+ * to minimize startup time.
-+ * XXX: this function and the next defined in nsApplicationAccessibleWrap.cpp
-+ */
+ * + * Perform initialization that should be done as soon as possible, in
+ * order
+ * + * to minimize startup time.
+ * + * XXX: this function and the next defined in
+ * nsApplicationAccessibleWrap.cpp
+ * + */
 +void PreInit();
 +
 +/**
-+ * Is platform accessibility enabled.
-+ * Only used on linux with atk for now.
-+ */
-+PRBool ShouldA11yBeEnabled();
+ * + * Is platform accessibility enabled.
+ * + * Only used on linux with atk for now.
+ * + */
+bool ShouldA11yBeEnabled();
 +#endif
 +
-+} // namespace a11y
-+} // namespace mozilla
-+
- class nsAccessibilityService : public nsAccDocManager,
-                                public nsIAccessibilityService,
-                                public nsIObserver
- {
- public:
-   virtual ~nsAccessibilityService();
+ /**
+  * Return focus manager.
+  */
+ FocusManager* FocusMgr();
+ 
+ } // namespace a11y
+ } // namespace mozilla
 
-   NS_DECL_ISUPPORTS_INHERITED
 diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 --- a/widget/src/gtk2/nsWindow.cpp
 +++ b/widget/src/gtk2/nsWindow.cpp
-@@ -103,29 +103,20 @@
+@@ -105,29 +105,21 @@
 #include "nsIStringBundle.h"
 #include "nsGfxCIID.h"
 #include "nsIObserverService.h"
@ -292,10 +290,10 @@ diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 -#include "stdlib.h"
 
 using namespace mozilla;
-
-static PRBool sAccessibilityChecked = PR_FALSE;
+ 
+-static bool sAccessibilityChecked = false;
 -/* static */
-PRBool nsWindow::sAccessibilityEnabled = PR_FALSE;
+-bool nsWindow::sAccessibilityEnabled = false;
 -static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1";
 -static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
 -static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility";
@ -307,11 +305,11 @@ diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 #include "nsIFile.h"
 #include "nsILocalFile.h"
 
-@@ -1109,19 +1100,18 @@ nsWindow::Show(PRBool aState)
+@@ -1111,19 +1103,18 @@ nsWindow::Show(bool aState)
             NativeResize(mBounds.x, mBounds.y, mBounds.width, mBounds.height,
-                          PR_FALSE);
+                          false);
         } else if (mNeedsResize) {
-             NativeResize(mBounds.width, mBounds.height, PR_FALSE);
+             NativeResize(mBounds.width, mBounds.height, false);
         }
     }
 
@ -328,7 +326,7 @@ diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 }
 
 NS_IMETHODIMP
-@@ -3887,16 +3877,21 @@ nsWindow::Create(nsIWidget        *aPare
+@@ -3885,16 +3876,21 @@ nsWindow::Create(nsIWidget        *aPare
     nsIWidget *baseParent = aInitData &&
         (aInitData->mWindowType == eWindowType_dialog ||
          aInitData->mWindowType == eWindowType_toplevel ||
@ -342,27 +340,27 @@ diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 +    a11y::PreInit();
 +#endif
 +
+     // Ensure that the toolkit is created.
+     nsGTKToolkit::GetToolkit();
+ 
     // initialize all the common bits of this class
-     BaseCreate(baseParent, aRect, aHandleEventFunction, aContext,
-                aAppShell, aToolkit, aInitData);
+     BaseCreate(baseParent, aRect, aHandleEventFunction, aContext, aInitData);
 
     // Do we need to listen for resizes?
-     PRBool listenForResizes = PR_FALSE;;
-     if (aNativeParent || (aInitData && aInitData->mListenForResizes))
-         listenForResizes = PR_TRUE;
-@@ -4278,43 +4273,16 @@ nsWindow::Create(nsIWidget        *aPare
+     bool listenForResizes = false;;
+@@ -4278,43 +4274,16 @@ nsWindow::Create(nsIWidget        *aPare
         LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow,
              gdk_x11_window_get_xid(mGdkWindow)));
     }
 
     // resize so that everything is set to the right dimensions
     if (!mIsTopLevel)
-         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
+         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false);
 
 -#ifdef ACCESSIBILITY
 -    nsresult rv;
 -    if (!sAccessibilityChecked) {
-        sAccessibilityChecked = PR_TRUE;
+-        sAccessibilityChecked = true;
 -
 -        //check if accessibility enabled/disabled by environment variable
 -        const char *envValue = PR_GetEnv(sAccEnv);
@ -394,7 +392,7 @@ diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
 
          if (mDFB)
               mDFB->GetDisplayLayer( mDFB, DLID_PRIMARY, &mDFBLayer );
-@@ -6504,19 +6472,18 @@ nsWindow::DispatchAccessibleEvent()
+@@ -6504,19 +6473,18 @@ nsWindow::DispatchAccessibleEvent()
     DispatchEvent(&event, status);
 
     return event.mAccessible;
--- a/mozilla-disable-neon-option.patch
+++ b/mozilla-disable-neon-option.patch
@ -0,0 +1,157 @@
+# HG changeset patch
+# User Joop Boonen <joop.boonen@opensuse.org>
+# Parent be20a0ae420eb2b3584ce2c5d241e2817bac8593
+Add configure option to allow disabling of neon.
+
+diff --git a/configure.in b/configure.in
+--- a/configure.in
+++ b/configure.in
+@@ -1674,41 +1674,47 @@ if test -n "$all_flags"; then
+     ASFLAGS="$ASFLAGS $all_flags"
+     if test -n "$thumb_flag"; then
+         LDFLAGS="$LDFLAGS $thumb_flag"
+     fi
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
+ 
+-if test "$CPU_ARCH" = "arm"; then
+-  AC_MSG_CHECKING(for ARM SIMD support in compiler)
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  AC_TRY_LINK([],
+-                 [asm("uqadd8 r1, r1, r2");],
+-                 result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
+-      AC_DEFINE(HAVE_ARM_SIMD)
+-      HAVE_ARM_SIMD=1
+-  fi
+-
+-  AC_MSG_CHECKING(for ARM NEON support in compiler)
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  AC_TRY_LINK([],
+-                 [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
+-                 result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
+-      AC_DEFINE(HAVE_ARM_NEON)
+-      HAVE_ARM_NEON=1
+-  fi
+-fi # CPU_ARCH = arm
+MOZ_ARG_DISABLE_BOOL(neon,
+[  --disable-neon       Disable neon extensions],
+    NS_DISABLE_NEON=1,
+    NS_DISABLE_NEON= )
+if test "$NS_DISABLE_NEON" != "1"; then
+  if test "$CPU_ARCH" = "arm"; then
+    AC_MSG_CHECKING(for ARM SIMD support in compiler)
+    # We try to link so that this also fails when
+    # building with LTO.
+    AC_TRY_LINK([],
+                   [asm("uqadd8 r1, r1, r2");],
+                   result="yes", result="no")
+    AC_MSG_RESULT("$result")
+    if test "$result" = "yes"; then
+        AC_DEFINE(HAVE_ARM_SIMD)
+        HAVE_ARM_SIMD=1
+    fi
+
+    AC_MSG_CHECKING(for ARM NEON support in compiler)
+    # We try to link so that this also fails when
+    # building with LTO.
+    AC_TRY_LINK([],
+                   [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
+                   result="yes", result="no")
+    AC_MSG_RESULT("$result")
+    if test "$result" = "yes"; then
+        AC_DEFINE(HAVE_ARM_NEON)
+        HAVE_ARM_NEON=1
+    fi
+  fi # CPU_ARCH = arm
+fi
+ 
+ AC_SUBST(HAVE_ARM_SIMD)
+ AC_SUBST(HAVE_ARM_NEON)
+ 
+ dnl ========================================================
+ dnl Android libstdc++, placed here so it can use MOZ_ARCH
+ dnl computed above.
+ dnl ========================================================
+diff --git a/js/src/configure.in b/js/src/configure.in
+--- a/js/src/configure.in
+++ b/js/src/configure.in
+@@ -1604,41 +1604,47 @@ if test -n "$all_flags"; then
+     ASFLAGS="$ASFLAGS $all_flags"
+     if test -n "$thumb_flag"; then
+         LDFLAGS="$LDFLAGS $thumb_flag"
+     fi
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
+ 
+-if test "$CPU_ARCH" = "arm"; then
+-  AC_MSG_CHECKING(for ARM SIMD support in compiler)
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  AC_TRY_LINK([],
+-                 [asm("uqadd8 r1, r1, r2");],
+-                 result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
+-      AC_DEFINE(HAVE_ARM_SIMD)
+-      HAVE_ARM_SIMD=1
+-  fi
+-
+-  AC_MSG_CHECKING(for ARM NEON support in compiler)
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  AC_TRY_LINK([],
+-                 [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
+-                 result="yes", result="no")
+-  AC_MSG_RESULT("$result")
+-  if test "$result" = "yes"; then
+-      AC_DEFINE(HAVE_ARM_NEON)
+-      HAVE_ARM_NEON=1
+-  fi
+-fi # CPU_ARCH = arm
+MOZ_ARG_DISABLE_BOOL(neon,
+[  --disable-neon       Disable neon extensions],
+    NS_DISABLE_NEON=1,
+    NS_DISABLE_NEON= )
+if test "$NS_DISABLE_NEON" != "1"; then
+  if test "$CPU_ARCH" = "arm"; then
+    AC_MSG_CHECKING(for ARM SIMD support in compiler)
+    # We try to link so that this also fails when
+    # building with LTO.
+    AC_TRY_LINK([],
+                   [asm("uqadd8 r1, r1, r2");],
+                   result="yes", result="no")
+    AC_MSG_RESULT("$result")
+    if test "$result" = "yes"; then
+        AC_DEFINE(HAVE_ARM_SIMD)
+        HAVE_ARM_SIMD=1
+    fi
+
+    AC_MSG_CHECKING(for ARM NEON support in compiler)
+    # We try to link so that this also fails when
+    # building with LTO.
+    AC_TRY_LINK([],
+                   [asm(".fpu neon\n vadd.i8 d0, d0, d0");],
+                   result="yes", result="no")
+    AC_MSG_RESULT("$result")
+    if test "$result" = "yes"; then
+        AC_DEFINE(HAVE_ARM_NEON)
+        HAVE_ARM_NEON=1
+    fi
+  fi # CPU_ARCH = arm
+fi
+ 
+ AC_SUBST(HAVE_ARM_SIMD)
+ AC_SUBST(HAVE_ARM_NEON)
+ 
+ dnl ========================================================
+ dnl Android libstdc++, placed here so it can use MOZ_ARCH
+ dnl computed above.
+ dnl ========================================================
--- a/mozilla-ppc64.patch
+++ b/mozilla-ppc64.patch
@ -1,30 +0,0 @@
-# HG changeset patch
-# Parent 928a29c4a79c9041d6b9f68e24de8f5aab15cc5d
-From: upstream
-Subject: Fix PPC64 build
-https://bugzilla.mozilla.org/show_bug.cgi?id=670719
-https://bugzilla.mozilla.org/show_bug.cgi?id=654056
-
-diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h
--- a/ipc/chromium/src/build/build_config.h
-+++ b/ipc/chromium/src/build/build_config.h
-@@ -54,16 +54,19 @@
- #define ARCH_CPU_X86_FAMILY 1
- #define ARCH_CPU_X86 1
- #define ARCH_CPU_32_BITS 1
- #elif defined(__ARMEL__)
- #define ARCH_CPU_ARM_FAMILY 1
- #define ARCH_CPU_ARMEL 1
- #define ARCH_CPU_32_BITS 1
- #define WCHAR_T_IS_UNSIGNED 1
-+#elif defined(__powerpc64__)
-+#define ARCH_CPU_PPC64 1
-+#define ARCH_CPU_64_BITS 1
- #elif defined(__ppc__) || defined(__powerpc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
- #elif defined(__sparc64__)
- #define ARCH_CPU_SPARC 1
- #define ARCH_CPU_64_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
--- a/mozilla-shared-nss-db.patch
+++ b/mozilla-shared-nss-db.patch
@ -1,13 +1,13 @@
 From: Hans Petter Jansson <hpj@copyleft.no>
      Wolfgang Rosenauer <wr@rosenauer.org>
 Subject: use libnsssharedhelper if available at compile time
-         (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
+         (can be disabled by exporting MOZ_TB_NO_NSSHELPER=1)
 References:

 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -571,16 +571,20 @@ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS
+@@ -567,16 +567,20 @@ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS
 MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
 
 MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
@ -31,7 +31,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8016,16 +8016,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8093,16 +8093,31 @@ AC_SUBST(QCMS_LIBS)
 
 dnl ========================================================
 dnl HarfBuzz
@ -61,12 +61,12 @@ diff --git a/configure.in b/configure.in
 AC_SUBST(MOZ_OTS_LIBS)
 
 dnl ========================================================
- dnl disable xul
+ dnl Skia 
 dnl ========================================================
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -113,12 +113,14 @@ CSRCS += md4.c
+@@ -114,12 +114,14 @@ CSRCS += md4.c
 
 
 EXTRA_DEPS = $(NSS_DEP_LIBS)
@ -109,7 +109,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 
 #include "nsNetUtil.h"
 #include "nsAppDirectoryServiceDefs.h"
-@@ -1727,18 +1734,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1725,18 +1732,34 @@ nsNSSComponent::InitializeNSS(bool showW
     ConfigureInternalPKCS11Token();
 
     // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@ -149,8 +149,8 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -138,17 +138,17 @@ ifdef MOZ_DEBUG
- EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -126,17 +126,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+ endif
 endif
 endif
 
--- a/tb-develdirs.patch
+++ b/tb-develdirs.patch
@ -1,9 +1,9 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -56,21 +56,21 @@ MOZ_APP_NAME	= @MOZ_APP_NAME@
- MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
+@@ -55,21 +55,21 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
+ MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@
 
 MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
 
@ -11,12 +11,12 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)3
+includedir	= @includedir@/$(MOZ_APP_NAME)
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
 -idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)3
+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)
 
 installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
--- a/thunderbird-10.0-source.tar.bz2
+++ b/thunderbird-10.0-source.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2e853f344c31cd33da0b57876647477032338c89d54f7cb2d145cbe497adc1d
+size 97500386
--- a/thunderbird-9.0-source.tar.bz2
+++ b/thunderbird-9.0-source.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14e1e94f11dd227b9202a540f831bb250efd311a59a395f34b194c11464396e7
-size 95973864
--- a/thunderbird-shared-nss-db.patch
+++ b/thunderbird-shared-nss-db.patch
@ -66,12 +66,12 @@ diff --git a/configure.in b/configure.in
 diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
 --- a/mail/app/Makefile.in
 +++ b/mail/app/Makefile.in
-@@ -103,16 +103,17 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+@@ -101,16 +101,17 @@ STL_FLAGS=
+ 
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 endif
 
- APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
- 
 LIBS += \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \