- update to Firefox 26.0 (bnc#854367, bnc#854370)

* rebased patches * requires NSPR 4.10.2 and NSS 3.15.3.1 * MFSA 2013-104/CVE-2013-5609/CVE-2013-5610 Miscellaneous memory safety hazards * MFSA 2013-105/CVE-2013-5611 (bmo#771294) Application Installation doorhanger persists on navigation * MFSA 2013-106/CVE-2013-5612 (bmo#871161) Character encoding cross-origin XSS attack * MFSA 2013-107/CVE-2013-5614 (bmo#886262) Sandbox restrictions not applied to nested object elements * MFSA 2013-108/CVE-2013-5616 (bmo#938341) Use-after-free in event listeners * MFSA 2013-109/CVE-2013-5618 (bmo#926361) Use-after-free during Table Editing * MFSA 2013-110/CVE-2013-5619 (bmo#917841) Potential overflow in JavaScript binary search algorithms * MFSA 2013-111/CVE-2013-6671 (bmo#930281) Segmentation violation when replacing ordered list elements * MFSA 2013-112/CVE-2013-6672 (bmo#894736) Linux clipboard information disclosure though selection paste * MFSA 2013-113/CVE-2013-6673 (bmo#970380) Trust settings for built-in roots ignored during EV certificate validation * MFSA 2013-114/CVE-2013-5613 (bmo#930381, bmo#932449) Use-after-free in synthetic mouse movement * MFSA 2013-115/CVE-2013-5615 (bmo#929261) GetElementIC typed array stubs can be generated outside observed typesets * MFSA 2013-116/CVE-2013-6629/CVE-2013-6630 (bmo#891693) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=358
2013-12-11 08:31:54 +00:00 · 2013-12-11 08:31:54 +00:00 · 2dbba8a23d
commit 2dbba8a23d
parent bf5fb37f98
15 changed files with 165 additions and 159 deletions
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Sun Dec  8 20:26:23 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 26.0 (bnc#854367, bnc#854370)
+  * rebased patches
+  * requires NSPR 4.10.2 and NSS 3.15.3.1
+  * MFSA 2013-104/CVE-2013-5609/CVE-2013-5610
+    Miscellaneous memory safety hazards
+  * MFSA 2013-105/CVE-2013-5611 (bmo#771294)
+    Application Installation doorhanger persists on navigation
+  * MFSA 2013-106/CVE-2013-5612 (bmo#871161)
+    Character encoding cross-origin XSS attack
+  * MFSA 2013-107/CVE-2013-5614 (bmo#886262)
+    Sandbox restrictions not applied to nested object elements
+  * MFSA 2013-108/CVE-2013-5616 (bmo#938341)
+    Use-after-free in event listeners
+  * MFSA 2013-109/CVE-2013-5618 (bmo#926361)
+    Use-after-free during Table Editing
+  * MFSA 2013-110/CVE-2013-5619 (bmo#917841)
+    Potential overflow in JavaScript binary search algorithms
+  * MFSA 2013-111/CVE-2013-6671 (bmo#930281)
+    Segmentation violation when replacing ordered list elements
+  * MFSA 2013-112/CVE-2013-6672 (bmo#894736)
+    Linux clipboard information disclosure though selection paste
+  * MFSA 2013-113/CVE-2013-6673 (bmo#970380)
+    Trust settings for built-in roots ignored during EV certificate
+    validation
+  * MFSA 2013-114/CVE-2013-5613 (bmo#930381, bmo#932449)
+    Use-after-free in synthetic mouse movement
+  * MFSA 2013-115/CVE-2013-5615 (bmo#929261)
+    GetElementIC typed array stubs can be generated outside observed
+    typesets
+  * MFSA 2013-116/CVE-2013-6629/CVE-2013-6630 (bmo#891693)
+    JPEG information leak
+  * MFSA 2013-117 (bmo#946351)
+    Mis-issued ANSSI/DCSSI certificate
+    (fixed via NSS 3.15.3.1)
+- removed gecko.js preference file as GStreamer is enabled by
+  default now
+
 -------------------------------------------------------------------
 Thu Oct 24 18:16:19 UTC 2013 - wr@rosenauer.org

--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@ -17,7 +17,7 @@
 #


-%define major 25
+%define major 26
 %define mainver %major.0
 %define update_channel release

@ -50,8 +50,8 @@ BuildRequires:  libproxy-devel
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10.1
-BuildRequires:  mozilla-nss-devel >= 3.15.2
+BuildRequires:  mozilla-nspr-devel >= 4.10.2
+BuildRequires:  mozilla-nss-devel >= 3.15.3.1
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1210
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
@ -63,7 +63,7 @@ Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013102400
+%define         releasedate 2013120700
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@ -91,7 +91,6 @@ Source11:       firefox.1
 Source12:       mozilla-get-app-id
 Source13:       add-plugins.sh.in
 Source14:       create-tar.sh
-Source15:       gecko.js
 # Gecko/Toolkit
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-nongnome-proxies.patch
@ -362,9 +361,6 @@ mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js
 install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js
 %endif
-# core configuration (e.g. temporary gstreamer pref)
-# this is expected to be just temporary and therefore not handled in openSUSE branding
-install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{progdir}/defaults/pref/gecko.js
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{progdir}:g" \
  %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh
--- a/compare-locales.tar.bz2
+++ b/compare-locales.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2dc72bf30a7defc9046866286cce2ca2f5d255248d3625d6c6a23bfc91420ca
-size 29959
+oid sha256:a93081c3f66e8b9f24509d773c5d0d7807679b1ec262846413d2093068572caa
+size 29858
--- a/create-tar.sh
+++ b/create-tar.sh
@ -2,8 +2,8 @@

 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_25_0_RELEASE"
-VERSION="25.0"
+RELEASE_TAG="FIREFOX_26_0_RELEASE"
+VERSION="26.0"

 # mozilla
 if [ -d mozilla ]; then
--- a/firefox-25.0-source.tar.bz2
+++ b/firefox-25.0-source.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3debc8f5e6f92abb2d38644ad0b302c91d518827729e49340ef64053180d24b7
-size 128652118
--- a/firefox-26.0-source.tar.bz2
+++ b/firefox-26.0-source.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a146ac1688d3ef4c6c0d448604383882783bd52c6be2cecf18ab5ed3a4b33e1
+size 128663938
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1161 @@
+@@ -0,0 +1,1158 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@ -129,6 +129,9 @@ new file mode 100644
 +    <!-- for url bar autocomplete -->
 +    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 +
+    <!-- for select dropdowns -->
+    <menupopup id="ContentSelectDropdown" rolluponmousewheel="true" hidden="true"/>
+
 +    <!-- for invalid form error message -->
 +    <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
 +      <description/>
@ -509,8 +512,6 @@ new file mode 100644
 +            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-+            <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-+            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
@ -745,11 +746,6 @@ new file mode 100644
 +                      oncommand="SocialUI.showLearnMore();"/>
 +          </menupopup>
 +        </toolbarbutton>
-+        <toolbarbutton id="social-mark-button"
-+                       class="toolbarbutton-1"
-+                       hidden="true"
-+                       disabled="true"
-+                       command="Social:TogglePageMark"/>
 +      </toolbaritem>
 +
 +      <hbox id="window-controls" hidden="true" pack="end">
@ -1029,7 +1025,8 @@ new file mode 100644
 +                  flex="1" contenttooltip="aHTMLTooltip"
 +                  tabcontainer="tabbrowser-tabs"
 +                  contentcontextmenu="contentAreaContextMenu"
-+                  autocompletepopup="PopupAutoComplete"/>
+                  autocompletepopup="PopupAutoComplete"
+                  selectpopup="ContentSelectDropdown"/>
 +      <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
 +    </vbox>
 +    <splitter id="social-sidebar-splitter"
@ -1167,12 +1164,12 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -52,16 +52,18 @@ browser.jar:
-         content/browser/abouthealthreport/abouthealth.css     (content/abouthealthreport/abouthealth.css)
+@@ -53,16 +53,18 @@ browser.jar:
 #endif
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
         content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
+         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
@ -1232,19 +1229,19 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 #endif
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
-     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
+     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
 #if defined(XP_WIN)
-     { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
+     { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor },
 #elif defined(MOZ_WIDGET_GTK)
-    { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor },
-+    { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor },
+-    { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
+    { &kNS_SHELLSERVICE_CID, false, nullptr, nsUnixShellServiceConstructor },
 #endif
-     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
-     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
+     { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor },
+     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
 #if defined(XP_WIN)
-     { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
+     { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
 #elif defined(XP_MACOSX)
-     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
+     { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
 #endif
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
@ -1301,7 +1298,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
 --- a/browser/components/shell/src/Makefile.in
 +++ b/browser/components/shell/src/Makefile.in
-@@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1
+@@ -9,10 +9,12 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
@ -1750,7 +1747,7 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -606,19 +606,21 @@
+@@ -593,19 +593,21 @@
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/browser/defaults/profile/prefs.js
 
--- a/firefox-multilocale-chrome.patch
+++ b/firefox-multilocale-chrome.patch
@ -1,13 +1,13 @@
 # HG changeset patch
-# Parent 020e09bf3fc6f17b3041ecf70f1376da37db8645
+# Parent 596aaeb7e5417f1f97eab2116503013bc68c0c3a
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 Add searchplugins to chrome packaging for proper localization

 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -340,16 +340,20 @@ pref("browser.download.panel.shown", fal
- pref("browser.download.panel.firstSessionCompleted", false);
+@@ -351,16 +351,20 @@ pref("browser.helperApps.deleteTempFileO
+ #endif
 
 // search engines URL
 pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
@ -30,7 +30,7 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -71,20 +71,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST
+@@ -63,20 +63,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST
 
 STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \
     $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \
@ -55,7 +55,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 DIST_SUBDIRS = browser metro
 else
 DIST_SUBDIRS = $(DIST_SUBDIR)
-@@ -131,20 +133,44 @@ install:: $(addprefix generic/profile/,$
+@@ -123,20 +125,44 @@ install:: $(addprefix generic/profile/,$
 
 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
@ -131,7 +131,7 @@ diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -119,14 +119,15 @@
+@@ -122,14 +122,15 @@
     locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
 #endif
 % locale browser-region @AB_CD@ %locale/browser-region/
--- a/gecko.js
+++ b/gecko.js
@ -1 +0,0 @@
-pref("media.gstreamer.enabled", true);
--- a/l10n-25.0.tar.bz2
+++ b/l10n-25.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98627eaa30aabc79aecdbbba9ef72222ef0352176908e07e9ca28f6c6ca8d479
-size 54788025
--- a/l10n-26.0.tar.bz2
+++ b/l10n-26.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6dde7ec0974c5dddae3d03855155e0c843fe3dce8aac66d7c2ced4118bf8ae91
+size 55496359
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@ -7,7 +7,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 --- a/modules/libpref/src/Makefile.in
 +++ b/modules/libpref/src/Makefile.in
-@@ -49,14 +49,15 @@ endif
+@@ -35,14 +35,15 @@ endif
 # Optimizer bug with GCC 3.2.2 on OS/2
 ifeq ($(OS_ARCH), OS2)
 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@ -26,8 +26,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
 --- a/modules/libpref/src/Preferences.cpp
 +++ b/modules/libpref/src/Preferences.cpp
-@@ -24,16 +24,17 @@
- #include "nsIStringEnumerator.h"
+@@ -26,16 +26,17 @@
 #include "nsIZipReader.h"
 #include "nsPrefBranch.h"
 #include "nsXPIDLString.h"
@ -35,6 +34,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
 #include "nsCOMArray.h"
 #include "nsXPCOMCID.h"
 #include "nsAutoPtr.h"
+ #include "nsPrintfCString.h"
 +#include "nsKDEUtils.h"
 
 #include "nsQuickSort.h"
@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
 #include "prefread.h"
 #include "prefapi_private_data.h"
 
-@@ -973,16 +974,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1098,16 +1099,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
 
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
     return NS_OK;
 
   bool hasMore;
-@@ -998,17 +1017,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1123,17 +1142,17 @@ static nsresult pref_LoadPrefsInDirList(
 
     nsAutoCString leaf;
     path->GetNativeLeafName(leaf);
@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
 {
   nsZipItemPtr<char> manifest(jarReader, name, true);
   NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1102,28 +1121,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1227,28 +1246,40 @@ static nsresult pref_InitInitialObjects(
   /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
   static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
@ -184,16 +184,11 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -11,13 +11,15 @@ VPATH = @srcdir@
- include $(DEPTH)/config/autoconf.mk
- 
- LIBRARY_NAME = download_s
- LIBXUL_LIBRARY = 1
- FAIL_ON_WARNINGS = 1
+@@ -4,9 +4,10 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
 
-+
 CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
 
 LOCAL_INCLUDES += \
@ -203,10 +198,10 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downl
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -38,16 +38,20 @@
- 
+@@ -41,16 +41,20 @@
 #ifdef XP_WIN
 #include <shlobj.h>
+ #include "nsWindowsHelpers.h"
 #ifdef DOWNLOAD_SCANNER
 #include "nsDownloadScanner.h"
 #endif
@ -224,7 +219,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 #include "AndroidBridge.h"
 #endif
 
-@@ -2609,16 +2613,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2686,16 +2690,25 @@ nsDownload::SetState(DownloadState aStat
       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 
       // Master pref to control this function.
@ -250,7 +245,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
         int64_t goat = PR_Now() - mStartTime;
         showTaskbarAlert = goat > alertIntervalUSec;
 
-@@ -2645,19 +2658,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2722,19 +2735,20 @@ nsDownload::SetState(DownloadState aStat
               // retention policy, there's no reason to make the text clickable
               // because if it is, they'll click open the download manager and
               // the items they downloaded will have been removed.
@ -265,7 +260,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
       }
 +      }
 
- #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
+ #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK)
       nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
       nsCOMPtr<nsIFile> file;
       nsAutoString path;
@ -275,7 +270,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -50,29 +50,33 @@ toolkit.jar:
+@@ -53,29 +53,33 @@ toolkit.jar:
    content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
 *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
    content/global/bindings/browser.xml         (widgets/browser.xml)
@ -769,7 +764,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1339 @@
+@@ -0,0 +1,1332 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
@ -1355,14 +1350,15 @@ new file mode 100644
 +        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 +#elif XP_UNIX
-+                pack="end">
-+	<xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
-+	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+	<xul:spacer anonid="spacer" flex="1"/>
-+	<xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+	        pack="end">
+        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+        <xul:spacer anonid="spacer" flex="1"/>
+        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
+        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+	
 +#else
 +                pack="end">
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@ -1511,7 +1507,7 @@ new file mode 100644
 +
 +          this._selector.selectedItem = document.getAnonymousElementByAttribute(this, "pane", aPaneElement.id);
 +          if (!aPaneElement.loaded) {
-+            function OverlayLoadObserver(aPane)
+            let OverlayLoadObserver = function(aPane)
 +            {
 +              this._pane = aPane;
 +            }
@ -2073,7 +2069,8 @@ new file mode 100644
 +    </handlers>
 +  </binding>
 +          
-+  <binding id="panebutton" extends="chrome://global/content/bindings/radio.xml#radio">
+  <binding id="panebutton" role="xul:listitem"
+           extends="chrome://global/content/bindings/radio.xml#radio">
 +    <resources>
 +      <stylesheet src="chrome://global/skin/preferences.css"/>
 +    </resources>
@ -2081,15 +2078,6 @@ new file mode 100644
 +      <xul:image class="paneButtonIcon" xbl:inherits="src"/>
 +      <xul:label class="paneButtonLabel" xbl:inherits="value=label"/>
 +    </content>
-+    <implementation implements="nsIAccessible">
-+      <property name="accessibleType" readonly="true">
-+        <getter>
-+          <![CDATA[
-+            return Components.interfaces.nsIAccessibleProvider.XULListitem;
-+          ]]>
-+        </getter>
-+      </property>
-+    </implementation>
 +  </binding>
 +
 +</bindings>
@ -2129,9 +2117,9 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
   NS_DECL_ISUPPORTS
   NS_DECL_NSISYSTEMPROXYSETTINGS
 
-   nsUnixSystemProxySettings() {}
-   nsresult Init();
-@@ -35,16 +37,17 @@ private:
+   nsUnixSystemProxySettings()
+     : mSchemeProxySettings(5)
+@@ -38,16 +40,17 @@ private:
   nsCOMPtr<nsIGSettingsService> mGSettings;
   nsCOMPtr<nsIGSettingsCollection> mProxySettings;
   nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@ -2149,7 +2137,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
 {
   // dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -496,16 +499,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -498,16 +501,19 @@ nsUnixSystemProxySettings::GetProxyFromG
 
 nsresult
 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
@ -2169,7 +2157,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
   if (mGConf)
     return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
 
-@@ -531,8 +537,34 @@ static const mozilla::Module::ContractID
+@@ -533,8 +539,34 @@ static const mozilla::Module::ContractID
 
 static const mozilla::Module kUnixProxyModule = {
   mozilla::Module::kVersion,
@ -2207,7 +2195,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -38,18 +38,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -44,18 +44,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
         'nsNativeAppSupportQt.cpp',
         'nsQAppInstance.cpp',
     ]
@ -2628,10 +2616,10 @@ new file mode 100644
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -77,9 +77,10 @@ endif
+@@ -45,9 +45,10 @@ ifdef MOZ_ENABLE_DBUS
+ LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
 endif
 
- include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
@ -2642,8 +2630,8 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -68,16 +68,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
-     pass
+@@ -73,16 +73,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+     ]
 else:
     CPP_SOURCES += [
         'nsOSHelperAppService.cpp',
@ -2878,7 +2866,7 @@ new file mode 100644
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -16,30 +16,33 @@
+@@ -10,30 +10,33 @@
 #include <QString>
 #if (MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
@ -2907,14 +2895,14 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
 -  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
 +  nsresult rv = nsCommonRegistry::LoadURL(aURI);
 
- #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
-   if (NS_FAILED(rv)){
-     HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
-     if (action) {
-       nsAutoCString spec;
-       aURI->GetAsciiSpec(spec);
-       if (hildon_uri_open(spec.get(), action, nullptr))
-@@ -67,22 +70,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+ #ifdef MOZ_WIDGET_QT
+   if (NS_FAILED(rv)) {
+     nsAutoCString spec;
+     aURI->GetAsciiSpec(spec);
+     if (QDesktopServices::openUrl(QUrl(spec.get()))) {
+       rv = NS_OK;
+     }
+@@ -48,22 +51,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
 {
   // if mDefaultApplication is set, it means the application has been set from
   // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
@ -2939,7 +2927,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
   if (*_retval)
     return NS_OK;
 
-@@ -130,16 +133,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
     ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
   if (action.isValid()) {
     action.trigger();
@ -2973,7 +2961,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
     nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIURI> uri;
-@@ -157,17 +177,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -124,17 +144,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
     /* Fallback to GnomeVFS */
     nsCOMPtr<nsIGnomeVFSMimeApp> app;
     if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
@ -3014,7 +3002,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 #include "nsXPIDLString.h"
 #include "nsIURL.h"
 #include "nsIFileStreams.h"
-@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1157,26 +1157,26 @@ nsresult nsOSHelperAppService::OSProtoco
     ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
 
   if (action.isValid())
@ -3025,9 +3013,6 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
   // Check the GConf registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
- #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
-   *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
- #endif
 #endif
 
   return NS_OK;
@ -3046,7 +3031,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 
 nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
 {
-@@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
                                          mime_types_description,
                                          true);
 
@ -3065,7 +3050,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 
     rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                   majorType,
-@@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1386,17 +1386,17 @@ nsOSHelperAppService::GetFromType(const 
 #ifdef MOZ_WIDGET_GTK
   nsRefPtr<nsMIMEInfoBase> gnomeInfo;
   if (handler.IsEmpty()) {
@ -3087,7 +3072,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
 --- a/widget/gtk2/Makefile.in
 +++ b/widget/gtk2/Makefile.in
-@@ -68,11 +68,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -38,11 +38,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
 
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
@ -3133,14 +3118,14 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 #include "nsFilePicker.h"
 +#include "nsKDEUtils.h"
 
- #if (MOZ_PLATFORM_MAEMO == 5)
- #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
- #endif
- 
 using namespace mozilla;
 
 #define MAX_PREVIEW_SIZE 180
-@@ -232,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+ 
+ nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
+ 
+ void
+@@ -225,17 +227,19 @@ nsFilePicker::AppendFilters(int32_t aFil
   return nsBaseFilePicker::AppendFilters(aFilterMask);
 }
 
@ -3161,7 +3146,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 
   mFilters.AppendElement(filter);
   mFilterNames.AppendElement(name);
-@@ -356,16 +360,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
 
 NS_IMETHODIMP
 nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@ -3194,7 +3179,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 
   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
   const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -553,8 +573,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
   if (mCallback) {
     mCallback->Done(result);
     mCallback = nullptr;
@ -3433,7 +3418,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
 --- a/widget/gtk2/nsFilePicker.h
 +++ b/widget/gtk2/nsFilePicker.h
-@@ -67,11 +67,17 @@ protected:
+@@ -66,11 +66,17 @@ protected:
   nsString  mDefault;
   nsString  mDefaultExtension;
 
@ -3454,7 +3439,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -23,9 +23,10 @@ LOCAL_INCLUDES	= \
+@@ -14,9 +14,10 @@ LOCAL_INCLUDES	= \
 	-I$(topsrcdir)/chrome/src \
 	-I$(topsrcdir)/modules/libjar \
 	$(NULL)
@ -3599,7 +3584,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk
+@@ -7,9 +7,9 @@ include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifeq ($(OS_ARCH),Linux)
@ -3610,18 +3595,10 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 
 -LOCAL_INCLUDES	+= -I..
 +LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
- 
- ifeq ($(MOZ_PLATFORM_MAEMO),5)
- CFLAGS          += $(MOZ_DBUS_CFLAGS)
- CXXFLAGS        += $(MOZ_DBUS_CFLAGS)
- endif
- 
- ifdef MOZ_PLATFORM_MAEMO
- CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -50,16 +50,17 @@
+@@ -42,16 +42,17 @@
 #include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
@ -3639,7 +3616,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 #include "prmem.h"
 #include "plbase64.h"
 
-@@ -1753,44 +1754,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1727,44 +1728,51 @@ nsLocalFile::SetPersistentDescriptor(con
     return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
@ -3705,15 +3682,15 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
       return rv;
     }
     return NS_ERROR_FAILURE;
-@@ -1816,16 +1824,23 @@ nsLocalFile::Launch()
+@@ -1772,16 +1780,23 @@ nsLocalFile::Reveal()
+     return NS_ERROR_FAILURE;
+ #endif
+ }
 
-     if (nullptr == connection)
-       return NS_ERROR_FAILURE;
- 
-     if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)
-       return NS_ERROR_FAILURE;
-     return NS_OK;
- #else
+ NS_IMETHODIMP
+ nsLocalFile::Launch()
+ {
+ #ifdef MOZ_WIDGET_GTK
 +    if( nsKDEUtils::kdeSupport()) {
 +      nsTArray<nsCString> command;
 +      command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
--- a/mozilla-nongnome-proxies.patch
+++ b/mozilla-nongnome-proxies.patch
@ -9,7 +9,7 @@ retrieving revision 1.1
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -50,24 +50,28 @@ nsUnixSystemProxySettings::GetMainThread
+@@ -53,23 +53,27 @@ nsUnixSystemProxySettings::GetMainThread
   // dbus prevents us from being threadsafe, but this routine should not block anyhow
   *aMainThreadOnly = true;
   return NS_OK;
@ -18,7 +18,6 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 nsresult
 nsUnixSystemProxySettings::Init()
 {
-  mSchemeProxySettings.Init(5);
 -  mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
 -  if (mGSettings) {
 -    mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
@ -29,7 +28,6 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 +  // only use GSettings if that is a GNOME session
 +  const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
 +  if (sessionType && !strcmp(sessionType, "gnome")) {
-+    mSchemeProxySettings.Init(5);
 +    mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
 +    if (mGSettings) {
 +      mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
--- a/mozilla-shared-nss-db.patch
+++ b/mozilla-shared-nss-db.patch
@ -7,7 +7,7 @@ References:
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8162,16 +8162,31 @@ AC_SUBST(QCMS_LIBS)
 
 dnl ========================================================
 dnl HarfBuzz
@ -42,20 +42,18 @@ diff --git a/configure.in b/configure.in
 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
-@@ -18,10 +18,13 @@ LIBXUL_LIBRARY	= 1
- CSRCS += md4.c
+@@ -5,8 +5,11 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+ EXPORT_LIBRARY	= 1
 DEFINES += \
   -DNSS_ENABLE_ECC \
   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)
- 
+
 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
-+
- include $(topsrcdir)/config/rules.mk
- 
 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
 --- a/security/manager/ssl/src/nsNSSComponent.cpp
 +++ b/security/manager/ssl/src/nsNSSComponent.cpp
@ -83,7 +81,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 #include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsICertOverrideService.h"
-@@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1136,18 +1143,35 @@ nsNSSComponent::InitializeNSS(bool showW
     ConfigureInternalPKCS11Token();
 
     // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@ -94,6 +92,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
     uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
 -    SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
 -                                         SECMOD_DB, init_flags);
+
 +    SECStatus init_rv = SECFailure;
 +#ifdef MOZ_ENABLE_NSSHELPER
 +    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
@ -116,18 +115,18 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
     if (init_rv != SECSuccess) {
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
 
-       if (supress_warning_preference) {
+       if (suppressWarningPref) {
         which_nss_problem = problem_none;
       }
       else {
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)),
- ifdef MOZ_DEBUG
- EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
- endif
- endif
+@@ -473,17 +473,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/intl/un
+ ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ SDK_LIBRARY = $(IMPORT_LIBRARY)
+ else
+ SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 EXTRA_DSO_LDOPTS += $(LIBS_DIR)
--- a/source-stamp.txt
+++ b/source-stamp.txt
@ -1,2 +1,2 @@
-REV=de08ee190ca3
+REV=39faf812aaec
 REPO=http://hg.mozilla.org/releases/mozilla-release