summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-22 17:22:00 +0000
committerintrigeri <intrigeri@boum.org>2019-03-22 17:22:00 +0000
commitcb0ee8c6ec0999e6d5df36b7d43c6661d9c5b9f9 (patch)
tree77e1e5664a53cf45b05bbf9ed52f4ef34975145c
parente0811fb447d7ddd63f813bbc8eb1870670f4a831 (diff)
parentf1a662ef3c209d886279dcb9d74afd3d60758c77 (diff)
Merge remote-tracking branch 'origin/master' into stable
-rw-r--r--wiki/src/contribute/calendar.mdwn4
-rw-r--r--wiki/src/contribute/release_process.mdwn71
-rw-r--r--wiki/src/donate.de.po23
-rwxr-xr-xwiki/src/donate.es.po23
-rw-r--r--wiki/src/donate.fa.po10
-rw-r--r--wiki/src/donate.fr.po23
-rw-r--r--wiki/src/donate.html6
-rw-r--r--wiki/src/donate.it.po10
-rw-r--r--wiki/src/donate.pt.po10
9 files changed, 88 insertions, 92 deletions
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 9ae60b8..fa35912 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -4,9 +4,9 @@ All times are referenced to Berlin and Paris time.
## 2019Q1
-* 2019-03-19: Test and **release Tails 3.13** (kibi is the RM)
+* 2019-03-23: Build and upload **release Tails 3.13.1** (intrigeri is the RM)
-* 2019-03-20 to 2019-03-22: [[!wikipedia Pwn2Own]], which often triggers an emergency Firefox release
+* 2019-03-24: Test and **release Tails 3.13.1** (Firefox 60.6.1, Tor Browser 8.0.8; bugfix release — intrigeri is the RM; XXX is the TR)
* 2019-04-02 to 2019-04-05: [[Foundations Team|contribute/working_together/roles/foundations_team]] sprint
- Port Tails to Debian 10 (Buster)
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 81de7f4..b341b86 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -152,7 +152,7 @@ Bootstrap manual testing coordination:
2. Copy the [[manual test suite|contribute/release_process/test]]
into it.
3. Send the pad URL to the usual testers (see `manual_testers.mdwn` in
- the RM team's Git repository).
+ the RM team's Git repository), end-to-end encrypted.
Update included files
=====================
@@ -212,7 +212,7 @@ See the dedicated page: [[tor-browser]]
Upgrade Tor Browser AppArmor profile
------------------------------------
-See the dedicated page: [[browser-apparmor-patch]]
+See the dedicated page: [[tor-browser_AppArmor_patch]]
Upgrade Thunderbird
---------------
@@ -276,9 +276,10 @@ Update other base branches
1. Merge the release branch into `devel` following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
-2. [[Thaw|APT_repository/time-based snapshots#thaw]], on the devel
+2. [[Thaw|APT_repository/time-based_snapshots#thaw]], on the devel
branch, the time-based APT repository snapshots that were used
- during the freeze.
+ during the freeze. It's fine if that results in a no-op
+ (it depends on how exactly previous operations were performed).
3. Merge `devel` into `feature/buster`, *without* following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
@@ -522,7 +523,9 @@ SquashFS file order
-------------------
1. Install the almost final USB image to a USB stick.
-1. Boot this USB stick **on bare metal**.
+1. Boot this USB stick a first time to trigger re-partitioning.
+1. Shut down this Tails.
+1. Boot this USB stick **on bare metal** again.
1. Add `profile` to the kernel command-line.
1. Login with the default settings in the Greeter (e.g. do not configure
an _Administration Password_).
@@ -576,6 +579,8 @@ suite should be ready, so it is time to:
1. build the final image!
Do _not_ set `keeprunning` nor `rescue` in `$TAILS_BUILD_OPTIONS`.
+ Our build system will apply the correct compression settings automatically
+ so don't bother setting it yourself.
1. Compare the new build manifest with the one from the previous,
almost final build:
@@ -609,6 +614,9 @@ suite should be ready, so it is time to:
- If all hashes match: yay, we're good to go!
+ Set the `$MATCHING_JENKINS_BUILD_ID` environment variable
+ to the ID of this job (an integer).
+
- If there is a hash mismatch for the image: ouch! Now we are in a
tricky situation: on the one hand it seems like a poor idea to
block users from benefiting from this release's security updates,
@@ -976,12 +984,6 @@ Upload the ISO and USB image signatures to our rsync server:
scp "${ISO_PATH:?}.sig" "${IMG_PATH:?}.sig" rsync.lizard:
-Pick a build from `$RELEASE_BRANCH` that produced identical ISO and USB images
-to the ones you've built locally (`XXX` must be the job ID, i.e.
-an integer):
-
- MATCHING_JENKINS_BUILD_ID=XXX
-
Copy the ISO and USB images to our rsync server, verify their signature,
move them in place with proper ownership and permissions
and update the time in `project/trace` file on our rsync server
@@ -1051,7 +1053,7 @@ If not, list already running Torrents:
ssh bittorrent.lizard transmission-remote --list
-… set `$ID` to the oldest one and delete it:
+… set `$ID` to the oldest one and delete it (do this both for the ISO and USB image):
ssh bittorrent.lizard -t "${ID:?}" --remove-and-delete
@@ -1314,8 +1316,15 @@ tracker. For a list of candidates, see:
* the "Fix committed" section on the *Release Manager View for ${VERSION:?}*
in Redmine.
+Select these issues with the checkboxes in the first column, then
+right click on the list to display the context menu, and finally
+change the _Status_ there. Relationships between tickets will likely
+prevent you from closing all these issues at once, but at least
+you can process them in several smaller batches instead of one by one.
+
Postpone to next release any remaining open issue for the version
-you've just released.
+you've just released. Use the right-click contextual menu to do so in
+one single batch.
Then, mark the just-released Redmine milestone as done: go to the
target version page, click *Edit*, and set *Status* to *Closed*.
@@ -1323,9 +1332,10 @@ target version page, click *Edit*, and set *Status* to *Closed*.
### Tickets linked from the website
Go through the tickets linked from the documentation and support sections of the
-website and point documentation writers to the tickets that might be resolved in
+website and point our lead technical writer (sajolida) to the tickets that might be resolved in
this release.
+ cd "${MASTER_CHECKOUT:?}" && \
find wiki/src/{doc,support} -name "*.mdwn" -o -name "*.html" | xargs cat | \
ruby -e 'puts STDIN.read.scan(/\[\[!tails_ticket\s+(\d+)[^\]]*\]\]/)' | \
while read ticket; do
@@ -1359,7 +1369,7 @@ Check in the comments of the ticket for the release notes if the
technical writers have prepared a tweet. Otherwise tweet a simple link
to the release notes:
- Tails x.y is out: https://tails.boum.org/news/version_x.y
+ Tails x.y is out: https://tails.boum.org/news/version_x.y/
Tor blog
--------
@@ -1413,11 +1423,14 @@ We announce *major* releases on the Tor blog:
Amnesia news
------------
-The release announcement are automatically sent to `amnesia-news@`
-(thanks to the `announce` flag) on an hourly basis, but it will be
-stuck in the moderation
-queue. [Log in](https://www.autistici.org/mailman/admindb/amnesia-news) and
-accept it.
+1. [Subscribe](https://www.autistici.org/mailman/listinfo/amnesia-news/)
+ to `amnesia-news@`. It's the only reliable way to check if the next
+ step has worked (the online web archive is not refreshed immediately).
+
+2. [Log in](https://www.autistici.org/mailman/admindb/amnesia-news)
+ and accept the release announcement, that's been automatically sent
+ to `amnesia-news@` on an hourly basis, and is stuck in the
+ moderation queue.
Prepare for the next development cycle
======================================
@@ -1429,10 +1442,12 @@ this, and skip what does not make sense for a RC.
stable release from:
- our rsync server:
`ssh rsync.lizard rm -rf /srv/rsync/tails/tails/stable/tails-amd64-${PREVIOUS_VERSION:?}/`
- - our Bittorrent seed: get the previous release's _Transmission_ ID
+ - our Bittorrent seed: get the previous release's _Transmission_ IDs
+ (ISO and USB image)
with `ssh bittorrent.lizard transmission-remote --list` and then
- delete it with
+ delete them with
`ssh bittorrent.lizard transmission-remote -t "${PREVIOUS_VERSION_TRANSMISSION_ID:?}" --remove-and-delete`
+ then re-run `ssh bittorrent.lizard transmission-remote --list` and make sure everything looks good
1. Remove any remaining RC for the just-published release from
`rsync.lizard:/srv/rsync/tails/tails/alpha/`
1. Remove IUKs that are more than 9 months old from
@@ -1470,23 +1485,23 @@ this, and skip what does not make sense for a RC.
git fetch && \
git submodule update && \
bare_repo=$(mktemp -d)
- torsocks git clone --bare --reference "${MASTER_CHECKOUT:?}" \
+ git clone --bare --reference "${MASTER_CHECKOUT:?}" \
gitolite@d53ykjpeekuikgoq.onion:tails \
"${bare_repo:?}" && \
PYTHONPATH=lib/python3 ./bin/delete-merged-git-branches \
--repo "${bare_repo:?}" && \
rm -rf "${bare_repo:?}"
-1. On the `stable` and `devel` branches, remove all old versions in
+1. On the `stable` and `devel` branches, remove all old versions
that were never released from `wiki/src/upgrade/v1/Tails` and
`debian/changelog`. Explanation: the
post-release APT repository steps from the previous stable release
will usually have had us prepare for an emergency release that was
never made.
-1. [[Thaw the packages that were granted freeze exceptions|APT_repository/time-based snapshots#freeze-exceptions-post-release]].
+1. [[Thaw the packages that were granted freeze exceptions|APT_repository/time-based_snapshots#freeze-exceptions-post-release]].
1. Pull `master` back and merge it into `stable`, and in turn into
`devel`
-1. [[Thaw|APT_repository/time-based snapshots#thaw]], on the devel
+1. [[Thaw|APT_repository/time-based_snapshots#thaw]], on the devel
branch, the time-based APT repository snapshots that were used
during the freeze. This should generally be a no-op but if there
was some hiccup earlier it could be needed.
@@ -1502,8 +1517,8 @@ this, and skip what does not make sense for a RC.
`wiki/src/upgrade/v1/Tails/<VERSION>/<ARCH>/<CHANNEL>`.
1. Verify that the snapshots used in the release branch are ok,
e.g. they use the correct snapshots, and they were bumped
- appropriately (they should expire after the major release _after_
- the one you're preparing). Look carefully at the output of this command:
+ appropriately (they should expire after the next planned major release date).
+ Look carefully at the output of this command:
cd "${RELEASE_CHECKOUT:?}" && \
git checkout "${RELEASE_BRANCH:?}" && \
diff --git a/wiki/src/donate.de.po b/wiki/src/donate.de.po
index 2efa5d6..125e8ef 100644
--- a/wiki/src/donate.de.po
+++ b/wiki/src/donate.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-03-06 10:10+0000\n"
+"POT-Creation-Date: 2019-03-20 17:51+0000\n"
"PO-Revision-Date: 2018-10-13 11:08+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
@@ -35,7 +35,9 @@ msgstr ""
"Benutzen von Computern sicher zu sein."
#. type: Content of: <div><div><p>
-msgid "Tails is used more than 20&#8239;000 times every day:"
+#, fuzzy
+#| msgid "Tails is used more than 20&#8239;000 times every day:"
+msgid "Tails is used more than 25&#8239;000 times every day:"
msgstr "Tails wird jeden Tag mehr als 20&#8239;000 Mal benutzt:"
#. type: Content of: <div><div><ul><li>
@@ -70,15 +72,6 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
-"day.</b> The price of a USB stick is all we need."
-msgstr ""
-"<b>Wenn alle, die Tails benutzen, 5€ spenden, wäre unsere Spendenkampagne an "
-"einem Tag bereits erfolgreich.</b> Der Preis von einem USB-Stick ist alles "
-"was wir benötigen."
-
-#. type: Content of: <div><div><p>
-msgid ""
"<b>But, not everyone using Tails can donate.</b> When you donate, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
@@ -659,6 +652,14 @@ msgstr "[[!img expenses.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Unsere Finanzberichte sind [[hier|doc/about/finances]] einsehbar."
+#~ msgid ""
+#~ "<b>If everyone using Tails donated $6, our fundraiser would be done in "
+#~ "one day.</b> The price of a USB stick is all we need."
+#~ msgstr ""
+#~ "<b>Wenn alle, die Tails benutzen, 5€ spenden, wäre unsere Spendenkampagne "
+#~ "an einem Tag bereits erfolgreich.</b> Der Preis von einem USB-Stick ist "
+#~ "alles was wir benötigen."
+
#~ msgid "But we need your support to stay alive!"
#~ msgstr "Aber wir brauchen Ihre Hilfe, um am Leben zu bleiben!"
diff --git a/wiki/src/donate.es.po b/wiki/src/donate.es.po
index 0c886cc..8bf205b 100755
--- a/wiki/src/donate.es.po
+++ b/wiki/src/donate.es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2019-03-06 10:10+0000\n"
+"POT-Creation-Date: 2019-03-20 17:51+0000\n"
"PO-Revision-Date: 2018-10-16 03:56+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/src-"
@@ -38,7 +38,9 @@ msgstr ""
"cuando utiliza la computadora."
#. type: Content of: <div><div><p>
-msgid "Tails is used more than 20&#8239;000 times every day:"
+#, fuzzy
+#| msgid "Tails is used more than 20&#8239;000 times every day:"
+msgid "Tails is used more than 25&#8239;000 times every day:"
msgstr "Tails es usado más de 20&#8239;000 veces por día:"
#. type: Content of: <div><div><ul><li>
@@ -73,15 +75,6 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
-"day.</b> The price of a USB stick is all we need."
-msgstr ""
-"<b>Si cada persona que usa Tails donaran 5€, nuestra campaña de donación se "
-"acabaría en un solo día.</b> Todo lo que necesitamos es el precio de una "
-"memoria USB."
-
-#. type: Content of: <div><div><p>
-msgid ""
"<b>But, not everyone using Tails can donate.</b> When you donate, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
@@ -669,6 +662,14 @@ msgstr "[[!img expenses.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Nuestro registro contable está disponible [[aquí|doc/about/finances]]."
+#~ msgid ""
+#~ "<b>If everyone using Tails donated $6, our fundraiser would be done in "
+#~ "one day.</b> The price of a USB stick is all we need."
+#~ msgstr ""
+#~ "<b>Si cada persona que usa Tails donaran 5€, nuestra campaña de donación "
+#~ "se acabaría en un solo día.</b> Todo lo que necesitamos es el precio de "
+#~ "una memoria USB."
+
#~ msgid "But we need your support to stay alive!"
#~ msgstr "¡Pero necesitamos tu apoyo para seguir a flote!"
diff --git a/wiki/src/donate.fa.po b/wiki/src/donate.fa.po
index a4c719b..6de0574 100644
--- a/wiki/src/donate.fa.po
+++ b/wiki/src/donate.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-06 10:10+0000\n"
+"POT-Creation-Date: 2019-03-20 17:51+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><p>
-msgid "Tails is used more than 20&#8239;000 times every day:"
+msgid "Tails is used more than 25&#8239;000 times every day:"
msgstr ""
#. type: Content of: <div><div><ul><li>
@@ -57,12 +57,6 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
-"day.</b> The price of a USB stick is all we need."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-msgid ""
"<b>But, not everyone using Tails can donate.</b> When you donate, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
diff --git a/wiki/src/donate.fr.po b/wiki/src/donate.fr.po
index 58a4354..cb64fd4 100644
--- a/wiki/src/donate.fr.po
+++ b/wiki/src/donate.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2019-03-06 10:10+0000\n"
+"POT-Creation-Date: 2019-03-20 17:51+0000\n"
"PO-Revision-Date: 2018-10-15 08:22+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -35,7 +35,9 @@ msgstr ""
"sécurité lors de l'utilisation d'ordinateurs."
#. type: Content of: <div><div><p>
-msgid "Tails is used more than 20&#8239;000 times every day:"
+#, fuzzy
+#| msgid "Tails is used more than 20&#8239;000 times every day:"
+msgid "Tails is used more than 25&#8239;000 times every day:"
msgstr "Tails est utilisé plus de 20&#8239;000 fois chaque jour :"
#. type: Content of: <div><div><ul><li>
@@ -70,15 +72,6 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
-"day.</b> The price of a USB stick is all we need."
-msgstr ""
-"<b>Si chaque personne qui utilise Tails donnait 5€, notre campagne de dons "
-"serait terminée en un jour.</b> Nous n'avons besoin que de l'équivalent du "
-"prix d'une clé USB."
-
-#. type: Content of: <div><div><p>
-msgid ""
"<b>But, not everyone using Tails can donate.</b> When you donate, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
@@ -661,6 +654,14 @@ msgstr "[[!img expenses.fr.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Nos rapports financiers sont disponibles [[ici|doc/about/finances]]."
+#~ msgid ""
+#~ "<b>If everyone using Tails donated $6, our fundraiser would be done in "
+#~ "one day.</b> The price of a USB stick is all we need."
+#~ msgstr ""
+#~ "<b>Si chaque personne qui utilise Tails donnait 5€, notre campagne de "
+#~ "dons serait terminée en un jour.</b> Nous n'avons besoin que de "
+#~ "l'équivalent du prix d'une clé USB."
+
#~ msgid "But we need your support to stay alive!"
#~ msgstr "Mais nous avons besoin de votre soutien pour survivre !"
diff --git a/wiki/src/donate.html b/wiki/src/donate.html
index 456b88b..838ef2e 100644
--- a/wiki/src/donate.html
+++ b/wiki/src/donate.html
@@ -11,7 +11,7 @@
<h2>Tails is free because nobody should have to pay to be safe while
using computers.</h2>
- <p>Tails is used more than 20&#8239;000 times every day:</p>
+ <p>Tails is used more than 25&#8239;000 times every day:</p>
<ul>
<li><b>Journalists and whistleblowers</b> use Tails to denounce the
@@ -24,10 +24,6 @@
tracking.</li>
</ul>
- <p><b>If everyone using Tails donated $6, our fundraiser would be done
- in one day.</b> The price of a USB stick is all we
- need.</p>
-
<p><b>But, not everyone using Tails can donate.</b> When you donate, you
are offering to many others who need it, the very precious tool that
is Tails.</p>
diff --git a/wiki/src/donate.it.po b/wiki/src/donate.it.po
index daa1c5c..f8016d3 100644
--- a/wiki/src/donate.it.po
+++ b/wiki/src/donate.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-03-06 10:10+0000\n"
+"POT-Creation-Date: 2019-03-20 17:51+0000\n"
"PO-Revision-Date: 2017-07-21 14:37+0200\n"
"Last-Translator: boyska <piuttosto@logorroici.org>\n"
"Language-Team: \n"
@@ -35,7 +35,7 @@ msgstr ""
"modo sicuro il proprio computer."
#. type: Content of: <div><div><p>
-msgid "Tails is used more than 20&#8239;000 times every day:"
+msgid "Tails is used more than 25&#8239;000 times every day:"
msgstr ""
#. type: Content of: <div><div><ul><li>
@@ -62,12 +62,6 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
-"day.</b> The price of a USB stick is all we need."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-msgid ""
"<b>But, not everyone using Tails can donate.</b> When you donate, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
diff --git a/wiki/src/donate.pt.po b/wiki/src/donate.pt.po
index 7d70ddb..8cb25db 100644
--- a/wiki/src/donate.pt.po
+++ b/wiki/src/donate.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-06 10:10+0000\n"
+"POT-Creation-Date: 2019-03-20 17:51+0000\n"
"PO-Revision-Date: 2018-03-17 15:30-0300\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -35,7 +35,7 @@ msgstr ""
"seguro ao usar um computador."
#. type: Content of: <div><div><p>
-msgid "Tails is used more than 20&#8239;000 times every day:"
+msgid "Tails is used more than 25&#8239;000 times every day:"
msgstr ""
#. type: Content of: <div><div><ul><li>
@@ -62,12 +62,6 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
-"day.</b> The price of a USB stick is all we need."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-msgid ""
"<b>But, not everyone using Tails can donate.</b> When you donate, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""