Commit eada3e1f authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'feature/jessie' into feature/i2p-0.9.23

parents 1186221b a264618b
......@@ -6,6 +6,10 @@ Package: b43-fwcutter
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: electrum
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: firmware-amd-graphics
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -134,6 +138,10 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Package: python-electrum
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: ttdnsd
Pin: release o=TorProject,a=unstable
Pin-Priority: 999
......
......@@ -86,4 +86,4 @@ hinting = 'slight'
[org/gnome/shell]
enabled-extensions = ['alternative-status-menu@gnome-shell-extensions.gcampax.github.com', 'topIcons@adel.gadllah@gmail.com', 'shutdown-helper@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'claws-mail.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
{
'protocol': 's',
'auto_cycle': True,
'server': 'electrum.coinwallet.me:50002:s',
'proxy': {'host': 'localhost', 'mode': 'socks5', 'port': '9050'},
"proxy": "socks5:localhost:9050",
}
#!/bin/sh
set -e
set -u
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
CLAWSMAIL_DIR="${HOME}/.claws-mail"
PROFILE="${HOME}/.icedove/profile.default"
claws_mail_config_is_persistent() {
[ "$(findmnt --noheadings --output SOURCE --target "${CLAWSMAIL_DIR}")" = "/dev/mapper/TailsData_unlocked[/claws-mail]" ]
}
warn_about_claws_mail_persistence() {
local dialog_msg="<b><big>`gettext \"The <b>Claws Mail</b> persistence feature is activated.\"`</big></b>
`gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Icedove</b>.\"`"
local launch="`gettext \"_Launch\"`"
local exit="`gettext \"_Exit\"`"
# Since zenity can't set the default button to cancel, we switch the
# labels and interpret the return value as its negation.
if zenity --question --title "" --ok-label "${exit}" \
--cancel-label "${launch}" --text "${dialog_msg}"; then
return 1
fi
}
start_icedove() {
# Give Icedove its own temp directory, similar rationale to a1fd1f0f & #9558.
TMPDIR="${PROFILE}/tmp"
......@@ -16,4 +40,8 @@ start_icedove() {
/usr/bin/icedove --class "Icedove" -profile "${PROFILE}" "${@}"
}
if claws_mail_config_is_persistent && [ -f "${CLAWSMAIL_DIR}/accountrc" ]; then
warn_about_claws_mail_persistence || exit 0
fi
start_icedove "${@}"
http://torbrowser-archive.tails.boum.org/5.0.4/
http://torbrowser-archive.tails.boum.org/5.0.5/
c4d38b8a0d42f19f4883f2ecc58bcc0ae2f1abe6d707442821ddc2de844fc0a6 tor-browser-linux32-5.0.4_ar.tar.xz
ff441589c7a01f051092430405fdd1bccb61f6dcc0a3191018c427297acc30a9 tor-browser-linux32-5.0.4_de.tar.xz
3d0fd640693c91ddc9ffce744695b9a46e4cfc4b4aecd5d57b9044c1fa335c0f tor-browser-linux32-5.0.4_en-US.tar.xz
e70fd621f9fcec94b1c015d041031e73df2f0c84eba024a26adb39168ee50ad1 tor-browser-linux32-5.0.4_es-ES.tar.xz
4dd0ed35bcafde800fc0f87ec3d7b66b74d743e4fe95693d880efce1cf4d7611 tor-browser-linux32-5.0.4_fa.tar.xz
5402d358075782db6419bd7af014e158a06926be216a6ac603dbec3074828dbe tor-browser-linux32-5.0.4_fr.tar.xz
6d274dcc6ae4ee7b3da062fb1ad3266efb50f917e75f18d9c48b4c1431a84f9d tor-browser-linux32-5.0.4_it.tar.xz
69a5f26328a4ae43d2132434700d422583919068e2da9863dc14355ff78bc8da tor-browser-linux32-5.0.4_ko.tar.xz
a666205eccb8f745ed1ce5d80df5a61c2c9f555e807c37f018294caef52d0a99 tor-browser-linux32-5.0.4_nl.tar.xz
a5b8e423b28742f7c0bf8eb94739131820eec4a54a1b42ea3ed346a8ce3603b4 tor-browser-linux32-5.0.4_pl.tar.xz
19c65d9c8ec0cb56c3afa7d97a076a0f7b891503e77c484381e0c03bd69e3307 tor-browser-linux32-5.0.4_pt-PT.tar.xz
c635438b8dbaef18da891f6b298f61a31babe6925a0e208fae390b9d995498d6 tor-browser-linux32-5.0.4_ru.tar.xz
c3597cbfdfb625f3f9135b629b8713cb9fcdfd49a93bffbfe5d5aa0cd3cb2775 tor-browser-linux32-5.0.4_tr.tar.xz
adb8bc1db36490e07c0302e22bf0a5252dbda44d107c214e6205bd5bdce31560 tor-browser-linux32-5.0.4_vi.tar.xz
aff2788ef059cef86c12cfa0a83e5857cb38b876d4d05a9915a05f0f03130d92 tor-browser-linux32-5.0.4_zh-CN.tar.xz
3009a39dd0ebdd55be5f5fbc7b6e4562b766f915c7dd5684772b66931fa739fe tor-browser-linux32-5.0.5_ar.tar.xz
efcffad4fbcdebae3a1690399c48731038f8db6f92083562d36685391ac8d190 tor-browser-linux32-5.0.5_de.tar.xz
65c390586c1ff7a1c9241aaaee76508751ba5c2c3a5bfa6ca2b8e958e39eb695 tor-browser-linux32-5.0.5_en-US.tar.xz
8538bf463b942e32fb243c7ceddc3b45fa0f505be0f3e8722c18779f30c56440 tor-browser-linux32-5.0.5_es-ES.tar.xz
0ddd3f4312d09924257f266bcf694b2e5b4c41f29da90670d7722ddfa28e7496 tor-browser-linux32-5.0.5_fa.tar.xz
ea2335ea1a48d0d46e95055751fcf3ba975ad2ddac90cd5eca0564a6d1efdfb1 tor-browser-linux32-5.0.5_fr.tar.xz
39271c9cce2ad90c5e964c678d646b4f690c16e1fcd9513cb7a63a515785e6dd tor-browser-linux32-5.0.5_it.tar.xz
6bf11d82c145cfadafbb5320e243d02b42c64f6878ecdc7211c168e16b33dc34 tor-browser-linux32-5.0.5_ko.tar.xz
44ac753fa35f205e5ae9b5982317fa2424e0a517192d770d8f16f182d78d4cce tor-browser-linux32-5.0.5_nl.tar.xz
394a3a77c639ae4bd1dd530c80eb75dfa7cdef2cdc61737db5df64de0ad0d5cd tor-browser-linux32-5.0.5_pl.tar.xz
da7e06e9a4e7fe4e233cb7e986b8e31e37c123c6b880414bd44992cc9aeeeca2 tor-browser-linux32-5.0.5_pt-PT.tar.xz
9da3ca9676d10d091f70b42bd902b9bf61b0495645527db0b71b60a603e5020d tor-browser-linux32-5.0.5_ru.tar.xz
a00efd61a90eefb98bcea6fcd81599d759ff90816e35ac55dd8496b3baa1095f tor-browser-linux32-5.0.5_tr.tar.xz
f7028330eadacdced2ffff9c02c50d733514072af6547b1e4c7687d4b6acb228 tor-browser-linux32-5.0.5_vi.tar.xz
b495b5e2293043074175c6f45e2a260f12bff0af612a0ac11c0ba79a582ee2ab tor-browser-linux32-5.0.5_zh-CN.tar.xz
......@@ -9,7 +9,7 @@ the service from starting at all).
# vim:syntax=apparmor
#include <tunables/global>
-profile system_tor {
-profile system_tor flags=(attach_disconnected) {
+/usr/bin/tor flags=(attach_disconnected) {
#include <abstractions/tor>
......
@product
#10497: wait_until_tor_is_working
@product @fragile
Feature: Installing packages through APT
As a Tails user
when I set an administration password in Tails Greeter
......@@ -11,11 +12,13 @@ Feature: Installing packages through APT
Scenario: APT sources are configured correctly
Then the only hosts in APT sources are "ftp.us.debian.org,security.debian.org,backports.debian.org,deb.tails.boum.org,deb.torproject.org,mozilla.debian.net"
#10496: apt-get scenarios are fragile
@check_tor_leaks @fragile
Scenario: Install packages using apt
When I update APT using apt
Then I should be able to install a package using apt
#10441: Synaptic test is fragile
@check_tor_leaks @fragile
Scenario: Install packages using Synaptic
When I start Synaptic
......
When /^I query the whois directory service for "([^"]+)"$/ do |domain|
retry_tor do
@vm_execute_res = $vm.execute("whois '#{domain}'", :user => LIVE_USER)
if @vm_execute_res.failure?
if @vm_execute_res.failure? || @vm_execute_res.stdout['LIMIT EXCEEDED']
raise "Looking up whois info for #{domain} failed with:\n" +
"#{@vm_execute_res.stdout}\n" +
"#{@vm_execute_res.stderr}"
......
......@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2014-12-05 17:21+0000\n"
"Last-Translator: Osama M. Mneina <o.mneina@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2014-12-30 17:30+0000\n"
"Last-Translator: E <ehuseynzade@gmail.com>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/"
......
......@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-09-22 17:25+0000\n"
"Last-Translator: 4Joy <kiril.banialiev@gmail.com>\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/"
......
......@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-09-12 16:06+0000\n"
"Last-Translator: laia_\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
......
......@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-08-28 07:47+0000\n"
"Last-Translator: Vlastimil Burián <burian.vlastimil2@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2014-04-30 09:10+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/"
......
......@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"PO-Revision-Date: 2015-10-14 16:27+0000\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-12-08 12:29+0000\n"
"Last-Translator: Tommy Gade\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
"da/)\n"
......
......@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-10-28 16:18+0000\n"
"Last-Translator: spriver <tor@dominik-pilatzki.de>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/"
......
......@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-10-08 20:37+0000\n"
"Last-Translator: Ilias Giannaros <iliasgnrs@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
......
......@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"POT-Creation-Date: 2015-12-14 22:10+0100\n"
"PO-Revision-Date: 2015-11-02 00:10+0000\n"
"Last-Translator: newharha ehrara <dbybgohg@yomail.info>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/"
......
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