Commit 33223686 authored by Cyril 'kibi' Brulebois's avatar Cyril 'kibi' Brulebois
Browse files

Merge branch 'web/release-3.13' (Fix-committed: #16470, #16565).

parents 6e77361b 89749e3a
......@@ -112,7 +112,7 @@ DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --keyring=$DEBOOTSTRAP_GNUPG_KEYRING"
export DEBOOTSTRAP_OPTIONS
: ${MKSQUASHFS_OPTIONS:='-comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K -no-exports'}
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/tails/build/mksquashfs-excludes"
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -mem 512M -wildcards -ef chroot/usr/share/tails/build/mksquashfs-excludes"
export MKSQUASHFS_OPTIONS
# build the doc wiki
......
......@@ -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.19.0-1'
KERNEL_VERSION='4.19.0-4'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
#!/bin/bash
set -e
# Including common functions
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'checking the size of the initramfs')"
HELP=""
USAGE="${PROGRAM}"
# Reading configuration files
Read_conffiles config/all config/common config/binary
Set_defaults
Echo_message "checking the size of the initramfs"
INITRAMFS=$(readlink --canonicalize binary/live/initrd.img)
MAX_SIZE=$((35 * 1024 * 1024)) # in bytes
ACTUAL_SIZE=$(stat --format='%s' "$INITRAMFS")
if [ "$ACTUAL_SIZE" -gt "$MAX_SIZE" ]; then
echo "E: initramfs is larger ($ACTUAL_SIZE bytes) than the maximum allowed ($MAX_SIZE)" >&2
exit 1
fi
This diff is collapsed.
......@@ -49,7 +49,7 @@ Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
Package: linux-compiler-* linux-headers-* linux-image-* linux-kbuild-* linux-source-*
Pin: version 4.19.13-1
Pin: release o=Debian,n=sid
Pin-Priority: 999
Explanation: We ship our custom-built Thunderbird for now, see #6156
......@@ -106,11 +106,6 @@ Package: tails-installer
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Explanation: #16348
Package: tor tor-geoipdb
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: virtualbox*
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
......
#!/bin/sh
set -e
set -u
echo "Checking for Thunderbird language packages"
SUFFIX="@thunderbird.mozilla.org.xpi"
LANG_PACK_COUNT=$(find /usr/share/thunderbird/extensions/ -name "langpack-*${SUFFIX}" | wc -l)
if [ "$LANG_PACK_COUNT" = "0" ]; then
cat >&2 <<EOF
E: No language packages matching the ${SUFFIX} suffix.
It is likely that tails-shell-library/thunderbird.sh needs an update
EOF
exit 1
else
echo "I: ${LANG_PACK_COUNT} language packages found" >&2
fi
......@@ -10,16 +10,14 @@ echo "Configuring compression of the initramfs"
ensure_hook_dependency_is_installed initramfs-tools xz-utils fatresize
# Compress the initramfs using a more size-wise efficient algorithm.
# We do this late in the build process because compressing with XZ
# takes much longer than compressing with the default algorithm
# and earlier stages of the build generate the initramfs quite a few times.
# live-build will regenerate it later on anyway, which will apply
# the settings we configure here.
OPTS_FILE='/etc/initramfs-tools/initramfs.conf'
[ -f "${OPTS_FILE}" ] || exit 11
sed -i'' 's,^COMPRESS=.*,COMPRESS=xz,' "${OPTS_FILE}"
# Force an initramfs update to apply our new compression settings.
# We're relying on the fact that 1 XZ compression takes less time than
# 6 * (XZ compression time - default compression time), so that making
# faster the 6 initramfs updates that we currently go through during
# the build is worth updating the initramfs a 7th time.
update-initramfs -u
......@@ -47,8 +47,11 @@ pref("toolkit.telemetry.enabled", false);
// Only allow SSL channels when fetching from the ISP.
pref("mailnews.auto_config.fetchFromISP.ssl_only", true);
// Only allow Thunderbird's automatic configuration wizard to use and
// configure secure (SSL/TLS) protocols. This is the Thunderbird default
// but let's be extra sure!
// configure secure (SSL/TLS) protocols.
pref("mailnews.auto_config.ssl_only_mail_servers", true);
// Old name for mailnews.auto_config.ssl_only_mail_servers, to make
// this configuration still work in case we have to revert to a previous
// version of the #6156 patchset.
pref("mailnews.auto_config.account_constraints.ssl_only", true);
// Drop auto-fetched configurations using Oauth2 -- they do not work
// together with Torbirdy since it disables needed functionality (like
......
......@@ -6,7 +6,7 @@ ConditionFileNotEmpty=/live/persistence/TailsData_unlocked/live-additional-softw
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/local/sbin/tails-additional-software install
ExecStart=-/usr/local/sbin/tails-additional-software install
ExecStartPost=/usr/bin/install -m 0644 -D /dev/null /run/live-additional-software/installed
TimeoutStartSec=infinity
PrivateDevices=yes
......
......@@ -153,6 +153,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
# Translators: Don't translate {package}, it's a placeholder and will be replaced.
_("Stop installing {package} "
"automatically").format(package=package_name))
remove_button.get_accessible().set_name(_("Remove"))
remove_button.connect(
"clicked", self.cb_listboxrow_remove_button_clicked,
package_name)
......
......@@ -2,8 +2,10 @@
set -e
# Import the TOR_LAUNCHER_INSTALL variable, and exec_unconfined_firefox()
# and configure_best_tor_launcher_locale()
# Import:
# - the TBB_EXT and TOR_LAUNCHER_INSTALL variables;
# - the exec_unconfined_firefox() and configure_best_tor_launcher_locale()
# functions.
. /usr/local/lib/tails-shell-library/tor-browser.sh
unset TOR_CONTROL_PASSWD
......@@ -18,8 +20,11 @@ fi
PROFILE="${HOME}/.tor-launcher/profile.default"
if [ ! -d "${PROFILE}" ]; then
mkdir -p "${PROFILE}"
configure_best_tor_launcher_locale "${PROFILE}"
mkdir -p "${PROFILE}/extensions"
for ext in "${TBB_EXT}"/langpack-*.xpi; do
ln -s "${ext}" "${PROFILE}/extensions/"
done
configure_best_tor_launcher_locale "${PROFILE}"
fi
exec_unconfined_firefox \
......
......@@ -6,6 +6,8 @@ import os.path
import subprocess
import sys
from tailslib.gnome import gnome_env_vars
import gi
from gi.repository import GLib
......@@ -56,7 +58,9 @@ class ASPNotifier(object):
elif action == "deny":
sys.exit(3)
elif action == "documentation":
subprocess.Popen(["tails-documentation", user_data])
subprocess.Popen(
["env", *gnome_env_vars(), "tails-documentation", user_data]
)
sys.exit(5)
def cb_notification_closed(self, notification):
......
......@@ -23,29 +23,24 @@ fi
LANGPREFIX=`echo "$LANG" | sed 's/_.*//'`
case "$LANGPREFIX" in
ja)
PRELOAD="['anthy', 'pinyin', 'hangul', 'Unikey', 'bopomofo']"
SOURCES="[$SOURCES, ('ibus', 'anthy'), ('ibus', 'pinyin'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'bopomofo')]"
NEEDIBUS='y'
PRELOAD="['anthy', 'libpinyin', 'hangul', 'Unikey', 'chewing']"
SOURCES="[$SOURCES, ('ibus', 'anthy'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
;;
ko)
PRELOAD="['hangul', 'pinyin', 'anthy', 'Unikey', 'bopomofo']"
SOURCES="[$SOURCES, ('ibus', 'hangul'), ('ibus', 'pinyin'), ('ibus', 'anthy'), ('ibus', 'Unikey'), ('ibus', 'bopomofo')]"
NEEDIBUS='y'
PRELOAD="['hangul', 'libpinyin', 'anthy', 'Unikey', 'chewing']"
SOURCES="[$SOURCES, ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy'), ('ibus', 'Unikey')]"
;;
vi)
PRELOAD="['Unikey', 'hangul', 'pinyin', 'anthy', 'bopomofo']"
SOURCES="[$SOURCES, ('ibus', 'Unikey'), ('ibus', 'hangul'), ('ibus', 'pinyin'), ('ibus', 'anthy'), ('ibus', 'bopomofo')]"
NEEDIBUS='y'
PRELOAD="['Unikey', 'hangul', 'libpinyin', 'anthy', 'chewing']"
SOURCES="[$SOURCES, ('ibus', 'Unikey'), ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy')]"
;;
zh)
PRELOAD="['pinyin', 'bopomofo', 'anthy', 'hangul', 'Unikey']"
SOURCES="[$SOURCES, ('ibus', 'pinyin'), ('ibus', 'bopomofo'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
NEEDIBUS='y'
PRELOAD="['libpinyin', 'chewing', 'anthy', 'hangul', 'Unikey']"
SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
;;
*)
PRELOAD="['pinyin', 'anthy', 'hangul', 'Unikey', 'bopomofo']"
SOURCES="[$SOURCES, ('ibus', 'pinyin'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'bopomofo')]"
NEEDIBUS='n'
PRELOAD="['libpinyin', 'anthy', 'hangul', 'Unikey', 'chewing']"
SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'chewing')]"
;;
esac
......
GNOME_ENV_VARS="
DBUS_SESSION_BUS_ADDRESS
DISPLAY
XAUTHORITY
XDG_RUNTIME_DIR
"
export_gnome_env() {
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
local gnome_shell_pid="$(pgrep --newest --euid ${LIVE_USERNAME} gnome-shell)"
local tmp_env_file="$(tempfile)"
local vars="(DBUS_SESSION_BUS_ADDRESS|DISPLAY|XAUTHORITY)"
local vars="($(echo ${GNOME_ENV_VARS} | tr ' ' '|'))"
tr '\0' '\n' < "/proc/${gnome_shell_pid}/environ" | \
grep -E "^${vars}=" > "${tmp_env_file}"
while read line; do export "${line}"; done < "${tmp_env_file}"
......
......@@ -107,13 +107,16 @@ def _notify(title, body="", accept_label="", deny_label="",
urgent = ""
try:
completed_process = subprocess.run(["sudo", "-u", LIVE_USERNAME, cmd,
title, body, accept_label,
deny_label, documentation_target,
urgent],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True)
completed_process = subprocess.run(
[
"sudo", "-u", LIVE_USERNAME,
cmd, title, body, accept_label, deny_label,
documentation_target, urgent
],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True
)
if completed_process.returncode == 1:
# sudo failed to execute the command
raise OSError(completed_process.stderr)
......
......@@ -8,3 +8,5 @@ MimeType=application/x-tcrypt-container
Terminal=false
Categories=GTK;Encryption;Utility;X-GNOME-Utilities;
Keywords=VeraCrypt;TrueCrypt;Encryption;Volume;Container;Device;Mount;Unlock;Decrypt
StartupNotify=true
StartupWMClass=unlock-veracrypt-volumes
......@@ -77,6 +77,9 @@
<property name="label" translatable="yes">The following software is installed automatically from your persistent storage when starting Tails.</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
<accessibility>
<relation type="label-for" target="listbox"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
......
http://torbrowser-archive.tails.boum.org/8.0.6-build1/
http://torbrowser-archive.tails.boum.org/8.0.7-build3/
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