summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsegfault <segfault@riseup.net>2018-08-08 16:21:04 +0200
committersegfault <segfault@riseup.net>2018-08-08 17:44:04 +0200
commit3fc4fb4757222e5bf494eb41801862ba8d0b80c5 (patch)
treeb0a479c034a5e656fd37d000cd1014af8e90c224
parent85392012d5dc8b5934286fa92a3f3c7e6829998c (diff)
Fix uBlock Origin addon id (refs: #15702)
-rwxr-xr-xconfig/chroot_local-hooks/10-tbb10
-rw-r--r--config/chroot_local-includes/etc/tor-browser/profile/chrome/userChrome.css2
2 files changed, 6 insertions, 6 deletions
diff --git a/config/chroot_local-hooks/10-tbb b/config/chroot_local-hooks/10-tbb
index 2e329fd..844b3ec 100755
--- a/config/chroot_local-hooks/10-tbb
+++ b/config/chroot_local-hooks/10-tbb
@@ -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() {
diff --git a/config/chroot_local-includes/etc/tor-browser/profile/chrome/userChrome.css b/config/chroot_local-includes/etc/tor-browser/profile/chrome/userChrome.css
index ee883fe..4de8299 100644
--- a/config/chroot_local-includes/etc/tor-browser/profile/chrome/userChrome.css
+++ b/config/chroot_local-includes/etc/tor-browser/profile/chrome/userChrome.css
@@ -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;
}