Commit a7db4fa6 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/devel' into feature/10658-clean-up-path

parents c85cef39 cb2ef045
......@@ -63,6 +63,7 @@ chmod go+rX config/chroot_local-includes/home
chmod go+rX config/chroot_local-includes/lib
chmod go+rX config/chroot_local-includes/lib/live
chmod -R go+rx config/chroot_local-includes/lib/live/config
chmod go+rX config/chroot_local-includes/lib/live/mount
chmod -R go+rX config/chroot_local-includes/lib/systemd
chmod go+rX config/chroot_local-includes/live
chmod -R go+rX config/chroot_local-includes/usr
......
......@@ -13,7 +13,7 @@
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
# need to set block.events_dfl_poll_msecs
AMNESIA_APPEND="live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails"
AMNESIA_APPEND="live-media=removable apparmor=1 security=apparmor nopersistence noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails"
# Options passed to isohybrid
AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
......
......@@ -150,6 +150,10 @@ Package: torsocks
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: xul-ext-torbirdy
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Explanation: weirdness in chroot_apt install-binary
Package: *
Pin: release o=chroot_local-packages
......
#!/bin/sh
set -e
echo 'Updating icedove.desktop'
sed -i 's;^Exec=icedove;Exec=/usr/local/bin/icedove;' /usr/share/applications/icedove.desktop
......@@ -12,5 +12,5 @@ if grep -E '^application/pgp-keys=' "$defaults_file"; then
else
# XXX: Stretch -- this fixes Tails#10571, unreproducible on non-Tails sid
echo 'application/pgp-keys=seahorse-pgp-keys.desktop' \
> "$defaults_file"
>> "$defaults_file"
fi
[AccountTemplate]
#you can use $DEFAULTDOMAIN here
#domain must be defined before the variables that use it
#by default, domain is extracted from the hostname
domain=localhost
#you can use $USERNAME for name (this is the default)
#name=
#you can use $LOGIN, $NAME_MAIL and $DOMAIN here
#$NAME_MAIL is the name without uppercase and with dots instead
#of spaces
#the default is $NAME_MAIL@$DOMAIN
#email=
#you can use $DOMAIN here
#the default organization is empty
#organization=
#you can use $DOMAIN here
#the default is stmp.$DOMAIN
#smtpserver=
#Whether to use smtp authentication
#the default is 0 (no)
smtpauth=1
#SMTP username
#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
#the default is empty (same as reception username)
#smtpuser=
#SMTP password
#the default is empty (same as reception password)
#smtppass=
#recvtype can be:
#0 for pop3
#3 for imap
#5 for a local mbox file
recvtype=3
#you can use $DOMAIN here
#the default is {pop,imap}.$DOMAIN
#recvserver=
#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
#default is $LOGIN
#recvuser=
#default is empty
#recvpass=
#imap dir if imap (relative to the home on the server)
#default is empty
#imapdir=
#show subscribed folders only, if imap
#default is TRUE
#subsonly=
#mbox file if local
#you can use $LOGIN here
#default is /var/mail/$LOGIN
#mboxfile=
#mailbox name if pop3 or local
#relative path from the user's home
#default is "Mail"
mailbox=.claws-mail/Mail
#whether to use ssl on STMP connections
#default is 0, 1 is ssl, 2 is starttls
smtpssl=1
#whether to use ssl on pop or imap connections
#default is 0, 1 is ssl, 2 is starttls
recvssl=1
[Plugins_GTK2]
/usr/lib/claws-mail/plugins/pgpcore.so
/usr/lib/claws-mail/plugins/pgpmime.so
/usr/lib/claws-mail/plugins/pgpinline.so
[Common]
enable_aspell=0
display_xface=0
render_html=0
invoke_plugin_on_html=0
promote_html_part=0
enable_log_standard=0
enable_log_warning=0
enable_log_error=0
enable_log_status=0
skip_ssl_cert_check=0
unsafe_ssl_certs=0
use_networkmanager=1
io_timeout_secs=120
autosave=0
send_dialog_mode=1
[GPG]
auto_check_signatures=1
use_gpg_agent=1
store_passphrase=0
gpg_warning=1
From
To
Cc
Subject
Date
Reply-To
Sender
Followup-To
-Received
-Message-ID
-In-Reply-To
-References
-Mime-Version
-Content-Type
-Content-Transfer-Encoding
-X-UIDL
-Precedence
-Status
-Priority
-X-Face
[Default Applications]
x-scheme-handler/mailto=claws-mail.desktop
x-scheme-handler/mailto=icedove.desktop
[Added Associations]
x-scheme-handler/mailto=claws-mail.desktop;
x-scheme-handler/mailto=icedove.desktop;
# This is the configuration for libtsocks (transparent socks) for use
# with the Tails mail user agent: /usr/local/bin/torified-claws-mail
# with the Tails mail user agent: /usr/local/bin/icedove
#
# See tsocks.conf(5) and torify(1) manpages.
......
/live/persistence
\ No newline at end of file
......@@ -2,4 +2,4 @@
# Start Pidgin with the GNOME integration disabled, so that the
# "Global proxy configuration" is used, which we set to use Tor
exec env GNOME_DESKTOP_SESSION_ID="" /usr/bin/pidgin
exec env GNOME_DESKTOP_SESSION_ID="" /usr/bin/pidgin "${@}"
#!/bin/sh
TSOCKS_CONF_FILE=/etc/tor/tor-tsocks-mua.conf /usr/bin/tsocks.distrib claws-mail
......@@ -6,7 +6,7 @@ PHYSICAL_SECURITY_SETTINGS='/var/lib/live/config/tails.physical_security'
_get_tg_setting() {
if [ -r "${1}" ]; then
. "${1}"
eval "echo \$${2}"
eval "echo \${${2}:-}"
fi
}
......
......@@ -70,11 +70,6 @@ cryptsetup
rsync
bash-completion
bookletimposer
claws-mail
claws-mail-archiver-plugin
claws-mail-i18n
claws-mail-pgpinline
claws-mail-pgpmime
connect-proxy
desktop-base
dmz-cursor-theme
......
--- a/usr/share/applications/claws-mail.desktop 2014-10-28 00:50:16.000000000 +0000
+++ b/usr/share/applications/claws-mail.desktop 2014-11-26 17:13:35.000000000 +0000
@@ -16,7 +16,7 @@
GenericName[pt-br]=Cliente de e-mail
GenericName[sk]=Poštový klient
GenericName[sv]=E-postklient
-Exec=claws-mail %u
+Exec=/usr/local/bin/torified-claws-mail
Icon=claws-mail
Categories=Network;Email;
Keywords=lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;
tails (2.0~beta1) UNRELEASED; urgency=medium
tails (2.0) UNRELEASED; urgency=medium
* Dummy entry for next release.
-- Tails developers <tails@boum.org> Tue, 22 Dec 2015 22:21:30 +0000
tails (2.0~beta1) unstable; urgency=medium
* Major new features and changes
- Upgrade to Debian 8 (Jessie).
......
......@@ -222,10 +222,11 @@ po_master_language: en|English
# slave languages (translated via PO files) format: ll|Langname
po_slave_languages:
- de|Deutsch
- fa|Farsi
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
......@@ -199,10 +199,11 @@ po_master_language: en|English
# slave languages (translated via PO files) format: ll|Langname
po_slave_languages:
- de|Deutsch
- fa|Farsi
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
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