summaryrefslogtreecommitdiff
path: root/mozilla-1255590.patch
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-04-25 14:58:04 +0200
committerMartin Stransky <stransky@redhat.com>2016-04-25 14:58:04 +0200
commitdba86ea74dde110b8e5d432bd5de746d0839a7d1 (patch)
tree0256841a7157cf01165570909cb5298e50b74c41 /mozilla-1255590.patch
parentApply mozbz#1263145 to gtk3.20 only (diff)
downloadlibrewolf-fedora-ff-dba86ea74dde110b8e5d432bd5de746d0839a7d1.tar.gz
librewolf-fedora-ff-dba86ea74dde110b8e5d432bd5de746d0839a7d1.tar.bz2
librewolf-fedora-ff-dba86ea74dde110b8e5d432bd5de746d0839a7d1.zip
Update to Firefox 46
Diffstat (limited to 'mozilla-1255590.patch')
-rw-r--r--mozilla-1255590.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/mozilla-1255590.patch b/mozilla-1255590.patch
new file mode 100644
index 0000000..2c61dc4
--- /dev/null
+++ b/mozilla-1255590.patch
@@ -0,0 +1,60 @@
+diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
+--- a/toolkit/mozapps/extensions/content/extensions.js
++++ b/toolkit/mozapps/extensions/content/extensions.js
+@@ -195,19 +195,25 @@ function loadView(aViewId) {
+
+ gViewController.loadInitialView(aViewId);
+ } else {
+ gViewController.loadView(aViewId);
+ }
+ }
+
+ function isCorrectlySigned(aAddon) {
+- // temporary add-ons do not require signing
++ // Temporary add-ons do not require signing.
+ if (aAddon.scope == AddonManager.SCOPE_TEMPORARY)
+ return true;
++ // On UNIX platforms except OSX, an additional location for system add-ons
++ // exists in /usr/{lib,share}/mozilla/extensions. Add-ons installed there
++ // do not require signing either.
++ if (aAddon.scope == AddonManager.SCOPE_SYSTEM &&
++ Services.appinfo.OS != "Darwin")
++ return true;
+ if (aAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING)
+ return false;
+ return true;
+ }
+
+ function isDiscoverEnabled() {
+ if (Services.prefs.getPrefType(PREF_DISCOVERURL) == Services.prefs.PREF_INVALID)
+ return false;
+diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
++++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+@@ -682,18 +682,23 @@ function isUsableAddon(aAddon) {
+ // Hack to ensure the default theme is always usable
+ if (aAddon.type == "theme" && aAddon.internalName == XPIProvider.defaultSkin)
+ return true;
+
+ if (aAddon._installLocation.name == KEY_APP_SYSTEM_ADDONS &&
+ aAddon.signedState != AddonManager.SIGNEDSTATE_SYSTEM) {
+ return false;
+ }
+- // temporary and system add-ons do not require signing
+- if ((aAddon._installLocation.name != KEY_APP_SYSTEM_DEFAULTS &&
++ // Temporary and system add-ons do not require signing.
++ // On UNIX platforms except OSX, an additional location for system add-ons
++ // exists in /usr/{lib,share}/mozilla/extensions. Add-ons installed there
++ // do not require signing either.
++ if (((aAddon._installLocation.scope != AddonManager.SCOPE_SYSTEM ||
++ Services.appinfo.OS == "Darwin") &&
++ aAddon._installLocation.name != KEY_APP_SYSTEM_DEFAULTS &&
+ aAddon._installLocation.name != KEY_APP_TEMPORARY) &&
+ mustSign(aAddon.type)) {
+ if (aAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING)
+ return false;
+ }
+
+ if (aAddon.blocklistState == Blocklist.STATE_BLOCKED)
+ return false;
+
bgstack15