Commit b959708b authored by intrigeri's avatar intrigeri
Browse files

Install uBlock Origin webext instead of xul-ext (refs: #15023)

parent 2e84dad3
...@@ -76,8 +76,8 @@ Package: xserver-xorg-core xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-x ...@@ -76,8 +76,8 @@ Package: xserver-xorg-core xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-x
Pin: release o=Debian,n=stretch Pin: release o=Debian,n=stretch
Pin-Priority: 999 Pin-Priority: 999
Package: xul-ext-ublock-origin Package: webext-ublock-origin
Pin: origin deb.tails.boum.org Pin: release o=Debian,n=sid
Pin-Priority: 999 Pin-Priority: 999
Package: pdf-redact-tools Package: pdf-redact-tools
......
...@@ -139,7 +139,7 @@ diff -Naur a/chrome/toolkit/content/mozapps/extensions/extensions.js b/chrome/to ...@@ -139,7 +139,7 @@ diff -Naur a/chrome/toolkit/content/mozapps/extensions/extensions.js b/chrome/to
aAddon.id == "tor-launcher@torproject.org" || aAddon.id == "tor-launcher@torproject.org" ||
- aAddon.id == "https-everywhere-eff@eff.org") { - aAddon.id == "https-everywhere-eff@eff.org") {
+ aAddon.id == "https-everywhere-eff@eff.org" || + aAddon.id == "https-everywhere-eff@eff.org" ||
+ aAddon.id == "uBlock0@raymondhill.net") { + aAddon.id == "uBlock0-webext@raymondhill.net") {
return true; return true;
} }
return aAddon.isCorrectlySigned !== false; return aAddon.isCorrectlySigned !== false;
...@@ -152,7 +152,7 @@ diff -Naur a/modules/addons/XPIProvider.jsm b/modules/addons/XPIProvider.jsm ...@@ -152,7 +152,7 @@ diff -Naur a/modules/addons/XPIProvider.jsm b/modules/addons/XPIProvider.jsm
aAddon.id == "https-everywhere-eff@eff.org" || aAddon.id == "https-everywhere-eff@eff.org" ||
- aAddon.id == "meek-http-helper@bamsoftware.com") { - aAddon.id == "meek-http-helper@bamsoftware.com") {
+ aAddon.id == "meek-http-helper@bamsoftware.com" || + aAddon.id == "meek-http-helper@bamsoftware.com" ||
+ aAddon.id == "uBlock0@raymondhill.net") { + aAddon.id == "uBlock0-webext@raymondhill.net") {
return true; return true;
} }
...@@ -160,7 +160,7 @@ diff -Naur a/modules/addons/XPIProvider.jsm b/modules/addons/XPIProvider.jsm ...@@ -160,7 +160,7 @@ diff -Naur a/modules/addons/XPIProvider.jsm b/modules/addons/XPIProvider.jsm
addon.id != "tor-launcher@torproject.org" && addon.id != "tor-launcher@torproject.org" &&
addon.id != "https-everywhere-eff@eff.org" && addon.id != "https-everywhere-eff@eff.org" &&
addon.id != "meek-http-helper@bamsoftware.com" && addon.id != "meek-http-helper@bamsoftware.com" &&
+ addon.id != "uBlock0@raymondhill.net" && + addon.id != "uBlock0-webext@raymondhill.net" &&
addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) { addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
logger.warn("Refusing to install staged add-on " + id + " with signed state " + addon.signedState); logger.warn("Refusing to install staged add-on " + id + " with signed state " + addon.signedState);
seenFiles.push(stageDirEntry.leafName); seenFiles.push(stageDirEntry.leafName);
...@@ -185,7 +185,7 @@ diff -Naur x/components/nsBrowserGlue.js y/components/nsBrowserGlue.js ...@@ -185,7 +185,7 @@ diff -Naur x/components/nsBrowserGlue.js y/components/nsBrowserGlue.js
addon.id == "tor-launcher@torproject.org" || addon.id == "tor-launcher@torproject.org" ||
- addon.id == "https-everywhere-eff@eff.org")) { - addon.id == "https-everywhere-eff@eff.org")) {
+ addon.id == "https-everywhere-eff@eff.org" || + addon.id == "https-everywhere-eff@eff.org" ||
+ addon.id == "uBlock0@raymondhill.net")) { + addon.id == "uBlock0-webext@raymondhill.net")) {
this._notifyUnsignedAddonsDisabled(); this._notifyUnsignedAddonsDisabled();
break; break;
} }
...@@ -259,8 +259,8 @@ install_debian_extensions() { ...@@ -259,8 +259,8 @@ install_debian_extensions() {
destination="${1}" destination="${1}"
shift shift
apt-get install --yes "${@}" apt-get install --yes "${@}"
ln -s /usr/share/xul-ext/ublock-origin/ \ ln -s /usr/share/webext/ublock-origin/ \
"${destination}"/'uBlock0@raymondhill.net' "${destination}"/'uBlock0-webext@raymondhill.net'
} }
create_default_profile() { create_default_profile() {
...@@ -296,7 +296,7 @@ TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}")" ...@@ -296,7 +296,7 @@ TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}")"
# The Firefox extensions we want to install from Debian and make # The Firefox extensions we want to install from Debian and make
# available in the Tor Browser. # available in the Tor Browser.
DEBIAN_EXT_PKGS="xul-ext-ublock-origin" DEBIAN_EXT_PKGS="webext-ublock-origin"
TMP="$(mktemp -d)" TMP="$(mktemp -d)"
download_and_verify_files "${TBB_TARBALLS_BASE_URL}" "${TBB_TARBALLS}" "${TMP}" download_and_verify_files "${TBB_TARBALLS_BASE_URL}" "${TBB_TARBALLS}" "${TMP}"
......
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