Make lint_po happy

config/chroot_local-hooks/99-set_mtimes

@@ -6,9 +6,7 @@ set -e
 echo "Setting mtime on large files whose content generally do not change"
 touch --no-create -t 197001010000 \
    /usr/lib/locale/locale-archive \
-   /usr/share/ppd/hplip/HP/*.ppd  \
-   /var/lib/anthy/anthy.dic       \
-   /var/lib/anthy/mkworddic/anthy.wdic
+   /usr/share/ppd/hplip/HP/*.ppd
 
 find /usr/share/doc/tails/website -depth -exec \
    touch --no-create -t 197001010000 '{}' \;

config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults

@@ -70,7 +70,7 @@ sleep-inactive-battery-type ='nothing'
 
 [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', 'TopIcons@phocean.net', 'status-menu-helper@tails.boum.org', 'torstatus@tails.boum.org', 'desktop-icons@csoriano']
-favorite-apps=['tor-browser.desktop', 'thunderbird.desktop', 'pidgin.desktop', 'org.keepassxc.KeePassXC.desktop', 'org.gnome.Nautilus.desktop', 'gnome-terminal.desktop']
+favorite-apps=['tor-browser.desktop', 'tails-persistence-setup.desktop', 'tails-documentation.desktop', 'whisperback.desktop', 'tails-installer.desktop', 'thunderbird.desktop', 'org.keepassxc.KeePassXC.desktop', 'pidgin.desktop', 'org.gnome.Nautilus.desktop']
 
 [org/gnome/shell/extensions/desktop-icons]
 icon-size='small'

config/chroot_local-includes/usr/local/lib/tails-configure-keyboard

@@ -23,24 +23,24 @@ fi
 LANGPREFIX=`echo "$LANG" | sed 's/_.*//'`
 case "$LANGPREFIX" in
    ja)
-      PRELOAD="['anthy', 'libpinyin', 'hangul', 'Unikey', 'chewing']"
-      SOURCES="[$SOURCES, ('ibus', 'anthy'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
+      PRELOAD="['mozc-jp', 'libpinyin', 'hangul', 'Unikey', 'chewing']"
+      SOURCES="[$SOURCES, ('ibus', 'mozc-jp'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
       ;;
    ko)
-      PRELOAD="['hangul', 'libpinyin', 'anthy', 'Unikey', 'chewing']"
-      SOURCES="[$SOURCES, ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy'), ('ibus', 'Unikey')]"
+      PRELOAD="['hangul', 'libpinyin', 'mozc-jp', 'Unikey', 'chewing']"
+      SOURCES="[$SOURCES, ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'mozc-jp'), ('ibus', 'Unikey')]"
       ;;
    vi)
-      PRELOAD="['Unikey', 'hangul', 'libpinyin', 'anthy', 'chewing']"
-      SOURCES="[$SOURCES, ('ibus', 'Unikey'), ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy')]"
+      PRELOAD="['Unikey', 'hangul', 'libpinyin', 'mozc-jp', 'chewing']"
+      SOURCES="[$SOURCES, ('ibus', 'Unikey'), ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'mozc-jp')]"
       ;;
    zh)
-      PRELOAD="['libpinyin', 'chewing', 'anthy', 'hangul', 'Unikey']"
-      SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
+      PRELOAD="['libpinyin', 'chewing', 'mozc-jp', 'hangul', 'Unikey']"
+      SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'mozc-jp'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
       ;;
    *)
-      PRELOAD="['libpinyin', 'anthy', 'hangul', 'Unikey', 'chewing']"
-      SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'chewing')]"
+      PRELOAD="['libpinyin', 'mozc-jp', 'hangul', 'Unikey', 'chewing']"
+      SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'mozc-jp'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'chewing')]"
       ;;
 esac
 

config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt

-http://torbrowser-archive.tails.boum.org/9.0.9-build1/
+http://torbrowser-archive.tails.boum.org/9.0.10-build2/

config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt

-cf910b9577dc94bcfeef60fe9904e7f8f29277bf1a7360600c32956225d04473  tor-browser-linux64-9.0.9_en-US.tar.xz
-c90d6b87c671a9dadeeaed84311511a21e067f39eab52d1b4e15bcb4c2dcf1ef  langpacks-tor-browser-linux64-9.0.9.tar.xz
+71bdf80a64488b95a621ab3275fa2de79cf7e671df41982d1f43bc1c17749c1d  tor-browser-linux64-9.0.10_en-US.tar.xz
+f699e2e9ee2f0db3a144801971ea3854604f82a08544db69ba38c05224bc9914  langpacks-tor-browser-linux64-9.0.10.tar.xz

config/chroot_local-includes/usr/src/iuk/dist.ini

@@ -6,6 +6,22 @@ license          = GPL_3
 copyright_holder = Tails developers
 copyright_year   = 2013
 
