Commit 903d2d31 authored by kytv's avatar kytv
Browse files

Merge branch 'devel' into bugfix/10741-icedove

parents 24a18dc8 ed38237b
This diff is collapsed.
......@@ -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
......
......@@ -8,8 +8,12 @@ if [ $1 = "lo" ]; then
exit 0
fi
# Run whenever an interface gets "up", not otherwise:
if [ $2 != "up" ]; then
if [ $2 = "up" ]; then
: # go on, that's what this script is for
elif [ "${2}" = "down" ]; then
systemctl --no-block stop tails-tor-has-bootstrapped.target
exit 0
else
exit 0
fi
......@@ -26,6 +30,10 @@ systemctl stop tor@default.service
# tordate/20-time.sh), so deleting it seems like a Good Thing(TM).
rm -f "${TOR_LOG}"
# Let the rest of the system know that Tor is not working at the moment.
# This matters e.g. if we have already bootstrapped.
systemctl --no-block restart tails-tor-has-bootstrapped.target
# The Tor syscall sandbox is not compatible with managed proxies.
# We could possibly detect whether the user has configured any such
# thing via Tor Launcher later (e.g. in 60-tor-ready.sh),
......
......@@ -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 "${@}"
......@@ -10,10 +10,9 @@ tweak_sysctl() {
echo 3 > /proc/sys/kernel/printk
echo 3 > /proc/sys/vm/drop_caches
echo 256 > /proc/sys/vm/min_free_kbytes
echo 1 > /proc/sys/vm/overcommit_memory
echo 1 > /proc/sys/vm/oom_kill_allocating_task
echo 0 > /proc/sys/vm/overcommit_memory
echo 0 > /proc/sys/vm/oom_kill_allocating_task
echo 0 > /proc/sys/vm/oom_dump_tasks
}
......@@ -29,8 +28,14 @@ if [ -n "${sdmem}" ] ; then
if [ -z "${sdmemopts}" ] ; then
sdmemopts="v"
fi
for i in $(seq 0 30) ; do /usr/bin/sdmem "-${sdmemopts}" & done
# Wait for sdmem jobs to complete.
# We run one instance of sdmem per 2 GiB of RAM to deal with the
# x86 per-process memory limitation.
mem=$(free | awk '/Mem:/ { print $2 }')
instances=$((${mem}/(2*1024*1024)+1))
for i in $(seq 1 "${instances}") ; do
( /usr/bin/sdmem "-${sdmemopts}" ; killall sdmem >/dev/null 2>&1 ) &
done
# Wait for sdmem jobs to finish.
wait
fi
......
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>
......
This diff is collapsed.
......@@ -4,7 +4,7 @@
debian-branch = master
debian-tag = %(version)s
[git-dch]
[dch]
full = True
auto = True
git-log = --no-merges
......
@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
......
......@@ -20,6 +20,8 @@ Feature: System memory erasure on shutdown
And I stop the boot at the bootloader menu
Then I find many patterns in the guest's memory
#10776
@fragile
Scenario: Memory erasure on a modern computer
Given a computer
And the computer is a modern 64-bit system
......@@ -51,6 +53,8 @@ Feature: System memory erasure on shutdown
And I stop the boot at the bootloader menu
Then I find many patterns in the guest's memory
#10776
@fragile
Scenario: Memory erasure on an old computer
Given a computer
And the computer is an old pentium without the PAE extension
......
......@@ -4,17 +4,18 @@ Feature: Using Evince
I want to view and print PDF files in Evince
And AppArmor should prevent Evince from doing dangerous things
@fragile
Scenario: I can view and print a PDF file stored in /usr/share
Given I have started Tails from DVD without network and logged in
When I open "/usr/share/cups/data/default-testpage.pdf" with Evince
Then I see "CupsTestPage.png" after at most 10 seconds
Then I see "CupsTestPage.png" after at most 20 seconds
And I can print the current document to "/home/amnesia/output.pdf"
Scenario: I can view and print a PDF file stored in non-persistent /home/amnesia
Given I have started Tails from DVD without network and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia" as user "amnesia"
When I open "/home/amnesia/default-testpage.pdf" with Evince
Then I see "CupsTestPage.png" after at most 10 seconds
Then I see "CupsTestPage.png" after at most 20 seconds
And I can print the current document to "/home/amnesia/output.pdf"
Scenario: I cannot view a PDF file stored in non-persistent /home/amnesia/.gnupg
......@@ -46,10 +47,8 @@ Feature: Using Evince
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/Persistent" as user "amnesia"
Then the file "/home/amnesia/Persistent/default-testpage.pdf" exists
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/.gnupg" as user "amnesia"
Then the file "/home/amnesia/.gnupg/default-testpage.pdf" exists
When I open "/home/amnesia/Persistent/default-testpage.pdf" with Evince
Then I see "CupsTestPage.png" after at most 10 seconds
Then I see "CupsTestPage.png" after at most 20 seconds
And I can print the current document to "/home/amnesia/Persistent/output.pdf"
#10720: Tails Installer freezes on Jenkins
......
Supports Markdown
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