Commit efa6c024 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'feature/15803-tor-browser-8.0a10+force-all-tests' into testing...

Merge branch 'feature/15803-tor-browser-8.0a10+force-all-tests' into testing (Fix-committed: #15803, #15706, #15801)
parents fc2fd631 efcbcb65
......@@ -71,8 +71,12 @@ install_tor_browser() {
done
# Let's use the libstdc++ that the Tor Browser is intended to be used with,
# instead of the system one.
cp "${prep}"/TorBrowser/Tor/libstdc++.so.6 "${prep}"
# instead of the system one, whenever ours is too old.
# For details see projects/firefox/abicheck.cc in
# https://git.torproject.org/builders/tor-browser-build.git
# Tor Browser 8.0a10 requires GLIBCXX_3.4.22, which Stretch has
# so disable this for now.
# cp "${prep}"/TorBrowser/Tor/libstdc++.so.6 "${prep}"
# We don't need the Tor binary, the shared libraries Tor needs
# (but Firefox doesn't) and documentation shipped in the TBB.
......@@ -338,7 +342,7 @@ create_default_profile "${TBB_INSTALL}"/TorBrowser/Data/Browser/profile.default
# Create a copy of the Firefox binary, for use e.g. by Tor Launcher.
# It won't be subject to AppArmor confinement.
cp -a "${TBB_INSTALL}/firefox" "${TBB_INSTALL}/firefox-unconfined"
cp -a "${TBB_INSTALL}/firefox.real" "${TBB_INSTALL}/firefox-unconfined"
chown -R root:root "${TBB_INSTALL}" "${TBB_PROFILE}" "${TBB_EXT}"
chmod -R a+rX "${TBB_INSTALL}" "${TBB_PROFILE}" "${TBB_EXT}"
......
......@@ -22,7 +22,7 @@ ensure_hook_dependency_is_installed p7zip imagemagick
BROWSER_LOCALIZATION_DIR="/usr/share/tails/browser-localization"
DESCRIPTIONS_FILE="${BROWSER_LOCALIZATION_DIR}/descriptions"
LOCALE_PROFILES_DIR="/etc/tor-browser/locale-profiles/"
NO_SPELLCHECKER_LOCALES="ja tr zh"
NO_SPELLCHECKER_LOCALES="ca ga id is ja nb tr zh"
# Sanity check that each supported Tor Browser locale has a
# description for how to localize it further.
......@@ -40,14 +40,13 @@ fi
# This very long while-loop is fed the DESCRIPTIONS_FILE (IO
# redirection at the bottom), which describes how we will localize
# each supported Tor Browser locale. The format is:
# MOZILLA_LOCALE:LOCATION:LOCALIZED_LANG
# MOZILLA_LOCALE:LOCATION
# Note that we're forced to pick some representative location for the
# language-only locales, like Egypt (EG) for Arabic (ar).
while IFS=: read MOZILLA_LOCALE LOCATION LOCALIZED_LANG; do
if [ -z "${MOZILLA_LOCALE}" ] || [ -z "${LOCATION}" ] || \
[ -z "${LOCALIZED_LANG}" ]; then
while IFS=: read MOZILLA_LOCALE LOCATION; do
if [ -z "${MOZILLA_LOCALE}" ] || [ -z "${LOCATION}" ]; then
echo "Something is wrong with ${DESCRIPTIONS_FILE}" >&2
echo "Description: ${MOZILLA_LOCALE}:${LOCATION}:${LOCALIZED_LANG}" >&2
echo "Description: ${MOZILLA_LOCALE}:${LOCATION}" >&2
exit 1
fi
......
......@@ -36,7 +36,7 @@ export TOR_NO_DISPLAY_NETWORK_SETTINGS='yes'
ask_for_confirmation() {
if [ "${TOR_BROWSER_SKIP_OFFLINE_WARNING:-}" = 'yes' ] || \
pgrep -u "${LIVE_USERNAME}" -f "${TBB_INSTALL}/firefox"; then
pgrep -u "${LIVE_USERNAME}" -f "${TBB_INSTALL}/firefox.real"; then
return
fi
......
......@@ -39,7 +39,7 @@ exec_firefox_helper() {
}
exec_firefox() {
exec_firefox_helper firefox "${@}"
exec_firefox_helper firefox.real "${@}"
}
exec_unconfined_firefox() {
......
......@@ -3,7 +3,7 @@ _Name=Tor Browser
_Comment=Anonymous Web Browser
_GenericName=Anonymous Web Browser
Categories=Network;
Icon=/usr/local/lib/tor-browser/browser/chrome/icons/default/default48.png
Icon=/usr/local/lib/tor-browser/browser/chrome/icons/default/default128.png
Terminal=false
Type=Application
Exec=/usr/local/bin/tor-browser %u
......
ar:EG:عربية
da:DK:Dansk
de:DE:Deutsch
es-ES:ES:Español
en-US:US:English
fa:IR:فارسی
fr:FR:Français
he:IL:עברית
it:IT:Italiano
ja:JP:日本語
ko:KR:한국어
nl:NL:Nederlands
pl:PL:Polski
pt-BR:BR:Português
ru:RU:Русский
sv-SE:SE:Svenska
tr:TR:Türkçe
vi:VN:Việt Nam
zh-CN:CN:汉语 (中华人民共和国)
zh-TW:TW:漢語 (中華民國)
ar:EG
ca:ES
da:DK
de:DE
es-ES:ES
en-US:US
fa:IR
fr:FR
ga-IE:IE
he:IL
id:ID
is:IS
it:IT
ja:JP
ko:KR
nb-NO:NO
nl:NL
pl:PL
pt-BR:BR
ru:RU
sv-SE:SE
tr:TR
vi:VN
zh-CN:CN
zh-TW:TW
http://people.torproject.org/~gk/builds/8.0a9/
http://people.torproject.org/~boklm/builds/8.0a10-build5/
cbc94a91b92000355997cc377a37ae52cd8c565e5e07adaad7119e5477614e10 tor-browser-linux64-8.0a9_ar.tar.xz
83b25be97c7d7cee36c270e27df765c2513a6a91a0bdae985a20f3d1983ceee1 tor-browser-linux64-8.0a9_da.tar.xz
5168b05f3eaede1b7c994d8335a5c694a149b4ee53bec21bc26d52fb89c7ac0b tor-browser-linux64-8.0a9_de.tar.xz
4c52c1b0e7ec28803ed3ce68e2c67537e1ecef3b499afc207dc9c168ee106e15 tor-browser-linux64-8.0a9_en-US.tar.xz
c0fdc442b444da54ffb5c0e8587f2d11fb82286493af8c6ffafd2137a597d1ea tor-browser-linux64-8.0a9_es-ES.tar.xz
fff80784022c08551bbb05c59ddbb9cf39ad3b2b7d550b29e0b4e4116b3264c4 tor-browser-linux64-8.0a9_fa.tar.xz
9943f54c262892d4261a5dc8ab9cc55045dfea0832b9d2d62e79f025662ab167 tor-browser-linux64-8.0a9_fr.tar.xz
9ff9d1ddf133100936d7e12bc73a506c3ca530ab727169ec12862715a3a4fe78 tor-browser-linux64-8.0a9_he.tar.xz
4861f2d611c33c8e6bbf8a0dc6d87147306d2f5f3607c5dd006387d3f1827128 tor-browser-linux64-8.0a9_it.tar.xz
fb894e2ee5f22ba9e90f50ccff1dd8ea31a2ddef8e28bf43fee5837e43bca7ba tor-browser-linux64-8.0a9_ja.tar.xz
4052d2d20b90def38e8928d929546b4fd870b50b3995e911520cbf47ba7f99b9 tor-browser-linux64-8.0a9_ko.tar.xz
4e5cd24cf3569b8948312bf207772ca7d3c93383eb7ba0ab5b65e462d8839eb9 tor-browser-linux64-8.0a9_nl.tar.xz
ad1bc9eb4b432e547c2b83ab3356ceea3d061a91be87d901ea788a6d0e26e74d tor-browser-linux64-8.0a9_pl.tar.xz
20980c33d20277756779abe3d4dfe6a72a78daf8bdc19a323a9157ae4f578d44 tor-browser-linux64-8.0a9_pt-BR.tar.xz
9363a87b8d578982d2fd18b4ecca42b04d6848a79dbadbda527fc876772e7aaf tor-browser-linux64-8.0a9_ru.tar.xz
b05ff5c044dae4557183ea260247a0f287dacd9dda86bfac90ec857958f3619f tor-browser-linux64-8.0a9_sv-SE.tar.xz
046a21871703aac5324a30079b9907aca91aa18fc32153cb7a625c42a42c6306 tor-browser-linux64-8.0a9_tr.tar.xz
c6926a66279312990856367fd13551fcc327976c306c2fda8037ff530f164169 tor-browser-linux64-8.0a9_vi.tar.xz
2480e04a48b0487bd885ce60ef8a211761c7a5a0c9015032a2de6e11692fde3c tor-browser-linux64-8.0a9_zh-CN.tar.xz
f2a9f195210bd838e8ab3885967883e74ebac584b915f956220b76cf965b032f tor-browser-linux64-8.0a9_zh-TW.tar.xz
b11cc9407b6ead14a78f2b19b0b7cbd0b67a53d05387f74f90bee06caaadcbe1 tor-browser-linux64-8.0a10_ar.tar.xz
bfd63fccc2814a1c8be7b5cb93d9d175c0716c01ea2ccf28ccd058d188fc6184 tor-browser-linux64-8.0a10_ca.tar.xz
99bad70602542906ece0c0b6ab2a2da76084c7548ac6a87918f0852d4f32dad6 tor-browser-linux64-8.0a10_da.tar.xz
d667fd81cd7ed717bc566ad0314d2bde9d7440d691429f57381d290d90ad8278 tor-browser-linux64-8.0a10_de.tar.xz
71a3cfacbeacef0f33f3295c02ba0e64809100fc78b8c631a3700c072f459a0f tor-browser-linux64-8.0a10_en-US.tar.xz
a2af2e6ef2c22084a7b10a0016bc34060aab818645e5f20511fba5b15dfaf44d tor-browser-linux64-8.0a10_es-ES.tar.xz
1faf95c02e3fb1c72c2b7ed3db95be6cdebf621de5d17e703555198ec9d4d8e0 tor-browser-linux64-8.0a10_fa.tar.xz
8f6c5cfe1e71ded39473d2455e652791579bcfd647247c4ac831665b06da6929 tor-browser-linux64-8.0a10_fr.tar.xz
949af5423ebe2d558b305b06f2572493df31f81c9e2c7ae0f30a87f91bb74d2e tor-browser-linux64-8.0a10_ga-IE.tar.xz
8e1463e81c29858787f02d2552ef4849dec999796a7845be6ecc9904061c5328 tor-browser-linux64-8.0a10_he.tar.xz
a91b68785da486e97427e6ab40f97c0ae0beb41c63ccf0c5be400aa4a437f520 tor-browser-linux64-8.0a10_id.tar.xz
b99acae928e5651e1d29ef094214ff6d6ba55776ebc4869db675eee9ff24838a tor-browser-linux64-8.0a10_is.tar.xz
e017164fd1fad6dee35880677e92e55e511d59e68f40a66ae0b388b334f65a23 tor-browser-linux64-8.0a10_it.tar.xz
12d0cc2ae3992d6904d00d10d6bdaf7a0dc7c9c89f1138158233d995a8b60713 tor-browser-linux64-8.0a10_ja.tar.xz
f7fff505148e5196280f730db74b1e8648be2219a1468f29839ba2a88a11f834 tor-browser-linux64-8.0a10_ko.tar.xz
819e413ad6686647f5028f52ce9e9e4d9d77a9afe83a0461cbbf6a987ebf30b2 tor-browser-linux64-8.0a10_nb-NO.tar.xz
402e65a10ed3e4679d6d3103b2daf9d46171cb9a87f39d4f3341e902ee663668 tor-browser-linux64-8.0a10_nl.tar.xz
aaf0024f34d2d5804464d0aa64e815146b75feffa7343b28a217b9624e72ea6c tor-browser-linux64-8.0a10_pl.tar.xz
5e678e3e877cb5ba849b6cd9aa1dbcddb039372163b9f3f8d3e3d0fa7e871dd0 tor-browser-linux64-8.0a10_pt-BR.tar.xz
4e9df02db964c76c4b4bfbc60b659f9fd6b53f4b23e51fdcbfe35b41f7784f0d tor-browser-linux64-8.0a10_ru.tar.xz
5382b8aa532dac77a8de7abccfe2ce3b46c7db43aefadc20966ca851813f3ab5 tor-browser-linux64-8.0a10_sv-SE.tar.xz
3fbe7974d10faf74403e06dc386e6c3a7906dd4418c6a92b1a972060fe818253 tor-browser-linux64-8.0a10_tr.tar.xz
d8dcfaa40abc470752094bf4a6d05230636e3a3b00f0de43a3784dc61ac1dd88 tor-browser-linux64-8.0a10_vi.tar.xz
b8618b7fbc40b8f8de2379f3c312dd8030ab10cfff88627439217e5de7ff2799 tor-browser-linux64-8.0a10_zh-CN.tar.xz
abeac79c48fab50fbe27d3852d884a4b666aa765b42299b38da2207309849e33 tor-browser-linux64-8.0a10_zh-TW.tar.xz
......@@ -13,11 +13,6 @@ pref("app.update.enabled", false);
// Suppress prompt and always spoof useragent as English
pref("privacy.spoof_english", 2);
// XXX: Now handled by privacy.spoof_english; remove the next two
// lines once Tor Button stops doing it itself in addition to what
// Firefox does.
pref("extensions.torbutton.spoof_english", true);
pref("extensions.torbutton.prompted_language", true);
// Tails-specific Torbutton preferences
pref("extensions.torbutton.lastUpdateCheck", "9999999999.999");
......
diff --git a/etc/apparmor.d/torbrowser.Browser.firefox b/etc/apparmor.d/torbrowser.Browser.firefox
index d0aded9..3be3872 100644
index d0aded9..87a0191 100644
--- a/etc/apparmor.d/torbrowser.Browser.firefox
+++ b/etc/apparmor.d/torbrowser.Browser.firefox
@@ -1,10 +1,11 @@
......@@ -7,7 +7,7 @@ index d0aded9..3be3872 100644
#include <tunables/torbrowser>
-@{torbrowser_firefox_executable} = /home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox
+@{torbrowser_firefox_executable} = /usr/local/lib/tor-browser/firefox
+@{torbrowser_firefox_executable} = /usr/local/lib/tor-browser/firefox.real
profile torbrowser_firefox @{torbrowser_firefox_executable} {
#include <abstractions/gnome>
......@@ -158,7 +158,7 @@ index d0aded9..3be3872 100644
+ deny /tmp/ rwklx,
}
diff --git a/etc/apparmor.d/torbrowser.Browser.plugin-container b/etc/apparmor.d/torbrowser.Browser.plugin-container
index fe95fdb..7ebf9d6 100644
index fe95fdb..32d0c38 100644
--- a/etc/apparmor.d/torbrowser.Browser.plugin-container
+++ b/etc/apparmor.d/torbrowser.Browser.plugin-container
@@ -10,9 +10,9 @@ profile torbrowser_plugin_container {
......
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