+; Author tests prereqs
+; authordep File::Find::Rule
+; authordep GnuPG::Interface
+; authordep HTTP::Server::Simple
+; authordep HTTP::Server::Simple::Static
+; authordep IO::Socket::SSL
+; authordep Module::Pluggable::Object
+; authordep Sys::Filesystem
+; authordep Test::BDD::Cucumber
+; authordep Test::EOL
+; authordep Test::Fatal
+; authordep Test::Most
+; authordep Test::Perl::Critic
+; authordep Test::Pod
+; authordep Test::Spec
+
 [MetaResources]
 homepage = https://tails.boum.org/
 repository.url  = git://git.tails.boum.org/tails

config/chroot_local-includes/usr/src/perl5lib/dist.ini

@@ -7,8 +7,11 @@ copyright_holder = Tails developers
 copyright_year   = 2014
 
 ; Author tests prereqs
+; authordep Module::Pluggable::Object
 ; authordep Test::EOL
+; authordep Test::Most
 ; authordep Test::Perl::Critic
+; authordep Test::Pod
 
 [MetaResources]
 homepage = https://tails.boum.org/

config/chroot_local-packageslists/tails-common.list

@@ -37,8 +37,6 @@ acl
 zenity
 # Needed by tails-htp-notify-user and others
 libdesktop-notify-perl
-# Needed by tails-transform-mirror-url
-nodejs
 # Needed by SSH's ProxyCommand
 netcat-openbsd
 # Needed by config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
@@ -287,7 +285,7 @@ ibus-libpinyin
 ## Chinese ZhuYin (Bopomofo)
 ibus-chewing
 ## Japanese
-ibus-anthy
+ibus-mozc
 ## Korean
 ibus-hangul
 ## Vietnamese
@@ -418,3 +416,6 @@ usbmuxd
 pdf-redact-tools
 tesseract-ocr
 ffmpeg
+
+# U2F support (i.e. in TorBrowser)
+libu2f-udev

config/chroot_local-packageslists/tails-perl5lib.list

@@ -19,3 +19,5 @@ libtype-tiny-xs-perl
 libtypes-path-tiny-perl
 libunix-mknod-perl
 libwww-curl-perl
+# Needed by tails-transform-mirror-url
+nodejs

debian/changelog

+tails (4.6) unstable; urgency=medium
+
+  * Security fixes
+    - Upgrade Tor Browser to 9.0.10-build2 (Closes: #17660).
+    - Upgrade Thunderbird to 1:68.7.0-1~deb10u1 (MFSA-2020-14, DSA-4656).
+    - Upgrade Git to 1:2.11.0-3+deb9u3 (DSA-4657, DSA-4659).
+    - Upgrade Node.js to 10.19.0~dfsg1-1 (DSA-4669).
+    - Upgrade OpenLDAP to 2.4.47+dfsg-3+deb10u2 (DSA-4666).
+    - Upgrade OpenSSL to 1.1.1d-0+deb10u3 (DSA-4661).
+    - Upgrade ReportLab to 3.5.13-1+deb10u1 (DSA-4663).
+    - Upgrade WebKitGTK to 2.26.4-1~deb10u3 (DSA-4658).
+
+  * Bugfixes
+    - Switch Japanese input method from Anthy to Mozc (Closes: #16719).
+    - Install the libu2f-udev package, for U2F device support.
+    - Update our list of 'Favorites' applications (Closes: #16990).
+
+  * Build system
+    - lint_po: support locales with "@" in their name, such as ru@petr1708
+      (Closes: #17554).
+    - perl5lib: declare missing test dependencies (Closes: #17591).
+    - iuk: declare missing test dependencies (Closes: #17592).
+    - Upgrade to po4a 0.55 for Tails images and Vagrant box (Closes: #17005).
+
+  * Test suite
+    - Print disk usage information when the test suite fails with “No
+      space left” errors.
+    - Ensure no zombie processes are left around, by cleaning subprocesses
+      correctly (Closes: #17551).
+    - Prevent webrick from becoming a zombie process.
+    - Avoid test suite getting stuck due to a zero timeout.
+    - Fix obsoletion warnings (Closes: #17552).
+    - Add root check and --allow-non-root option (Closes: #17613). Let's
+      make it clear running the test suite requires root privileges in
+      the general case.
+
+ -- Tails developers <tails@boum.org>  Mon, 04 May 2020 18:43:38 +0200
+
 tails (4.5) unstable; urgency=medium
 
   * Security fixes

features/scripts/vm-execute

@@ -46,7 +46,7 @@ opt_parser = OptionParser.new do |opts|
 end
 opt_parser.parse!(ARGV)
 cmd = ARGV.join(" ")
-c = RemoteShell::ShellCommand.new(FakeVM.new, cmd, cmd_opts)
+c = RemoteShell::ShellCommand.new(FakeVM.new, cmd, **cmd_opts)
 puts "Return status: #{c.returncode}"
 puts "STDOUT:\n#{c.stdout}"
 puts "STDERR:\n#{c.stderr}"

features/step_definitions/common_steps.rb

@@ -62,8 +62,13 @@ end