Commit 42441f97 authored by anonym's avatar anonym

Merge branch 'feature/17841-17828-17790-17835-upgrades-for-4.10+force-all-tests' into 'stable'

Upgrades for 4.10: Linux, Electrum, Debian Buster 10.5, firmware

Closes #17841, #17828, #17790, #17834, and #15952

See merge request !123
parents dcba2138 0a16c52d
......@@ -9,9 +9,7 @@ AllCops:
# Let's ignore this script until we start using it and maintaining
# the corresponding doc-source-relationships.yml
- 'bin/doc-impacted-by'
# XXX:Buster: bump to 2.5 once we require Buster to build Tails and to run our
# test suite
TargetRubyVersion: 2.3
TargetRubyVersion: 2.5
Layout/HashAlignment:
EnforcedHashRocketStyle: table
......
......@@ -23,7 +23,7 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo
AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
# Kernel version
KERNEL_VERSION='5.7.0-1'
KERNEL_VERSION='5.7.0-2'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
......@@ -7,8 +7,23 @@ Pin: release o=Debian,n=sid
Pin-Priority: 999
Explanation: unavailable in Buster
Package: electrum python3-electrum python3-aiohttp-socks python3-aiorpcx
Pin: release o=Debian,n=sid
Package: electrum python3-electrum python3-aiohttp-socks python3-aiorpcx python3-ecdsa
Pin: release o=Debian,n=bullseye
Pin-Priority: 999
Explanation: Electrum needs a version newer than the one in Buster
Package: python3-attr python3-protobuf libprotobuf23
Pin: release o=Debian,n=buster-backports
Pin-Priority: 990
Explanation: Electrum 4.0.2 and recent TREZOR firmware need 0.12
Package: python3-trezor trezor
Pin: release o=Debian,n=bullseye
Pin-Priority: 999
Explanation: python3-trezor needs a version newer than the one in Buster
Package: python3-usb1
Pin: release o=Debian,n=bullseye
Pin-Priority: 999
Package: firmware-b43-installer
......
......@@ -35,7 +35,7 @@ def main(*args):
# Disable update checking for all users (even those who made their config
# persistent before we changed this value in the default config), because
# users can't easily update to a new version anyway if it's not in Debian.
subprocess.run(['/usr/bin/electrum', 'setconfig', 'check_updates', 'false'], check=True, stdout=subprocess.DEVNULL)
subprocess.run(['/usr/bin/electrum', '--offline', 'setconfig', 'check_updates', 'false'], check=True, stdout=subprocess.DEVNULL)
os.execv('/usr/bin/electrum', ['/usr/bin/electrum'] + list(args))
......
--- a/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/uBlock0@raymondhill.net/js/background.js 2019-07-07 21:57:21.000000000 +0000
+++ b/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/uBlock0@raymondhill.net/js/background.js 2019-07-08 10:21:49.658415914 +0000
@@ -69,7 +69,7 @@
@@ -84,7 +84,7 @@
userSettings: {
advancedUserEnabled: false,
alwaysDetachLogger: true,
......
......@@ -384,6 +384,9 @@ xdotool
python3-trezor
trezor
# Electrum 4.0.2-0.1 needs one of pycryptodomex and cryptography
python3-cryptography
# onion-grater
python3-psutil
python3-yaml
......
buster-backports.chroot
\ No newline at end of file
deb http://ftp.us.debian.org/debian/ buster-backports main contrib non-free
......@@ -24,8 +24,12 @@ When /^I clone the Git repository "([\S]+)" in GNOME Terminal$/ do |repo|
end
Then /^the Git repository "([\S]+)" has been cloned successfully$/ do |repo|
assert($vm.directory_exist?("/home/#{LIVE_USER}/#{repo}/.git"))
assert($vm.file_exist?("/home/#{LIVE_USER}/#{repo}/.git/config"))
$vm.execute_successfully("cd '/home/#{LIVE_USER}/#{repo}/' && git status",
user: LIVE_USER)
# Git needs a strictly positive time, after seeing "Unpacking objects: 100%",
# before the conditions we check below are verified
try_for(10, msg: 'the Git repository has not been cloned') do
$vm.directory_exist?("/home/#{LIVE_USER}/#{repo}/.git")
$vm.file_exist?("/home/#{LIVE_USER}/#{repo}/.git/config")
$vm.execute("cd '/home/#{LIVE_USER}/#{repo}/' && git status",
user: LIVE_USER).success?
end
end
......@@ -250,7 +250,8 @@ When /^I unlock and mount this VeraCrypt (volume|file container) with GNOME Disk
pim_field.typeText($veracrypt_pim)
end
if @veracrypt_needs_keyfile
# not accessible and unreachable with the keyboard (#15952)
# XXX:Bullseye: port to Dogtail, as #15952 was fixed in GNOME Disks 3.35.2
@screen.wait('GnomeDisksUnlockDialogKeyfileComboBox.png', 5)
@screen.click('GnomeDisksUnlockDialogKeyfileComboBox.png')
@screen.wait('Gtk3FileChooserDesktopButton.png', 10)
$vm.file_overwrite('/tmp/keyfile', 'asdf')
......
......@@ -627,6 +627,7 @@ SquashFS file order
| \A(?:lib/live/mount/overlay/rw/)?etc/(?:group|gshadow|passwd|shadow)-\s
| \A(?:lib/live/mount/overlay/rw/)?etc/resolv-over-clearnet[.]conf\s
| \A(?:lib/live/mount/overlay/rw/)?etc/skel/[.]config/autostart/end-profile[.]desktop\s
| \Alib/modules/.*/kernel/drivers/(?:cpufreq|net)/
| \Arun/
| \Avar/lib/AccountsService/users/Debian-gdm\s
| \Avar/lib/gdm3/[#]\d+\s
......
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