summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-08 14:55:31 +0000
committerintrigeri <intrigeri@boum.org>2016-08-08 14:55:31 +0000
commit2e5d6b0c65a79b98610742943289d33031dba4fa (patch)
treee6e9f87e49e6c164617cebf9198cc097be900c3c
parent7fc939bd4b26f66780654a94109f7e34f0bb3b09 (diff)
parente01063f026d89e25573f2b58dc13391d2762d02f (diff)
Merge branch 'test/10971-more-CPUs-for-TailsToaster' into test/10971-more-CPUs-for-TailsToaster+11588+10733
-rw-r--r--config/base_branch2
-rw-r--r--config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch14
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
-rw-r--r--config/chroot_local-patches/apparmor-adjust-tor-profile.diff20
-rw-r--r--config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff253
-rw-r--r--config/chroot_local-patches/torbirdy-0002-secure-autoconfig-POP-defaults.diff42
-rw-r--r--debian/changelog6
-rw-r--r--features/checks.feature106
-rw-r--r--features/documentation.feature10
-rw-r--r--features/emergency_shutdown.feature26
-rw-r--r--features/gnome.feature8
-rw-r--r--features/hardening.feature14
-rw-r--r--features/keys.feature10
-rw-r--r--features/networking.feature27
-rw-r--r--features/regression_tests.feature6
-rw-r--r--features/sane_defaults.feature15
-rw-r--r--features/step_definitions/tor.rb18
-rw-r--r--features/step_definitions/torified_gnupg.rb2
-rw-r--r--features/support/config.rb14
-rw-r--r--features/tor_enforcement.feature4
-rw-r--r--features/virtualization.feature7
-rw-r--r--wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn4
-rw-r--r--wiki/src/blueprint/Linux_containers.mdwn5
-rw-r--r--wiki/src/blueprint/VoIP_support.mdwn6
-rw-r--r--wiki/src/blueprint/accessibility.mdwn3
-rw-r--r--wiki/src/blueprint/macchanger.mdwn4
-rw-r--r--wiki/src/blueprint/reproducible_builds.mdwn12
-rw-r--r--wiki/src/contribute/APT_repository/custom.mdwn4
-rw-r--r--wiki/src/contribute/APT_repository/time-based_snapshots.mdwn2
-rw-r--r--wiki/src/contribute/design.mdwn4
-rw-r--r--wiki/src/contribute/design/Time_syncing.mdwn6
-rw-r--r--wiki/src/contribute/design/UEFI.mdwn4
-rw-r--r--wiki/src/contribute/how/code.mdwn5
-rw-r--r--wiki/src/contribute/l10n_tricks.mdwn2
-rw-r--r--wiki/src/contribute/relationship_with_upstream.mdwn6
-rw-r--r--wiki/src/contribute/release_process.mdwn58
-rw-r--r--wiki/src/contribute/release_process/test.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn6
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn30
-rw-r--r--wiki/src/contribute/working_together/roles/release_manager.mdwn5
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/news/bounties_2013_report.de.po8
-rw-r--r--wiki/src/news/bounties_2013_report.fa.po25
-rw-r--r--wiki/src/news/bounties_2013_report.fr.po8
-rw-r--r--wiki/src/news/bounties_2013_report.it.po8
-rw-r--r--wiki/src/news/bounties_2013_report.mdwn6
-rw-r--r--wiki/src/news/bounties_2013_report.pt.po8
-rw-r--r--wiki/src/news/version_2.5.de.po125
-rw-r--r--wiki/src/news/version_2.5.fa.po125
-rw-r--r--wiki/src/news/version_2.5.fr.po125
-rw-r--r--wiki/src/news/version_2.5.it.po125
-rw-r--r--wiki/src/news/version_2.5.mdwn59
-rw-r--r--wiki/src/news/version_2.5.pt.po125
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.4.de.po16
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.4.fa.po16
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.4.fr.po16
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.4.it.po16
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.4.mdwn6
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.4.pt.po16
-rw-r--r--wiki/src/support/known_issues.de.po5
-rw-r--r--wiki/src/support/known_issues.fa.po12
-rw-r--r--wiki/src/support/known_issues.fr.po19
-rw-r--r--wiki/src/support/known_issues.it.po5
-rw-r--r--wiki/src/support/known_issues.mdwn2
-rw-r--r--wiki/src/support/known_issues.pt.po8
-rw-r--r--wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml.pgp26
71 files changed, 1045 insertions, 697 deletions
diff --git a/config/base_branch b/config/base_branch
index 2bf5ad0..d64531f 100644
--- a/config/base_branch
+++ b/config/base_branch
@@ -1 +1 @@
-stable
+devel
diff --git a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
index 9fb59dc..dc44b8d 100644
--- a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
+++ b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
@@ -42,9 +42,9 @@
+ /etc/machine-id r,
+ /var/lib/dbus/machine-id r,
- @{PROC}/[0-9]*/mountinfo r,
- @{PROC}/[0-9]*/stat r,
- @{PROC}/[0-9]*/task/*/stat r,
+ owner @{PROC}/[0-9]*/mountinfo r,
+ owner @{PROC}/[0-9]*/stat r,
+ owner @{PROC}/[0-9]*/task/*/stat r,
@{PROC}/sys/kernel/random/uuid r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/ r,
@@ -55,17 +55,17 @@
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/ rw,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/** rw,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser.bak/ rwk,
-- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser.bak/updated/ rwk,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser.bak/** rwk,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/components/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/browser/components/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox rix,
-- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/updates/[0-9]*/updater ix,
-- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/updates/0/MozUpdater/bgupdate/updater ix,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/{,TorBrowser/UpdateInfo/}updates/[0-9]*/updater ix,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/{,TorBrowser/UpdateInfo/}updates/0/MozUpdater/bgupdate/updater ix,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Data/Browser/profiles.ini r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Data/Browser/profile.default/ r,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Data/Browser/profile.default/** rwk,
-- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Tor/tor Px,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Tor/tor px,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Tor/libstdc++.so.6 m,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/Desktop/ rw,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/Desktop/** rwk,
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index b578ed5..3a62b66 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -105,6 +105,7 @@ gnome-screenshot
gnome-session
gnome-session-flashback
gnome-shell-extensions
+gnome-sound-recorder
gnome-system-log
gnome-system-monitor
gnome-terminal
diff --git a/config/chroot_local-patches/apparmor-adjust-tor-profile.diff b/config/chroot_local-patches/apparmor-adjust-tor-profile.diff
index 64d3e1c..98aa7df 100644
--- a/config/chroot_local-patches/apparmor-adjust-tor-profile.diff
+++ b/config/chroot_local-patches/apparmor-adjust-tor-profile.diff
@@ -1,21 +1,13 @@
-XXX: renaming the profile should not be needed on Stretch anymore,
-since tor@default.service loads the profile correctly itself there
-(and actually, renaming the profile as this patch does may prevent
-the service from starting at all).
-
---- a/etc/apparmor.d/system_tor 2015-06-04 12:28:12.243020484 +0000
-+++ b/etc/apparmor.d/system_tor 2015-06-04 12:29:32.580249731 +0000
-@@ -1,9 +1,12 @@
- # vim:syntax=apparmor
- #include <tunables/global>
-
--profile system_tor flags=(attach_disconnected) {
-+/usr/bin/tor flags=(attach_disconnected) {
+--- a/etc/apparmor.d/system_tor 2016-06-01 21:34:23.000000000 +0000
++++ b/etc/apparmor.d/system_tor 2016-06-10 11:09:09.249017739 +0000
+@@ -4,6 +4,9 @@
+ profile system_tor flags=(attach_disconnected) {
#include <abstractions/tor>
+ link /etc/tor/.wh.torrc -> /.wh..wh.aufs,
+ /etc/tor/* w,
+
owner /var/lib/tor/** rwk,
+ owner /var/lib/tor/ r,
owner /var/log/tor/* w,
-
+
diff --git a/config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff b/config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff
deleted file mode 100644
index cf05803..0000000
--- a/config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff
+++ /dev/null
@@ -1,253 +0,0 @@
---- /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.js.orig
-+++ /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.js
-@@ -1,28 +1,46 @@
-+Components.utils.import("resource://gre/modules/Preferences.jsm");
-+
- if (!org) var org = {};
- if (!org.torbirdy) org.torbirdy = {};
-
- if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
- var pub = {};
-
-- var prefs = Cc["@mozilla.org/preferences-service;1"]
-- .getService(Ci.nsIPrefBranch);
--
-- // Check if we are running Tails. If yes, disable the manual account
-- // configuration wizard since Tails handles that on its own. See:
-- // https://tails.boum.org/todo/Return_of_Icedove__63__/#index6h2
-- // This is also disabled if "extensions.torbirdy.emailwizard" is true.
-- var disableWizard = false;
-- if (prefs.prefHasUserValue("vendor.name")) {
-- if (prefs.getCharPref("vendor.name") === "Tails") {
-- disableWizard = true;
-- }
-+ var disableAutoConfiguration = false;
-+ if (Preferences.get("extensions.torbirdy.emailwizard", false)) {
-+ disableAutoConfiguration = true;
- }
-- if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) {
-- disableWizard = true;
-+
-+ fixupTorbirdySettingsOnNewAccount = function(account) {
-+ var idkey = account.defaultIdentity.key;
-+ var serverkey = account.incomingServer.key;
-+ var protocol = account.incomingServer.type;
-+
-+ var pref_spec = [
-+ ['mail.server.%serverkey%.check_new_mail', false],
-+ ['mail.server.%serverkey%.login_at_startup', false]
-+ ];
-+
-+ // Make sure that drafts are saved to Local Folders if it is an IMAP account.
-+ if (protocol === "imap") {
-+ pref_spec.push(['mail.identity.%idkey%.draft_folder',
-+ 'mailbox://nobody@Local%20Folders/Drafts']);
-+ }
-+
-+ // Do not automatically download new messages in POP accounts.
-+ if (protocol === "pop3") {
-+ pref_spec.push(['mail.server.%serverkey%.download_on_biff', false]);
-+ }
-+
-+ for each (var [pref_template, value] in pref_spec) {
-+ var pref = pref_template.replace("%idkey%", idkey);
-+ pref = pref.replace("%serverkey%", serverkey);
-+ Preferences.set(pref, value);
-+ }
- }
-
-- pub.disableAutoWizard = function() {
-- if (!disableWizard) {
-+ pub.adjustAutoWizard = function() {
-+ if (!disableAutoConfiguration) {
- var realname = document.getElementById("realname").value;
- var email = document.getElementById("email").value;
- var password = document.getElementById("password").value;
-@@ -63,10 +81,6 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
- config.incoming.auth = 3;
- config.outgoing.auth = 3;
-
-- // Set default values to disable automatic email fetching.
-- config.incoming.loginAtStartup = false;
-- config.incoming.downloadOnBiff = false;
--
- // Default the outgoing SMTP port.
- config.outgoing.port = 465;
-
-@@ -75,31 +89,8 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
- replaceVariables(config, realname, email, password);
- config.rememberPassword = rememberPassword && !!password;
-
-- var newAccount = createAccountInBackend(config);
--
-- // Set check_new_mail to false. We can't do this through the account setup, so let's do it here.
-- var checkNewMail = 'mail.server.%serverkey%.check_new_mail';
-- var serverkey = newAccount.incomingServer.key;
-- var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey);
-- prefs.setBoolPref(checkNewMailPref, false);
--
-- // Make sure that drafts are saved to Local Folders if it is an IMAP account.
-- if (protocol === "imap") {
-- var identity = newAccount.defaultIdentity;
-- identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts";
-- }
--
-- // Do not check for new messages at startup.
-- var loginAtStartup = 'mail.server.%serverkey%.login_at_startup';
-- var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey);
-- prefs.setBoolPref(loginAtStartupPref, false);
--
-- // Do not automatically download new messages.
-- if (protocol === "pop3") {
-- var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff';
-- var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey);
-- prefs.setBoolPref(downloadOnBiffPref, false);
-- }
-+ var new_account = createAccountInBackend(config);
-+ fixupTorbirdySettingsOnNewAccount(new_account);
-
- // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup().
- var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"]
-@@ -111,12 +102,23 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
- } else {
- window.openDialog("chrome://messenger/content/AccountManager.xul",
- "AccountManager", "chrome,centerscreen,modal,titlebar",
-- { server: newAccount.incomingServer,
-+ { server: new_account.incomingServer,
- selectPage: "am-server.xul" });
- }
- window.close();
- }
- else {
-+ // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : finish().
-+ // We need somewhere to hook in, so we can access the new
-+ // account object created through the autoconfig wizard, and
-+ // apply Torbirdy's settings on it.
-+ gEmailConfigWizard.finish = function() {
-+ gEmailWizardLogger.info("creating account in backend");
-+ var account = createAccountInBackend(this.getConcreteConfig());
-+ fixupTorbirdySettingsOnNewAccount(account);
-+ window.close();
-+ }
-+
- gEmailConfigWizard.onNext();
- }
- };
-@@ -125,25 +127,17 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
- var keycode = event.keyCode;
- if (keycode == 13) {
- if (document.getElementById("next_button").disabled === false) {
-- if (!disableWizard) {
-- pub.disableAutoWizard();
-- }
-- else {
-- gEmailConfigWizard.onNext();
-- }
-+ pub.adjustAutoWizard();
- }
- }
- };
-
- pub.onLoad = function() {
-- if (disableWizard) {
-+ if (disableAutoConfiguration) {
- document.getElementById("torbirdy-protocol-box").collapsed = true;
-- document.getElementById("provisioner_button").disabled = false;
-- document.getElementById("provisioner_button").hidden = false;
-- } else {
-- document.getElementById("provisioner_button").disabled = true;
-- document.getElementById("provisioner_button").hidden = true;
- }
-+ document.getElementById("provisioner_button").disabled = true;
-+ document.getElementById("provisioner_button").hidden = true;
- };
-
- return pub;
---- /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.xul.orig
-+++ /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.xul
-@@ -9,7 +9,7 @@
- </stringbundleset>
-
- <button id="next_button"
-- oncommand="org.torbirdy.emailwizard.disableAutoWizard();" />
-+ oncommand="org.torbirdy.emailwizard.adjustAutoWizard();" />
-
- <vbox id="mastervbox" flex="1">
- <groupbox id="torbirdy-protocol-box" class="indent" insertafter="initialSettings">
---- /usr/share/xul-ext/torbirdy/chrome/content/preferences.js.orig
-+++ /usr/share/xul-ext/torbirdy/chrome/content/preferences.js
-@@ -37,36 +37,20 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
- };
-
- pub.setEnigmailPrefs = function(anonService) {
-+ var opts = "";
- if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
-- if (anonService === "tor") {
-- return "--no-emit-version " +
-- "--no-comments " +
-- "--throw-keyids " +
-- "--display-charset utf-8 " +
-- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118";
-- }
-- if (anonService === "jondo") {
-- return "--no-emit-version " +
-- "--no-comments " +
-- "--throw-keyids " +
-- "--display-charset utf-8 " +
-- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001";
-- }
-- }
-- else {
-- if (anonService === "tor") {
-- return "--no-emit-version " +
-- "--no-comments " +
-- "--display-charset utf-8 " +
-- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118";
-- }
-- if (anonService === "jondo") {
-- return "--no-emit-version " +
-- "--no-comments " +
-- "--display-charset utf-8 " +
-- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001";
-- }
-+ opts += "--throw-keyids ";
- }
-+ var proxy = "socks5h://127.0.0.1:9050";
-+ if (anonService === "jondo") {
-+ proxy = "http://127.0.0.1:4001";
-+ }
-+ return opts +
-+ "--no-emit-version " +
-+ "--no-comments " +
-+ "--display-charset utf-8 " +
-+ "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=" +
-+ proxy;
- };
-
- pub.updateKeyserver = function(anonService) {
---- /usr/share/xul-ext/torbirdy/components/torbirdy.js.orig
-+++ /usr/share/xul-ext/torbirdy/components/torbirdy.js
-@@ -181,6 +181,14 @@ const TorBirdyPrefs = {
- "mail.inline_attachments": false,
- // Do not IDLE (disable push mail).
- "mail.server.default.use_idle": false,
-+ // Thunderbird's autoconfig wizard is designed to enable an initial
-+ // mail fetch (by setting login_at_start) for the first account it
-+ // creates (which will become the "default" account, see
-+ // msgMail3PaneWindow.js for details) which side-steps the settings
-+ // we apply in fixupTorbirdySettingsOnNewAccount(). Hence, fool
-+ // Thunderbird to think that this initial mail fetch has already
-+ // been done so we get the settings we want.
-+ "mail.startup.enabledMailCheckOnce": true,
-
- /*
- Browser
-@@ -215,7 +223,7 @@ const TorBirdyPrefs = {
- // We want to force UTF-8 everywhere
- "--display-charset utf-8 " +
- // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell
-- "--keyserver-options http-proxy=http://127.0.0.1:8118 ",
-+ "--keyserver-options http-proxy=socks5h://127.0.0.1:9050 ",
-
- // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network)
- "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",
diff --git a/config/chroot_local-patches/torbirdy-0002-secure-autoconfig-POP-defaults.diff b/config/chroot_local-patches/torbirdy-0002-secure-autoconfig-POP-defaults.diff
deleted file mode 100644
index 363979f..0000000
--- a/config/chroot_local-patches/torbirdy-0002-secure-autoconfig-POP-defaults.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.js.orig
-+++ /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.js
-@@ -108,6 +108,39 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
- window.close();
- }
- else {
-+ var prefer_pop = Preferences.get("extensions.torbirdy.defaultprotocol") != 1;
-+ // Both of these monkeypatches hook in only to change the
-+ // selection default (POP vs IMAP according to our pref) at
-+ // suitable times, i.e. when the page has been pre-filled and is
-+ // finally presented to user action.
-+ var result_imappop_hacks_run_once = false;
-+ var old_displayConfigResult = gEmailConfigWizard.displayConfigResult;
-+ gEmailConfigWizard.displayConfigResult = function(config) {
-+ old_displayConfigResult.call(this, config);
-+ var radiogroup = document.getElementById("result_imappop");
-+ if (radiogroup.hidden) return;
-+ // We can only run the monkeypatch code below once -- this
-+ // method is called every time we change selection, preventing
-+ // us from changing the selection away from POP.
-+ if (result_imappop_hacks_run_once) return;
-+ result_imappop_hacks_run_once = true;
-+ var imap_element = document.getElementById("result_select_imap");
-+ var pop_element = document.getElementById("result_select_pop3");
-+ if (prefer_pop && imap_element.selected && pop_element) {
-+ radiogroup.selectedItem = pop_element;
-+ gEmailConfigWizard.onResultIMAPOrPOP3();
-+ }
-+ }
-+ var old_fillManualEditFields = gEmailConfigWizard._fillManualEditFields;
-+ gEmailConfigWizard._fillManualEditFields = function(config) {
-+ old_fillManualEditFields.call(this, config);
-+ if (prefer_pop) {
-+ // In this itemlist, POP is located at index 1.
-+ document.getElementById("incoming_protocol").selectedIndex = 1;
-+ gEmailConfigWizard.onChangedProtocolIncoming();
-+ }
-+ }
-+
- // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : finish().
- // We need somewhere to hook in, so we can access the new
- // account object created through the autoconfig wizard, and
diff --git a/debian/changelog b/debian/changelog
index 104651e..959b177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tails (2.6) UNRELEASED; urgency=medium
+
+ * Dummy entry.
+
+ -- anonym <anonym@riseup.net> Tue, 07 Jun 2016 09:07:40 +0200
+
tails (2.5.1) UNRELEASED; urgency=medium
* Dummy entry.
diff --git a/features/checks.feature b/features/checks.feature
deleted file mode 100644
index 8570341..0000000
--- a/features/checks.feature
+++ /dev/null
@@ -1,106 +0,0 @@
-@product
-Feature: Various checks
-
- Scenario: AppArmor is enabled and has enforced profiles
- Given I have started Tails from DVD without network and logged in
- Then AppArmor is enabled
- And some AppArmor profiles are enforced
-
- Scenario: A screenshot is taken when the PRINTSCREEN key is pressed
- Given I have started Tails from DVD without network and logged in
- And there is no screenshot in the live user's Pictures directory
- When I press the "PRINTSCREEN" key
- Then a screenshot is saved to the live user's Pictures directory
-
- Scenario: VirtualBox guest modules are available
- Given I have started Tails from DVD without network and logged in
- When Tails has booted a 64-bit kernel
- Then the VirtualBox guest modules are available
-
- Scenario: The shipped Tails OpenPGP keys are up-to-date
- Given I have started Tails from DVD without network and logged in
- Then the OpenPGP keys shipped with Tails will be valid for the next 3 months
-
- Scenario: The Tails Debian repository key is up-to-date
- Given I have started Tails from DVD without network and logged in
- Then the shipped Debian repository key will be valid for the next 3 months
-
- @doc
- Scenario: The "Report an Error" launcher will open the support documentation
- Given I have started Tails from DVD without network and logged in
- And the network is plugged
- And Tor is ready
- And all notifications have disappeared
- When I double-click the Report an Error launcher on the desktop
- Then the support documentation page opens in Tor Browser
-
- Scenario: The live user is setup correctly
- Given I have started Tails from DVD without network and logged in
- Then the live user has been setup by live-boot
- And the live user is a member of only its own group and "audio cdrom dialout floppy video plugdev netdev scanner lp lpadmin vboxsf"
- And the live user owns its home dir and it has normal permissions
-
- Scenario: No initial network
- Given I have started Tails from DVD without network and logged in
- And I wait between 30 and 60 seconds
- Then the Tor Status icon tells me that Tor is not usable
- When the network is plugged
- Then Tor is ready
- And the Tor Status icon tells me that Tor is usable
- And all notifications have disappeared
- And the time has synced
-
- #11463
- @fragile
- Scenario: The 'Tor is ready' notification is shown when Tor has bootstrapped
- Given I have started Tails from DVD without network and logged in
- And the network is plugged
- When I see the 'Tor is ready' notification
- Then Tor is ready
-
- Scenario: The tor process should be confined with Seccomp
- Given I have started Tails from DVD without network and logged in
- And the network is plugged
- And Tor is ready
- Then the running process "tor" is confined with Seccomp in filter mode
-
- Scenario: No unexpected network services
- Given I have started Tails from DVD without network and logged in
- When the network is plugged
- And Tor is ready
- Then no unexpected services are listening for network connections
-
- #11616
- @fragile
- Scenario: The emergency shutdown applet can shutdown Tails
- Given I have started Tails from DVD without network and logged in
- When I request a shutdown using the emergency shutdown applet
- Then Tails eventually shuts down
-
- #11616
- @fragile
- Scenario: The emergency shutdown applet can reboot Tails
- Given I have started Tails from DVD without network and logged in
- When I request a reboot using the emergency shutdown applet
- Then Tails eventually restarts
-
- Scenario: tails-debugging-info does not leak information
- Given I have started Tails from DVD without network and logged in
- Then tails-debugging-info is not susceptible to symlink attacks
-
- Scenario: Tails shuts down on DVD boot medium removal
- Given I have started Tails from DVD without network and logged in
- When I eject the boot medium
- Then Tails eventually shuts down
-
- Scenario: Tails shuts down on USB boot medium removal
- Given I have started Tails without network from a USB drive without a persistent partition and logged in
- When I eject the boot medium
- Then Tails eventually shuts down
-
- Scenario: The Tails Greeter "disable all networking" option disables networking within Tails
- Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
- And I enable more Tails Greeter options
- And I disable all networking in the Tails Greeter
- And I log in to a new session
- Then no network interfaces are enabled
diff --git a/features/documentation.feature b/features/documentation.feature
new file mode 100644
index 0000000..c636b19
--- /dev/null
+++ b/features/documentation.feature
@@ -0,0 +1,10 @@
+@product @doc
+Feature: Tails documentation
+
+ Scenario: The "Report an Error" launcher will open the support documentation
+ Given I have started Tails from DVD without network and logged in
+ And the network is plugged
+ And Tor is ready
+ And all notifications have disappeared
+ When I double-click the Report an Error launcher on the desktop
+ Then the support documentation page opens in Tor Browser
diff --git a/features/emergency_shutdown.feature b/features/emergency_shutdown.feature
new file mode 100644
index 0000000..144e6c6
--- /dev/null
+++ b/features/emergency_shutdown.feature
@@ -0,0 +1,26 @@
+@product
+Feature: Emergency shutdown
+
+ #11616
+ @fragile
+ Scenario: The emergency shutdown applet can shutdown Tails
+ Given I have started Tails from DVD without network and logged in
+ When I request a shutdown using the emergency shutdown applet
+ Then Tails eventually shuts down
+
+ #11616
+ @fragile
+ Scenario: The emergency shutdown applet can reboot Tails
+ Given I have started Tails from DVD without network and logged in
+ When I request a reboot using the emergency shutdown applet
+ Then Tails eventually restarts
+
+ Scenario: Tails shuts down on DVD boot medium removal
+ Given I have started Tails from DVD without network and logged in
+ When I eject the boot medium
+ Then Tails eventually shuts down
+
+ Scenario: Tails shuts down on USB boot medium removal
+ Given I have started Tails without network from a USB drive without a persistent partition and logged in
+ When I eject the boot medium
+ Then Tails eventually shuts down
diff --git a/features/gnome.feature b/features/gnome.feature
new file mode 100644
index 0000000..21b2672
--- /dev/null
+++ b/features/gnome.feature
@@ -0,0 +1,8 @@
+@product
+Feature: GNOME is well-integrated into Tails
+
+ Scenario: A screenshot is taken when the PRINTSCREEN key is pressed
+ Given I have started Tails from DVD without network and logged in
+ And there is no screenshot in the live user's Pictures directory
+ When I press the "PRINTSCREEN" key
+ Then a screenshot is saved to the live user's Pictures directory
diff --git a/features/hardening.feature b/features/hardening.feature
new file mode 100644
index 0000000..42600b8
--- /dev/null
+++ b/features/hardening.feature
@@ -0,0 +1,14 @@
+@product
+Feature: Hardening features
+
+ Scenario: AppArmor is enabled and has enforced profiles
+ Given I have started Tails from DVD without network and logged in
+ Then AppArmor is enabled
+ And some AppArmor profiles are enforced
+
+ Scenario: The tor process should be confined with Seccomp
+ Given I have started Tails from DVD without network and logged in
+ And the network is plugged
+ And Tor is ready
+ Then the running process "tor" is confined with Seccomp in filter mode
+
diff --git a/features/keys.feature b/features/keys.feature
new file mode 100644
index 0000000..e1db95c
--- /dev/null
+++ b/features/keys.feature
@@ -0,0 +1,10 @@
+@product
+Feature: Tails-related cryptographic keys are up-to-date
+
+ Scenario: The shipped Tails OpenPGP keys are up-to-date
+ Given I have started Tails from DVD without network and logged in
+ Then the OpenPGP keys shipped with Tails will be valid for the next 3 months
+
+ Scenario: The Tails Debian repository key is up-to-date
+ Given I have started Tails from DVD without network and logged in
+ Then the shipped Debian repository key will be valid for the next 3 months
diff --git a/features/networking.feature b/features/networking.feature
new file mode 100644
index 0000000..a5e15b2
--- /dev/null
+++ b/features/networking.feature
@@ -0,0 +1,27 @@
+@product
+Feature: Networking
+
+ Scenario: No initial network
+ Given I have started Tails from DVD without network and logged in
+ And I wait between 30 and 60 seconds
+ Then the Tor Status icon tells me that Tor is not usable
+ When the network is plugged
+ Then Tor is ready
+ And the Tor Status icon tells me that Tor is usable
+ And all notifications have disappeared
+ And the time has synced
+
+ Scenario: The Tails Greeter "disable all networking" option disables networking within Tails
+ Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
+ And I enable more Tails Greeter options
+ And I disable all networking in the Tails Greeter
+ And I log in to a new session
+ Then no network interfaces are enabled
+
+ #11463
+ @fragile
+ Scenario: The 'Tor is ready' notification is shown when Tor has bootstrapped
+ Given I have started Tails from DVD without network and logged in
+ And the network is plugged
+ When I see the 'Tor is ready' notification
+ Then Tor is ready
diff --git a/features/regression_tests.feature b/features/regression_tests.feature
new file mode 100644
index 0000000..a1925ff
--- /dev/null
+++ b/features/regression_tests.feature
@@ -0,0 +1,6 @@
+@product
+Feature: Regressions tests
+
+ Scenario: tails-debugging-info does not leak information
+ Given I have started Tails from DVD without network and logged in
+ Then tails-debugging-info is not susceptible to symlink attacks
diff --git a/features/sane_defaults.feature b/features/sane_defaults.feature
new file mode 100644
index 0000000..65c10f9
--- /dev/null
+++ b/features/sane_defaults.feature
@@ -0,0 +1,15 @@
+@product
+Feature: Tails has a sane default configuration
+
+ Scenario: The live user is setup correctly
+ Given I have started Tails from DVD without network and logged in
+ Then the live user has been setup by live-boot
+ And the live user is a member of only its own group and "audio cdrom dialout floppy video plugdev netdev scanner lp lpadmin vboxsf"
+ And the live user owns its home dir and it has normal permissions
+
+ Scenario: No unexpected network services
+ Given I have started Tails from DVD without network and logged in
+ When the network is plugged
+ And Tor is ready
+ Then no unexpected services are listening for network connections
+
diff --git a/features/step_definitions/tor.rb b/features/step_definitions/tor.rb
index babde27..ff78d81 100644
--- a/features/step_definitions/tor.rb
+++ b/features/step_definitions/tor.rb
@@ -394,21 +394,3 @@ When /^all Internet traffic has only flowed through the configured pluggable tra
@bridge_hosts.include?({ address: c.daddr, port: c.dport })
end
end
-
-Then /^the Tor binary is configured to use the expected Tor authorities$/ do
- tor_auths = Set.new
- tor_binary_orport_strings = $vm.execute_successfully(
- "strings /usr/bin/tor | grep -E 'orport=[0-9]+'").stdout.chomp.split("\n")
- tor_binary_orport_strings.each do |potential_auth_string|
- auth_regex = /^\S+ orport=\d+( bridge)?( no-v2)?( v3ident=[A-Z0-9]{40})? ([0-9\.]+):\d+( [A-Z0-9]{4}){10}$/
- m = auth_regex.match(potential_auth_string)
- if m
- auth_ipv4_addr = m[4]
- tor_auths << auth_ipv4_addr
- end
- end
- expected_tor_auths = Set.new(TOR_AUTHORITIES)
- assert_equal(expected_tor_auths, tor_auths,
- "The Tor binary does not have the expected Tor authorities " +
- "configured")
-end
diff --git a/features/step_definitions/torified_gnupg.rb b/features/step_definitions/torified_gnupg.rb
index 282db48..cb0a9db 100644
--- a/features/step_definitions/torified_gnupg.rb
+++ b/features/step_definitions/torified_gnupg.rb
@@ -108,7 +108,7 @@ end
Then /^I synchronize keys in Seahorse$/ do
recovery_proc = Proc.new do
- # The versions of Seahorse in Wheezy and Jessie will abort with a
+ # The version of Seahorse in Jessie will abort with a
# segmentation fault whenever there's any sort of network error while
# syncing keys. This will usually happens after clicking away the error
# message. This does not appear to be a problem in Stretch.
diff --git a/features/support/config.rb b/features/support/config.rb
index ce3c048..89fa1ba 100644
--- a/features/support/config.rb
+++ b/features/support/config.rb
@@ -74,20 +74,6 @@ SERVICES_EXPECTED_ON_ALL_IFACES =
]
# OpenDNS
SOME_DNS_SERVER = "208.67.222.222"
-TOR_AUTHORITIES =
- # List grabbed from Tor's sources, src/or/config.c:~750.
- [
- "86.59.21.38",
- "128.31.0.39",
- "194.109.206.212",
- "82.94.251.203",
- "199.254.238.52",
- "131.188.40.189",
- "193.23.244.244",
- "208.83.223.34",
- "171.25.193.9",
- "154.35.175.225",
- ]
VM_XML_PATH = "#{Dir.pwd}/features/domains"
TAILS_SIGNING_KEY = cmd_helper(". #{Dir.pwd}/config/amnesia; echo ${AMNESIA_DEV_KEYID}").tr(' ', '').chomp
diff --git a/features/tor_enforcement.feature b/features/tor_enforcement.feature
index a958b14..fd4acef 100644
--- a/features/tor_enforcement.feature
+++ b/features/tor_enforcement.feature
@@ -5,10 +5,6 @@ Feature: The Tor enforcement is effective
And as a Tails developer
I want to ensure that the automated test suite detects firewall leaks reliably
- Scenario: Tails' Tor binary is configured to use the expected Tor authorities
- Given I have started Tails from DVD and logged in and the network is connected
- Then the Tor binary is configured to use the expected Tor authorities
-
Scenario: The firewall configuration is very restrictive
Given I have started Tails from DVD and logged in and the network is connected
Then the firewall's policy is to drop all IPv4 traffic
diff --git a/features/virtualization.feature b/features/virtualization.feature
new file mode 100644
index 0000000..e04a5ff
--- /dev/null
+++ b/features/virtualization.feature
@@ -0,0 +1,7 @@
+@product
+Feature: Virtualization support
+
+ Scenario: VirtualBox guest modules are available
+ Given I have started Tails from DVD without network and logged in
+ When Tails has booted a 64-bit kernel
+ Then the VirtualBox guest modules are available
diff --git a/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn b/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn
index 8b37079..94a2882 100644
--- a/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn
+++ b/wiki/src/blueprint/Add_Gnome_PPP_for_Dial-Up_Users.mdwn
@@ -23,8 +23,8 @@ Ideal solution: [[todo/NetworkManager:_PSTN_dial-up]]
# Research
NetworkManager (and ModemManager) have full support for **mobile** modems. But
-nothing for old school dial-up modems at the moment: see [b.g.o #348330 -
-Tracker: Integrated PPP support](https://bugzilla.gnome.org/show_bug.cgi?id=348330)
+nothing for old school dial-up modems at the moment:
+see [[!gnomebug 348330 desc="Integrated PPP support"]]
Fallback option: provide GNOME PPP, a GUI front-end to old but trusty WvDial.
diff --git a/wiki/src/blueprint/Linux_containers.mdwn b/wiki/src/blueprint/Linux_containers.mdwn
index 5eaca12..4a46c8b 100644
--- a/wiki/src/blueprint/Linux_containers.mdwn
+++ b/wiki/src/blueprint/Linux_containers.mdwn
@@ -39,9 +39,8 @@ Security limitations
unsafe](https://www.stgraber.org/2014/01/01/lxc-1-0-security-features/).
* [Unprivileged
containers](https://www.stgraber.org/2014/01/17/lxc-1-0-unprivileged-containers/)
- should be enough for most of what we intend to contain. It's unclear
- if they can be made to work on Debian Wheezy (seems to require quite
- some backporting work). Note, however, that unprivileged containers
+ should be enough for most of what we intend to contain.
+ Note, however, that unprivileged containers
have had quite some security issues when they were introduced (and
for this reason, the grsec patchset disables unprivileged use of
user namespaces). Have things gotten better since?
diff --git a/wiki/src/blueprint/VoIP_support.mdwn b/wiki/src/blueprint/VoIP_support.mdwn
index 5cad22a..ee430aa 100644
--- a/wiki/src/blueprint/VoIP_support.mdwn
+++ b/wiki/src/blueprint/VoIP_support.mdwn
@@ -88,13 +88,13 @@ Ekiga
- in Debian Squeeze and Wheezy
- supposed to support zRTP... some day:
- * [their TODO item](https://bugzilla.gnome.org/show_bug.cgi?id=335594)
+ * [[!gnomebug 335594 desc="their TODO item"]]
* [last
update](http://mail.gnome.org/archives/ekiga-devel-list/2009-April/msg00036.html)
as of 200904
- supports IPv6 in 3.3.x (Debian experimental only, as of 20121129)
- but not before ([[!debbug 375056]], [upstream
- bug](https://bugzilla.gnome.org/show_bug.cgi?id=331041))
+ but not before ([[!debbug 375056]],
+ [[!gnomebug 331041 desc="upstream bug]])
Empathy
-------
diff --git a/wiki/src/blueprint/accessibility.mdwn b/wiki/src/blueprint/accessibility.mdwn
index 1429acd..1a3bf33 100644
--- a/wiki/src/blueprint/accessibility.mdwn
+++ b/wiki/src/blueprint/accessibility.mdwn
@@ -66,6 +66,5 @@ for some people with sight impairment; such features Compiz includes are:
is much clearer cut than the mouse tracking in gnome-mag.
- zoom: magnify the entire desktop
-On the other hand, Compiz requires modern graphics hardware, seems
-pretty hard to get working on Debian Squeeze, and won't be in Wheezy
+On the other hand, Compiz has not been in Debian since Wheezy
=> discarded.
diff --git a/wiki/src/blueprint/macchanger.mdwn b/wiki/src/blueprint/macchanger.mdwn
index 7df30ef..7663a35 100644
--- a/wiki/src/blueprint/macchanger.mdwn
+++ b/wiki/src/blueprint/macchanger.mdwn
@@ -18,8 +18,8 @@ emitted.
Some bugs of interest that may bring some hope:
-* <https://bugzilla.gnome.org/show_bug.cgi?id=387832> resolved
-* <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=518368> fixed upstream
+* [[!gnomebug 387832]] resolved
+* [[!debbug 518368]] fixed upstream
* <https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/336736> wontfix
## Vendor bit randomisation with macchiato
diff --git a/wiki/src/blueprint/reproducible_builds.mdwn b/wiki/src/blueprint/reproducible_builds.mdwn
index 7f9adac..dcab246 100644
--- a/wiki/src/blueprint/reproducible_builds.mdwn
+++ b/wiki/src/blueprint/reproducible_builds.mdwn
@@ -491,5 +491,13 @@ It also raises technical questions:
the POT-Creation-Date header. The basic approach here is from gettext,
though implemented a bit more simply since we can assume perl."
-* Making ISO filesystem reproducible: ask Chris Lamb
- <lamby@debian.org> (keyword: libisofs).
+* Building Debian Live reproducibly:
+ - see commits authored by "lamby" in
+ [Webconverger's Debian live configuration](https://github.com/Webconverger/Debian-Live-config/commits/master),
+ that include a script to clamp mtimes
+ - [[!debbug 832998]] / [[!debbug 833118]]
+
+* Making ISO filesystem reproducible:
+ - ask Chris Lamb <lamby@debian.org> (keywords: libisofs,
+ libisoburn, xorriso)
+ - [[!debbug 831379]] / [[!debbug 832689]]
diff --git a/wiki/src/contribute/APT_repository/custom.mdwn b/wiki/src/contribute/APT_repository/custom.mdwn
index 13ebc67..59df239 100644
--- a/wiki/src/contribute/APT_repository/custom.mdwn
+++ b/wiki/src/contribute/APT_repository/custom.mdwn
@@ -22,8 +22,8 @@ We use one single APT repository hosting multiple *suites*:
by any Tails git branch; it can be used as hosting space for other
packaging work we might do, e.g. acting as upstream or
Debian maintainers.
-* We also have a `builder-wheezy` suite, used to provide additional
- packages needed on a Wheezy system to build Tails.
+* We also have a `builder-jessie` suite, used to provide additional
+ packages needed on a Jessie system to build Tails.
The suite(s) to use as sources for APT, during the build and inside
the resulting system, are determined by the content of the
diff --git a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
index 91ba7a4..5244a60 100644
--- a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
+++ b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
@@ -93,7 +93,7 @@ a specific set of APT repository snapshots must be used:
git checkout "$RELEASE_BRANCH" && \
./auto/scripts/apt-snapshots-serials thaw && \
git commit \
- -m 'Thaw APT snapshots after Tails $VERSION was released.' \
+ -m "Thaw APT snapshots after Tails $VERSION was released." \
config/APT_snapshots.d/*/serial
<a id="bump-expiration-date"></a>
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 57c9afd..d6a9afd 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1190,8 +1190,8 @@ send the hostname over DHCP by default. Likely this can be overridden
on a per-connection basis if one really needs to change this.
Third, dhclient itself is told not to send the hostname. This is
-needed because on Wheezy, NetworkManager runs dhclient with the `-cf
-/var/run/nm-dhclient-eth0.conf` option, and generates that file by
+needed because on Jessie, NetworkManager runs dhclient with the `-cf
+/var/lib/NetworkManager/dhclient-eth0.conf` option, and generates that file by
concatenating `/etc/dhcp/dhclient.conf` with its own settings.
Fourth, dhclient is told to override any hostname provided by the DHCP
diff --git a/wiki/src/contribute/design/Time_syncing.mdwn b/wiki/src/contribute/design/Time_syncing.mdwn
index 4a9234b..1a9fbd9 100644
--- a/wiki/src/contribute/design/Time_syncing.mdwn
+++ b/wiki/src/contribute/design/Time_syncing.mdwn
@@ -90,10 +90,10 @@ Third, things are different depending on if you're using a bridge or
not.
If not using a bridge: Tails starts without a cached consensus, so its
-Tor client starts by connecting directly to a directory authority (and
-not to a directory mirror / entry guard), so feeding you an old
+Tor client starts by connecting directly to a fallback directory
+mirror, so feeding you an old
consensus requires the attacker either to break SSL, or to control the
-directory authority your Tor client connects to. Not good, but
+fallback directory mirror your Tor client connects to. Not good, but
probably a compromise we can make.
If using a bridge: your bridge can replay an old (one week old max.)
diff --git a/wiki/src/contribute/design/UEFI.mdwn b/wiki/src/contribute/design/UEFI.mdwn
index 5736e7d..1685a75 100644
--- a/wiki/src/contribute/design/UEFI.mdwn
+++ b/wiki/src/contribute/design/UEFI.mdwn
@@ -314,9 +314,7 @@ to convert it on the fly to GRUB's format:
Support for `{vesa,}menu.c32` was added in GRUB upstream, but didn't
make it into Debian yet as of 2.02~beta2-22, so we have backported
-these patches and are shipping a custom GRUB2 package. Note that this
-source package doesn't build on Wheezy, so the binary package we're
-including was built with pbuilder in a Debian sid chroot.
+these patches and are shipping a custom GRUB2 package.
Discarded implementation ideas
------------------------------
diff --git a/wiki/src/contribute/how/code.mdwn b/wiki/src/contribute/how/code.mdwn
index e76cf2f..0e136d8 100644
--- a/wiki/src/contribute/how/code.mdwn
+++ b/wiki/src/contribute/how/code.mdwn
@@ -38,8 +38,9 @@ Our focus on low-effort maintainability has practical consequences.
First of all, we tend to **carry the smallest possible delta** with
our upstreams (i.e. upstream software and Debian). For details about
this, read our [[contribute/relationship_with_upstream]] statement.
-Moreover, we encourage you to [[improve Tails by working on
-Debian|contribute/how/debian]].
+Moreover, we encourage you to improve Tails [[by working on
+Debian|contribute/how/debian]] or
+[[by working on GNOME|contribute/relationship_with_upstream#gnome-bts]].
Second, we try **not to reinvent the wheel**, and we flee the
[[!wikipedia Not_invented_here]] syndrome like the plague. Very little
diff --git a/wiki/src/contribute/l10n_tricks.mdwn b/wiki/src/contribute/l10n_tricks.mdwn
index e646dd3..48ffc88 100644
--- a/wiki/src/contribute/l10n_tricks.mdwn
+++ b/wiki/src/contribute/l10n_tricks.mdwn
@@ -51,7 +51,7 @@ work properly.
To check the validity of PO files, install [i18nspector](http://jwilk.net/software/i18nspector)
by running the following command line:
- sudo apt-get install i18nspector/wheezy-backports
+ sudo apt install i18nspector
You can then check a single file:
diff --git a/wiki/src/contribute/relationship_with_upstream.mdwn b/wiki/src/contribute/relationship_with_upstream.mdwn
index 61a1346..069ea53 100644
--- a/wiki/src/contribute/relationship_with_upstream.mdwn
+++ b/wiki/src/contribute/relationship_with_upstream.mdwn
@@ -71,3 +71,9 @@ globally](https://www.debian.org/Bugs/Developer#tags) on the BTS.
We contribute to [Debian Live](http://live.debian.net/) on a regular
basis. Every single feature we have added to Debian Live has been
merged upstream, and we intend to go on this way.
+
+<a id="gnome-bts"></a>
+
+## GNOME
+
+See the [tickets that affect Tails in the GNOME bug tracker](https://bugzilla.gnome.org/buglist.cgi?keywords=AffectsTails&list_id=141377&order=bug_id&query_based_on=&query_format=advanced).
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 8c3fda2..e4e4923 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -16,7 +16,7 @@ the scripts snippets found on this page:
export TAG=$(echo "$VERSION" | sed -e 's,~,-,')
export PREVIOUS_VERSION=$(dpkg-parsechangelog --offset 1 --count 1 -SVersion)
-* `NEXT_MAJOR_VERSION`: set to the version number of the next Tails release
+* `NEXT_PLANNED_VERSION`: set to the version number of the next Tails release
(e.g. 0.23 when releasing 0.22.1, and 1.3 when releasing 1.2)
* `MAJOR_RELEASE`: set to 1 if preparing a major release, to 0 else
* `ISOS`: the directory where one stores `tails-i386-*`
@@ -34,6 +34,7 @@ the scripts snippets found on this page:
Git repository.
* `PERL5LIB_CHECKOUT`: a checkout of the relevant tag of the
`perl5lib` Git repository.
+* `DIST`: either 'alpha' (for RC:s) or 'stable' (for actual releases)
Pre-freeze
==========
@@ -263,7 +264,10 @@ Update other base branches
4. Push the modified branches to Git:
- git push origin "${RELEASE_BRANCH}:${RELEASE_BRANCH}" devel:devel
+ git push origin \
+ "${RELEASE_BRANCH}:${RELEASE_BRANCH}" \
+ feature/stretch:feature/stretch \
+ devel:devel
Update more included files
==========================
@@ -333,12 +337,6 @@ matches the date of the future signature.
Read the Changelog carefully, and update [[doc/about/features]]
pages accordingly.
-Also:
-
- git grep PENDING wiki/src/contribute/design*
-
-... and remove the `PENDING-FOR-N.M` warnings.
-
Website translations
--------------------
@@ -348,6 +346,7 @@ the new release. This e.g. ensures that the RC call for translation
points translators to up-to-date PO files:
./build-website && git add wiki/src && git commit -m 'Update website PO files.'
+ git push origin "${RELEASE_BRANCH}:${RELEASE_BRANCH}"
Call for translation
====================
@@ -587,7 +586,7 @@ below):
Note that developer tools for creating IUK and upgrade-description
files were only tested on Debian sid. It should hopefully work well on
-Wheezy too.
+Jessie too.
<a id="prepare-upgrade-description-files"></a>
@@ -612,8 +611,8 @@ Prepare upgrade-description files
( cd $IUK_CHECKOUT && \
./bin/tails-iuk-generate-upgrade-description-files \
--version "$VERSION" \
- --next-version "$NEXT_MAJOR_VERSION" \
- --next-version "${NEXT_MAJOR_VERSION}~rc1" \
+ --next-version "$NEXT_PLANNED_VERSION" \
+ --next-version "${NEXT_PLANNED_VERSION}~rc1" \
--next-version "${VERSION}.1" \
--iso "$ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso" \
--previous-version "$PREVIOUS_VERSION" \
@@ -733,12 +732,11 @@ rsync.lizard:
scp -3 -r \
bittorrent.lizard:/var/lib/transmission-daemon/downloads/tails-i386-$VERSION \
rsync.lizard:
- # set DIST to either 'alpha' (for RC:s) or 'stable' (for actual releases)
ssh rsync.lizard << EOF
- chown -R root:rsync_tails \
+ sudo chown -R root:rsync_tails \
tails-i386-$VERSION \
Tails_i386_${PREVIOUS_VERSION}_to_${VERSION}.iuk && \
- chmod -R u=rwX,go=rX \
+ sudo chmod -R u=rwX,go=rX \
tails-i386-$VERSION \
Tails_i386_${PREVIOUS_VERSION}_to_${VERSION}.iuk && \
sudo mv tails-i386-$VERSION \
@@ -779,10 +777,6 @@ If preparing a final release
Skip this part if preparing a RC.
-In order to get any new documentation into the website, merge either
-`stable` or `testing` (depending on which release you just did) into
-`master`.
-
Rename the `.packages` file to remove the `.iso` and build date parts
of its name:
@@ -842,8 +836,8 @@ in order to let the users of the old versions
know that they have to upgrade. Date it a few days before the ISO
image to be released was *built*. Including:
-- the list of CVE fixed in Linux since the one shipped in the previous
- release of Tails:
+- if we are shipping Linux from testing/sid, the list of CVE fixed in
+ Linux since the one shipped in the previous release of Tails:
<http://metadata.ftp-master.debian.org/changelogs/main/l/linux/stable_changelog>
- the list of DSA fixed in packages we ship since those that were in
the previous release of Tails: <https://www.debian.org/security/#DSAS>
@@ -903,9 +897,9 @@ Testing
of bandwidth.
1. Email <tails-testers@boum.org> to ask them to test the tentative
ISO, pointing them to the up-to-date mirror you've found previously.
-1. Set up a Gobby document and copy the [[manual test
+1. Set up a pad and copy the [[manual test
suite|contribute/release_process/test]] in it.
-1. Email to <tails@boum.org> and potential contributors (see
+1. Email <tails@boum.org> and potential contributors (see
`manual_testers.mdwn` in the internal Git repository) that tests
may start:
- point them to the up-to-date mirror you've found previously
@@ -962,7 +956,7 @@ repository like this:
) && \
( cd "$MASTER_CHECKOUT" && \
git fetch && \
- git merge "$RELEASE_BRANCH" && \
+ git merge "origin/$RELEASE_BRANCH" && \
git push origin master:master \
)
@@ -998,12 +992,12 @@ this release.
echo "Failed to fetch ${url} so manually investigate #${ticket}" >&2
continue
fi
- status=$(echo "${url_content}" | \
+ ticket_status=$(echo "${url_content}" | \
sed -n 's,^.*<th class="status">Status:</th><td class="status">\([^<]\+\)</td>.*$,\1,p')
- if [ "${status}" != "New" ] && \
- [ "${status}" != "Confirmed" ] && \
- [ "${status}" != "In Progress" ]; then
- echo "It seems ticket #${ticket} has been fixed (Status: ${status}) so please find all instances in the wiki and fix them. Ticket URL: ${url}"
+ if [ "${ticket_status}" != "New" ] && \
+ [ "${ticket_status}" != "Confirmed" ] && \
+ [ "${ticket_status}" != "In Progress" ]; then
+ echo "It seems ticket #${ticket} has been fixed (Status: ${ticket_status}) so please find all instances in the wiki and fix them. Ticket URL: ${url}"
fi
done
@@ -1011,14 +1005,6 @@ Remember that ticket expressions, e.g. `[[!tails_ticket 1234]]`, can
span several lines, so finding the ones reported by the above code
*might* be harder than `git grep "tails_ticket 1234"`.
-Test suite
-----------
-
-Remove indications of known broken tests that were fixed by this
-release:
-
- git grep XXX -- features
-
XMPP
----
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 9cadc53..9849fe3 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -295,8 +295,6 @@ language. You *really* have to reboot between each language.
- Type something in the textarea.
- Right-click and select a language.
- Verify that the spelling suggestion are from that language. (automate: [[!tails_ticket 10271]])
-* Once [[!tails_ticket 5962]] is fixed, the browser spelling dictionary must be
- localized (for languages that are supported by our branding extension). (automate: [[!tails_ticket 10272]])
# Misc
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn
index eea80ed..49a81ed 100644
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn
+++ b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn
@@ -1,14 +1,12 @@
-Note that you need the qemu command, which is provided on wheezy by the `qemu-system` package.
-
* Start the VM
- with a 64-bit CPU that supports PAE
- qemu -enable-kvm -cpu Nehalem -cdrom tails.iso -m 5120
+ qemu-system-x86_64 -enable-kvm -cpu Nehalem -cdrom tails.iso -m 5120
- with a 32-bit CPU that does not support PAE
- qemu -enable-kvm -cpu 486 -cdrom tails.iso -m 5120
+ qemu-system-x86_64 -enable-kvm -cpu 486 -cdrom tails.iso -m 5120
* Open the qemu console (CTRL-ALT-2).
* Save physical memory to the `tails.dump` file (length is an integer, max size for one dump is 4G = 0xF0000000):
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 289dc9c..c141d1d 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Releasing the Tor Browser"]]
+[[!meta title="Upgrading the Tor Browser"]]
[[!toc levels=2]]
@@ -43,6 +43,7 @@ Have a look at
* <https://www.torproject.org/dist/torbrowser/>
* <https://people.torproject.org/~mikeperry/builds/>
* <https://people.torproject.org/~gk/builds/>
+* <https://people.torproject.org/~boklm/builds/>
* <https://people.torproject.org/~linus/builds/>
and see if the desired version is available. Set `DIST_URL` to the
@@ -113,10 +114,10 @@ Self-hosted Tor Browser tarballs archive
Initial setup
-------------
-First, install git-annex from wheezy-backports or newer.
+First, install git-annex.
Then, make sure you have an entry for `git.puppet.tails.boum.org` in
-your `~/.ssh/config`. See systems/ISO_history in the internal Git repo
+your `~/.ssh/config`. See `systems/ISO_history.mdwn` in the internal Git repo
for details.
Then, clone the metadata repository and initialize git-annex:
@@ -161,7 +162,8 @@ Import a new set of Tor Browser tarballs
cat "$TBB_SHA256SUMS_FILE" | while read expected_sha256 tarball; do
(
cd "$TMPDIR"
- curl --remote-name "${TBB_TARBALLS_BASE_URL}/${tarball}"
+ curl --remote-name --continue-at - \
+ "${TBB_TARBALLS_BASE_URL}/${tarball}"
)
done
(cd "$TMPDIR" && sha256sum -c "$TBB_SHA256SUMS_FILE")
@@ -180,15 +182,6 @@ Commit and push your changes
git annex sync && \
git annex copy --to origin -- "${VERSION}"
-Adjust the URL in the main Git repository
------------------------------------------
-
- cd "$TAILS_GIT_REPO" && \
- echo "http://torbrowser-archive.tails.boum.org/${VERSION}/" > \
- config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
- git commit config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt \
- -m "Fetch Tor Browser from our own archive."
-
Wait for the synchronization
----------------------------
@@ -196,7 +189,16 @@ Once you've gone through these steps, a cronjob that runs every
5 minutes will download the tarballs and make them available on
<http://torbrowser-archive.tails.boum.org/>.
-Wait for this to happen before you can build Tails using the new URL.
+Wait for this to happen before you proceed with the next steps.
In the meantime, you might want to import the new Tor Browser tarballs
into your `apt-cacher-ng` local cache.
+
+Adjust the URL in the main Git repository
+-----------------------------------------
+
+ cd "$TAILS_GIT_REPO" && \
+ echo "http://torbrowser-archive.tails.boum.org/${VERSION}/" > \
+ config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
+ git commit config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt \
+ -m "Fetch Tor Browser from our own archive."
diff --git a/wiki/src/contribute/working_together/roles/release_manager.mdwn b/wiki/src/contribute/working_together/roles/release_manager.mdwn
index fe29d82..da13108 100644
--- a/wiki/src/contribute/working_together/roles/release_manager.mdwn
+++ b/wiki/src/contribute/working_together/roles/release_manager.mdwn
@@ -33,9 +33,10 @@
- Have a look at recent changes
in [Torbutton](https://gitweb.torproject.org/torbutton.git), and
make sure they are compatible with our configuration.
-- Have Kill Your TV upgrade I2P if needed. See [[contribute/design/I2P]].
+- Have someone ([[!tails_ticket 11276 desc="who?"]]) upgrade I2P if needed.
+ See [[contribute/design/I2P]].
- If needed, update the list of Tor authorities in the test
- suite configuration.
+ suite configuration (`TOR_AUTHORITIES`).
- Check that the list of backends we ship in `/usr/lib/cups/backend`
are all listed in the (patched) `/etc/apparmor.d/usr.sbin.cups`:
* backends shipped in [[!debpkg cups-daemon]] should have `ixr`
diff --git a/wiki/src/inc/trace b/wiki/src/inc/trace
index 4f0c2bf..a5ba537 100644
--- a/wiki/src/inc/trace
+++ b/wiki/src/inc/trace
@@ -1 +1 @@
-1465246924
+1469995978
diff --git a/wiki/src/news/bounties_2013_report.de.po b/wiki/src/news/bounties_2013_report.de.po
index 16e971c..b4babb5 100644
--- a/wiki/src/news/bounties_2013_report.de.po
+++ b/wiki/src/news/bounties_2013_report.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-20 23:46+0300\n"
+"POT-Creation-Date: 2016-08-02 17:15+0300\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"
@@ -88,11 +88,11 @@ msgid "<https://bugs.debian.org/668221>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+msgid "[[!gnomebug 325803]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+msgid "[[!gnomebug 699161]]"
msgstr ""
#. type: Bullet: ' - '
@@ -100,7 +100,7 @@ msgid "<https://bugs.freedesktop.org/show_bug.cgi?id=65679>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
+msgid "[[!gnomebug 708640]]"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/news/bounties_2013_report.fa.po b/wiki/src/news/bounties_2013_report.fa.po
index d985f75..1064192 100644
--- a/wiki/src/news/bounties_2013_report.fa.po
+++ b/wiki/src/news/bounties_2013_report.fa.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: 2016-05-20 23:46+0300\n"
+"POT-Creation-Date: 2016-08-02 17:15+0300\n"
"PO-Revision-Date: 2015-10-17 07:31+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -107,20 +107,22 @@ msgid "<https://bugs.debian.org/668221>"
msgstr "<https://bugs.debian.org/668221>"
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
-msgstr "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+#, fuzzy
+#| msgid "[[!tor_bug 2905]]"
+msgid "[[!gnomebug 325803]]"
+msgstr "[[!tor_bug 2905]]"
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
-msgstr "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+msgid "[[!gnomebug 699161]]"
+msgstr ""
#. type: Bullet: ' - '
msgid "<https://bugs.freedesktop.org/show_bug.cgi?id=65679>"
msgstr "<https://bugs.freedesktop.org/show_bug.cgi?id=65679>"
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
-msgstr "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
+msgid "[[!gnomebug 708640]]"
+msgstr ""
#. type: Plain text
#, fuzzy
@@ -302,3 +304,12 @@ msgid ""
"the contract."
msgstr ""
"فردی که برای این کار با او تماس گرفته بودیم پیش از امضای قرارداد ناپدید شد."
+
+#~ msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+#~ msgstr "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+
+#~ msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+#~ msgstr "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+
+#~ msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
+#~ msgstr "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
diff --git a/wiki/src/news/bounties_2013_report.fr.po b/wiki/src/news/bounties_2013_report.fr.po
index 16e971c..b4babb5 100644
--- a/wiki/src/news/bounties_2013_report.fr.po
+++ b/wiki/src/news/bounties_2013_report.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-20 23:46+0300\n"
+"POT-Creation-Date: 2016-08-02 17:15+0300\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"
@@ -88,11 +88,11 @@ msgid "<https://bugs.debian.org/668221>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+msgid "[[!gnomebug 325803]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+msgid "[[!gnomebug 699161]]"
msgstr ""
#. type: Bullet: ' - '
@@ -100,7 +100,7 @@ msgid "<https://bugs.freedesktop.org/show_bug.cgi?id=65679>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
+msgid "[[!gnomebug 708640]]"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/news/bounties_2013_report.it.po b/wiki/src/news/bounties_2013_report.it.po
index 16e971c..b4babb5 100644
--- a/wiki/src/news/bounties_2013_report.it.po
+++ b/wiki/src/news/bounties_2013_report.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-20 23:46+0300\n"
+"POT-Creation-Date: 2016-08-02 17:15+0300\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"
@@ -88,11 +88,11 @@ msgid "<https://bugs.debian.org/668221>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+msgid "[[!gnomebug 325803]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+msgid "[[!gnomebug 699161]]"
msgstr ""
#. type: Bullet: ' - '
@@ -100,7 +100,7 @@ msgid "<https://bugs.freedesktop.org/show_bug.cgi?id=65679>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
+msgid "[[!gnomebug 708640]]"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/news/bounties_2013_report.mdwn b/wiki/src/news/bounties_2013_report.mdwn
index ef6db32..34d91d7 100644
--- a/wiki/src/news/bounties_2013_report.mdwn
+++ b/wiki/src/news/bounties_2013_report.mdwn
@@ -36,10 +36,10 @@ and libcryptui.
Relevant tickets:
- <https://bugs.debian.org/668221>
- - <https://bugzilla.gnome.org/show_bug.cgi?id=325803>
- - <https://bugzilla.gnome.org/show_bug.cgi?id=699161>
+ - [[!gnomebug 325803]]
+ - [[!gnomebug 699161]]
- <https://bugs.freedesktop.org/show_bug.cgi?id=65679>
- - <https://bugzilla.gnome.org/show_bug.cgi?id=708640>
+ - [[!gnomebug 708640]]
The patches were merged upstream by December 2013.
diff --git a/wiki/src/news/bounties_2013_report.pt.po b/wiki/src/news/bounties_2013_report.pt.po
index 16e971c..b4babb5 100644
--- a/wiki/src/news/bounties_2013_report.pt.po
+++ b/wiki/src/news/bounties_2013_report.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-20 23:46+0300\n"
+"POT-Creation-Date: 2016-08-02 17:15+0300\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"
@@ -88,11 +88,11 @@ msgid "<https://bugs.debian.org/668221>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=325803>"
+msgid "[[!gnomebug 325803]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=699161>"
+msgid "[[!gnomebug 699161]]"
msgstr ""
#. type: Bullet: ' - '
@@ -100,7 +100,7 @@ msgid "<https://bugs.freedesktop.org/show_bug.cgi?id=65679>"
msgstr ""
#. type: Bullet: ' - '
-msgid "<https://bugzilla.gnome.org/show_bug.cgi?id=708640>"
+msgid "[[!gnomebug 708640]]"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/news/version_2.5.de.po b/wiki/src/news/version_2.5.de.po
index ffb8fbd..4e7bfb6 100644
--- a/wiki/src/news/version_2.5.de.po
+++ b/wiki/src/news/version_2.5.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 11:08+0200\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"
@@ -33,9 +33,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"issues|security/Numerous_security_holes_in_2.4]] and users should upgrade as "
-"soon as possible."
+"This release fixes [[many security issues|security/"
+"Numerous_security_holes_in_2.4]] and users should upgrade as soon as "
+"possible."
msgstr ""
#. type: Plain text
@@ -43,6 +43,121 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr ""
+#. type: Title #
+#, no-wrap
+msgid "Changes"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Plain text
+msgid "- Update *Tor Browser* to 6.0.3, based on *Firefox* 45.3."
+msgstr ""
+
+#. type: Plain text
+msgid "- Upgrade *Icedove* to 45.1. ([[!tails_ticket 11530]])"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"The automatic account configuration of *Icedove* used to freeze when "
+"connecting to some email providers. ([[!tails_ticket 11486]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"In some cases sending an email with *Icedove* used to result in the error: "
+"\"The message could not be sent using Outgoing server (SMTP) mail.riseup."
+"net for an unknown reason.\" ([[!tails_ticket 10933]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"A spurious error message used to sometimes appear when creating an account "
+"in *Icedove* and providing its password. ([[!tails_ticket 11550]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Fix some time synchronization problems, by replacing obsolete and unreliable "
+"servers, and decreasing a timeout. ([[!tails_ticket 11577]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"[[KVM virtual machines|doc/advanced_topics/virtualization/virt-manager]] "
+"with QXL video: vastly improve graphics performance and fix visual artifacts "
+"in *Tor Browser*. ([[!tails_ticket 11500]], [[!tails_ticket 11489]])"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For more details, read our [changelog](https://git-tails.immerda.ch/tails/"
+"plain/debian/changelog)."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Known issues"
+msgstr ""
+
+#. type: Plain text
+msgid "See the list of [[long-standing issues|support/known_issues]]."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Get Tails 2.5"
+msgstr ""
+
+#. type: Plain text
+msgid "- To install, follow our [[installation instructions|install]]."
+msgstr ""
+
#. type: Plain text
-msgid "XXX: [[!tails_ticket 11371]]"
+msgid "- To upgrade, an automatic upgrade is available from 2.4 to 2.5."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you cannot do an automatic upgrade or if you fail to start after an\n"
+" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
+msgstr ""
+
+#. type: Plain text
+msgid "- [[Download Tails 2.5.|install/download]]"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's coming up?"
+msgstr ""
+
+#. type: Plain text
+msgid "Tails 2.6 is [[scheduled|contribute/calendar]] for September 13."
+msgstr ""
+
+#. type: Plain text
+msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We need your help and there are many ways to [[contribute to Tails|"
+"contribute]] ([[donating|contribute/how/donate]] is only one of them). Come "
+"[[talk to us|about/contact#tails-dev]]!"
msgstr ""
diff --git a/wiki/src/news/version_2.5.fa.po b/wiki/src/news/version_2.5.fa.po
index ffb8fbd..4e7bfb6 100644
--- a/wiki/src/news/version_2.5.fa.po
+++ b/wiki/src/news/version_2.5.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 11:08+0200\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"
@@ -33,9 +33,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"issues|security/Numerous_security_holes_in_2.4]] and users should upgrade as "
-"soon as possible."
+"This release fixes [[many security issues|security/"
+"Numerous_security_holes_in_2.4]] and users should upgrade as soon as "
+"possible."
msgstr ""
#. type: Plain text
@@ -43,6 +43,121 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr ""
+#. type: Title #
+#, no-wrap
+msgid "Changes"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Plain text
+msgid "- Update *Tor Browser* to 6.0.3, based on *Firefox* 45.3."
+msgstr ""
+
+#. type: Plain text
+msgid "- Upgrade *Icedove* to 45.1. ([[!tails_ticket 11530]])"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"The automatic account configuration of *Icedove* used to freeze when "
+"connecting to some email providers. ([[!tails_ticket 11486]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"In some cases sending an email with *Icedove* used to result in the error: "
+"\"The message could not be sent using Outgoing server (SMTP) mail.riseup."
+"net for an unknown reason.\" ([[!tails_ticket 10933]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"A spurious error message used to sometimes appear when creating an account "
+"in *Icedove* and providing its password. ([[!tails_ticket 11550]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Fix some time synchronization problems, by replacing obsolete and unreliable "
+"servers, and decreasing a timeout. ([[!tails_ticket 11577]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"[[KVM virtual machines|doc/advanced_topics/virtualization/virt-manager]] "
+"with QXL video: vastly improve graphics performance and fix visual artifacts "
+"in *Tor Browser*. ([[!tails_ticket 11500]], [[!tails_ticket 11489]])"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For more details, read our [changelog](https://git-tails.immerda.ch/tails/"
+"plain/debian/changelog)."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Known issues"
+msgstr ""
+
+#. type: Plain text
+msgid "See the list of [[long-standing issues|support/known_issues]]."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Get Tails 2.5"
+msgstr ""
+
+#. type: Plain text
+msgid "- To install, follow our [[installation instructions|install]]."
+msgstr ""
+
#. type: Plain text
-msgid "XXX: [[!tails_ticket 11371]]"
+msgid "- To upgrade, an automatic upgrade is available from 2.4 to 2.5."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you cannot do an automatic upgrade or if you fail to start after an\n"
+" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
+msgstr ""
+
+#. type: Plain text
+msgid "- [[Download Tails 2.5.|install/download]]"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's coming up?"
+msgstr ""
+
+#. type: Plain text
+msgid "Tails 2.6 is [[scheduled|contribute/calendar]] for September 13."
+msgstr ""
+
+#. type: Plain text
+msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We need your help and there are many ways to [[contribute to Tails|"
+"contribute]] ([[donating|contribute/how/donate]] is only one of them). Come "
+"[[talk to us|about/contact#tails-dev]]!"
msgstr ""
diff --git a/wiki/src/news/version_2.5.fr.po b/wiki/src/news/version_2.5.fr.po
index ffb8fbd..4e7bfb6 100644
--- a/wiki/src/news/version_2.5.fr.po
+++ b/wiki/src/news/version_2.5.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 11:08+0200\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"
@@ -33,9 +33,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"issues|security/Numerous_security_holes_in_2.4]] and users should upgrade as "
-"soon as possible."
+"This release fixes [[many security issues|security/"
+"Numerous_security_holes_in_2.4]] and users should upgrade as soon as "
+"possible."
msgstr ""
#. type: Plain text
@@ -43,6 +43,121 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr ""
+#. type: Title #
+#, no-wrap
+msgid "Changes"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Plain text
+msgid "- Update *Tor Browser* to 6.0.3, based on *Firefox* 45.3."
+msgstr ""
+
+#. type: Plain text
+msgid "- Upgrade *Icedove* to 45.1. ([[!tails_ticket 11530]])"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"The automatic account configuration of *Icedove* used to freeze when "
+"connecting to some email providers. ([[!tails_ticket 11486]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"In some cases sending an email with *Icedove* used to result in the error: "
+"\"The message could not be sent using Outgoing server (SMTP) mail.riseup."
+"net for an unknown reason.\" ([[!tails_ticket 10933]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"A spurious error message used to sometimes appear when creating an account "
+"in *Icedove* and providing its password. ([[!tails_ticket 11550]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Fix some time synchronization problems, by replacing obsolete and unreliable "
+"servers, and decreasing a timeout. ([[!tails_ticket 11577]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"[[KVM virtual machines|doc/advanced_topics/virtualization/virt-manager]] "
+"with QXL video: vastly improve graphics performance and fix visual artifacts "
+"in *Tor Browser*. ([[!tails_ticket 11500]], [[!tails_ticket 11489]])"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For more details, read our [changelog](https://git-tails.immerda.ch/tails/"
+"plain/debian/changelog)."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Known issues"
+msgstr ""
+
+#. type: Plain text
+msgid "See the list of [[long-standing issues|support/known_issues]]."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Get Tails 2.5"
+msgstr ""
+
+#. type: Plain text
+msgid "- To install, follow our [[installation instructions|install]]."
+msgstr ""
+
#. type: Plain text
-msgid "XXX: [[!tails_ticket 11371]]"
+msgid "- To upgrade, an automatic upgrade is available from 2.4 to 2.5."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you cannot do an automatic upgrade or if you fail to start after an\n"
+" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
+msgstr ""
+
+#. type: Plain text
+msgid "- [[Download Tails 2.5.|install/download]]"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's coming up?"
+msgstr ""
+
+#. type: Plain text
+msgid "Tails 2.6 is [[scheduled|contribute/calendar]] for September 13."
+msgstr ""
+
+#. type: Plain text
+msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We need your help and there are many ways to [[contribute to Tails|"
+"contribute]] ([[donating|contribute/how/donate]] is only one of them). Come "
+"[[talk to us|about/contact#tails-dev]]!"
msgstr ""
diff --git a/wiki/src/news/version_2.5.it.po b/wiki/src/news/version_2.5.it.po
index ffb8fbd..4e7bfb6 100644
--- a/wiki/src/news/version_2.5.it.po
+++ b/wiki/src/news/version_2.5.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 11:08+0200\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"
@@ -33,9 +33,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"issues|security/Numerous_security_holes_in_2.4]] and users should upgrade as "
-"soon as possible."
+"This release fixes [[many security issues|security/"
+"Numerous_security_holes_in_2.4]] and users should upgrade as soon as "
+"possible."
msgstr ""
#. type: Plain text
@@ -43,6 +43,121 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr ""
+#. type: Title #
+#, no-wrap
+msgid "Changes"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Plain text
+msgid "- Update *Tor Browser* to 6.0.3, based on *Firefox* 45.3."
+msgstr ""
+
+#. type: Plain text
+msgid "- Upgrade *Icedove* to 45.1. ([[!tails_ticket 11530]])"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"The automatic account configuration of *Icedove* used to freeze when "
+"connecting to some email providers. ([[!tails_ticket 11486]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"In some cases sending an email with *Icedove* used to result in the error: "
+"\"The message could not be sent using Outgoing server (SMTP) mail.riseup."
+"net for an unknown reason.\" ([[!tails_ticket 10933]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"A spurious error message used to sometimes appear when creating an account "
+"in *Icedove* and providing its password. ([[!tails_ticket 11550]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Fix some time synchronization problems, by replacing obsolete and unreliable "
+"servers, and decreasing a timeout. ([[!tails_ticket 11577]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"[[KVM virtual machines|doc/advanced_topics/virtualization/virt-manager]] "
+"with QXL video: vastly improve graphics performance and fix visual artifacts "
+"in *Tor Browser*. ([[!tails_ticket 11500]], [[!tails_ticket 11489]])"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For more details, read our [changelog](https://git-tails.immerda.ch/tails/"
+"plain/debian/changelog)."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Known issues"
+msgstr ""
+
+#. type: Plain text
+msgid "See the list of [[long-standing issues|support/known_issues]]."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Get Tails 2.5"
+msgstr ""
+
+#. type: Plain text
+msgid "- To install, follow our [[installation instructions|install]]."
+msgstr ""
+
#. type: Plain text
-msgid "XXX: [[!tails_ticket 11371]]"
+msgid "- To upgrade, an automatic upgrade is available from 2.4 to 2.5."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you cannot do an automatic upgrade or if you fail to start after an\n"
+" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
+msgstr ""
+
+#. type: Plain text
+msgid "- [[Download Tails 2.5.|install/download]]"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's coming up?"
+msgstr ""
+
+#. type: Plain text
+msgid "Tails 2.6 is [[scheduled|contribute/calendar]] for September 13."
+msgstr ""
+
+#. type: Plain text
+msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We need your help and there are many ways to [[contribute to Tails|"
+"contribute]] ([[donating|contribute/how/donate]] is only one of them). Come "
+"[[talk to us|about/contact#tails-dev]]!"
msgstr ""
diff --git a/wiki/src/news/version_2.5.mdwn b/wiki/src/news/version_2.5.mdwn
index 31253cd..fb0ae89 100644
--- a/wiki/src/news/version_2.5.mdwn
+++ b/wiki/src/news/version_2.5.mdwn
@@ -8,4 +8,61 @@ upgrade as soon as possible.
[[!toc levels=1]]
-XXX: [[!tails_ticket 11371]]
+# Changes
+
+## New features
+
+
+## Upgrades and changes
+
+- Update *Tor Browser* to 6.0.3, based on *Firefox* 45.3.
+
+- Upgrade *Icedove* to 45.1. ([[!tails_ticket 11530]])
+
+## Fixed problems
+
+- The automatic account configuration of *Icedove* used to freeze when
+ connecting to some email providers. ([[!tails_ticket 11486]])
+
+- In some cases sending an email with *Icedove* used to result in the
+ error: "The message could not be sent using Outgoing server (SMTP)
+ mail.riseup.net for an unknown reason." ([[!tails_ticket 10933]])
+
+- A spurious error message used to sometimes appear when creating an
+ account in *Icedove* and providing its password.
+ ([[!tails_ticket 11550]])
+
+- Fix some time synchronization problems, by replacing obsolete and
+ unreliable servers, and decreasing a timeout. ([[!tails_ticket 11577]])
+
+- [[KVM virtual machines|doc/advanced_topics/virtualization/virt-manager]]
+ with QXL video: vastly improve graphics performance and fix visual
+ artifacts in *Tor Browser*. ([[!tails_ticket 11500]],
+ [[!tails_ticket 11489]])
+
+For more details, read our [changelog](https://git-tails.immerda.ch/tails/plain/debian/changelog).
+
+# Known issues
+
+See the list of [[long-standing issues|support/known_issues]].
+
+# Get Tails 2.5
+
+- To install, follow our [[installation instructions|install]].
+
+- To upgrade, an automatic upgrade is available from 2.4 to 2.5.
+
+ If you cannot do an automatic upgrade or if you fail to start after an
+ automatic upgrade, please try to do a [[manual upgrade|upgrade]].
+
+- [[Download Tails 2.5.|install/download]]
+
+# What's coming up?
+
+Tails 2.6 is [[scheduled|contribute/calendar]] for September 13.
+
+Have a look at our [[!tails_roadmap]] to see where we are heading to.
+
+We need your help and there are many ways to [[contribute to
+Tails|contribute]] ([[donating|contribute/how/donate]] is only one of
+them). Come [[talk to us|about/contact#tails-dev]]!
diff --git a/wiki/src/news/version_2.5.pt.po b/wiki/src/news/version_2.5.pt.po
index ffb8fbd..4e7bfb6 100644
--- a/wiki/src/news/version_2.5.pt.po
+++ b/wiki/src/news/version_2.5.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 11:08+0200\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"
@@ -33,9 +33,9 @@ msgstr ""
#. type: Plain text
msgid ""
-"This release fixes [[many security "
-"issues|security/Numerous_security_holes_in_2.4]] and users should upgrade as "
-"soon as possible."
+"This release fixes [[many security issues|security/"
+"Numerous_security_holes_in_2.4]] and users should upgrade as soon as "
+"possible."
msgstr ""
#. type: Plain text
@@ -43,6 +43,121 @@ msgstr ""
msgid "[[!toc levels=1]]\n"
msgstr ""
+#. type: Title #
+#, no-wrap
+msgid "Changes"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "New features"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Upgrades and changes"
+msgstr ""
+
+#. type: Plain text
+msgid "- Update *Tor Browser* to 6.0.3, based on *Firefox* 45.3."
+msgstr ""
+
+#. type: Plain text
+msgid "- Upgrade *Icedove* to 45.1. ([[!tails_ticket 11530]])"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Fixed problems"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"The automatic account configuration of *Icedove* used to freeze when "
+"connecting to some email providers. ([[!tails_ticket 11486]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"In some cases sending an email with *Icedove* used to result in the error: "
+"\"The message could not be sent using Outgoing server (SMTP) mail.riseup."
+"net for an unknown reason.\" ([[!tails_ticket 10933]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"A spurious error message used to sometimes appear when creating an account "
+"in *Icedove* and providing its password. ([[!tails_ticket 11550]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Fix some time synchronization problems, by replacing obsolete and unreliable "
+"servers, and decreasing a timeout. ([[!tails_ticket 11577]])"
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"[[KVM virtual machines|doc/advanced_topics/virtualization/virt-manager]] "
+"with QXL video: vastly improve graphics performance and fix visual artifacts "
+"in *Tor Browser*. ([[!tails_ticket 11500]], [[!tails_ticket 11489]])"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"For more details, read our [changelog](https://git-tails.immerda.ch/tails/"
+"plain/debian/changelog)."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Known issues"
+msgstr ""
+
+#. type: Plain text
+msgid "See the list of [[long-standing issues|support/known_issues]]."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Get Tails 2.5"
+msgstr ""
+
+#. type: Plain text
+msgid "- To install, follow our [[installation instructions|install]]."
+msgstr ""
+
#. type: Plain text
-msgid "XXX: [[!tails_ticket 11371]]"
+msgid "- To upgrade, an automatic upgrade is available from 2.4 to 2.5."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" If you cannot do an automatic upgrade or if you fail to start after an\n"
+" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
+msgstr ""
+
+#. type: Plain text
+msgid "- [[Download Tails 2.5.|install/download]]"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "What's coming up?"
+msgstr ""
+
+#. type: Plain text
+msgid "Tails 2.6 is [[scheduled|contribute/calendar]] for September 13."
+msgstr ""
+
+#. type: Plain text
+msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We need your help and there are many ways to [[contribute to Tails|"
+"contribute]] ([[donating|contribute/how/donate]] is only one of them). Come "
+"[[talk to us|about/contact#tails-dev]]!"
msgstr ""
diff --git a/wiki/src/security/Numerous_security_holes_in_2.4.de.po b/wiki/src/security/Numerous_security_holes_in_2.4.de.po
index 8b763f5..8dd74a5 100644
--- a/wiki/src/security/Numerous_security_holes_in_2.4.de.po
+++ b/wiki/src/security/Numerous_security_holes_in_2.4.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 18:54+0300\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"
@@ -32,7 +32,8 @@ msgid "[[!tag security/fixed]]\n"
msgstr ""
#. type: Plain text
-msgid "Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
+msgid ""
+"Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
msgstr ""
#. type: Plain text
@@ -47,7 +48,16 @@ msgid "Details\n"
msgstr ""
#. type: Bullet: '* '
-msgid "Tor Browser: [[!mfsa2016 XXX]]"
+msgid ""
+"Tor Browser: [[!mfsa2016 62]], [[!mfsa2016 63]], [[!mfsa2016 64]], [[!"
+"mfsa2016 65]], [[!mfsa2016 67]], [[!mfsa2016 70]], [[!mfsa2016 72]], [[!"
+"mfsa2016 73]], [[!mfsa2016 76]], [[!mfsa2016 77]], [[!mfsa2016 78]], [[!"
+"mfsa2016 79]],"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!mfsa2016 80]]\n"
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/security/Numerous_security_holes_in_2.4.fa.po b/wiki/src/security/Numerous_security_holes_in_2.4.fa.po
index 8b763f5..8dd74a5 100644
--- a/wiki/src/security/Numerous_security_holes_in_2.4.fa.po
+++ b/wiki/src/security/Numerous_security_holes_in_2.4.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 18:54+0300\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"
@@ -32,7 +32,8 @@ msgid "[[!tag security/fixed]]\n"
msgstr ""
#. type: Plain text
-msgid "Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
+msgid ""
+"Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
msgstr ""
#. type: Plain text
@@ -47,7 +48,16 @@ msgid "Details\n"
msgstr ""
#. type: Bullet: '* '
-msgid "Tor Browser: [[!mfsa2016 XXX]]"
+msgid ""
+"Tor Browser: [[!mfsa2016 62]], [[!mfsa2016 63]], [[!mfsa2016 64]], [[!"
+"mfsa2016 65]], [[!mfsa2016 67]], [[!mfsa2016 70]], [[!mfsa2016 72]], [[!"
+"mfsa2016 73]], [[!mfsa2016 76]], [[!mfsa2016 77]], [[!mfsa2016 78]], [[!"
+"mfsa2016 79]],"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!mfsa2016 80]]\n"
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/security/Numerous_security_holes_in_2.4.fr.po b/wiki/src/security/Numerous_security_holes_in_2.4.fr.po
index 8b763f5..8dd74a5 100644
--- a/wiki/src/security/Numerous_security_holes_in_2.4.fr.po
+++ b/wiki/src/security/Numerous_security_holes_in_2.4.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 18:54+0300\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"
@@ -32,7 +32,8 @@ msgid "[[!tag security/fixed]]\n"
msgstr ""
#. type: Plain text
-msgid "Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
+msgid ""
+"Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
msgstr ""
#. type: Plain text
@@ -47,7 +48,16 @@ msgid "Details\n"
msgstr ""
#. type: Bullet: '* '
-msgid "Tor Browser: [[!mfsa2016 XXX]]"
+msgid ""
+"Tor Browser: [[!mfsa2016 62]], [[!mfsa2016 63]], [[!mfsa2016 64]], [[!"
+"mfsa2016 65]], [[!mfsa2016 67]], [[!mfsa2016 70]], [[!mfsa2016 72]], [[!"
+"mfsa2016 73]], [[!mfsa2016 76]], [[!mfsa2016 77]], [[!mfsa2016 78]], [[!"
+"mfsa2016 79]],"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!mfsa2016 80]]\n"
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/security/Numerous_security_holes_in_2.4.it.po b/wiki/src/security/Numerous_security_holes_in_2.4.it.po
index 8b763f5..8dd74a5 100644
--- a/wiki/src/security/Numerous_security_holes_in_2.4.it.po
+++ b/wiki/src/security/Numerous_security_holes_in_2.4.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 18:54+0300\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"
@@ -32,7 +32,8 @@ msgid "[[!tag security/fixed]]\n"
msgstr ""
#. type: Plain text
-msgid "Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
+msgid ""
+"Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
msgstr ""
#. type: Plain text
@@ -47,7 +48,16 @@ msgid "Details\n"
msgstr ""
#. type: Bullet: '* '
-msgid "Tor Browser: [[!mfsa2016 XXX]]"
+msgid ""
+"Tor Browser: [[!mfsa2016 62]], [[!mfsa2016 63]], [[!mfsa2016 64]], [[!"
+"mfsa2016 65]], [[!mfsa2016 67]], [[!mfsa2016 70]], [[!mfsa2016 72]], [[!"
+"mfsa2016 73]], [[!mfsa2016 76]], [[!mfsa2016 77]], [[!mfsa2016 78]], [[!"
+"mfsa2016 79]],"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!mfsa2016 80]]\n"
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/security/Numerous_security_holes_in_2.4.mdwn b/wiki/src/security/Numerous_security_holes_in_2.4.mdwn
index 1d06bc4..ec4a246 100644
--- a/wiki/src/security/Numerous_security_holes_in_2.4.mdwn
+++ b/wiki/src/security/Numerous_security_holes_in_2.4.mdwn
@@ -10,7 +10,11 @@ We **strongly** encourage you to [[upgrade to Tails 2.5|news/version_2.5]] as s
Details
=======
-* Tor Browser: [[!mfsa2016 XXX]]
+* Tor Browser: [[!mfsa2016 62]], [[!mfsa2016 63]], [[!mfsa2016 64]],
+ [[!mfsa2016 65]], [[!mfsa2016 67]], [[!mfsa2016 70]],
+ [[!mfsa2016 72]], [[!mfsa2016 73]], [[!mfsa2016 76]],
+ [[!mfsa2016 77]], [[!mfsa2016 78]], [[!mfsa2016 79]],
+ [[!mfsa2016 80]]
* Icedove: [[!debsa2016 3601]]
* Linux: [[!debsa2016 3616]], [[!debsa2016 3607]]
* GIMP: [[!debsa2016 3612]]
diff --git a/wiki/src/security/Numerous_security_holes_in_2.4.pt.po b/wiki/src/security/Numerous_security_holes_in_2.4.pt.po
index 8b763f5..8dd74a5 100644
--- a/wiki/src/security/Numerous_security_holes_in_2.4.pt.po
+++ b/wiki/src/security/Numerous_security_holes_in_2.4.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-08-01 11:55+0200\n"
+"POT-Creation-Date: 2016-08-02 18:54+0300\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"
@@ -32,7 +32,8 @@ msgid "[[!tag security/fixed]]\n"
msgstr ""
#. type: Plain text
-msgid "Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
+msgid ""
+"Several security holes that affect Tails 2.4 are now fixed in Tails 2.5."
msgstr ""
#. type: Plain text
@@ -47,7 +48,16 @@ msgid "Details\n"
msgstr ""
#. type: Bullet: '* '
-msgid "Tor Browser: [[!mfsa2016 XXX]]"
+msgid ""
+"Tor Browser: [[!mfsa2016 62]], [[!mfsa2016 63]], [[!mfsa2016 64]], [[!"
+"mfsa2016 65]], [[!mfsa2016 67]], [[!mfsa2016 70]], [[!mfsa2016 72]], [[!"
+"mfsa2016 73]], [[!mfsa2016 76]], [[!mfsa2016 77]], [[!mfsa2016 78]], [[!"
+"mfsa2016 79]],"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!mfsa2016 80]]\n"
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index 3333e49..4740ec5 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-06-08 10:47+0300\n"
+"POT-Creation-Date: 2016-08-02 18:56+0300\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"
@@ -995,6 +995,5 @@ msgid ""
msgstr ""
#. type: Plain text
-msgid ""
-"See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
+msgid "See [[!tails_ticket 10576]] for more details."
msgstr ""
diff --git a/wiki/src/support/known_issues.fa.po b/wiki/src/support/known_issues.fa.po
index 657c0ef..b8a44ed 100644
--- a/wiki/src/support/known_issues.fa.po
+++ b/wiki/src/support/known_issues.fa.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: 2016-06-08 10:47+0300\n"
+"POT-Creation-Date: 2016-08-02 18:56+0300\n"
"PO-Revision-Date: 2015-10-25 10:05+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -1216,14 +1216,10 @@ msgid ""
msgstr ""
#. type: Plain text
-msgid ""
-"See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
-msgstr ""
-
#, fuzzy
-#~| msgid "See also [[!tails_ticket 6397]]."
-#~ msgid "See [[!tails_ticket 10835]] for more details."
-#~ msgstr "همچنین رجوع کنید به [[!tails_ticket 6397]]."
+#| msgid "See also [[!tails_ticket 6397]]."
+msgid "See [[!tails_ticket 10576]] for more details."
+msgstr "همچنین رجوع کنید به [[!tails_ticket 6397]]."
#, fuzzy
#~| msgid "See also [[!tails_ticket 6397]]."
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 89efad0..1457f69 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-06-08 10:47+0300\n"
+"POT-Creation-Date: 2016-08-02 18:56+0300\n"
"PO-Revision-Date: 2016-07-12 12:52-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -1218,10 +1218,16 @@ msgstr ""
"Shell corrige souvent ce problème.\n"
#. type: Plain text
-msgid ""
-"See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
-msgstr ""
-"Voir [[!tails_ticket 10576]] et [[!tails_ticket 10807]] pour plus de détails."
+#, fuzzy
+#| msgid "See [[!tails_ticket 10835]] for more details."
+msgid "See [[!tails_ticket 10576]] for more details."
+msgstr "Voir [[!tails_ticket 10835]] pour plus de détails."
+
+#~ msgid ""
+#~ "See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
+#~ msgstr ""
+#~ "Voir [[!tails_ticket 10576]] et [[!tails_ticket 10807]] pour plus de "
+#~ "détails."
#~ msgid ""
#~ "Tor Browser 5.5 introduces [protection against fingerprinting](https://"
@@ -1262,9 +1268,6 @@ msgstr ""
#~ "En revanche, les sites web proposant des vidéos WebM en streaming "
#~ "marchent correctement."
-#~ msgid "See [[!tails_ticket 10835]] for more details."
-#~ msgstr "Voir [[!tails_ticket 10835]] pour plus de détails."
-
#~ msgid "Network interfaces remain turned off"
#~ msgstr "Les interfaces réseau restent inactives"
diff --git a/wiki/src/support/known_issues.it.po b/wiki/src/support/known_issues.it.po
index 3333e49..4740ec5 100644
--- a/wiki/src/support/known_issues.it.po
+++ b/wiki/src/support/known_issues.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-06-08 10:47+0300\n"
+"POT-Creation-Date: 2016-08-02 18:56+0300\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"
@@ -995,6 +995,5 @@ msgid ""
msgstr ""
#. type: Plain text
-msgid ""
-"See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
+msgid "See [[!tails_ticket 10576]] for more details."
msgstr ""
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index 52fb99e..112dcf1 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -520,4 +520,4 @@ be visible.
Press <span class="keycap">Alt+F2</span> and type `r` to restart GNOME
Shell, which often solves this problem.
-See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details.
+See [[!tails_ticket 10576]] for more details.
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index 858c7b1..336dd55 100644
--- a/wiki/src/support/known_issues.pt.po
+++ b/wiki/src/support/known_issues.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-06-08 10:47+0300\n"
+"POT-Creation-Date: 2016-08-02 18:56+0300\n"
"PO-Revision-Date: 2016-05-30 17:49+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1163,13 +1163,13 @@ msgstr ""
#. type: Plain text
#, fuzzy
#| msgid "See also [[!tails_ticket 6397]]."
-msgid ""
-"See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
+msgid "See [[!tails_ticket 10576]] for more details."
msgstr "Veja também [[!tails_ticket 6397]]."
#, fuzzy
#~| msgid "See also [[!tails_ticket 6397]]."
-#~ msgid "See [[!tails_ticket 10835]] for more details."
+#~ msgid ""
+#~ "See [[!tails_ticket 10576]] and [[!tails_ticket 10807]] for more details."
#~ msgstr "Veja também [[!tails_ticket 6397]]."
#, fuzzy
diff --git a/wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml
deleted file mode 100644
index abb9d08..0000000
--- a/wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: i386
-channel: alpha
-product-name: Tails
-product-version: 2.4.1
diff --git a/wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml.pgp
deleted file mode 100644
index d0e6e3a..0000000
--- a/wiki/src/upgrade/v1/Tails/2.4.1/i386/alpha/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJXVeb5AAoJEJj+xrx1Kj22AzwP/1s0eHhp+kLdRUX/GhP4QQms
-Xh98wJErE+qQ5P8Bo30gYH/uNqEPbTc1lqLFws3WncWwA/bUArjVVZ1Bi7zymj3p
-9e/HRuBGp1EbveNYFHSO8+EMM8UYsWr5eWmNODmCXUTTH4wK+lT/9lhSIevz1HF8
-y/9hDbdSAkdvuWq4YimWTa21HjPIDICDExr9yIkaK6CEPOcBUL5bI+3mphM5nU3s
-i2GGa1x664EW6IiGIXnwM4IjLrOVFH4jzV75HeZZ0VPdFEjX7JqooJnSxaduU1HN
-l4nYMS340Avld9/5QusIc5Zt7+dfAyG5UL0DVZLgl2FB7yzHt58gUaxlgtrI++Jk
-YmdEhfaknhwtrvewclyY4DDLVeZBWRerAwCBIO546gO8uEKhJQIOoyESNYxJXCAJ
-gjEI2XHVxPy9x9J6DaP0An7GuZUeMxo8ewayDO0cbKJ9wnQJVVRbcNN6SzFEpUyc
-zWA8juTKypSwUncLVPTM7pn/xVQkyL/bWozNH+XEMN5gBHxz4SrUrIM03FuEg16I
-iS2S4ZOhmToKJ2GTrl64PL1ZbcXlSvdIUkILI/jXja8i1J0UhgwKPRDH4Mm8Q4pJ
-3GE3FCsxvtTQrvkAhONQvp0XQLOVTjd3Y5c0aSAH104QVSTl2MzmLJ5unBbGGpWE
-AHSoJpVEgDtJlJdPDbRd
-=e67O
------END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml
deleted file mode 100644
index e320159..0000000
--- a/wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: i386
-channel: stable
-product-name: Tails
-product-version: 2.4.1
diff --git a/wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml.pgp
deleted file mode 100644
index 63d4f50..0000000
--- a/wiki/src/upgrade/v1/Tails/2.4.1/i386/stable/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJXVeb2AAoJEJj+xrx1Kj22wcsP/3vN3qiRYTZVpqhoxTcCHLuj
-sAfTCFxlaBDwLB5ZJ7kFioHOo/B84MQKC4fKPlsyHZgXEuhI96qlsPCggFbO78M2
-dsYsAgoKMRrBfpOl6p5r4ShY8hhtoWUrDqJhVcidV14+9PR/EoZ8bAEgDBl9x7h+
-YM9Pxtfq/RERyMRUWnVbU3l53DgHaMW3urkQR4v0+gw/qP4Tn9HGka2UR5/sGdws
-YWozF4QNpYe6QE9kQXF46fPJLd9FSPV4J1VBXrZDBY4pCTVAn9Wi1SlBoGfsrHfz
-47Bprl7UeHPDIAR4mEEk81s330YrZv5iCQ2Xa6m1oiRrHw7+uwlsJIUrlVMPmQVd
-DIzEW+J+3dUJCFnV/EkBDzm/z2IOpiHFBAUicsc68JZrcUM99Tqh8xd7t89dCEvB
-omBv2nL8FAZ6HyjLAeSTrF7TcFPOt812I5U9ia7ITbiyfd/XfeCmJkw0Qhueww8p
-Xl0VP82Wd5REMlWbEUQjx9BT358fK1oyhIVx54nVNbabJrAw6OaongcMagqoR3yY
-e2OaPZFZVotBPfFKNRFeuN1iwWCVQMOikJ50B8LLdI36Ysza/Q8WDSVcPebMiJZL
-jYQR7E9TbMhyuNeOX81NiuuKc4IJtXlm1Hh+ujUjgt6tZkfU1RJMZ4H7cVYrVqB4
-cU4OxkHUB8tdzeOtCVHD
-=FJKY
------END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml
index 545087d..3ff84b0 100644
--- a/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
channel: alpha
product-name: Tails
product-version: '2.4'
+upgrades:
+- details-url: https://tails.boum.org/news/version_2.5/
+ type: major
+ upgrade-paths:
+ - target-files:
+ - sha256: ac1e5c08dba8fd6cdb4149de9956821247bdc9e991a000ec8838b8c613575578
+ size: 1151539200
+ url: http://dl.amnesia.boum.org/tails/stable/tails-i386-2.5/tails-i386-2.5.iso
+ type: full
+ - target-files:
+ - sha256: d89b93995fdd06ec2f11fc585ef6d8f28936987e7d1108843f455a3014586e03
+ size: 340428800
+ url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_2.4_to_2.5.iuk
+ type: incremental
+ version: '2.5'
diff --git a/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml.pgp
index 1db9dfe..51964c4 100644
--- a/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/2.4/i386/alpha/upgrades.yml.pgp
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
-iQIcBAABCgAGBQJW1XuwAAoJEDyD3LUvaZxW5LYQAJ9ag97wpIMMn6TtHTg4PRsl
-p4lcM/UaK0lJpCIpzQadMy2b6MYJQmTCwiI59685beQiHAcGznambeJgDlThA/OM
-+k5l9pWOpT7kzen7YPviGGyYCka5hcUxtirVhbIPd+/XM1I0KvAQhxdwv4kmfUps
-+wLexvyWKhtu2I5dgOS1Ae+bUkuIrSyuX5JVQbMZkRJcMyCO2iSFxZakuC8Gs6Pm
-tEWuw6oQ3W/Rg0M56FellEdAyj9QZVNP2L0vcaRmPIsYNr8w76aPqKje7krgI3St
-7y3LBQOBr2FKcoVbBzb2sbbWqDw8qwmRRzmVf+HmcRFBPagJynniCyBPvpm2o/jw
-HjMPeiS6MUjUvH/f/A+aR7oR2YyfjbascVU0xFkCrO8KAmkc3OoiI/vV2/blKvPP
-kC7MopDE+e6HzwTOTD/CIBt/tE8vA7uLbFQ/NxaSpR9EO6o4cQ4H0wAHOre+2WSA
-r5WtUzZh61/ijPfSA2M3IppYOlduy+F9N6OF82ewvn5yIAdN3VjyGC7XmCm7Ba4s
-upGtDOFeoFVjiFxUTIVN8ptSS8i0u/Ka4gVT+PZmAFM0iu+9KsyWCHiDLMqsey4l
-MMdsVq3nMA/JjaRVXdO1feAkd/A/rV+a4eESSgaIJt5ZM3h9G7DvyuoOtj+5IaGT
-rIZY13kToiacK66ORtML
-=LQ5y
+iQIcBAABCgAGBQJXnwhHAAoJEDyD3LUvaZxW6CgP+weOPat2Joz2Sl3KXbEczc2a
+amhaio023d7nkYww+JtFNaMOrHnYKBVGcJzQ/492sTb6DMdsI5lN500TBRgkMvJZ
+xjzKYCaDfWPpIrtRdtNaIPNrY7MEMPrr09z7/yF/3C22ojetKQ5PBKRABiB6AdG8
+9y/tF0DP5wwFOQxwFb1/y2m587x2LgNTb6ZmOdCUWMvdSxTN0NFl2RRQIW+Osc3J
+WsVd1MyooW51Ul3TL5vMdGZ/OomB4lURVWMn6kI2f57VbLyU6H0PG8fEt+bVqyNv
+KRsxoWLbmzkTOU2JzyScO+QxlIa+VLfDLb3hWOSh/GEy9mP1vR7Uy/6KVZqzqDcv
+h4fCZ28A41GlH66Rb7uBbeRuUk5WIVd9FxgSmFa+RNgaVryOEdwX0xdJ4oBMDZF3
+bunEdkUSmGiuIz4hF7mUSPOgm5laK5TXD98XaDW9JIqf77bSE7Vs1r462dJ04ZJk
+JcSLXOd9esNLFp9skgOec9NYd5hgmChX0uMuVHFlFDutSahc6RHxiH9QnKUK65l/
+qYHM+2EJfzpt88tC39H01M6PDQ9HgX/bLkAujh/9cMG9zEeV7BnY4gsywvsITYrh
+jFa880F6Thw2GHrk6IwJdklyvGo1AP/+4RdqlbtGD4lMzT+sMFYVqgUZwLdLMqPE
+1n9alUMlOS5Z0mGwUB/+
+=w/86
-----END PGP SIGNATURE-----