Commit 1f5f7b99 authored by anonym's avatar anonym
Browse files

Merge branch 'stable' into devel

parents 30b8aeb8 1d21bc73
......@@ -26,7 +26,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
KERNEL_VERSION='4.15.0-1'
KERNEL_VERSION='4.15.0-2'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
......@@ -87,14 +87,28 @@ try:
except IndexError:
page = 'getting_started'
try:
anchor = sys.argv[2]
except IndexError:
anchor = None
wiki_path = '/usr/share/doc/tails/website'
lang_code = os.getenv('LANG', 'en')[0:2]
# If possible, let's hand-off to our website, which should be the most
# up-to-date option.
if os.system('/usr/local/sbin/tor-has-bootstrapped') == 0:
if os.path.isfile(os.path.join(
wiki_path, page + '.' + lang_code + ".html")):
uri = 'https://tails.boum.org/' + page + '/index.' + lang_code + '.html'
else:
uri = 'https://tails.boum.org/' + page
if anchor is not None:
uri = uri + '#' + anchor
os.execv('/usr/local/bin/tor-browser',
['--new-tab', 'https://tails.boum.org/' + page])
['/usr/local/bin/tor-browser', '--new-tab',
uri])
wiki_path = '/usr/share/doc/tails/website'
lang_code = os.getenv('LANG', 'en')[0:2]
trials = [
os.path.join(wiki_path, page + code + ".html")
for code in ['.' + lang_code, '.en', '']
......@@ -103,6 +117,8 @@ try:
uri = 'file://' + next(trial for trial in trials if os.path.isfile(trial))
except StopIteration:
sys.exit('error: could not find the requested documentation page')
if anchor is not None:
uri = uri + '#' + anchor
if '..' in uri.split(os.sep):
sys.exit('error: cannot escape from {}'.format(wiki_path))
......
http://torbrowser-archive.tails.boum.org/7.5.2-build1/
http://torbrowser-archive.tails.boum.org/7.5.3/
a34469433e144e9b48b968487500364a94edacb8b7736fa9a12102c343124cf7 tor-browser-linux64-7.5.2_ar.tar.xz
51922785e447ba1636d3ec6f47b89390520aae611bb57b777a23c61a801e294d tor-browser-linux64-7.5.2_de.tar.xz
542cb965e08dbd31f0b63c19d599094d77d0b7b5c56ff2ab40d6fcf955b0ee3b tor-browser-linux64-7.5.2_en-US.tar.xz
03deee775103716b4b8b0bcd653700bf5b9d91c71406c9dfedefc4981a242105 tor-browser-linux64-7.5.2_es-ES.tar.xz
adbae3a4fc42a486e992a678c554f519e388f4a267df33b127fd9082d848c250 tor-browser-linux64-7.5.2_fa.tar.xz
15b8cadfe2f8cc54c8699901e1e2cafcf6adcaab777d2b8439959510f6464447 tor-browser-linux64-7.5.2_fr.tar.xz
880c1ba684ed15ff779bce773ec7cd9568d6ed3a114f70e89a00d51f6f26cbb4 tor-browser-linux64-7.5.2_it.tar.xz
933cea8541b7c96b266baf7a5a030c23c4060b520ebed2c08e536b4f49689e3e tor-browser-linux64-7.5.2_ja.tar.xz
99982e3b71128bbe617ddafa72adc07a9e8c1722549da4966f3e0d989fae6047 tor-browser-linux64-7.5.2_ko.tar.xz
8122df5066875ec2650fc5c23f25871ecdcc4892c84a9a29d551c18c1270c0fb tor-browser-linux64-7.5.2_nl.tar.xz
86e186467ff502df9df5c8002c3ca9b402db60748db59d4d53a7c37e1b9f0c64 tor-browser-linux64-7.5.2_pl.tar.xz
b30db9c5b6dd9f8c76a507a2c9cd3200ed8515459114587e83c70cdf2cfa3a0e tor-browser-linux64-7.5.2_pt-BR.tar.xz
d906bb406d5fc5c01788ec23f84f730291baba48bbf7cdde193de1da9104d76a tor-browser-linux64-7.5.2_ru.tar.xz
a6e07977b945489fa3e26abed48cda3caab64af00011c2d0e99c31747e71c261 tor-browser-linux64-7.5.2_tr.tar.xz
83dd2a0673b5ea3d0628812004630bc5be2a3093088a5f2ca98aa404acf10b1d tor-browser-linux64-7.5.2_vi.tar.xz
57546564b5cde1191f39f42273db313a59d4c201d2262cf42bac089a2584c71e tor-browser-linux64-7.5.2_zh-CN.tar.xz
564f143605068df081d27c9683b4a9a8238397dfff8f7d0a43f87dfa727b9896 tor-browser-linux64-7.5.3_ar.tar.xz
95be0dd76cbc52f5de06d92deeb6768491defaa1bc9665f079e534b246ec9843 tor-browser-linux64-7.5.3_de.tar.xz
0df06f7bb39d80876e15e186cb0f5c0a8151cb66fc27aeed5b0b67d3340efc6d tor-browser-linux64-7.5.3_en-US.tar.xz
7a01b6e2802d936d165709498c778b7931c14211fea481e09b5d421d550bfde4 tor-browser-linux64-7.5.3_es-ES.tar.xz
52f567f1129e31332e7ab508894f12def24cb1f6016e394a30fc76c2d2c6a104 tor-browser-linux64-7.5.3_fa.tar.xz
168eb7821b6783c6f9f116b5230ec1259a506fecce73c26499395219e222275a tor-browser-linux64-7.5.3_fr.tar.xz
64e969d1683ff752b660dd521930254d68b699c07c1c6eb49aa65ab49ed4a959 tor-browser-linux64-7.5.3_it.tar.xz
39937c83374d60b242829b6e3fd5bce4c7b0e6c0060ac6229cd459e318fd946b tor-browser-linux64-7.5.3_ja.tar.xz
72c5130d04e6455f871f702810a2594520817065ff52cca9c29f81aca986a359 tor-browser-linux64-7.5.3_ko.tar.xz
4b711ba2830c720daa7a8ec5aeb08b2397016fc66bfa4cd8cf707a5e17c2a195 tor-browser-linux64-7.5.3_nl.tar.xz
7945e4a1d48f756cd206d8d4b4898e281dc84f54a3b3ea955558cf9b08a4e2e3 tor-browser-linux64-7.5.3_pl.tar.xz
20ffd2acae1d0027530126b0674fe0b512373c1a3c5c6597d35837b239a4d5a6 tor-browser-linux64-7.5.3_pt-BR.tar.xz
3657ce2fb41f665127f72b3ffae9bcbfbd2fa448ea0bab097088f5ea9d5566e8 tor-browser-linux64-7.5.3_ru.tar.xz
7f004f416f30940cde957a5e3f00428a3a2f8d952ba25c026c2f9bca5c24457d tor-browser-linux64-7.5.3_tr.tar.xz
c34c6b6df8fc38712ae11b9a389864ae5fd4bf85e91ad7ed814054afa760c875 tor-browser-linux64-7.5.3_vi.tar.xz
c508a0e98e99972014dd6d0e388a3bbf3b72080d953f1c90253023ef3e6a6437 tor-browser-linux64-7.5.3_zh-CN.tar.xz
......@@ -11,16 +11,18 @@
# Uncomment the following lines if you want to give the Tor Browser read-write
# access to most of your personal files.
@@ -22,6 +23,8 @@
@@ -22,13 +23,16 @@
deny /etc/passwd r,
deny /etc/group r,
deny /etc/mailcap r,
+ deny @{HOME}/.local/share/gvfs-metadata/home r,
+ deny /run/resolvconf/resolv.conf r,
deny /etc/machine-id r,
deny /var/lib/dbus/machine-id r,
@@ -29,6 +32,7 @@
- deny /etc/machine-id r,
- deny /var/lib/dbus/machine-id r,
+ /etc/machine-id r,
+ /var/lib/dbus/machine-id r,
/dev/ r,
/dev/shm/ r,
......@@ -172,7 +174,7 @@
owner @{PROC}/@{pid}/mountinfo r,
owner @{PROC}/@{pid}/stat r,
@@ -30,28 +32,26 @@ profile torbrowser_plugin_container {
@@ -30,28 +32,27 @@ profile torbrowser_plugin_container {
owner @{PROC}/@{pid}/task/*/stat r,
@{PROC}/sys/kernel/random/uuid r,
......@@ -209,6 +211,7 @@
+ owner "@{HOME}/Persistent/Tor Browser/" rw,
+ owner "@{HOME}/Persistent/Tor Browser/**" rwk,
+
+ owner @{HOME}/.tor-browser/profile.default/extensions/*.xpi r,
+ /etc/xul-ext/ r,
+ /etc/xul-ext/** r,
+ /usr/local/share/tor-browser-extensions/ r,
......@@ -221,7 +224,7 @@
/sys/devices/system/cpu/ r,
/sys/devices/system/cpu/present r,
@@ -77,6 +77,12 @@ profile torbrowser_plugin_container {
@@ -77,6 +78,12 @@ profile torbrowser_plugin_container {
deny @{PROC}/@{pid}/net/route r,
deny /sys/devices/system/cpu/cpufreq/policy[0-9]*/cpuinfo_max_freq r,
deny /sys/devices/system/cpu/*/cache/index[0-9]*/size r,
......
......@@ -415,10 +415,6 @@ python3-yaml
libcanberra-pulse
sound-theme-freedesktop
# Support Video Acceleration API (VA-API)
gstreamer1.0-vaapi
va-driver-all
# needed for tails-screen-locker
python3-pampy
python3-pydbus
......
Subproject commit caea84a33dce187ad77f9ee524d7ec46acc69c63
Subproject commit 84295fc49a4778dd60a4a3e9b3075e1b341a356d
......@@ -714,12 +714,3 @@ ThinkPad 11e laptops, such as the 2015 model.
To fix this problem, add `intel_idle.max_cstate=1` to the
[[startup options|/doc/first_steps/startup_options/#boot_loader_menu]].
## Starting *GNOME Settings* makes the system crash
Since Tails 3.6~rc1, on some computers starting *GNOME Settings* makes
the system crash. This will be fixed in Tails 3.7. In the meantime,
to fix this problem you can remove the following packages:
@va-driver-all i965-va-driver mesa-va-drivers gstreamer1.0-vaapi@.
See [[!tails_ticket 15433]] for more details.
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