summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2019-02-20 17:19:24 +0100
committeranonym <anonym@riseup.net>2019-02-20 17:19:24 +0100
commitd72efd1f7baf2037e58813ffbdf3b45a7e809b5c (patch)
tree761e9371950f827422713cc15ec17405924eeae1
parent7235487c3e89c2535498ba3e1ea3d213e2cfcdb2 (diff)
parent180e763f194cbdbe3b0357663a2a62798aec0fa3 (diff)
Merge remote-tracking branch 'origin/bugfix/16462-16458-stretch-9.8-linux-4.19.20+force-all-tests' into stable
Fix-committed: #16462, #16458
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/amnesia2
-rw-r--r--config/chroot_apt/preferences2
-rw-r--r--config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff2
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial2
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial2
6 files changed, 6 insertions, 6 deletions
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index 676c145..232a529 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2019012304
+2019021901
diff --git a/config/amnesia b/config/amnesia
index 887afec..c171407 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-1'
+KERNEL_VERSION='4.19.0-3'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index e4fddcf..3c9f653 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -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
diff --git a/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff b/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff
index 6067473..376b067 100644
--- a/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff
+++ b/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff
@@ -1,6 +1,6 @@
--- a/usr/share/webext/ublock-origin/js/background.js 2018-10-11 17:14:14.000000000 +0200
+++ b/usr/share/webext/ublock-origin/js/background.js 2018-10-12 12:07:07.951778615 +0200
-@@ -77,7 +77,7 @@
+@@ -74,7 +74,7 @@
userSettings: {
advancedUserEnabled: false,
alwaysDetachLogger: true,
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial
index 676c145..232a529 100644
--- a/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial
@@ -1 +1 @@
-2019012304
+2019021901
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial
index 676c145..232a529 100644
--- a/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2019012304
+2019021901