summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-02-11 14:19:25 +0000
committerintrigeri <intrigeri@boum.org>2016-02-11 14:19:25 +0000
commitd2f6fe03253eb90ce2326ee2d25ffc000082daf9 (patch)
tree838a52cfd674b3270c6cfa72a3ad74502c34a6fb
parent614c63ea14fa5d9ee939eec013f8448fbb187f37 (diff)
parentd4a69eae2db4ac59cf020832dbc78f504e93b1aa (diff)
Merge remote-tracking branch 'origin/bugfix/11097-tor-browser-fontconfig' into devel
Fix-committed: #11097
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-browser5
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh26
-rw-r--r--features/images/BrowserAddressBar.pngbin1611 -> 1760 bytes
-rw-r--r--features/images/BrowserDownloadDialog.pngbin2470 -> 2442 bytes
-rw-r--r--features/images/BrowserDownloadDialogSaveAsButton.pngbin1440 -> 1467 bytes
-rw-r--r--features/images/BrowserPrintToFile.pngbin0 -> 1394 bytes
-rw-r--r--features/images/EvincePrintToFile.png (renamed from features/images/PrintToFile.png)bin1365 -> 1365 bytes
-rw-r--r--features/images/GtkTorBrowserPersistentBookmark.pngbin2022 -> 2180 bytes
-rw-r--r--features/images/GtkTorBrowserPersistentBookmarkSelected.pngbin1906 -> 2042 bytes
-rw-r--r--features/images/I2PNetworkHidden.pngbin1067 -> 1216 bytes
-rw-r--r--features/images/I2PRouterConsole.pngbin3123 -> 2893 bytes
-rw-r--r--features/images/I2PSharedClientTunnels.pngbin2130 -> 2484 bytes
-rw-r--r--features/images/SupportDocumentation.pngbin2229 -> 2099 bytes
-rw-r--r--features/images/SupportDocumentationGerman.pngbin2925 -> 2629 bytes
-rw-r--r--features/images/TorBrowserBookmarkPrompt.pngbin2273 -> 2402 bytes
-rw-r--r--features/images/TorBrowserEFFBookmark.pngbin2074 -> 1918 bytes
-rw-r--r--features/images/TorBrowserNoPlugins.pngbin3339 -> 3299 bytes
-rw-r--r--features/images/TorBrowserNoScriptTemporarilyAllowDialog.pngbin1637 -> 1619 bytes
-rw-r--r--features/images/TorBrowserOkButton.pngbin598 -> 1198 bytes
-rw-r--r--features/images/TorBrowserPrintDialog.pngbin3230 -> 828 bytes
-rw-r--r--features/images/TorBrowserPrintOutputFile.pngbin1225 -> 1298 bytes
-rw-r--r--features/images/TorBrowserPrintOutputFileSelected.pngbin1185 -> 1277 bytes
-rw-r--r--features/images/TorBrowserSaveOutputFileSelected.pngbin1558 -> 1647 bytes
-rw-r--r--features/images/TorBrowserSavedStartupPage.pngbin1934 -> 1700 bytes
-rw-r--r--features/images/TorBrowserUnableToConnect.pngbin3964 -> 3855 bytes
-rw-r--r--features/images/TorButtonNewIdentity.pngbin1277 -> 1244 bytes
-rw-r--r--features/images/TorLauncherBridgeList.pngbin1502 -> 1568 bytes
-rw-r--r--features/images/TorLauncherBridgePrompt.pngbin6534 -> 5163 bytes
-rw-r--r--features/images/TorLauncherConfigureButton.pngbin1615 -> 1679 bytes
-rw-r--r--features/images/TorLauncherConnectingWindow.pngbin2593 -> 2572 bytes
-rw-r--r--features/images/TorLauncherFinishButton.pngbin1003 -> 1435 bytes
-rw-r--r--features/images/TorLauncherNextButton.pngbin816 -> 1100 bytes
-rw-r--r--features/images/TorLauncherYesRadioOption.pngbin1008 -> 1069 bytes
-rw-r--r--features/images/UnsafeBrowserExportBookmarksButton.pngbin1844 -> 1906 bytes
-rw-r--r--features/images/UnsafeBrowserExportBookmarksMenuEntry.pngbin1006 -> 1074 bytes
-rw-r--r--features/images/UnsafeBrowserNetworkTab.pngbin1594 -> 1563 bytes
-rw-r--r--features/images/UnsafeBrowserNetworkTabAlreadySelected.pngbin1608 -> 1570 bytes
-rw-r--r--features/images/UnsafeBrowserNetworkTabSettingsButton.pngbin1571 -> 1527 bytes
-rw-r--r--features/images/UnsafeBrowserNoAddons.pngbin1976 -> 1974 bytes
-rw-r--r--features/images/UnsafeBrowserNoProxySelected.pngbin1611 -> 1550 bytes
-rw-r--r--features/images/UnsafeBrowserProxyRefused.pngbin3314 -> 3260 bytes
-rw-r--r--features/images/UnsafeBrowserProxySettingsOkButton.pngbin1005 -> 1032 bytes
-rw-r--r--features/images/UnsafeBrowserProxySettingsWindow.pngbin2793 -> 2851 bytes
-rw-r--r--features/images/UnsafeBrowserStartPage.pngbin2978 -> 2461 bytes
-rw-r--r--features/step_definitions/common_steps.rb2
-rw-r--r--features/step_definitions/evince.rb2
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn6
47 files changed, 26 insertions, 15 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tor-browser b/config/chroot_local-includes/usr/local/bin/tor-browser
index cb38ccf..4f755db 100755
--- a/config/chroot_local-includes/usr/local/bin/tor-browser
+++ b/config/chroot_local-includes/usr/local/bin/tor-browser
@@ -67,11 +67,6 @@ start_browser() {
# not enough to simply set intl.locale.matchOS to true.
configure_best_tor_browser_locale "${PROFILE}"
- unset SESSION_MANAGER
-
- export FONTCONFIG_PATH="${TBB_INSTALL}/TorBrowser/Data/fontconfig"
- export FONTCONFIG_FILE="fonts.conf"
-
exec_firefox -allow-remote --class "Tor Browser" -profile "${PROFILE}" "${@}"
}
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
index a365bc7..a00411b 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
@@ -6,16 +6,30 @@ TBB_EXT=/usr/local/share/tor-browser-extensions
TOR_LAUNCHER_INSTALL=/usr/local/lib/tor-launcher-standalone
TOR_LAUNCHER_LOCALES_DIR="${TOR_LAUNCHER_INSTALL}/chrome/locale"
+exec_firefox_helper() {
+ local binary="${1}"; shift
+
+ export LD_LIBRARY_PATH="${TBB_INSTALL}"
+ export FONTCONFIG_PATH="${TBB_INSTALL}/TorBrowser/Data/fontconfig"
+ export FONTCONFIG_FILE="fonts.conf"
+
+ # The Tor Browser often assumes that the current directory is
+ # where the browser lives, e.g. for the fixed set of fonts set by
+ # fontconfig above.
+ cd "${TBB_INSTALL}"
+
+ # From start-tor-browser:
+ unset SESSION_MANAGER
+
+ exec "${TBB_INSTALL}"/"${binary}" "${@}"
+}
+
exec_firefox() {
- LD_LIBRARY_PATH="${TBB_INSTALL}"
- export LD_LIBRARY_PATH
- exec "${TBB_INSTALL}"/firefox "${@}"
+ exec_firefox_helper firefox "${@}"
}
exec_unconfined_firefox() {
- LD_LIBRARY_PATH="${TBB_INSTALL}"
- export LD_LIBRARY_PATH
- exec "${TBB_INSTALL}"/firefox-unconfined "${@}"
+ exec_firefox_helper firefox-unconfined "${@}"
}
guess_best_tor_browser_locale() {
diff --git a/features/images/BrowserAddressBar.png b/features/images/BrowserAddressBar.png
index 8da3af9..1b7571f 100644
--- a/features/images/BrowserAddressBar.png
+++ b/features/images/BrowserAddressBar.png
Binary files differ
diff --git a/features/images/BrowserDownloadDialog.png b/features/images/BrowserDownloadDialog.png
index 8783b6d..469efe5 100644
--- a/features/images/BrowserDownloadDialog.png
+++ b/features/images/BrowserDownloadDialog.png
Binary files differ
diff --git a/features/images/BrowserDownloadDialogSaveAsButton.png b/features/images/BrowserDownloadDialogSaveAsButton.png
index 60933ae..bd3e1c0 100644
--- a/features/images/BrowserDownloadDialogSaveAsButton.png
+++ b/features/images/BrowserDownloadDialogSaveAsButton.png
Binary files differ
diff --git a/features/images/BrowserPrintToFile.png b/features/images/BrowserPrintToFile.png
new file mode 100644
index 0000000..568c315
--- /dev/null
+++ b/features/images/BrowserPrintToFile.png
Binary files differ
diff --git a/features/images/PrintToFile.png b/features/images/EvincePrintToFile.png
index d0b5297..d0b5297 100644
--- a/features/images/PrintToFile.png
+++ b/features/images/EvincePrintToFile.png
Binary files differ
diff --git a/features/images/GtkTorBrowserPersistentBookmark.png b/features/images/GtkTorBrowserPersistentBookmark.png
index a487495..3e3e6b7 100644
--- a/features/images/GtkTorBrowserPersistentBookmark.png
+++ b/features/images/GtkTorBrowserPersistentBookmark.png
Binary files differ
diff --git a/features/images/GtkTorBrowserPersistentBookmarkSelected.png b/features/images/GtkTorBrowserPersistentBookmarkSelected.png
index 6ad7516..ee6384c 100644
--- a/features/images/GtkTorBrowserPersistentBookmarkSelected.png
+++ b/features/images/GtkTorBrowserPersistentBookmarkSelected.png
Binary files differ
diff --git a/features/images/I2PNetworkHidden.png b/features/images/I2PNetworkHidden.png
index 99ebd45..07c8da6 100644
--- a/features/images/I2PNetworkHidden.png
+++ b/features/images/I2PNetworkHidden.png
Binary files differ
diff --git a/features/images/I2PRouterConsole.png b/features/images/I2PRouterConsole.png
index dfb67e9..6f7a8ed 100644
--- a/features/images/I2PRouterConsole.png
+++ b/features/images/I2PRouterConsole.png
Binary files differ
diff --git a/features/images/I2PSharedClientTunnels.png b/features/images/I2PSharedClientTunnels.png
index a5e34ab..22b1754 100644
--- a/features/images/I2PSharedClientTunnels.png
+++ b/features/images/I2PSharedClientTunnels.png
Binary files differ
diff --git a/features/images/SupportDocumentation.png b/features/images/SupportDocumentation.png
index ae648cd..bccfb80 100644
--- a/features/images/SupportDocumentation.png
+++ b/features/images/SupportDocumentation.png
Binary files differ
diff --git a/features/images/SupportDocumentationGerman.png b/features/images/SupportDocumentationGerman.png
index 36ab037..24c7708 100644
--- a/features/images/SupportDocumentationGerman.png
+++ b/features/images/SupportDocumentationGerman.png
Binary files differ
diff --git a/features/images/TorBrowserBookmarkPrompt.png b/features/images/TorBrowserBookmarkPrompt.png
index 24cde85..9cce24f 100644
--- a/features/images/TorBrowserBookmarkPrompt.png
+++ b/features/images/TorBrowserBookmarkPrompt.png
Binary files differ
diff --git a/features/images/TorBrowserEFFBookmark.png b/features/images/TorBrowserEFFBookmark.png
index ff4a68a..e6bf815 100644
--- a/features/images/TorBrowserEFFBookmark.png
+++ b/features/images/TorBrowserEFFBookmark.png
Binary files differ
diff --git a/features/images/TorBrowserNoPlugins.png b/features/images/TorBrowserNoPlugins.png
index 287b234..597101e 100644
--- a/features/images/TorBrowserNoPlugins.png
+++ b/features/images/TorBrowserNoPlugins.png
Binary files differ
diff --git a/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png b/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
index 8de70ff..b9e8448 100644
--- a/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
+++ b/features/images/TorBrowserNoScriptTemporarilyAllowDialog.png
Binary files differ
diff --git a/features/images/TorBrowserOkButton.png b/features/images/TorBrowserOkButton.png
index a9ee1d0..1d536f6 100644
--- a/features/images/TorBrowserOkButton.png
+++ b/features/images/TorBrowserOkButton.png
Binary files differ
diff --git a/features/images/TorBrowserPrintDialog.png b/features/images/TorBrowserPrintDialog.png
index f13edce..8e9aa93 100644
--- a/features/images/TorBrowserPrintDialog.png
+++ b/features/images/TorBrowserPrintDialog.png
Binary files differ
diff --git a/features/images/TorBrowserPrintOutputFile.png b/features/images/TorBrowserPrintOutputFile.png
index 4b8a142..d6aa5cf 100644
--- a/features/images/TorBrowserPrintOutputFile.png
+++ b/features/images/TorBrowserPrintOutputFile.png
Binary files differ
diff --git a/features/images/TorBrowserPrintOutputFileSelected.png b/features/images/TorBrowserPrintOutputFileSelected.png
index 158ada3..41e9599 100644
--- a/features/images/TorBrowserPrintOutputFileSelected.png
+++ b/features/images/TorBrowserPrintOutputFileSelected.png
Binary files differ
diff --git a/features/images/TorBrowserSaveOutputFileSelected.png b/features/images/TorBrowserSaveOutputFileSelected.png
index ca26b77..8de38a9 100644
--- a/features/images/TorBrowserSaveOutputFileSelected.png
+++ b/features/images/TorBrowserSaveOutputFileSelected.png
Binary files differ
diff --git a/features/images/TorBrowserSavedStartupPage.png b/features/images/TorBrowserSavedStartupPage.png
index 5d7d519..f32a0f9 100644
--- a/features/images/TorBrowserSavedStartupPage.png
+++ b/features/images/TorBrowserSavedStartupPage.png
Binary files differ
diff --git a/features/images/TorBrowserUnableToConnect.png b/features/images/TorBrowserUnableToConnect.png
index 943357d..bd6d251 100644
--- a/features/images/TorBrowserUnableToConnect.png
+++ b/features/images/TorBrowserUnableToConnect.png
Binary files differ
diff --git a/features/images/TorButtonNewIdentity.png b/features/images/TorButtonNewIdentity.png
index 143d400..ee533ee 100644
--- a/features/images/TorButtonNewIdentity.png
+++ b/features/images/TorButtonNewIdentity.png
Binary files differ
diff --git a/features/images/TorLauncherBridgeList.png b/features/images/TorLauncherBridgeList.png
index bad0810..c4981ea 100644
--- a/features/images/TorLauncherBridgeList.png
+++ b/features/images/TorLauncherBridgeList.png
Binary files differ
diff --git a/features/images/TorLauncherBridgePrompt.png b/features/images/TorLauncherBridgePrompt.png
index c224ed8..9fc5ebb 100644
--- a/features/images/TorLauncherBridgePrompt.png
+++ b/features/images/TorLauncherBridgePrompt.png
Binary files differ
diff --git a/features/images/TorLauncherConfigureButton.png b/features/images/TorLauncherConfigureButton.png
index b96a742..1acdcff 100644
--- a/features/images/TorLauncherConfigureButton.png
+++ b/features/images/TorLauncherConfigureButton.png
Binary files differ
diff --git a/features/images/TorLauncherConnectingWindow.png b/features/images/TorLauncherConnectingWindow.png
index 98d34aa..3a6af8f 100644
--- a/features/images/TorLauncherConnectingWindow.png
+++ b/features/images/TorLauncherConnectingWindow.png
Binary files differ
diff --git a/features/images/TorLauncherFinishButton.png b/features/images/TorLauncherFinishButton.png
index 6d763b5..cee5b53 100644
--- a/features/images/TorLauncherFinishButton.png
+++ b/features/images/TorLauncherFinishButton.png
Binary files differ
diff --git a/features/images/TorLauncherNextButton.png b/features/images/TorLauncherNextButton.png
index d8bc684..a6c4aac 100644
--- a/features/images/TorLauncherNextButton.png
+++ b/features/images/TorLauncherNextButton.png
Binary files differ
diff --git a/features/images/TorLauncherYesRadioOption.png b/features/images/TorLauncherYesRadioOption.png
index 1c2a772..6d3df76 100644
--- a/features/images/TorLauncherYesRadioOption.png
+++ b/features/images/TorLauncherYesRadioOption.png
Binary files differ
diff --git a/features/images/UnsafeBrowserExportBookmarksButton.png b/features/images/UnsafeBrowserExportBookmarksButton.png
index b568dc3..964e339 100644
--- a/features/images/UnsafeBrowserExportBookmarksButton.png
+++ b/features/images/UnsafeBrowserExportBookmarksButton.png
Binary files differ
diff --git a/features/images/UnsafeBrowserExportBookmarksMenuEntry.png b/features/images/UnsafeBrowserExportBookmarksMenuEntry.png
index fdea806..a996e1f 100644
--- a/features/images/UnsafeBrowserExportBookmarksMenuEntry.png
+++ b/features/images/UnsafeBrowserExportBookmarksMenuEntry.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNetworkTab.png b/features/images/UnsafeBrowserNetworkTab.png
index 743982c..2c6c0ef 100644
--- a/features/images/UnsafeBrowserNetworkTab.png
+++ b/features/images/UnsafeBrowserNetworkTab.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNetworkTabAlreadySelected.png b/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
index 92139b7..6ad4531 100644
--- a/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
+++ b/features/images/UnsafeBrowserNetworkTabAlreadySelected.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNetworkTabSettingsButton.png b/features/images/UnsafeBrowserNetworkTabSettingsButton.png
index 414cf7a..ba25ea8 100644
--- a/features/images/UnsafeBrowserNetworkTabSettingsButton.png
+++ b/features/images/UnsafeBrowserNetworkTabSettingsButton.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNoAddons.png b/features/images/UnsafeBrowserNoAddons.png
index 24e1baa..75c426d 100644
--- a/features/images/UnsafeBrowserNoAddons.png
+++ b/features/images/UnsafeBrowserNoAddons.png
Binary files differ
diff --git a/features/images/UnsafeBrowserNoProxySelected.png b/features/images/UnsafeBrowserNoProxySelected.png
index d28dae1..19a6415 100644
--- a/features/images/UnsafeBrowserNoProxySelected.png
+++ b/features/images/UnsafeBrowserNoProxySelected.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxyRefused.png b/features/images/UnsafeBrowserProxyRefused.png
index c0d84d4..f8233a0 100644
--- a/features/images/UnsafeBrowserProxyRefused.png
+++ b/features/images/UnsafeBrowserProxyRefused.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxySettingsOkButton.png b/features/images/UnsafeBrowserProxySettingsOkButton.png
index 84b23b4..251ceb8 100644
--- a/features/images/UnsafeBrowserProxySettingsOkButton.png
+++ b/features/images/UnsafeBrowserProxySettingsOkButton.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxySettingsWindow.png b/features/images/UnsafeBrowserProxySettingsWindow.png
index cda8689..9013ccf 100644
--- a/features/images/UnsafeBrowserProxySettingsWindow.png
+++ b/features/images/UnsafeBrowserProxySettingsWindow.png
Binary files differ
diff --git a/features/images/UnsafeBrowserStartPage.png b/features/images/UnsafeBrowserStartPage.png
index 67a9923..5ec183f 100644
--- a/features/images/UnsafeBrowserStartPage.png
+++ b/features/images/UnsafeBrowserStartPage.png
Binary files differ
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 5b7a144..fca6120 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -810,7 +810,7 @@ When /^I can print the current page as "([^"]+[.]pdf)" to the (default downloads
end
@screen.type("p", Sikuli::KeyModifier.CTRL)
@screen.wait("TorBrowserPrintDialog.png", 10)
- @screen.wait_and_click("PrintToFile.png", 10)
+ @screen.wait_and_click("BrowserPrintToFile.png", 10)
@screen.wait_and_double_click("TorBrowserPrintOutputFile.png", 10)
@screen.hide_cursor
@screen.wait("TorBrowserPrintOutputFileSelected.png", 10)
diff --git a/features/step_definitions/evince.rb b/features/step_definitions/evince.rb
index 990c6ce..a62a2d1 100644
--- a/features/step_definitions/evince.rb
+++ b/features/step_definitions/evince.rb
@@ -5,7 +5,7 @@ end
Then /^I can print the current document to "([^"]+)"$/ do |output_file|
@screen.type("p", Sikuli::KeyModifier.CTRL)
@screen.wait("EvincePrintDialog.png", 10)
- @screen.wait_and_click("PrintToFile.png", 10)
+ @screen.wait_and_click("EvincePrintToFile.png", 10)
@screen.wait_and_click("EvincePrintOutputFileButton.png", 10)
@screen.wait("EvincePrintFileDialog.png", 10)
# Only the file's basename is selected by double-clicking,
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 071fc53..d8faca0 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -94,8 +94,10 @@ the corresponding tarballs ourselves, so read on the next section.
Sync with the start-tor-browser script
======================================
-Adapt our `config/chroot_local-includes/usr/local/bin/tor-browser` for
-recent changes in `RelativeLink/start-tor-browser` in the
+Adapt our `config/chroot_local-includes/usr/local/bin/tor-browser`
+and/or
+`config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh`
+for recent changes in `RelativeLink/start-tor-browser` in the
[Tor Browser Bundle Git repo](https://git.torproject.org/builders/tor-browser-bundle.git). Look
in the Git history: