summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-18 05:59:16 +0000
committerintrigeri <intrigeri@boum.org>2019-03-18 05:59:16 +0000
commit3286c7a4459504d11991a2cbea9eb389cb9ec002 (patch)
treeced6baf9c40f947e69684a7b5b3254a00b6e0057
parentb02cfe43722c7f1fdfb5d7a8a24c9fdca03cc588 (diff)
parent58ab820453766f77a97611ad96bdb7356bea2cdd (diff)
Merge remote-tracking branch 'origin/stable' into bugfix-16422-thunderbird-60.5.1
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/amnesia2
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-additional-software-install.service2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-configure-keyboard25
-rw-r--r--config/chroot_local-packageslists/tails-common.list6
-rw-r--r--features/step_definitions/common_steps.rb6
-rw-r--r--features/step_definitions/usb.rb6
7 files changed, 27 insertions, 22 deletions
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index 232a529..1104572 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2019021901
+2019031601
diff --git a/config/amnesia b/config/amnesia
index c171407..e9ff4d1 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -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-3'
+KERNEL_VERSION='4.19.0-4'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-additional-software-install.service b/config/chroot_local-includes/lib/systemd/system/tails-additional-software-install.service
index 4f57709..72a4603 100644
--- a/config/chroot_local-includes/lib/systemd/system/tails-additional-software-install.service
+++ b/config/chroot_local-includes/lib/systemd/system/tails-additional-software-install.service
@@ -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
diff --git a/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard b/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard
index 4ae9639..c25119c 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard
+++ b/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard
@@ -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
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 9084578..77f032b 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -276,8 +276,10 @@ xserver-xorg-video-amdgpu
ibus-gtk
ibus-gtk3
ibus-qt4
-## Chinese
-ibus-pinyin
+## Chinese Pinyin and ZhuYin (Bopomofo)
+ibus-libpinyin
+## Chinese ZhuYin (Bopomofo)
+ibus-chewing
## Japanese
ibus-anthy
## Korean
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 7a802a2..4f5601a 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -953,8 +953,12 @@ Given /^Tails is fooled to think it is running version (.+)$/ do |version|
)
end
+def running_tails_version
+ $vm.execute_successfully('tails-version').stdout.split.first
+end
+
Then /^Tails is running version (.+)$/ do |version|
- v1 = $vm.execute_successfully('tails-version').stdout.split.first
+ v1 = running_tails_version
assert_equal(version, v1, "The version doesn't match tails-version's output")
v2 = $vm.file_content('/etc/os-release')
.scan(/TAILS_VERSION_ID="(#{version})"/).flatten.first
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index 2553388..7a8306d 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -556,10 +556,14 @@ Then /^all persistence configuration files have safe access rights$/ do
persistent_volumes_mountpoints.each do |mountpoint|
assert($vm.execute("test -e #{mountpoint}/persistence.conf").success?,
"#{mountpoint}/persistence.conf does not exist, while it should")
+ if running_tails_version.to_f >= 3.13
+ assert($vm.execute("test -e #{mountpoint}/persistence.conf.bak").success?,
+ "#{mountpoint}/persistence.conf.bak does not exist, while it should")
+ end
assert($vm.execute("test ! -e #{mountpoint}/live-persistence.conf").success?,
"#{mountpoint}/live-persistence.conf does exist, while it should not")
$vm.execute(
- "ls -1 #{mountpoint}/persistence.conf #{mountpoint}/live-*.conf"
+ "ls -1 #{mountpoint}/persistence.conf* #{mountpoint}/live-*.conf"
).stdout.chomp.split.each do |f|
file_owner = $vm.execute("stat -c %U '#{f}'").stdout.chomp
file_group = $vm.execute("stat -c %G '#{f}'").stdout.chomp