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 532dca658a2f7f0270fcc2870cd44a4100871eed..83d44078870348d0040a63084ff5af5633855b9b 100644 (file)
--- 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 ac14ea3420259145e21b35361ec62d8f59dbe249..2b4b5d51fd8f6850315abfb81ca92fe8f2132942 100644 (file)
--- 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)