summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2019-12-07 15:09:28 +0000
committersajolida <sajolida@pimienta.org>2019-12-07 15:09:28 +0000
commitbac1bcbf3ee483d8f39f2c59116287d175dbe35e (patch)
tree6666a8e2d92e48ebed2e893a263aba694a28afcc
parent7f4acf94d734e602dc449ed831ae1d222ede3a95 (diff)
parentabfbe7d52bb305c88fb7b57ec5b01a435dbe8408 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--wiki/src/blueprint/GitLab.mdwn2
-rw-r--r--wiki/src/blueprint/monthly_report/report_2019_11.mdwn7
-rw-r--r--wiki/src/contribute/release_process.mdwn13
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml2
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml.pgp7
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml2
-rw-r--r--wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml.pgp7
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/alpha/upgrades.yml.pgp7
-rw-r--r--wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/stable/upgrades.yml.pgp7
-rw-r--r--wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml.pgp8
11 files changed, 59 insertions, 18 deletions
diff --git a/wiki/src/blueprint/GitLab.mdwn b/wiki/src/blueprint/GitLab.mdwn
index 881cffa..cb826a9 100644
--- a/wiki/src/blueprint/GitLab.mdwn
+++ b/wiki/src/blueprint/GitLab.mdwn
@@ -686,7 +686,7 @@ repository that meet certain conditions:
# GitLab hosting options
-See https://salsa.debian.org/tails-team/gitlab-migration/wikis/hosting/comparison
+See <https://salsa.debian.org/tails-team/gitlab-migration/wikis/hosting/comparison>
(tables in pure Markdown are too tedious for me -- intrigeri).
# Resources
diff --git a/wiki/src/blueprint/monthly_report/report_2019_11.mdwn b/wiki/src/blueprint/monthly_report/report_2019_11.mdwn
index c3ec106..dd0abd2 100644
--- a/wiki/src/blueprint/monthly_report/report_2019_11.mdwn
+++ b/wiki/src/blueprint/monthly_report/report_2019_11.mdwn
@@ -38,13 +38,12 @@ User experience
Hot topics on our help desk
===========================
-XXX: Ask tails-bugs@boum.org to list hot topics for the last month.
+1. Multiple users reported having trouble [[importing keys in Seahorse|https://redmine.tails.boum.org/code/issues/17183]]
-1.
+1. We also had some reports about [[issues with Nvidia|https://redmine.tails.boum.org/code/issues/17184]] [[graphics cards|https://redmine.tails.boum.org/code/issues/17155]]
-1.
+1. And MacOS users were affected by a [[bug in Etcher|https://redmine.tails.boum.org/code/issues/17185]]
-1.
Infrastructure
==============
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 6bfad97..0d8386c 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -15,9 +15,10 @@ To release Tails you'll need some packages installed:
* `tidy mktorrent transmission-cli`
* aufs DKMS module for your running kernel.
-* [[!debpts squashfs-tools]] that honors `$SOURCE_DATE_EPOCH`.
- If you're running Stretch or Buster, install it from our custom `devel` APT suite.
- If you're running Bullseye or sid, install it from sid.
+* [[!debpts squashfs-tools]]:
+ - If you're running Stretch or Buster, ensure you have the latest version
+ from our custom `iukbuilder-stretch` APT suite.
+ - If you're running Bullseye or sid, install it from sid.
* `tails-iuk` dependencies, including suggested packages (see
`debian/control` in the `debian` branch of its repo)
* `tails-perl5lib` dependencies (same trick as `tails-iuk` to get the
@@ -802,10 +803,8 @@ and run the following:
for source_version in $(echo ${IUK_SOURCE_VERSIONS:?}); do
squashfs_tools_version="$(dpkg-query --showformat '${Version}\n' --show squashfs-tools)"
- if [ "$squashfs_tools_version" != 1:4.3-3.0tails4 ] && \
- [ "$squashfs_tools_version" != 1:4.3-8.0tails1 ] && \
- dpkg --compare-versions "$squashfs_tools_version" lt 1:4.4-1; then
- echo 'ERROR! Your squashfs-tools probably does not honor SOURCE_DATE_EPOCH so any generated IUKs will *not* be reproducible!'
+ if dpkg --compare-versions "$squashfs_tools_version" lt '1:4.4-1~'; then
+ echo 'ERROR! Your squashfs-tools is too old so any generated IUKs will *not* be reproducible!'
break
fi
echo "Generating IUK file from ${source_version:?} to ${VERSION:?}"
diff --git a/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml
index ae8f060..2d52844 100644
--- a/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml
@@ -13,7 +13,7 @@ upgrades:
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-1.0~testoverlayfs/tails-amd64-1.0~testoverlayfs.iso
type: full
- target-files:
- - sha256: 725c9d0facab6cf4f0a3f708bbf393d638e2714d6eae0c3292718ae1dd80d373
+ - sha256: 828e55f83829b190ebee8b310b444b779c1cc9930010305368b908021825ecb2
size: 20480
url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_amd64_1.0~testoverlayfs_to_1.1~testoverlayfs.iuk
type: incremental
diff --git a/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml.pgp
new file mode 100644
index 0000000..dbe29c7
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/alpha/upgrades.yml.pgp
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCXek5nQAKCRCQsrS9eu0j
+X17DAP9f++yHTBRpRXEhnojS9QG7XoX4y3W9dTGv+zHlg73ixQD+LzPY13Ay0625
+sjLUFxTL0bi1x6bQF68l8hAlSEBamAE=
+=VIY3
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml
index 4424d44..a69ed72 100644
--- a/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml
@@ -13,7 +13,7 @@ upgrades:
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-1.0~testoverlayfs/tails-amd64-1.0~testoverlayfs.iso
type: full
- target-files:
- - sha256: 725c9d0facab6cf4f0a3f708bbf393d638e2714d6eae0c3292718ae1dd80d373
+ - sha256: 828e55f83829b190ebee8b310b444b779c1cc9930010305368b908021825ecb2
size: 20480
url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_amd64_1.0~testoverlayfs_to_1.1~testoverlayfs.iuk
type: incremental
diff --git a/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml.pgp
new file mode 100644
index 0000000..739d41f
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.0~testoverlayfs/amd64/stable/upgrades.yml.pgp
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCXek5mQAKCRCQsrS9eu0j
+X9qBAQDKvbgoKiTGhvnmImWugYnzZ+2yQIbpAQ6t4SNrf44JJQEAmEYnULR+pUIh
+da8Cc4yeMprWuc0BqsuKqln33LVGqwM=
+=o5wl
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/alpha/upgrades.yml.pgp
new file mode 100644
index 0000000..eada7a3
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/alpha/upgrades.yml.pgp
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCXen+bwAKCRCQsrS9eu0j
+X339AQC3pP9aMQomDgKIBdMf29ZdgFTXdQsNK1nNWEbkn5G86wEAlXd2aeIhAdSS
+/fcpi+5FR6l+cHR5XYNhwffSQPPoAAo=
+=ulNa
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/stable/upgrades.yml.pgp
new file mode 100644
index 0000000..f555865
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.1~testoverlayfs/amd64/stable/upgrades.yml.pgp
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCXen+egAKCRCQsrS9eu0j
+X2W0AP9dqVRrxNgGrfykFgCnUthATQwXSge6QpX69e2dmsFe4AEAnvTpDb2Oz3oD
+yAtMY0F8lHX20JnXzF0UCLUZ8XioggE=
+=qKOA
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml
index a1c3efa..79b671e 100644
--- a/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml
@@ -3,3 +3,18 @@ build-target: amd64
channel: alpha
product-name: Tails
product-version: 4.0~rc1
+upgrades:
+- details-url: https://tails.boum.org/news/version_4.0/
+ type: major
+ upgrade-paths:
+ - target-files:
+ - sha256: 26469ff8f760cf90b349dc20b6159dfa7cf49725d2e86a626baeac7287ca25eb
+ size: 1135089664
+ url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-4.0/tails-amd64-4.0.iso
+ type: full
+ - target-files:
+ - sha256: ab7f224cecc124e0a276d3e31a54ff4f87c8cb8852d6584b5c8aa240005d3081
+ size: 145756160
+ url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_amd64_4.0~rc1_to_4.0.iuk
+ type: incremental
+ version: '4.0'
diff --git a/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml.pgp
index 68f4bdf..97caa65 100644
--- a/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/4.0~rc1/amd64/alpha/upgrades.yml.pgp
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNATURE-----
-iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCXW2OBgAKCRCQsrS9eu0j
-X6gpAQDHH63G9BJRcL/+TZfYD81ITqaX+3vFmIM4vK45QO6QZgD/Sq7zZpM4DenS
-A/YF3ZZnbuH/FdZD4be7ZH82d1LxoAY=
-=SJ2U
+iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCXek7BwAKCRCQsrS9eu0j
+XwFbAQCyPrFjCAdUjFKOo3dQnJuHJkr0K91tN9NNhEYaByzayQEA0KJOZUw1H98P
+gixpNN7U2zDR723BbzLsS9M2V73Y+Qc=
+=dZRp
-----END PGP SIGNATURE-----