summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-11-16 14:18:25 +0000
committerintrigeri <intrigeri@boum.org>2019-11-16 14:18:25 +0000
commiteb69cdc05689a75aba29fb358f8263b38b3967e8 (patch)
tree109ce62cb3185be47a89d4bb20c42955c4f1b7ee
parent66c3fd995278f98d30ac55a752ac75b696f48b78 (diff)
parent102750cef98c15c766362c06b7e5673e9bcf97a7 (diff)
Merge remote-tracking branch 'origin/stable' into feature/16771-thunderbird-68+force-all-testsfeature/16771-thunderbird-68+force-all-tests
-rw-r--r--config/chroot_local-includes/etc/default/htpdate.pools2
-rw-r--r--config/chroot_local-includes/etc/default/htpdate.user-agent1
-rw-r--r--config/chroot_local-includes/etc/tor-browser/profile/chrome/userContent.css9
-rw-r--r--config/chroot_local-includes/lib/systemd/system/htpdate.service4
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh12
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userContent.css9
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userContent.css0
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt2
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt64
-rw-r--r--config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js5
-rw-r--r--wiki/src/contribute/release_process/test.mdwn2
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn20
12 files changed, 40 insertions, 90 deletions
diff --git a/config/chroot_local-includes/etc/default/htpdate.pools b/config/chroot_local-includes/etc/default/htpdate.pools
index 9e1307c..b143b88 100644
--- a/config/chroot_local-includes/etc/default/htpdate.pools
+++ b/config/chroot_local-includes/etc/default/htpdate.pools
@@ -1,3 +1,3 @@
HTP_POOL_1="puscii.nl,espiv.net,db.debian.org,epic.org,mail.riseup.net,leap.se,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
HTP_POOL_2="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,getfedora.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
-HTP_POOL_3="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,myspace.com,www.paypal.com,www.rackspace.com,www.sony.com"
+HTP_POOL_3="www.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,myspace.com,www.paypal.com,www.rackspace.com,www.sony.com"
diff --git a/config/chroot_local-includes/etc/default/htpdate.user-agent b/config/chroot_local-includes/etc/default/htpdate.user-agent
deleted file mode 100644
index f2265ad..0000000
--- a/config/chroot_local-includes/etc/default/htpdate.user-agent
+++ /dev/null
@@ -1 +0,0 @@
-HTTP_USER_AGENT="Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0"
diff --git a/config/chroot_local-includes/etc/tor-browser/profile/chrome/userContent.css b/config/chroot_local-includes/etc/tor-browser/profile/chrome/userContent.css
deleted file mode 100644
index 031e7f7..0000000
--- a/config/chroot_local-includes/etc/tor-browser/profile/chrome/userContent.css
+++ /dev/null
@@ -1,9 +0,0 @@
-@-moz-document url(about:preferences) {
-
- #category-tor,
- #torPreferences-bridges-group,
- #torPreferences-advanced-group {
- display: none !important;
- }
-
-}
diff --git a/config/chroot_local-includes/lib/systemd/system/htpdate.service b/config/chroot_local-includes/lib/systemd/system/htpdate.service
index dda8aef..5409f7e 100644
--- a/config/chroot_local-includes/lib/systemd/system/htpdate.service
+++ b/config/chroot_local-includes/lib/systemd/system/htpdate.service
@@ -11,8 +11,7 @@ Environment=SUCCESS_FILE=/run/htpdate/success
Environment=LOG=/var/log/htpdate.log
EnvironmentFile=/etc/default/htpdate.*
ExecStartPre=/bin/sh -c \
- '[ -n "${HTTP_USER_AGENT}" ] && \
- [ -n "${HTP_POOL_1}" ] && \
+ '[ -n "${HTP_POOL_1}" ] && \
[ -n "${HTP_POOL_2}" ] && \
[ -n "${HTP_POOL_3}" ]'
ExecStartPre=/bin/rm -f "${DONE_FILE}"
@@ -21,7 +20,6 @@ ExecStartPre=/usr/bin/install -o htp -g nogroup -m 0644 /dev/null "${LOG}"
ExecStart=/usr/local/sbin/htpdate \
--debug \
--log_file "${LOG}" \
- --user_agent "${HTTP_USER_AGENT}" \
--allowed_per_pool_failure_ratio 0.34 \
--user htp \
--done_file "${DONE_FILE}" \
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
index 7cd944ca..49b9ae9 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/chroot-browser.sh
@@ -146,13 +146,11 @@ configure_chroot_browser_profile () {
fi
# Customize the GUI.
- for css in userChrome.css userContent.css ; do
- local browser_css="${browser_profile}/chrome/${css}"
- mkdir -p "$(dirname "${browser_css}")"
- cat "${chroot_browser_config}/common/${css}" \
- "${chroot_browser_config}/${browser_name}/${css}" >> \
- "${browser_css}"
- done
+ local browser_chrome="${browser_profile}/chrome/userChrome.css"
+ mkdir -p "$(dirname "${browser_chrome}")"
+ cat "${chroot_browser_config}/common/userChrome.css" \
+ "${chroot_browser_config}/${browser_name}/userChrome.css" >> \
+ "${browser_chrome}"
set_chroot_browser_permissions "${chroot}" "${browser_name}" "${browser_user}"
}
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userContent.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userContent.css
deleted file mode 100644
index 031e7f7..0000000
--- a/config/chroot_local-includes/usr/share/tails/chroot-browsers/common/userContent.css
+++ /dev/null
@@ -1,9 +0,0 @@
-@-moz-document url(about:preferences) {
-
- #category-tor,
- #torPreferences-bridges-group,
- #torPreferences-advanced-group {
- display: none !important;
- }
-
-}
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userContent.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userContent.css
deleted file mode 100644
index e69de29..0000000
--- a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userContent.css
+++ /dev/null
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
index 085db72..06d4b8d 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
@@ -1 +1 @@
-http://torbrowser-archive.tails.boum.org/9.0-build2/
+http://torbrowser-archive.tails.boum.org/9.0.1/
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
index 5f1017e..80fd8bd 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -1,32 +1,32 @@
-3e3b54af9578b19f316fe800e0712081aa8190222d29cc2119f9ff0cfd168a7b tor-browser-linux64-9.0_ar.tar.xz
-30f395cfffc00a25dcd4456ec77fbee8a476149fd4a214829786369aa7e35451 tor-browser-linux64-9.0_ca.tar.xz
-2a1f81130db6c60b4d6d79b1921496fb03203efe9b2e81213862203d0cbf69fa tor-browser-linux64-9.0_cs.tar.xz
-76da951871e7bd703cbdb9259dcfbd36f79b241afa62a770fc1d009a40ad71b7 tor-browser-linux64-9.0_da.tar.xz
-ccb94c28a7ac0c4289622b64fbce5de30d2287f08da2d92154711712ac4e4030 tor-browser-linux64-9.0_de.tar.xz
-eb5991b63ca5a95c66b83cfe90a0e61938be063315dbe750b780ca46a5c696b1 tor-browser-linux64-9.0_el.tar.xz
-670d5c53d989f70eaffd7052f911c5d36b70b17af6cc5691fd8a5d5acc5c5229 tor-browser-linux64-9.0_en-US.tar.xz
-da218e040b77714607e3f23f5ba6c595ffdc69c8fb953160bcf008500ba1305e tor-browser-linux64-9.0_es-AR.tar.xz
-00d87ec26e4276a27b80eaf1f65503811ea53d2a8f8a371fbb2e827549bb6314 tor-browser-linux64-9.0_es-ES.tar.xz
-2c98d92b471c3ad4c613b6d41203909ac269a4469e2b79a92c3132bf4bd7083b tor-browser-linux64-9.0_fa.tar.xz
-210ea7d0aaf1c1f8cab4585d1243c2314d048b1a8813579d1c70c96f79153408 tor-browser-linux64-9.0_fr.tar.xz
-a213209b276867ea9a628e5835ba7f58f0602ead1cbedc6c300996a19625a483 tor-browser-linux64-9.0_ga-IE.tar.xz
-77865eba5483b497d7309d0c4c2d3fc7316beb5938bce3e0b85a8403859424af tor-browser-linux64-9.0_he.tar.xz
-7822b5e9542180816888a79e3bef6b49722ae44d9d4484eae1e6275497c1f141 tor-browser-linux64-9.0_hu.tar.xz
-46d8fd7635bbb7e03255b09e42448c42234393fc056114da700e411054526630 tor-browser-linux64-9.0_id.tar.xz
-3df5169222564ef0de2335ad29ee285a5186bc4d0b616ae6add663db2327b2bf tor-browser-linux64-9.0_is.tar.xz
-4bcf84d6c8498809c7ab8486e712bfb5a45c550cd736779e7b28903bc6672529 tor-browser-linux64-9.0_it.tar.xz
-2cf97178eeeab5dfd2a80646ac9d4ab9bd5fcb2956fa8ea2a1cc63cb5df120cf tor-browser-linux64-9.0_ja.tar.xz
-e4c68ca40380815471346573bde103c91ea038eb63ee1ecd23bd49524226584c tor-browser-linux64-9.0_ka.tar.xz
-c5cfb2be514b95e321f91debcbc9ac603215a4ee8411749ca3004878d5aea202 tor-browser-linux64-9.0_ko.tar.xz
-69f9c2aa7d55cc26a4e056633f6ecffa0177c60488834ffc7fda81bae1324897 tor-browser-linux64-9.0_mk.tar.xz
-ad7da45bf34940d7aacef8375161586cf87b6ffd570daf65ad32e250ba6eb3a8 tor-browser-linux64-9.0_nb-NO.tar.xz
-c3d70b5098e82d4b05ee0cf437fe52b65d80156fa69d3a18ba1c558457b68241 tor-browser-linux64-9.0_nl.tar.xz
-383b80b2c53245cd1d35d8272c8429cbcae1ed59e3211066b28fd1de1be4df36 tor-browser-linux64-9.0_pl.tar.xz
-2f4ab42e1ece4efe2fe0d1ad2cb899cc5e074431115620d09deac3327050bdb5 tor-browser-linux64-9.0_pt-BR.tar.xz
-53fb6eb3b666614d132f28027557b85bda815600b909ec5c0ac064b6cd69d778 tor-browser-linux64-9.0_ro.tar.xz
-2574974344ef37fc46b3ea91478a8fe29e1d23128d6d6cb794a33e936add9604 tor-browser-linux64-9.0_ru.tar.xz
-f050f8fce8bbfe59677adbc192337c3ddaea3007a1e58638b59cb94dd0f9b6bc tor-browser-linux64-9.0_sv-SE.tar.xz
-3463ad9bd78ba6742674833dde6861df7ef07e334e5d5ef9c263a2883a0fe996 tor-browser-linux64-9.0_tr.tar.xz
-1062dc39c6ab58eaca83b4ba81d5514c838743d84ec07a129cfdbcb83592d9d5 tor-browser-linux64-9.0_vi.tar.xz
-27a7b69dab632f799b0354abc0ec16a11a4389037c068677d3bcf3c3594fe106 tor-browser-linux64-9.0_zh-CN.tar.xz
-c65c7599faa3693c5b6d558abbe0605f6abacaca14e279e21e8b960dbb52254d tor-browser-linux64-9.0_zh-TW.tar.xz
+e50ba2c732e99775326c18c0133e40c0b6b9539f4a2af96e02d1c7d3efdd1790 tor-browser-linux64-9.0.1_ar.tar.xz
+bf38fba48e39e1564996d80fe952f5ed6f913c74ceb9ef147d7e5f5062f9b1d5 tor-browser-linux64-9.0.1_ca.tar.xz
+4a5de850d4756158dc69e2030d9cee92719bf49130575fdc601967b8b93e54fa tor-browser-linux64-9.0.1_cs.tar.xz
+19a71856474e3679a793d5ddf38201c83e537efc600080f2fec1333f544b6ee9 tor-browser-linux64-9.0.1_da.tar.xz
+78c889558aa2e74f65a0dee187956222bcef94ff62924e23c4f0f6a52a5e33d2 tor-browser-linux64-9.0.1_de.tar.xz
+f5b55dbba3eaf521028e141d1117e26df9d865202be86ce68407a33bbde65162 tor-browser-linux64-9.0.1_el.tar.xz
+a5f45b02a59cb84f936b06a64a7bb71cf54c38e7c4f6fb7c0b6d583e82d42a26 tor-browser-linux64-9.0.1_en-US.tar.xz
+981ae74df16d8841617cf0011728ffaebfc1929efeb6b40a9b45f9775abf0b4a tor-browser-linux64-9.0.1_es-AR.tar.xz
+55aeeedffaa5a275709696d8c818974d4aedae2d4f8ca5ea740cc8d5626ad527 tor-browser-linux64-9.0.1_es-ES.tar.xz
+f51c3c836761df712e7030efc8a92079a156964ec436d3e50169b43316451146 tor-browser-linux64-9.0.1_fa.tar.xz
+5447309d1bc133110586c65f1f85bb32759b329449929bd8dc14075b26a3bc21 tor-browser-linux64-9.0.1_fr.tar.xz
+f10339b21b14662596143379d6a5e0a880fa07cbf1eca70c61b902e0fa9715c9 tor-browser-linux64-9.0.1_ga-IE.tar.xz
+79ddccc31156909bc9ec34ce444797cf189d560c451c44a7e99c1f3a1169ffef tor-browser-linux64-9.0.1_he.tar.xz
+1350da6b99c27fde95dd4f8f79100553692ff24393c1ce63c9f67b8187f99c12 tor-browser-linux64-9.0.1_hu.tar.xz
+bc6ee3d00f020fd1be8b05b34235728a6fcebdf0b75fcc5e44cf57ef0ed35371 tor-browser-linux64-9.0.1_id.tar.xz
+ab6cdba14f2ebe44c3e194c5e9160133282d0e6e847b0a7ad866ae9c8ea6e542 tor-browser-linux64-9.0.1_is.tar.xz
+ef42fd066bb9dbfe21bec384f3ffa03546aa826c0c917682f14cb73cbd34c0aa tor-browser-linux64-9.0.1_it.tar.xz
+e2b95f948591023737a03e994d21df131dc203c6da0e43a2c2e14904dd3f9b58 tor-browser-linux64-9.0.1_ja.tar.xz
+531912cb3c9afa899463681f429def1d11781a5ee6ee03ebbd27f641358cb607 tor-browser-linux64-9.0.1_ka.tar.xz
+2414c3d1eb0832c0a29f5c61d3ad52102225d4b6c4dc190c16e13a9ce107350d tor-browser-linux64-9.0.1_ko.tar.xz
+91b4e67274af7b24480b7d7647881d2f8f386fd06a1ef34f894a32c7190189fb tor-browser-linux64-9.0.1_mk.tar.xz
+87313c4112db86b5e14dff4e14efedced3e82bd824e0cb1ccbf1011f40848d3e tor-browser-linux64-9.0.1_nb-NO.tar.xz
+1adc47b790318cc6f7e5071e623e9d26a0f0738f964e5b3c019d69b86e6c9dc5 tor-browser-linux64-9.0.1_nl.tar.xz
+edfcf016d123b152e35ecd67d03ad063a8464d8161ffdf5e494bfd1fe2f2d35b tor-browser-linux64-9.0.1_pl.tar.xz
+8fffe6d3deab57515e261d0e1e6a116bceb33ed1546a6ba3d1f1ded6e372bab6 tor-browser-linux64-9.0.1_pt-BR.tar.xz
+133911251e989b6becdb689912abd6da3ca3f576e5989eb4224a665cf98ce49c tor-browser-linux64-9.0.1_ro.tar.xz
+b15ec067ab887b0deebd4ab9e2d413ceff6b51748f72b9dec65425f87adb36fa tor-browser-linux64-9.0.1_ru.tar.xz
+d0742d872108c6801a094dd2715349667659922d01e051f107b546d207691fe3 tor-browser-linux64-9.0.1_sv-SE.tar.xz
+2762bb69e137915b1f68e63ec92454d0bb3164fd3b92d64916bc0de77bb04a3a tor-browser-linux64-9.0.1_tr.tar.xz
+eaf8263fe9921687a99d8bd5f2e60969cd6c57eeabb3d069c7f6845acb7d30b9 tor-browser-linux64-9.0.1_vi.tar.xz
+c4e6966b0c2162dec88e473c698b519301be8ae1e4a74dc51edda5b77b84783a tor-browser-linux64-9.0.1_zh-CN.tar.xz
+cbeb6bd526593c5c09b4fd30a2b4b2e8e3a5c21507ed876c5ca1c6ed41db003f tor-browser-linux64-9.0.1_zh-TW.tar.xz
diff --git a/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js b/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js
index 77e2307..9f752b5 100644
--- a/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js
@@ -52,11 +52,6 @@ pref("browser.download.forbid_open_with", true);
// Disable the Pocket service integration
pref("extensions.pocket.enabled", false);
-// Disable the Quantum Bar. In #17121 we found that it can cause the
-// URL bar to misbehave (the suggestion pop-up with bookmarks/history/...
-// doesn't show up, and pressing Enter doesn't visit the URL).
-pref("browser.urlbar.quantumbar", false);
-
// Set the hunspell directory. This shouldn't be required anymore in
// Tor Browser based on Firefox 68
pref("spellchecker.dictionary_path", "/usr/share/hunspell");
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 17ca0a5..956f587 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -149,8 +149,6 @@ tracked by tickets prefixed with `todo/test_suite:`.
microphone with the remote website; anything else should fail.
- <http://net.ipcalf.com/> should display _literally_
`ifconfig | grep inet | grep -v inet6 | cut -d" " -f2 | tail -n1`
-* The content of `/etc/default/htpdate.user-agent` should match should produce
- the User-Agent used in the Tor Browser. (automate: [[!tails_ticket 10268]])
<a id="Thunderbird"></a>
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 08c0bfe..ee405aa 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -242,23 +242,3 @@ Clean up
cd "$TBB_ARCHIVE" && \
git annex drop -- "${TBB_VERSION}" && \
rm -rf "$DL_DIR"
-
-Update the htpdate User Agent
-=============================
-
-We want to use the same user agent in our htpdate script (see the
-[[Time syncing design|contribute/design/Time_syncing]]
-for more info on that) as in Tor Browser.
-
-To find out the User Agent of the new Tor Browser:
-
-1. Start Tor Browser (outside of Tails, if there is no ISO with the new
- Tor Browser yet).
-2. Open the _Network_ tab in the _Developer Tools_ (Ctrl+Shift+E).
-3. Load a website (e.g. <https://tails.boum.org>).
-4. Select one of the GET requests in the _Developer Tools_.
-5. Scroll down to `User-Agent` in the _Request headers_ section.
-
-Finally, replace the value of `$HTTP_USER_AGENT` in
-`config/chroot_local-includes/etc/default/htpdate.user-agent` with the
-one you found above.