80fbe46e49
Changes: https://www.mozilla.org/firefox/62.0/releasenotes/ PR: 229168 Security: c96d416a-eae7-4d5d-bc84-40deca9329fb MFH: 2018Q3 Differential Revision: https://reviews.freebsd.org/D15913
55 lines
4.8 KiB
Text
55 lines
4.8 KiB
Text
https://github.com/mozilla/addons/issues/708
|
|
https://github.com/mozilla/addons-frontend/issues/4610
|
|
|
|
diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js
|
|
index 75c2c5e435e35..4d8c09c02759b 100644
|
|
--- browser/app/profile/firefox.js
|
|
+++ browser/app/profile/firefox.js
|
|
@@ -45,8 +45,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru
|
|
pref("extensions.getAddons.cache.enabled", true);
|
|
pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
|
|
pref("extensions.getAddons.compatOverides.url", "https://services.addons.mozilla.org/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%");
|
|
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
|
|
-pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
|
|
+pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%");
|
|
+pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%");
|
|
pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
|
|
pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/?src=firefox");
|
|
|
|
@@ -186,8 +186,8 @@ pref("app.update.service.enabled", true);
|
|
// .. etc ..
|
|
//
|
|
pref("extensions.update.enabled", true);
|
|
-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
|
|
-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
|
|
+pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
|
|
+pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
|
|
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
|
|
// Themes every day
|
|
// Non-symmetric (not shared by extensions) extension-specific [update] preferences
|
|
diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm
|
|
index f70fd8d7e3bd8..81e8cd7764fdf 100644
|
|
--- toolkit/mozapps/extensions/internal/AddonRepository.jsm
|
|
+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm
|
|
@@ -602,7 +602,7 @@ var AddonRepository = {
|
|
addon.version = String(aEntry.current_version.version);
|
|
if (Array.isArray(aEntry.current_version.files)) {
|
|
for (let file of aEntry.current_version.files) {
|
|
- if (file.platform == "all" || file.platform == PLATFORM) {
|
|
+ if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) {
|
|
if (file.url) {
|
|
addon.sourceURI = NetUtil.newURI(file.url);
|
|
}
|
|
diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm
|
|
index f70fd8d7e3bd8..81e8cd7764fdf 100644
|
|
--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm
|
|
+++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm
|
|
@@ -355,7 +355,7 @@ class AddonInternal {
|
|
// Something is causing errors in here
|
|
try {
|
|
for (let platform of this.targetPlatforms) {
|
|
- if (platform.os == Services.appinfo.OS) {
|
|
+ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
|
|
if (platform.abi) {
|
|
needsABI = true;
|
|
if (platform.abi === abi)
|