Bug 715876 - Start using the maintenance service for x64 updates and enable verifying signatures. r=rstrong
authorBrian R. Bondy <netzen@gmail.com>
Fri, 10 Oct 2014 23:13:20 -0400
changeset 209952 5fc6e12c048b54555061d85a656dd7ef7e23620d
parent 209951 43bd6e46c62c795053a643822b887c953ab5b4ed
child 209953 89d559ebb859d1a7511227458210c092db608d81
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersrstrong
bugs715876
milestone35.0a1
Bug 715876 - Start using the maintenance service for x64 updates and enable verifying signatures. r=rstrong
browser/app/profile/firefox.js
browser/confvars.sh
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -215,20 +215,18 @@ pref("app.update.showInstalledUI", false
 //     to newer versions of installed addons that resolve them.
 // 1 = suppress prompting for incompatibilities only if there are VersionInfo
 //     updates available to installed addons that resolve them, not newer
 //     versions.
 pref("app.update.incompatible.mode", 0);
 
 // Whether or not to attempt using the service for updates.
 #ifdef MOZ_MAINTENANCE_SERVICE
-#ifndef HAVE_64BIT_BUILD
 pref("app.update.service.enabled", true);
 #endif
-#endif
 
 // Symmetric (can be overridden by individual extensions) update preferences.
 // e.g.
 //  extensions.{GUID}.update.enabled
 //  extensions.{GUID}.update.url
 //  .. etc ..
 //
 pref("extensions.update.enabled", true);
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -5,18 +5,18 @@
 
 MOZ_APP_BASENAME=Firefox
 MOZ_APP_VENDOR=Mozilla
 MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
+  MOZ_VERIFY_MAR_SIGNATURE=1
   if ! test "$HAVE_64BIT_BUILD"; then
-    MOZ_VERIFY_MAR_SIGNATURE=1
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "release"; then
       if ! test "$MOZ_DEBUG"; then
         MOZ_STUB_INSTALLER=1
       fi
     fi