summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-10-29 17:45:33 +0000
committerTails developers <amnesia@boum.org>2013-10-29 17:45:33 +0000
commit86954e8e3a3bb818e45aa4d534e787703d814355 (patch)
tree0e5433f149c176a0ae70142c55db2699ebff1d95
parentbce54710025d9ed96dec328d794166a6b5c58bad (diff)
parent8635784295522da702b5b260fd0b46d655e8cc62 (diff)
Merge remote-tracking branch 'origin/master' into testing
-rw-r--r--wiki/src/contribute/release_process.mdwn5
-rw-r--r--wiki/src/contribute/release_process/iceweasel.mdwn20
-rw-r--r--wiki/src/contribute/release_process/tails-greeter.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test.mdwn4
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn10
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn9
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn2
-rw-r--r--wiki/src/contribute/release_process/test/test_results.mdwn8
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po6
-rw-r--r--wiki/src/doc/first_steps/startup_options.es.po6
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po10
-rw-r--r--wiki/src/doc/first_steps/startup_options.mdwn1
-rw-r--r--wiki/src/doc/first_steps/startup_options.pt.po9
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/shortcuts.mdwn1
-rw-r--r--wiki/src/todo/flash_support.html1
16 files changed, 65 insertions, 31 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 23e717c..39479e1 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -104,7 +104,7 @@ Then see the relevant release processes:
* [[tails-greeter]]
* [[persistence-setup]]
* [[tails-iuk]]
-* whisperback:
+* whisperback:
* see release process on
<https://git-tails.immerda.ch/whisperback/plain/HACKING>
* build a debian package
@@ -180,6 +180,7 @@ matches the date of the future signature.
echo "$VERSION" > wiki/src/inc/stable_i386_version.html
echo "$RELEASE_DATE" > wiki/src/inc/stable_i386_date.html
+ $EDITOR wiki/src/inc/*.html
./build-wiki
git commit wiki/src/inc/ -m "Update version and date for $VERSION."
@@ -407,7 +408,7 @@ Write the announcement for the release in
news mailing-list.
- Document important config changes that persistence users have to do
themselves (e.g. the Pidgin proxy settings change in
- [[!tails_gitweb_commit 9925321]] break all existing persistent
+ [[!tails_gitweb_commit 9925321]] breaks all existing persistent
profiles).
Write an announcement listing the security bugs affecting the previous
diff --git a/wiki/src/contribute/release_process/iceweasel.mdwn b/wiki/src/contribute/release_process/iceweasel.mdwn
index 6dac20e..a82e4c7 100644
--- a/wiki/src/contribute/release_process/iceweasel.mdwn
+++ b/wiki/src/contribute/release_process/iceweasel.mdwn
@@ -41,19 +41,20 @@ a bit more work is needed.
Note that usually, we're doing these steps (usually on Sunday or
Monday) *before* the new ESR was officially released (which usually
happens on Tuesday). Mozilla make the source available on previous
-Friday or Saturday, so that downstreams (such as us!) can get their stuff ready
-in time for the security announce.
+Friday or Saturday, so that downstreams (such as us!) can get their
+stuff ready in time for the security announce.
* Download the Firefox tarball and detached signature from
<https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/VERSION/source/>
- (`VERSION` is the version we want to build, that is something like `17.0.7esr`).
+ (`VERSION` is the version we want to build, that is something like
+ `17.0.7esr`).
* Check the signature.
* Put the tarball in the parent directory of your Iceweasel Git repository.
* Extract the tarball.
* `cd` into the extracted directory.
* Copy the `debian/` directory from our previous package into the new
upstream source directory.
-* Use `dch` to add a `debian/changelog` entry matching the new
+* Add a `debian/changelog` entry matching the new
upstream version. Use 0 for the Debian packaging version, e.g.
`17.0.5esr-0`, to leave room for the official packaging that we will
want to merge when it's out:
@@ -309,7 +310,13 @@ Update debian/changelog
Tag the release
---------------
- git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" "debian/${VERSION}-0+tails1"
+ DEB_VERSION=$(dpkg-parsechangelog -SVersion)
+ git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" "debian/${DEB_VERSION}"
+
+Clean up the source tree
+------------------------
+
+ rm -f .mozconfig*
Build for unstable
------------------
@@ -339,7 +346,8 @@ Build for squeeze-backports
* Tag the backport:
- git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" $TAG_NAME
+ git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" \
+ "debian/$(dpkg-parsechangelog -SVersion | sed -e 's,~,_,')"
* Build for squeeze-backports and i386, e.g. using our
[[contribute/Debian_package_builder]].
diff --git a/wiki/src/contribute/release_process/tails-greeter.mdwn b/wiki/src/contribute/release_process/tails-greeter.mdwn
index 803eff1..3d9a4b5 100644
--- a/wiki/src/contribute/release_process/tails-greeter.mdwn
+++ b/wiki/src/contribute/release_process/tails-greeter.mdwn
@@ -7,7 +7,7 @@
Update POT and PO files
=======================
-FIXME!
+ ./setup.py build_i18n
Update the Debian package
=========================
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index ddd6d69..430e862 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -23,8 +23,8 @@ e.g. `git diff 0.17..06fa1ab80d55c9f29274b7459bd198edb1a8d53d`
## Result
-Compare the list of bundled packages and
-versions with the one shipped last time e.g.:
+Compare the list of bundled packages and versions with the one shipped last
+time. `.packages` are usually attached to the email announcing the ISO is ready.
/usr/bin/diff -u \
wiki/src/torrents/files/tails-i386-0.16.packages \
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
index b9cee87..60a083a 100644
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
+++ b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
@@ -2,6 +2,8 @@
[[!toc levels=2]]
+You are highly welcome to save the result of this test in [[test_results]]
+
# 0. Prepare the needed tools
Make sure the BIOS is *not* configured to "test" the memory on startup.
@@ -24,7 +26,7 @@ Pick one of those:
address space of a given process is usually limited at 3 GiB - or
less, depends on the kernel configuration); as root:
- for i in $(seq 0 31) ; do fillram & done ; watch -n 1 free -m
+ for i in $(seq 0 31) ; do fillram & done ; watch -n 1 free -m
* The `free` output should allow you to reboot late enough (so that
enough memory is filled) and soon enough (so that the system is
@@ -37,11 +39,11 @@ Pick one of those:
better be careful not rebooting your host system and proceed like
this:
- echo 1 > /proc/sys/kernel/sysrq ; echo b > /proc/sysrq-trigger
+ echo 1 > /proc/sys/kernel/sysrq ; echo b > /proc/sysrq-trigger
* Dump memory and try to find the known pattern in it, e.g.:
- grep -c wipe_didnt_work tails.dump
+ grep -c wipe_didnt_work tails.dump
- you should get some integer larger than zero if the pattern was found in
RAM, which is the expected result;
@@ -60,7 +62,7 @@ Pick one of those:
Tails stick.
* Dump memory and try to find the known pattern in it, e.g.:
- grep -c wipe_didnt_work tails.dump
+ grep -c wipe_didnt_work tails.dump
- you should get zero if the pattern was not found in RAM, which is the
optimal (and expected) result;
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn
index bffbd61..b3e8a12 100644
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn
+++ b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn
@@ -10,11 +10,14 @@ to analyze.
Why Lenny? To be able to grep `/dev/mem`, one must run a kernel that
has `CONFIG_STRICT_DEVMEM` disabled. This setting has been enabled in
-Debian kernels since 2.6.28-1, so we use lenny:
+Debian kernels since 2.6.28-1, so we use lenny.
- lb config --architecture i386 --linux-flavours 686 --apt-recommends false --distribution lenny --binary-images usb-hdd --binary-indices false --memtest none --packages-lists="minimal" --syslinux-menu vesamenu --initramfs=live-initramfs --bootappend-live "init=/bin/bash"
+<div class="note">
-*Nota bene*: if you have 64 bits hardware, better build an `amd64` image.
+It is no more possible to build such an image from the Debian archive. Ask
+tails@boum.org if you need to one to run these tests.
+
+</div>
Then install this image on a USB stick.
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 a1902f5..aac2838 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
@@ -16,5 +16,5 @@ Note that you need the qemu command, which is provided on wheezy by the `qemu-sy
e.g for 5G one has to do two dumps:
- pmemsave 0 0xF0000000 tails14.dump
+ pmemsave 0 0xFFFFFFFF tails14.dump
pmemsave 0x100000000 0x40000000 tails5.dump
diff --git a/wiki/src/contribute/release_process/test/test_results.mdwn b/wiki/src/contribute/release_process/test/test_results.mdwn
index 76c2d8d..fc87d09 100644
--- a/wiki/src/contribute/release_process/test/test_results.mdwn
+++ b/wiki/src/contribute/release_process/test/test_results.mdwn
@@ -1,6 +1,14 @@
Memory erasure
==============
+0.21
+----
+
+### PAE
+
+without wipe : 272063018pat = 43530088 / 5368669120 o (81.081%)
+with wipe : 0 (0%)
+
0.19-rc1
--------
diff --git a/wiki/src/doc/first_steps/startup_options.de.po b/wiki/src/doc/first_steps/startup_options.de.po
index 08cc977..3aa2051 100644
--- a/wiki/src/doc/first_steps/startup_options.de.po
+++ b/wiki/src/doc/first_steps/startup_options.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-01-14 00:03+0100\n"
+"POT-Creation-Date: 2013-10-28 10:41+0100\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"
@@ -102,7 +102,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"tails_greeter\"></a>\n"
+msgid ""
+"<a id=\"greeter\"></a>\n"
+"<a id=\"tails_greeter\"></a>\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/startup_options.es.po b/wiki/src/doc/first_steps/startup_options.es.po
index 08cc977..3aa2051 100644
--- a/wiki/src/doc/first_steps/startup_options.es.po
+++ b/wiki/src/doc/first_steps/startup_options.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-01-14 00:03+0100\n"
+"POT-Creation-Date: 2013-10-28 10:41+0100\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"
@@ -102,7 +102,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"tails_greeter\"></a>\n"
+msgid ""
+"<a id=\"greeter\"></a>\n"
+"<a id=\"tails_greeter\"></a>\n"
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/first_steps/startup_options.fr.po b/wiki/src/doc/first_steps/startup_options.fr.po
index 6311c7a..39d71bb 100644
--- a/wiki/src/doc/first_steps/startup_options.fr.po
+++ b/wiki/src/doc/first_steps/startup_options.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-01-14 00:03+0100\n"
+"POT-Creation-Date: 2013-10-28 10:41+0100\n"
"PO-Revision-Date: 2012-06-09 10:48-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -119,8 +119,11 @@ msgstr ""
"encryption_and_privacy/truecrypt]]"
#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails_greeter\"></a>\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"tails_greeter\"></a>\n"
+msgid ""
+"<a id=\"greeter\"></a>\n"
+"<a id=\"tails_greeter\"></a>\n"
msgstr "<a id=\"tails_greeter\"></a>\n"
#. type: Title =
@@ -184,4 +187,3 @@ msgstr "[[Définir un mot de passe administrateur|administration_password]]"
#. type: Bullet: ' - '
msgid "[[Activate Windows Camouflage|windows_camouflage]]"
msgstr "[[Activer le Camouflage Windows|windows_camouflage]]"
-
diff --git a/wiki/src/doc/first_steps/startup_options.mdwn b/wiki/src/doc/first_steps/startup_options.mdwn
index 0078e1c..42c5c70 100644
--- a/wiki/src/doc/first_steps/startup_options.mdwn
+++ b/wiki/src/doc/first_steps/startup_options.mdwn
@@ -37,6 +37,7 @@ menu</span>:
- <span class="command">truecrypt</span>, to enable
[[TrueCrypt|encryption_and_privacy/truecrypt]]
+<a id="greeter"></a>
<a id="tails_greeter"></a>
Using <span class="application">Tails Greeter</span>
diff --git a/wiki/src/doc/first_steps/startup_options.pt.po b/wiki/src/doc/first_steps/startup_options.pt.po
index 3501e3a..b31cfb8 100644
--- a/wiki/src/doc/first_steps/startup_options.pt.po
+++ b/wiki/src/doc/first_steps/startup_options.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-01-14 00:03+0100\n"
+"POT-Creation-Date: 2013-10-28 10:41+0100\n"
"PO-Revision-Date: 2012-07-19 10:00+0100\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,8 +120,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#, no-wrap
-msgid "<a id=\"tails_greeter\"></a>\n"
+#, fuzzy, no-wrap
+#| msgid "<a id=\"tails_greeter\"></a>\n"
+msgid ""
+"<a id=\"greeter\"></a>\n"
+"<a id=\"tails_greeter\"></a>\n"
msgstr "<a id=\"tails_greeter\"></a>\n"
#. type: Title =
diff --git a/wiki/src/inc/trace b/wiki/src/inc/trace
index 8a8be5c..a98e225 100644
--- a/wiki/src/inc/trace
+++ b/wiki/src/inc/trace
@@ -1 +1 @@
-1382273204
+1382833922
diff --git a/wiki/src/shortcuts.mdwn b/wiki/src/shortcuts.mdwn
index 83585af..7bbc58e 100644
--- a/wiki/src/shortcuts.mdwn
+++ b/wiki/src/shortcuts.mdwn
@@ -109,6 +109,7 @@ ikiwiki will include your shortcut in the standard underlay.
* [[!shortcut name=wikipedia_de url="https://secure.wikimedia.org/wikipedia/de/wiki/%s"]]
* [[!shortcut name=wikipedia_es url="https://secure.wikimedia.org/wikipedia/es/wiki/%s"]]
* [[!shortcut name=wikipedia_fr url="https://secure.wikimedia.org/wikipedia/fr/wiki/%s"]]
+* [[!shortcut name=wikipedia_tr url="https://secure.wikimedia.org/wikipedia/tr/wiki/%s"]]
* [[!shortcut name=debsa2012
url="http://www.debian.org/security/2012/dsa-%s"
desc="Debian Security Advisory %s"]]
diff --git a/wiki/src/todo/flash_support.html b/wiki/src/todo/flash_support.html
new file mode 100644
index 0000000..60ce3e0
--- /dev/null
+++ b/wiki/src/todo/flash_support.html
@@ -0,0 +1 @@
+chatango.com