Commit 6b321a7f authored by intrigeri's avatar intrigeri
Browse files

Adjust to the fact Tor Browser 8.0a10 replaces firefox with a wrapper (refs: #15803).

Their new wrapper conditionally (more on that later) adds their own libstdc++6
to LD_LIBRARY_PATH, which our wrapper already does.
parent b61d81a9
......@@ -338,7 +338,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}"
......
......@@ -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() {
......
......@@ -16,7 +16,7 @@ end
def xul_application_info(application)
binary = $vm.execute_successfully(
'echo ${TBB_INSTALL}/firefox', :libs => 'tor-browser'
'echo ${TBB_INSTALL}/firefox.real', :libs => 'tor-browser'
).stdout.chomp
address_bar_image = "BrowserAddressBar.png"
unused_tbb_libs = ['libnssdbm3.so', "libmozavcodec.so", "libmozavutil.so"]
......
......@@ -258,7 +258,7 @@ def stream_isolation_info(application)
}
when "Tor Browser"
{
:grep_monitor_expr => 'users:(("firefox"',
:grep_monitor_expr => 'users:(("firefox\.real"',
:socksport => 9150,
:controller => true,
}
......
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