From: Mike Hommey <mh@glandium.org>
Date: Sat, 5 Dec 2015 09:23:58 +0000 (+0900)
Subject: Allow unsigned addons in /usr/{lib,share}/mozilla/extensions
X-Git-Tag: archive/raspbian/60.4.0esr-1+rpi1~1^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a572342b06f3eea27a761c93218d4ef3a0b28cc;p=firefox-esr.git

Allow unsigned addons in /usr/{lib,share}/mozilla/extensions


Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Allow-unsigned-addons-in-usr-lib-share-mozilla-exten.patch
---

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 532dca658a2..83d44078870 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -202,6 +202,8 @@ function loadView(aViewId) {
 }
 
 function isCorrectlySigned(aAddon) {
+  if (aAddon.scope == AddonManager.SCOPE_SYSTEM)
+    return true;
   if (aAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING)
     return false;
   if (aAddon.foreignInstall && aAddon.signedState < AddonManager.SIGNEDSTATE_SIGNED)
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index ac14ea34202..2b4b5d51fd8 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -666,7 +666,8 @@ function isUsableAddon(aAddon) {
     return false;
   }
 
-  if (aAddon._installLocation.name != KEY_APP_SYSTEM_DEFAULTS && mustSign(aAddon.type)) {
+  if (aAddon._installLocation.scope != AddonManager.SCOPE_SYSTEM &&
+      aAddon._installLocation.name != KEY_APP_SYSTEM_DEFAULTS && mustSign(aAddon.type)) {
     if (aAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING)
       return false;
     if (aAddon.foreignInstall && aAddon.signedState < AddonManager.SIGNEDSTATE_SIGNED)