summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-05-25 19:55:45 +0200
committeranonym <anonym@riseup.net>2016-05-25 19:55:45 +0200
commitc85b38043de63c4fb6ac5df57769c6f6324a8846 (patch)
treea11b704d2455e900b7a7d64dee0af87c8e5d3bbe /config
parenta714df5c6fb37d43a4c9f50bbac1704e129d96a3 (diff)
parent7ebedfaa1ea226434d9833365a674ae682c28a11 (diff)
Merge branch 'feature/11403-tor-browser-6.x' into devel
Fix-committed: #11403
Diffstat (limited to 'config')
-rw-r--r--config/chroot_local-hooks/11-localize_browser48
-rw-r--r--config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js5
-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.txt32
4 files changed, 38 insertions, 49 deletions
diff --git a/config/chroot_local-hooks/11-localize_browser b/config/chroot_local-hooks/11-localize_browser
index 9b3cf78..51237a8 100644
--- a/config/chroot_local-hooks/11-localize_browser
+++ b/config/chroot_local-hooks/11-localize_browser
@@ -16,7 +16,6 @@ echo "Localize each supported browser locale"
# Import TAILS_WIKI_SUPPORTED_LANGUAGES
. /etc/amnesia/environment
-TBB_DEFAULT_SEARCHPLUGINS_DIR="${TBB_INSTALL}/browser/searchplugins"
TBB_LOCALIZED_SEARCHPLUGINS_DIR="${TBB_INSTALL}/distribution/searchplugins/locale/"
BROWSER_LOCALIZATION_DIR="/usr/share/tails/browser-localization"
DESCRIPTIONS_FILE="${BROWSER_LOCALIZATION_DIR}/descriptions"
@@ -143,49 +142,34 @@ while IFS=: read MOZILLA_LOCALE LOCATION LOCALIZED_LANG STARTPAGE_LANG STARTPAGE
fi
set_simple_config_key "${TARGET_BRANDING_FILE}" \
"browser.startup.homepage" "${HOMEPAGE}"
-
- # We also want the localized search plugins from Debian's
- # Iceweasel packages. Note that en-US doesn't have one; the
- # en-US search plugins are in the iceweasel package, but it
- # would only add search engines that we have decided to
- # exclude so let's skip it.
- if [ "${MOZILLA_LOCALE}" != en-US ]; then
- PKG="iceweasel-l10n-$(echo "${MOZILLA_LOCALE}" | tr 'A-Z' 'a-z')"
- DEB_PATH_TO_SEARCHPLUGINS="etc/iceweasel/searchplugins/locale/${MOZILLA_LOCALE}"
- TMP="$(mktemp -d)"
- cd "${TMP}"
- apt-get download "${PKG}"
- ar x "${PKG}"*.deb
- tar xf data.tar.* ./"${DEB_PATH_TO_SEARCHPLUGINS}"
- rm -f "${DEB_PATH_TO_SEARCHPLUGINS}"/amazon*.xml \
- "${DEB_PATH_TO_SEARCHPLUGINS}"/bing*.xml \
- "${DEB_PATH_TO_SEARCHPLUGINS}"/eBay*.xml \
- "${DEB_PATH_TO_SEARCHPLUGINS}"/yahoo*.xml \
- "${DEB_PATH_TO_SEARCHPLUGINS}"/wikipedia*.xml
- cp "${DEB_PATH_TO_SEARCHPLUGINS}"/* "${TARGET_SEARCHPLUGINS_DIR}"
- cd /
- rm -r "${TMP}"
- fi
done < "${DESCRIPTIONS_FILE}"
# This directory is not needed after build time.
rm -r "${BROWSER_LOCALIZATION_DIR}"
# Remove unwanted browser search plugins bundled in the Tor Browser.
-rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/yahoo*.xml
-# We generate localized versions of the following:
-rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/disconnect*.xml
-rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/startpage*.xml
-rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/wikipedia*.xml
+7z d -tzip "${TBB_INSTALL}/browser/omni.ja" \
+ 'chrome/en-US/locale/browser/searchplugins/disconnect*.xml' \
+ 'chrome/en-US/locale/browser/searchplugins/startpage*.xml' \
+ 'chrome/en-US/locale/browser/searchplugins/wikipedia*.xml' \
+ 'chrome/en-US/locale/browser/searchplugins/yahoo*.xml'
# We want our localized English Wikipedia plugin to be available in
# all locales.
-mv "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}/en-US/wikipedia-en-US.xml" \
- "${TBB_DEFAULT_SEARCHPLUGINS_DIR}/"
+(
+ cd "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}"
+ for dir in *; do
+ if [ -d "${dir}" ] && [ "${dir}" != en-US ]; then
+ (
+ cd "${dir}"
+ cp -a ../en-US/wikipedia-en-US.xml .
+ )
+ fi
+ done
+)
# All generated files must be world-readable.
chmod -R a+rX "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}" \
- "${TBB_DEFAULT_SEARCHPLUGINS_DIR}" \
"${BRANDING_DIR}"
apt-get --yes purge imagemagick
diff --git a/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js b/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js
index 4fc78bd..4fa21f2 100644
--- a/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js
+++ b/config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js
@@ -102,3 +102,8 @@ pref("browser.download.panel.shown", true);
// open external applications, so let's not offer the option to the user,
// and instead only propose them to save downloaded files.
pref("browser.download.forbid_open_with", true);
+
+// AdBlock Plus and the amnesia branding extensions are not signed and
+// therefore disabled by default for FF 45+ *unless* we set this
+// option. This is only a temporary stop gap. See #11419.
+pref("xpinstall.signatures.required", false);
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 7a01a70..f47eec4 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/5.5.5/
+http://torbrowser-archive.tails.boum.org/6.0-build1/
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 9e34796..48c3087 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -1,16 +1,16 @@
-e08f0ca1136895666146ffa1057ec049424b0815e529440804f8f8893a72f17c tor-browser-linux32-5.5.5_ar.tar.xz
-fbb288479a89d519934c64b34f356bbd9c5b56b23e9c223411af6a884064b5b3 tor-browser-linux32-5.5.5_de.tar.xz
-ea4f4ba44b2d9eda3e2879cf8580ed6fc69fff6c8ab7fa50f4e528de6d95b812 tor-browser-linux32-5.5.5_en-US.tar.xz
-08a0f228aaa24439b0eddddadf3a98eb30ad4360c2dd29c1f119bad2fd10c2f1 tor-browser-linux32-5.5.5_es-ES.tar.xz
-0926754250a257695ac63dd6038bec5e980d3eddf71ca0e01099ed3e431a4c99 tor-browser-linux32-5.5.5_fa.tar.xz
-a5d4f70bc81a8e8737c1730f56253a0ce09f7b5b1b0de8297098b166a478ac96 tor-browser-linux32-5.5.5_fr.tar.xz
-a151ded0d05dc4cc1d2a2814aee7305d039c4ea5b6e6faa83f695b926c9f3ca9 tor-browser-linux32-5.5.5_it.tar.xz
-5522df3fcdd903e374936061595a877ca64cd9a51f9ed25a32fa411a904ccee9 tor-browser-linux32-5.5.5_ja.tar.xz
-05b52308c46a845fdeac5619cf37e066d9be0075d802f73a9ddbc5d6e55c8e91 tor-browser-linux32-5.5.5_ko.tar.xz
-15eebdea32ecbfe7f28c9320cf0cb6f6a5afb3052948533c3b4b2632d08bc06a tor-browser-linux32-5.5.5_nl.tar.xz
-b91b44470c789bbcbae1dfa732cb98c70757a19922da98d14aa7b4b76866af2f tor-browser-linux32-5.5.5_pl.tar.xz
-35f97514baeeaf0f2c20b4796a521d94c27a636dec28e8d9e59b3a1118165157 tor-browser-linux32-5.5.5_pt-PT.tar.xz
-c52380acac9bb0c3e6f593d2fc88abeeac334204aac272bb34641fd7d8f4323e tor-browser-linux32-5.5.5_ru.tar.xz
-7e9c0ea073429402bcd93d276028310110884e1344444af3783255a3c1dbb3e8 tor-browser-linux32-5.5.5_tr.tar.xz
-e15a4c85d7afcd907b7f594a4fb3d72b4c99710d9aa86aef08db9ca7c8ee44bb tor-browser-linux32-5.5.5_vi.tar.xz
-d8cb7b650c51a35a67ca0356d9bcfbe16814b7fafb5efa2148ec01b2b1301fde tor-browser-linux32-5.5.5_zh-CN.tar.xz
+255b07fa8b2c97c0bccc3908dc8afaa256ce87bc7b5ad345b2390c07d6dbde68 tor-browser-linux32-6.0_ar.tar.xz
+59f96ea1665912bbaf95fe323eeb69eeea7d744c118a26ee0b52e616b2940a5c tor-browser-linux32-6.0_de.tar.xz
+6638721f342f0fd7536b9f161e87bc0ea20b8b4faa895b45eec5cda9a10c70ff tor-browser-linux32-6.0_en-US.tar.xz
+2c8d519038e9bb658d7994a849cc0a3292168d66400bb2bd39bcc698331f43cf tor-browser-linux32-6.0_es-ES.tar.xz
+a793f504b83cbdfccc4f4e71db36361f92f4caeffe13ec4e4c478e993ab9519c tor-browser-linux32-6.0_fa.tar.xz
+bde8475fa59006c5c6d71d3a1f8b373f156d4becd626efe52403f3292d56c39f tor-browser-linux32-6.0_fr.tar.xz
+02d6f3e41effeb2c7f224e4da0b1cccde1e14f8b1a4b69904e28bbafc3573dc1 tor-browser-linux32-6.0_it.tar.xz
+b2413f05c1d936d613639574ecd648a02172e1d9a415a6a29d300245e4defff7 tor-browser-linux32-6.0_ja.tar.xz
+9ea87406906155fd45dba75ea97db3f3f5f79fae9fc59bb6c5f204a1198650a0 tor-browser-linux32-6.0_ko.tar.xz
+da2652b22612c6d3efca302de42ac483e08f1c3fc5de781be9ea8b1ba536718e tor-browser-linux32-6.0_nl.tar.xz
+2a4a051b2ebde434b96c0e15e719c8aa2efe7d80a1887ad424359724b97fe38a tor-browser-linux32-6.0_pl.tar.xz
+244ec8379029e8ac4b5aaa4be5778226330de2391402a7208caee966d6f4fb25 tor-browser-linux32-6.0_pt-PT.tar.xz
+76cfced243d37ed028ef5fe5cfb80e113b81f3369d5fd86b71a3782a55289435 tor-browser-linux32-6.0_ru.tar.xz
+c827fc2316c2183c91c96fbb306fa543060edc6b8596a5ffa1f93ed7fa5200aa tor-browser-linux32-6.0_tr.tar.xz
+67c9eb7c739a2c623104573d56d187cbec576e212c3e6f35484cb01f0eb7e0c2 tor-browser-linux32-6.0_vi.tar.xz
+0feeb354f7849579aafbf6444edb723cd6a0a9e34d434a087f0d8332806eb3d5 tor-browser-linux32-6.0_zh-CN.tar.xz