Commit 97386f05 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'devel' into bugfix/10754-electrum-2.5.4-2

parents c940cf29 6d33424f
......@@ -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,14 @@ Package: torsocks
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: xserver-xorg-video-intel
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
......
......@@ -6,5 +6,5 @@ echo "Generating Tor Browser profile"
set -e
/usr/local/bin/generate-tor-browser-profile
/usr/local/lib/generate-tor-browser-profile
mv ~/.tor-browser /etc/skel
......@@ -52,6 +52,7 @@ sed -i 's|^.*\(wrapper\.java\.additional\.6=-Djava\.net\.preferIPv6Addresses=\).
# * In-I2P Network Updates: Disabled
# * Inbound connections: Disabled (setting is "i2cp.ntcp.autoip")
# * Disable I2P plugins
# * Disable NTP
cat > "$I2P/router.config" << EOF
# NOTE: This I2P config file must use UTF-8 encoding
i2cp.disableInterface=true
......@@ -61,6 +62,7 @@ i2np.udp.ipv6=false
router.isHidden=true
router.updateDisabled=true
router.enablePlugins=false
time.disabled=true
EOF
cat > "$I2P/susimail.config" << EOF
......
......@@ -8,5 +8,5 @@ CONFFILE='/etc/default/htpdate.user-agent'
install -o root -g root -m 0644 /dev/null "$CONFFILE"
echo "HTTP_USER_AGENT=\"$(/usr/local/bin/getTorBrowserUserAgent)\"" \
echo "HTTP_USER_AGENT=\"$(/usr/local/lib/getTorBrowserUserAgent)\"" \
> "$CONFFILE"
#!/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
......@@ -211,7 +211,7 @@ is_clock_way_off() {
start_notification_helper() {
export_gnome_env
exec /bin/su -c /usr/local/bin/tails-htp-notify-user "$LIVE_USERNAME" &
exec /bin/su -c /usr/local/lib/tails-htp-notify-user "$LIVE_USERNAME" &
}
......
......@@ -85,5 +85,5 @@ antialiasing = 'rgba'
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']
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'topIcons@adel.gadllah@gmail.com', 'shutdown-helper@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
[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
user_pref("extensions.enigmail.configuredVersion", "1.7.2");
user_pref("extensions.enigmail.configuredVersion", "1.8.2");
[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;
......@@ -3,7 +3,7 @@ ProxyCommand none
Host *
ProxyCommand /usr/local/bin/connect-socks %h %p
ProxyCommand /usr/local/lib/connect-socks %h %p
Ciphers aes256-ctr,aes256-cbc,aes128-ctr,aes128-cbc,3des-cbc
MACs hmac-sha1,hmac-md5,hmac-ripemd160
......
amnesia ALL = NOPASSWD: /usr/local/sbin/kill-boot-profile
amnesia ALL = NOPASSWD: /usr/local/lib/kill-boot-profile
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