Commit 1fe1cfbb authored by Ulrike Uhlig's avatar Ulrike Uhlig
Browse files

Merge branch 'web/16170-other-ways-above-fold' of d53ykjpeekuikgoq.onion:tails...

Merge branch 'web/16170-other-ways-above-fold' of d53ykjpeekuikgoq.onion:tails into web/16170-other-ways-above-fold
parents b29ca48e 185424cd
......@@ -39,7 +39,6 @@ apt-get --yes purge \
mlocate \
ncurses-term \
nfs-common \
procmail \
python3-reportbug \
reportbug \
telnet \
......@@ -60,6 +59,12 @@ if is_package_installed mutt; then
apt-get --yes purge mutt
fi
### Hotfix for 3.14: procmail is no longer known by apt in tagged
### snapshots, likely because no longer pulled by monkeysphere:
if is_package_installed procmail; then
apt-get --yes purge procmail
fi
### Deinstall some other unwanted packages.
apt-get --yes purge \
'^aptitude*' \
......
......@@ -26,21 +26,6 @@ rm /etc/console-setup/cached_setup_keyboard.sh
rm /var/cache/ldconfig/aux-cache
rm /var/lib/systemd/catalog/database
# Delete non-deterministically generated files, that should not be shared among
# all Tails systems anyway. We don't ship SSHd, so we don't bother generating
# them at boot.
# We remove with -f due to a suspected race condition: it seems that
# .../authentication/sphere/S.gpg-agent can be removed (by gpg-agent?)
# *right after* `rm -r` has listed it, so that when `rm` tries to
# remove it, it doesn't exist any more and it fails.
if [ -d /var/lib/monkeysphere/authentication/ ]; then
rm -rf /var/lib/monkeysphere/authentication/
else
echo 'Cannot remove /var/lib/monkeysphere/authentication/:' \
'directory does not exist' >&2
exit 1
fi
# Empty non-deterministically generated file. If it exists and is empty, systemd
# will automatically set up a new unique ID. But if does not exist, systemd
# will populate /etc with preset unit settings, which will for example re-enable
......
......@@ -67,7 +67,7 @@ lid-close-ac-action = 'blank'
lid-close-battery-action = 'blank'
[org/gnome/shell]
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'status-menu-helper@tails.boum.org', 'torstatus@tails.boum.org']
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'TopIcons@phocean.net', 'status-menu-helper@tails.boum.org', 'torstatus@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'thunderbird.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
[org/gnome/shell/extensions/topicons]
......
......@@ -3,9 +3,6 @@ NODE_PATH=/usr/local/lib/nodejs
SOCKS_SERVER=127.0.0.1:9050
SOCKS5_SERVER=127.0.0.1:9050
# Port that the monkeysphere validation agent listens on
MSVA_PORT='6136'
# Have Qt applications use the Adwaita theme
QT_STYLE_OVERRIDE=adwaita
......
......@@ -80,11 +80,6 @@ domain ip {
mod owner uid-owner $amnesia_uid ACCEPT;
}
# White-list access to Monkeysphere
daddr 127.0.0.1 proto tcp syn dport 6136 {
mod owner uid-owner $amnesia_uid ACCEPT;
}
# White-list access to OnionShare
daddr 127.0.0.1 proto tcp syn dport 17600:17650 {
mod owner uid-owner $amnesia_uid ACCEPT;
......
net.ipv6.conf.default.disable_ipv6 = 1
net.ipv6.conf.all.disable_ipv6 = 1
# Some programs expect the loopback interface to have IPv6 enabled
net.ipv6.conf.lo.disable_ipv6 = 0
......@@ -130,19 +130,6 @@ class PasswordDialog(object):
label_subtitle = Gtk.Label(
label=_("Set up a password to unlock the screen."),
)
label_subtitle.get_style_context().add_class("dim-label")
label1 = Gtk.Label(
label=_("Password"),
xalign=1
)
label1.get_style_context().add_class("dim-label")
label2 = Gtk.Label(
label=_("Confirm"),
xalign=1
)
label2.get_style_context().add_class("dim-label")
self.entry1 = Gtk.Entry(
can_focus=True,
......@@ -159,8 +146,8 @@ class PasswordDialog(object):
self.entry2.connect("changed", self.on_entry_changed)
grid = Gtk.Grid(row_spacing=2, column_spacing=10)
grid.attach(label1, 0, 0, 1, 1)
grid.attach(label2, 0, 1, 1, 1)
grid.attach(Gtk.Label(label=_("Password"), xalign=1), 0, 0, 1, 1)
grid.attach(Gtk.Label(label=_("Confirm"), xalign=1), 0, 1, 1, 1)
grid.attach(self.entry1, 1, 0, 1, 1)
grid.attach(self.entry2, 1, 1, 1, 1)
......
from os import path
APP_NAME = "unlock-veracrypt-volumes"
DATA_DIR = "/usr/share/%s/" % APP_NAME
UI_DIR = path.join(DATA_DIR, "ui")
MAIN_UI_FILE = path.join(UI_DIR, "main.ui")
VOLUME_UI_FILE = path.join(UI_DIR, "volume.ui")
DATA_DIR = "/usr/share/tails/%s/" % APP_NAME
MAIN_UI_FILE = path.join(DATA_DIR, "main.ui")
VOLUME_UI_FILE = path.join(DATA_DIR, "volume.ui")
TRANSLATION_DOMAIN = "tails"
......@@ -4,7 +4,7 @@ from typing import Union
from gi.repository import Gtk, GLib, Gio, UDisks
from unlock_veracrypt_volumes import _
from unlock_veracrypt_volumes.config import VOLUME_UI_FILE, APP_NAME
from unlock_veracrypt_volumes.config import TRANSLATION_DOMAIN, VOLUME_UI_FILE
from unlock_veracrypt_volumes.exceptions import UdisksObjectNotFoundError, AlreadyUnlockedError
logger = getLogger(__name__)
......@@ -31,7 +31,7 @@ class Volume(object):
self.dialog_is_showing = False
self.builder = Gtk.Builder.new_from_file(VOLUME_UI_FILE)
self.builder.set_translation_domain(APP_NAME)
self.builder.set_translation_domain(TRANSLATION_DOMAIN)
self.builder.connect_signals(self)
self.list_box_row = self.builder.get_object("volume_row") # type: Gtk.ListBoxRow
self.box = self.builder.get_object("volume_box") # type: Gtk.Box
......
......@@ -11,7 +11,7 @@ from unlock_veracrypt_volumes import _
from unlock_veracrypt_volumes.volume_list import ContainerList, DeviceList
from unlock_veracrypt_volumes.volume import Volume
from unlock_veracrypt_volumes.exceptions import UdisksObjectNotFoundError, VolumeNotFoundError
from unlock_veracrypt_volumes.config import APP_NAME, MAIN_UI_FILE
from unlock_veracrypt_volumes.config import MAIN_UI_FILE, TRANSLATION_DOMAIN
WAIT_FOR_LOOP_SETUP_TIMEOUT = 1
......@@ -32,12 +32,12 @@ class VolumeManager(object):
self.mount_op_lock = Lock()
self.builder = Gtk.Builder.new_from_file(MAIN_UI_FILE)
self.builder.set_translation_domain(APP_NAME)
self.builder.set_translation_domain(TRANSLATION_DOMAIN)
self.builder.connect_signals(self)
self.window = self.builder.get_object("window") # type: Gtk.ApplicationWindow
self.window.set_application(application)
self.window.set_title("Unlock VeraCrypt Volumes")
self.window.set_title(_("Unlock VeraCrypt Volumes"))
self.container_list = ContainerList()
self.device_list = DeviceList()
......@@ -161,7 +161,7 @@ class VolumeManager(object):
body=_("The file %s does not seem to be a VeraCrypt container.") % path)
else:
self.show_warning(title=_("Failed to add container"),
body=_("Could not add file container %s: Timeout while waiting for loop setup."
body=_("Could not add file container %s: Timeout while waiting for loop setup.\n"
"Please try using the <i>Disks</i> application instead.") % path)
def _wait_for_loop_setup(self, path: str) -> Union[Volume, None]:
......
#!/usr/bin/python
#!/usr/bin/python3
# NB: this program is subject to the system's per-process memory limits.
......
......@@ -102,7 +102,7 @@ sgdisk \
log_end_msg
# Tell the kernel to reload the partition table
partprobe
partprobe "${PARENT_DEVICE}"
# fatresize overwrites the VBR, so we have to back it up to be able to
# restore the boot code later
......@@ -139,4 +139,4 @@ sgdisk \
"${PARENT_DEVICE}"
# Tell the kernel to reload the partition table
partprobe
partprobe "${PARENT_DEVICE}"
ar:EG
ca:ES
cs:CZ
da:DK
de:DE
el:GR
es-ES:ES
es-AR:AR
en-US:US
fa:IR
fr:FR
ga-IE:IE
he:IL
hu:HU
ka:GE
id:ID
is:IS
it:IT
......
......@@ -46,11 +46,11 @@ crontab:x:107:
netdev:x:108:
kvm:x:150:
render:x:151:
Debian-exim:x:152:
messagebus:x:105:
ssh:x:109:
memlockd:x:110:
ssl-cert:x:111:
monkeysphere:x:113:
debian-tor:x:114:tor-launcher
lpadmin:x:115:
vboxsf:x:112:
......
......@@ -20,9 +20,9 @@ systemd-timesync:x:100:102:systemd Time Synchronization,,,:/run/systemd:/bin/fal
systemd-network:x:101:103:systemd Network Management,,,:/run/systemd/netif:/bin/false
systemd-resolve:x:102:104:systemd Resolver,,,:/run/systemd/resolve:/bin/false
_apt:x:104:65534::/nonexistent:/bin/false
messagebus:x:103:105::/var/run/dbus:/bin/false
memlockd:x:105:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
monkeysphere:x:106:113:monkeysphere authentication user,,,:/var/lib/monkeysphere:/bin/bash
Debian-exim:x:103:152::/var/spool/exim4:/bin/false
messagebus:x:105:105::/var/run/dbus:/bin/false
memlockd:x:106:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
debian-tor:x:107:114::/var/lib/tor:/bin/false
speech-dispatcher:x:108:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/false
colord:x:109:117:colord colour management daemon,,,:/var/lib/colord:/bin/false
......
http://torbrowser-archive.tails.boum.org/8.0.9-build1/
http://torbrowser-archive.tails.boum.org/8.5.3/
b3d89a9c621b02fa40fa14c7102b3fb7d0f536e0fe8b983ecd48cf2fa46aa13c tor-browser-linux64-8.0.9_ar.tar.xz
f7f9c1f540a505831b4cd249cdde776a8d1dca465c7b730722831fde0cba21ed tor-browser-linux64-8.0.9_ca.tar.xz
6a2572c0663ea42364a712213c9e4730e54ed89f73d32ebf25d3c7f26b2e77fb tor-browser-linux64-8.0.9_da.tar.xz
ac7e8528780c7c91142f8f554dd38cde84470f2731683e8d712af8155d3f55ee tor-browser-linux64-8.0.9_de.tar.xz
ee2c3a2cb8763e8727a7c06f6c22ec54481b34ce648846050941663494205222 tor-browser-linux64-8.0.9_en-US.tar.xz
4820a741249fcccc5d601b33430bbb97dc28bbe0d64588412b52116defd670fb tor-browser-linux64-8.0.9_es-ES.tar.xz
191549954393c95d203da31ef8b445d32b2a816878c111af26dad482dffcfdab tor-browser-linux64-8.0.9_fa.tar.xz
63781c85d77ceb1753be5c1b0624b916dec27f74329a728c3c7d0ebe65110217 tor-browser-linux64-8.0.9_fr.tar.xz
37703494d48bf82303b46fe303a8b16a2a8aac5c5d3ef4faa9e29fb3379ab9e3 tor-browser-linux64-8.0.9_ga-IE.tar.xz
3f7d087d04bb901ccbb1222fd1e41fb979dc7975f2e07b7ae1cd06004c1eb71c tor-browser-linux64-8.0.9_he.tar.xz
b772eac90c9551a96a7aa831405671af7384322aa765874783e333a4144c6025 tor-browser-linux64-8.0.9_id.tar.xz
5a3d727d31946dae9885a61ea992282e1c9995a86f3f0538e26c055016077b32 tor-browser-linux64-8.0.9_is.tar.xz
51bd844084b8faef7f43625ae1dcc79c8f576e1632e13577c018acc9ce97ddae tor-browser-linux64-8.0.9_it.tar.xz
8632da3b0d08ff351423facf8b0c87b00712b84f294e12997580695b16a51cb3 tor-browser-linux64-8.0.9_ja.tar.xz
dde0c22b8b276b0964f8ff9dcf0d95bfeac0a68fc8641893d4a0294a8a5d0f93 tor-browser-linux64-8.0.9_ko.tar.xz
598b7f2b4565e46132bc8399dea7b633bd415845f0979986ebe0c23836a0b561 tor-browser-linux64-8.0.9_nb-NO.tar.xz
fedf3ebaf34bdb7915ec35de5b53922dac53d13e3aaad695fe6394482b55d70b tor-browser-linux64-8.0.9_nl.tar.xz
93ebc591fe4fc79afc2e2479a006f8aeaa8e0cc39c2df6c49a6855d7335f33b9 tor-browser-linux64-8.0.9_pl.tar.xz
36b74b04dba2bd77858d92040992be5f21b75581149ec583a4434f188617df8e tor-browser-linux64-8.0.9_pt-BR.tar.xz
94d407a5df805873fd9042e1d04fa3037f2078e05b85175d262a447a55c37fa4 tor-browser-linux64-8.0.9_ru.tar.xz
10732b735a5ff620e4dc5afa23bff7b32d7070029465199c98da086eeefd87c3 tor-browser-linux64-8.0.9_sv-SE.tar.xz
b88b19547e8d07dd576addecf9b56aca50b5096dd3bc06db6001130a0b017111 tor-browser-linux64-8.0.9_tr.tar.xz
9ac38ac1290e55e90ef04d9b3ec8b1cf428620ee909e4b8aba85103d4a8ea331 tor-browser-linux64-8.0.9_vi.tar.xz
26d4018db6e93f17658a087036671bfffee7e21d561d3e9762752639a6cfeffc tor-browser-linux64-8.0.9_zh-CN.tar.xz
6ae168dae5ec9a3087b44d19dc8a40ea2e2eee781a4cd0423c648714dc45146a tor-browser-linux64-8.0.9_zh-TW.tar.xz
b04dab73db628b4ca4899eced4d12135d06da7915248006136f325453ab6b23a tor-browser-linux64-8.5.3_ar.tar.xz
fd8e72dda51a1487e7b18fab9549b0a6dd2afdba78d02bdd55af319524bcb857 tor-browser-linux64-8.5.3_ca.tar.xz
40312d8c4a3fec78689d9e4bde4e492d56a020dbfe15ff80c17f00523df9ca34 tor-browser-linux64-8.5.3_cs.tar.xz
e447c2b24096983be59f6d4bbe72804d2b43c5b5d10dc73cb3ce1ddb5d8bb4b7 tor-browser-linux64-8.5.3_da.tar.xz
e6c104776f5ad5d6c7a2db54cab9a5f0d79b924a2ddf4f4937e5e51cb634da3d tor-browser-linux64-8.5.3_de.tar.xz
41d7218b57cadf3cebb96fab872d228b7eebfadff47fce2dbcf0b611f0b5f909 tor-browser-linux64-8.5.3_el.tar.xz
4f2011f83f014abddc1a23ead058efd7b8ec75bfdd23040573b4c6c3be02b496 tor-browser-linux64-8.5.3_en-US.tar.xz
7a108410d460580c3b3053f27c0799184b47ca495b3a5faa4d737a0dd02ed796 tor-browser-linux64-8.5.3_es-AR.tar.xz
fdc112e8dc3c22869ea37e14b5ff2f65c1d14410237c482c211d7a2522c089cb tor-browser-linux64-8.5.3_es-ES.tar.xz
ae9376a2e53aa15415e805d8e63e14dc2e6336362db9ef0ac688a34adc917332 tor-browser-linux64-8.5.3_fa.tar.xz
8f1382e7bf3e3add7a1126f14f770c24c63428e2325bc11739f901a954ca6610 tor-browser-linux64-8.5.3_fr.tar.xz
887424d167a4823dfdde9d6967b45b34f66b174837c57cd0a4ad206e2ecd3e85 tor-browser-linux64-8.5.3_ga-IE.tar.xz
3c44e2fe67dfb6f776a7f063a7e3fa0bcc0c773a212a07ed7d0f5f22777cff71 tor-browser-linux64-8.5.3_he.tar.xz
a595bc7555f62c4e25b084802e4bf90e43dc8aafd67845949016a57615c68c80 tor-browser-linux64-8.5.3_hu.tar.xz
10a29f8755386e698b5c5b632eb195b9203849c863635c90c495fd10bb7a2d35 tor-browser-linux64-8.5.3_id.tar.xz
493a85d90b88f76ebb431472be84d0f350bd040def038a0f06e2519dd8ed0e29 tor-browser-linux64-8.5.3_is.tar.xz
a229385ddbabcd2bc3dc4f6623eff89695f4edab28fa56a0b7363f705dd6e36f tor-browser-linux64-8.5.3_it.tar.xz
8a6ca6a4349525a751408182679d52b400be6ac3583254ae985843511c713f8c tor-browser-linux64-8.5.3_ja.tar.xz
d89718efa43844280ef73bb95d8cd760052945ef8425c9e50b31f96d30c04526 tor-browser-linux64-8.5.3_ka.tar.xz
862769768447f8d0f3ca3784e846b713df940588550174d665a8abbe8495cbff tor-browser-linux64-8.5.3_ko.tar.xz
70129aeb7cc5da839060febbdf31d58ed2f7dca25a1d251e680d942737de46f2 tor-browser-linux64-8.5.3_nb-NO.tar.xz
dc2963437ab8a003fcd747f52e9c48345948aebc49ca7b3a857f52e7a1e04f9d tor-browser-linux64-8.5.3_nl.tar.xz
4fa5ab35074895ea9b53f7434560cf6033664d3c6016b924a2fa0effa5ef576c tor-browser-linux64-8.5.3_pl.tar.xz
104de699690c128033b7d3805562251d2a5928c1d2306d20ca3dea554305f42a tor-browser-linux64-8.5.3_pt-BR.tar.xz
29d8842470763e8ee31fd5e4474f73434aa4dbc39b22372619f11dddec8a6dff tor-browser-linux64-8.5.3_ru.tar.xz
e4d79db8f951364d3c619922bca1b45f456c970b159d7f1364debf339e35bc47 tor-browser-linux64-8.5.3_sv-SE.tar.xz
f0aab03c27960df1d27d753b3d1e472050ae3db00a5a713176ec83bad5134040 tor-browser-linux64-8.5.3_tr.tar.xz
8159978e86805fdb958751cc764edfdfffa6ee711f1463a25fb1238867406bb6 tor-browser-linux64-8.5.3_vi.tar.xz
eb3819faa3dae419c40f7a06ff77f682d5b39993f2b27521a30099764b265d65 tor-browser-linux64-8.5.3_zh-CN.tar.xz
456051374bf61188e0698f9c65bf063ee75cc0060cd5f410a6fa88a75b4fcb79 tor-browser-linux64-8.5.3_zh-TW.tar.xz
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<interface domain="tails">
<requires lib="gtk+" version="3.22"/>
<object class="GtkApplicationWindow" id="window">
<property name="default-width">700</property>
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<interface domain="tails">
<requires lib="gtk+" version="3.22"/>
<object class="GtkListBoxRow" id="volume_row">
<property name="activatable">False</property>
......@@ -26,7 +26,7 @@
<child>
<object class="GtkButton" id="open_button">
<property name="no_show_all">True</property>
<property name="label">_Open</property>
<property name="label" translatable="yes">_Open</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_open_button_clicked" swapped="no"/>
</object>
......@@ -49,7 +49,7 @@
<child>
<object class="GtkButton" id="unlock_button">
<property name="no_show_all">True</property>
<property name="label">_Unlock</property>
<property name="label" translatable="yes">_Unlock</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_unlock_button_clicked" swapped="no"/>
</object>
......
......@@ -111,7 +111,6 @@ gnome-user-guide
gnupg-agent
gnupg2
gobi-loader
gobby
## breaks lb because of desktop-base.postinst (see Debian bug #467620)
#if ARCHITECTURE amd64
# grub
......@@ -126,19 +125,16 @@ hardlink
haveged
# needed by laptop-mode-tools to spin-down hard drives
hdparm
hopenpgp-tools
inkscape
iptables
# ships isolinux.bin in syslinux 6.x packaging
isolinux
ferm
keepassx
keyringer
memlockd
less
laptop-mode-tools
libgail-common
libgfshare-bin
libcaribou-gtk-module
libsane-hpaio
live-config
......@@ -147,11 +143,7 @@ live-tools
lvm2
macchanger
mat
pdf-redact-tools
mesa-utils
monkeysign
monkeysphere
msva-perl
nautilus
nautilus-wipe
nautilus-gtkhash
......@@ -182,20 +174,17 @@ libreoffice-l10n-zh-cn
onioncircuits
openpgp-applet
openssh-client
paperkey
parted
patch
pidgin
pidgin-guifications
pidgin-otr
pinentry-gtk2
pitivi
poedit
ppp
pppoe
pulseaudio
pulseaudio-utils
pwgen
p7zip-full
qt-at-spi
rng-tools
......@@ -219,7 +208,6 @@ system-config-printer-common
synaptic
torsocks
totem-plugins
traverso
ttf-dejavu
tcpdump
tcpflow
......@@ -237,7 +225,6 @@ thunderbird-l10n-zh-cn
tor
tor-geoipdb
sound-juicer
ssss
totem
unar
usbutils
......@@ -262,9 +249,7 @@ firmware-intel-sound
firmware-ipw2x00
firmware-iwlwifi
firmware-libertas
firmware-linux
firmware-linux-free
firmware-linux-nonfree
firmware-misc-nonfree
firmware-realtek
firmware-ti-connectivity
......@@ -351,11 +336,6 @@ modemmanager
usb-modeswitch
usb-modeswitch-data
### Monkeysign dependencies for qrcodes scanning
python-qrencode
python-zbar
python-zbarpygtk
### Printing support
foomatic-db
foomatic-db-engine
......
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