Commit d43ffc2c authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/devel' into feature/15622-linux-4.16

parents 0dab7a19 90115447
#!/bin/sh
set -e
set -u
display_help_and_exit () {
echo "Usage: $(basename "$0") INPUT_FILE" >&2
}
[ $# -eq 1 ] || display_help_and_exit
INPUT_FILE="$1"
[ -f "$INPUT_FILE" ] || exit 2
# For posterity: the general idea is to introduce \r\n as a token
# where we have made a line break to make the dump more diff-friendly
# (and, hence, Git-friendly). The most complex expression is the one
# done with perl, where we employ negative lookahead. What it means,
# is: replace single occurrences of | except when followed by \\n.
echo '.dump' \
| sqlite3 "$INPUT_FILE" | \
grep -v "cached_asset_content://cache://compiled-" | \
awk '!/^INSERT/; /^INSERT/ {print $0 | "sort -n"}' | \
sed 's_\\n_\\n\r\n_g' | \
sed 's_,_,\r\n_g' | \
perl -p -e 's/([^|])\|((?!\||\\n).)/\1\|\r\n\2/g' | \
sed "/^INSERT INTO \"settings\" VALUES('\(remoteBlacklists\|cached_asset_entries\)'/"'s_,_,\r\n_g'
......@@ -25,13 +25,4 @@ if ! "${git_dir}/bin/sanity-check-website" ; then
fi
fi
# If I knew Ikiwiki better I'd probably figure out how to just make it
# keep the misc/*.html files as-is instead of this hack.
fixup_14962_workaround() {
mkdir -p config/chroot_local-includes/usr/share/doc/tails/website/misc
rm -f config/chroot_local-includes/usr/share/doc/tails/website/misc/*
cp wiki/src/misc/*.html \
config/chroot_local-includes/usr/share/doc/tails/website/misc
}
ikiwiki -setup ikiwiki.setup -refresh "$@" && fixup_14962_workaround
ikiwiki -setup ikiwiki.setup -refresh "$@"
This diff is collapsed.
......@@ -4,5 +4,5 @@ Encoding=UTF-8
_Name=Tails documentation
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation getting_started
Exec=/usr/local/bin/tails-documentation doc
Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
......@@ -25,6 +25,9 @@ pref("mailnews.database.global.indexer.enabled", false);
// Disable chat
pref("mail.chat.enabled", false);
// Hide the "Know your rights" message
pref("mail.rights.version", 1);
// Disable system addons
pref("extensions.autoDisableScopes", 3);
pref("extensions.enabledScopes", 4);
......@@ -53,5 +56,5 @@ pref("mailnews.auto_config.dns_mx_lookup.enabled", false);
// We disable Memory Hole for encrypted email until support is more
// mature and widely spread (#15201).
pref("extensions.enigmail.protectHeaders", false);
pref("extensions.torbirdy.custom.extensions.enigmail.protectHeaders", false);
pref("extensions.enigmail.protectedHeaders", 0);
pref("extensions.torbirdy.custom.extensions.enigmail.protectedHeaders", 0);
/* Required, do not remove */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
#torbirdy-jondo-selection,
#torbirdy-whonix-selection,
#torbirdy-tor-selection,
......
......@@ -12,6 +12,7 @@
import os
import subprocess
import random
import re
import locale
import gettext
......@@ -173,7 +174,7 @@ def mail_appended_info():
process = subprocess.Popen (["sudo", "/usr/local/sbin/tails-debugging-info"],
stdout=subprocess.PIPE)
for line in process.stdout:
debugging_info += line.decode('utf-8')
debugging_info += re.sub(r'^--\s*', '', line.decode('utf-8'))
process.wait()
except OSError:
debugging_info += "sudo command not found\n"
......
......@@ -87,7 +87,7 @@ class DocumentationWindow(tailsgreeter.gui.GreeterHelpWindow):
try:
page = sys.argv[1]
except IndexError:
page = 'getting_started'
page = 'doc'
try:
anchor = sys.argv[2]
......
......@@ -59,7 +59,7 @@ class PasswordDialog(object):
if not pw1 == pw2:
return
self.pw = pw1.encode('ascii')
self.pw = pw1.encode('utf8')
bus = SystemBus()
object_path = bus.get("org.freedesktop.Accounts").FindUserById(os.getuid())
......
......@@ -29,16 +29,6 @@ configure_default_incoming_protocol() {
}
start_thunderbird() {
# Give Thunderbird its own temp directory, similar rationale to a1fd1f0f & #9558.
TMPDIR="${PROFILE}/tmp"
mkdir --mode=0700 -p "$TMPDIR"
export TMPDIR
# Clean the temporary directory: it's generally persistent, and then
# temporary files (including decrypted attachements) would otherwise
# be stored forever there (#13340).
rm -rf "${TMPDIR}"/*
export GNOME_ACCESSIBILITY=1
unset SESSION_MANAGER
......
......@@ -6,5 +6,5 @@ _Comment=Learn how to use Tails
Categories=Documentation;Tails;
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation getting_started
Exec=/usr/local/bin/tails-documentation doc
Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
http://torbrowser-archive.tails.boum.org/7.5.4-build1/
http://torbrowser-archive.tails.boum.org/7.5.6-build4/
66f9bea2a37a8980131e7bf549883d01bd5ef3cef705c233e4177b76a2eedf25 tor-browser-linux64-7.5.4_ar.tar.xz
b46c9e507d3b287c76f2ef99665a3e402ab1e6d3ce1433cf0e7b6ff9ddad656f tor-browser-linux64-7.5.4_de.tar.xz
098e18b59a0477aef3fe34b82efc804fb14c8af3a114427fe4a2f979d816b8b4 tor-browser-linux64-7.5.4_en-US.tar.xz
bc7ab5ec4d7e890cde92ef6d9565f9c5171d02e7159f6a42951b0a4909c286c9 tor-browser-linux64-7.5.4_es-ES.tar.xz
2952a00add25c5adc1845fb2625973b6b3866dd1719fbc994aae19ae63c4089c tor-browser-linux64-7.5.4_fa.tar.xz
da0001f3b2dce01bb5bf68ba3da5bcc72fb1b20d1c3eacd0ba6c3e6852eeccf8 tor-browser-linux64-7.5.4_fr.tar.xz
895c7e1f1b5abe7f72862bcf8860349a11e34efc300d69a077b88a0a7fdaa9db tor-browser-linux64-7.5.4_it.tar.xz
0b01a30e7a5dbd8b883a35bf0c391b224a9ded2aaa3f8915e6e010a80adab60a tor-browser-linux64-7.5.4_ja.tar.xz
7022ae680ea20f8804dbf8a0fc9db66a68d2af138057f889f73476537d258310 tor-browser-linux64-7.5.4_ko.tar.xz
25cada5c8100c1398cba5434973b9858fae7c24693b4ccff8dc5369e7a863b06 tor-browser-linux64-7.5.4_nl.tar.xz
b08e1cce2a61ec7b9f2cbbab54f0e5c25fa4c06091b12241fa43ed6fa7be992d tor-browser-linux64-7.5.4_pl.tar.xz
db1b1d0c9e84cd791ff4008a47f4e50aafed04ceab485539d4ca79f2c0318c0e tor-browser-linux64-7.5.4_pt-BR.tar.xz
a33096142245f3f13e296b442770e5f64cc89cc99973143c60ef94e72a317c71 tor-browser-linux64-7.5.4_ru.tar.xz
8208f51f215c667de81961fa7014a7b54beee92262c150fb09140528e54d55af tor-browser-linux64-7.5.4_tr.tar.xz
4d2419305f51b4672750fe0af04c709185d990794e72a4e80f26c43b9371eace tor-browser-linux64-7.5.4_vi.tar.xz
a5a7f2802cae0ccaf60b800a71aecdc35444cc31988c55af625d6c122e2f91d2 tor-browser-linux64-7.5.4_zh-CN.tar.xz
9b386560112924cd9fe4a1eaea3e97d6eba7046eb980bfdaf908f3d670f02e4f tor-browser-linux64-7.5.6_ar.tar.xz
507c6b28fba5863217f6e508b596f72f2c011becda2f23ddaabe2beb3029c39f tor-browser-linux64-7.5.6_de.tar.xz
bafcde14e53987a7df17f88d69f5aec4bd65312720df931080cae7e8caa3e71f tor-browser-linux64-7.5.6_en-US.tar.xz
aa8f7b37444fcf1abba3892b6464fba874efbe12c46b391bcd61122965046687 tor-browser-linux64-7.5.6_es-ES.tar.xz
d84e7b91b933ab0ba598da0cefb53e363c298b2df4b97b4245241e0cb592ed25 tor-browser-linux64-7.5.6_fa.tar.xz
09a2ea440adc4accb8952c3b231e25ca833b86ea5e309a7762e30a7933b47e32 tor-browser-linux64-7.5.6_fr.tar.xz
32467210aadcd7a66c0b0ec0e81180861e6fe77d5832f67dcc5f9988c887b750 tor-browser-linux64-7.5.6_it.tar.xz
08e5a472d393f0329d7a33ea6b8b8513392cf174ef20595275634ef2a8a806eb tor-browser-linux64-7.5.6_ja.tar.xz
0ad6fa5e42baead21a2c8050132df7496920b17fca55ed4ad191d53a7ba3682a tor-browser-linux64-7.5.6_ko.tar.xz
931d48969ed2ad7c79e46527ad3848cf4188ce1e9a9b47857bbd3c283b6a518e tor-browser-linux64-7.5.6_nl.tar.xz
a81a31f7213a1baeb135021b74113ea50d3246ae6cea04c80d17717b1d397292 tor-browser-linux64-7.5.6_pl.tar.xz
353e7f8881e3085a6855142a14205c916b9c2150b036da4947489b4477cc228c tor-browser-linux64-7.5.6_pt-BR.tar.xz
fedd6b336767dae84df2e3ecf22c2e3c06e3c6075841df0a40e70884c4637be1 tor-browser-linux64-7.5.6_ru.tar.xz
1d0e2858c2bf11125c9d705cb01700d0d126236e53ea2c4d827a944aeee817a1 tor-browser-linux64-7.5.6_tr.tar.xz
d0574af0755db098931e080e5bce21c38e9110a5c81c899fd58a961d964b4af6 tor-browser-linux64-7.5.6_vi.tar.xz
ebde07d71ca96144be0b3078d0987cb8b6a0d7cea495bf8b67300a4d9aa70596 tor-browser-linux64-7.5.6_zh-CN.tar.xz
......@@ -55,24 +55,3 @@
/sys/devices/system/cpu/ r,
/sys/devices/system/cpu/** r,
@@ -373,13 +362,16 @@
# for revocation certificate generation
owner @{HOME}/.{icedove,thunderbird}/*/0x[A-F0-9]*_rev.asc rw,
+ # for revocation certificate generation
+ owner @{HOME}/.{icedove,thunderbird}/*.default/0x[A-F0-9]*_rev.asc rw,
+
# for signature generation
- owner /tmp/nsemail.eml w,
- owner /tmp/nsemail-[0-9]*.eml w,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/nsemail.eml w,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/nsemail-[0-9]*.eml w,
# for signature verifications
- owner /tmp/data.sig r,
- owner /tmp/data-[0-9]*.sig r,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/data.sig r,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/data-[0-9]*.sig r,
owner /tmp/gpg-[a-zA-Z0-9]*/S.gpg-agent rw,
diff --git a/usr/lib/python3/dist-packages/tailsgreeter/persistence.py b/usr/lib/python3/dist-packages/tailsgreeter/persistence.py
index e1415fa..cabefd6 100644
--- a/usr/lib/python3/dist-packages/tailsgreeter/persistence.py
+++ b/usr/lib/python3/dist-packages/tailsgreeter/persistence.py
@@ -54,15 +54,17 @@ class PersistenceSettings(object):
Returns: True if everything went fine, False if the user should try
again."""
logging.debug("Unlocking persistence")
- try:
- self.activate_container(
- device=self.containers[0]['path'],
- password=passphrase,
- readonly=readonly)
- self.is_unlocked = True
- return True
- except tailsgreeter.errors.WrongPassphraseError:
- return False
+ for container in self.containers:
+ try:
+ self.activate_container(
+ device=container['path'],
+ password=passphrase,
+ readonly=readonly)
+ self.is_unlocked = True
+ return True
+ except tailsgreeter.errors.WrongPassphraseError:
+ pass
+ return False
def lock(self):
logging.debug("Locking persistence")
@@ -133,7 +135,7 @@ class PersistenceSettings(object):
"/sbin/cryptsetup", "luksClose",
self.cleartext_name
]
- self.check_output_and_error(
+ tailsgreeter.utils.check_output_and_error(
args,
exception=tailsgreeter.errors.LivePersistError,
error_message=_("cryptsetup failed with return code "
tails (3.9) UNRELEASED; urgency=medium
* Dummy entry for next release.
* Dummy entry for next major release.
-- Tails developers <tails@boum.org> Thu, 10 May 2018 13:37:23 +0200
-- Tails developers <tails@boum.org> Sat, 09 Jun 2018 15:22:28 +0000
tails (3.8) unstable; urgency=medium
* Security fixes
- Upgrade Tor Browser to 7.5.6 (MFSA 2018-17; Closes: #15683).
- Upgrade Enigmail to 2.0.7 (partly fixes #15602 aka. EFAIL).
- Upgrade libgcrypt to 1.7.6-2+deb9u3 (DSA-4231-1).
- Upgrade perl to 5.24.1-3+deb9u4 (DSA-4226-1).
* Bugfixes
- Thunderbird: fix importing public OpenPGP keys from email attachments
(Closes: #15610).
- Make the Unsafe Browser home page translatable again (Closes: #15461).
* Minor improvements
- Don't display the "Know your rights" message on Thunderbird first run.
- Move Thunderbird's default userChrome.css to /etc/thunderbird, just like
we do for Tor Browser, for easier upgrade handling.
-- Tails developers <tails@boum.org> Mon, 25 Jun 2018 09:59:22 +0000
tails (3.7.1) unstable; urgency=medium
* Security fixes
- Upgrade Tor Browser to 7.5.5 (MFSA 2018-14; closes: #15643).
- Upgrade Thunderbird to 52.8.0 (DSA-4209-1; Closes: #15607).
- Partially fixes EFAIL.
- Fixes importing OpenPGP keys from keyservers with Enigmail.
- Accordingly refresh our Thunderbird AppArmor profile patch.
- Upgrade cURL to 7.52.1-5+deb9u6 (DSA-4202-1).
- Upgrade GnuPG (modern) 2.1.18-8~deb9u2 (DSA-4222-1).
- Upgrade GnuPG (legacy) to 1.4.21-4+deb9u1 (DSA-4223-1).
- Upgrade Git to 1:2.11.0-3+deb9u3 (DSA-4212-1).
- Upgrade PackageKit to 1.1.5-2+deb9u1 (DSA-4207-1).
- Upgrade procps to 2:3.3.12-3+deb9u1 (DSA-4208-1).
- Upgrade wavpack to 5.0.0-2+deb9u2 (DSA-4197-1).
- Upgrade wget to 1.18-5+deb9u2 (DSA-4195-1).
- Upgrade xdg-utils to 1.1.1-1+deb9u1 (DSA-4211-1).
* Bugfixes
- Fix setting a screen locker password with non-ASCII characters
(Closes: #15636).
- WhisperBack:
- Rename the WhisperBack launcher to "WhisperBack Error Reporting"
so that users have a better chance to understand what it does
(Closes: #6432)
- Ensure debugging info in Whisperback reports don't contain email
signature markers so that email clients forward it in full
(Closes: #15468).
- Wrap text written by the user to 70 chars (Closes: #11689).
* Minor improvements
- The "Tails documentation" desktop launcher now opens /doc instead of
the aging /getting_started that confused people during user testing
(Closes: #15575).
* Test suite
- Update to match "Tails documentation" behaviour change.
-- Tails developers <tails@boum.org> Sat, 09 Jun 2018 19:53:51 +0000
tails (3.7) unstable; urgency=medium
......
......@@ -6,7 +6,7 @@ Feature: Tails documentation
Scenario: The Tails documentation launcher on the desktop works when offline
Given I have started Tails from DVD without network and logged in
When I double-click on the Tails documentation launcher on the desktop
Then the documentation viewer opens the "Getting started" page
Then the documentation viewer opens the "Documentation" page
#15514
@fragile
......@@ -14,7 +14,7 @@ Feature: Tails documentation
Given I have started Tails from DVD and logged in and the network is connected
When I double-click on the Tails documentation launcher on the desktop
Then the Tor Browser starts
And the Tor Browser opens the Getting started page
And the Tor Browser opens the "Documentation" page
#15321
@fragile
......
......@@ -220,10 +220,10 @@ end
# python2 (#12185) we have terrible unicode support; for instance
# `.child('Tails - Getting started…')` will fail since Dogtail expects
# ascii and cannot decode "…".
Then /^the Tor Browser opens the Getting started page$/ do
Then /^the Tor Browser opens the "Documentation" page$/ do
try_for(60) do
@torbrowser
.children(roleName: "document frame")
.any? { |f| f.name == 'Tails - Getting started…' }
.any? { |f| f.name == 'Tails - Documentation' }
end
end
......@@ -94,7 +94,7 @@ Then /^the VirtualBox guest modules are available$/ do
"The vboxguest module is not available.")
end
Then /^the documentation viewer opens the "(Support|Getting started)" page$/ do |page|
Then /^the documentation viewer opens the "(Support|Documentation)" page$/ do |page|
if @language == 'German'
expected_title = 'Tails-Dokumentation'
if page == 'Support'
......@@ -107,7 +107,7 @@ Then /^the documentation viewer opens the "(Support|Getting started)" page$/ do
if page == 'Support'
expected_heading = 'Search the documentation'
else
expected_heading = 'Found a bug?'
expected_heading = 'First steps with Tails'
end
end
app = Dogtail::Application.new('tails-documentation')
......
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