Commit 3fc4fb47 authored by segfault's avatar segfault
Browse files

Fix uBlock Origin addon id (refs: #15702)

parent 85392012
......@@ -136,7 +136,7 @@ diff -Naur a/chrome/toolkit/content/mozapps/extensions/extensions.js b/chrome/to
aAddon.id == "tor-launcher@torproject.org" ||
- aAddon.id == "https-everywhere-eff@eff.org") {
+ aAddon.id == "https-everywhere-eff@eff.org" ||
+ aAddon.id == "uBlock0-webext@raymondhill.net") {
+ aAddon.id == "uBlock0@raymondhill.net") {
return true;
}
return aAddon.isCorrectlySigned !== false;
......@@ -149,7 +149,7 @@ diff -Naur a/modules/addons/XPIProvider.jsm b/modules/addons/XPIProvider.jsm
aAddon.id == "https-everywhere-eff@eff.org" ||
- aAddon.id == "meek-http-helper@bamsoftware.com") {
+ aAddon.id == "meek-http-helper@bamsoftware.com" ||
+ aAddon.id == "uBlock0-webext@raymondhill.net") {
+ aAddon.id == "uBlock0@raymondhill.net") {
return true;
}
......@@ -157,7 +157,7 @@ diff -Naur a/modules/addons/XPIProvider.jsm b/modules/addons/XPIProvider.jsm
addon.id != "tor-launcher@torproject.org" &&
addon.id != "https-everywhere-eff@eff.org" &&
addon.id != "meek-http-helper@bamsoftware.com" &&
+ addon.id != "uBlock0-webext@raymondhill.net" &&
+ addon.id != "uBlock0@raymondhill.net" &&
addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
logger.warn("Refusing to install staged add-on " + id + " with signed state " + addon.signedState);
seenFiles.push(stageDirEntry.leafName);
......@@ -182,7 +182,7 @@ diff -Naur x/components/nsBrowserGlue.js y/components/nsBrowserGlue.js
addon.id == "tor-launcher@torproject.org" ||
- addon.id == "https-everywhere-eff@eff.org")) {
+ addon.id == "https-everywhere-eff@eff.org" ||
+ addon.id == "uBlock0-webext@raymondhill.net")) {
+ addon.id == "uBlock0@raymondhill.net")) {
this._notifyUnsignedAddonsDisabled();
break;
}
......@@ -263,7 +263,7 @@ install_debian_extensions() {
shift
apt-get install --yes "${@}"
ln -s /usr/share/webext/ublock-origin/ \
"${destination}"/'uBlock0-webext@raymondhill.net'
"${destination}"/'uBlock0@raymondhill.net'
}
create_default_profile() {
......
......@@ -33,6 +33,6 @@
vbox#sidebar-box[sidebarcommand="_UUID~ADDON_-sidebar-action"] {
display: none !important;
}
vbox#sidebar-box[sidebarcommand="ublock0-webext_raymondhill_net-sidebar-action"] {
vbox#sidebar-box[sidebarcommand="ublock0_raymondhill_net-sidebar-action"] {
display: none !important;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment