Commit fe986b4a authored by Cyril 'kibi' Brulebois's avatar Cyril 'kibi' Brulebois
Browse files

Merge branch 'stable' into devel

parents 3dd100bb dc6d9cdc
......@@ -499,7 +499,7 @@ etc/modprobe.d/amd64-microcode-blacklist.conf 32065
lib/modprobe.d/fbdev-blacklist.conf 32064
etc/modprobe.d/intel-microcode-blacklist.conf 32063
etc/modprobe.d/loop.conf 32062
lib/modules/4.17.0-3-amd64/modules.softdep 32061
lib/modules/4.18.0-2-amd64/modules.softdep 32061
etc/modprobe.d/no-bluetooth.conf 32060
etc/modprobe.d/no-conntrack-helper.conf 32059
etc/modprobe.d/no-mei.conf 32058
......@@ -507,10 +507,10 @@ etc/modprobe.d/no-n-hdlc.conf 32057
etc/modprobe.d/no-pc-speaker.conf 32056
lib/modprobe.d/systemd.conf 32055
etc/modprobe.d/uncommon-network-protocols.conf 32054
lib/modules/4.17.0-3-amd64/modules.dep.bin 32053
lib/modules/4.17.0-3-amd64/modules.alias.bin 32052
lib/modules/4.17.0-3-amd64/modules.symbols.bin 32051
lib/modules/4.17.0-3-amd64/modules.builtin.bin 32050
lib/modules/4.18.0-2-amd64/modules.dep.bin 32053
lib/modules/4.18.0-2-amd64/modules.alias.bin 32052
lib/modules/4.18.0-2-amd64/modules.symbols.bin 32051
lib/modules/4.18.0-2-amd64/modules.builtin.bin 32050
lib/systemd/network/99-default.link 32049
etc/udev/rules.d/00-mac-spoof.rules 32048
lib/udev/rules.d/40-usb_modeswitch.rules 32047
......@@ -609,18 +609,18 @@ sbin/plymouthd 31953
lib/x86_64-linux-gnu/libply-splash-core.so.4.0.0 31952
etc/adjtime 31950
usr/bin/dbus-daemon 31948
lib/modules/4.17.0-3-amd64/kernel/drivers/cpufreq/acpi-cpufreq.ko 31943
lib/modules/4.18.0-2-amd64/kernel/drivers/cpufreq/acpi-cpufreq.ko 31943
run/udev/tags/seat/+input:input4 31934
run/udev/tags/seat/+input:input6 31927
lib/modules/4.17.0-3-amd64/kernel/drivers/char/hw_random/rng-core.ko 31923
lib/modules/4.17.0-3-amd64/kernel/drivers/acpi/battery.ko 31910
lib/modules/4.17.0-3-amd64/kernel/net/rfkill/rfkill.ko 31908
lib/modules/4.17.0-3-amd64/kernel/drivers/acpi/ac.ko 31906
lib/modules/4.18.0-2-amd64/kernel/drivers/char/hw_random/rng-core.ko 31923
lib/modules/4.18.0-2-amd64/kernel/drivers/acpi/battery.ko 31910
lib/modules/4.18.0-2-amd64/kernel/net/rfkill/rfkill.ko 31908
lib/modules/4.18.0-2-amd64/kernel/drivers/acpi/ac.ko 31906
run/udev/tags/seat/+input:input3 31899
run/udev/tags/seat/+input:input2 31894
lib/modules/4.17.0-3-amd64/kernel/drivers/cpufreq/pcc-cpufreq.ko 31892
lib/modules/4.17.0-3-amd64/kernel/drivers/input/evdev.ko 31888
lib/modules/4.17.0-3-amd64/kernel/drivers/char/tpm/tpm.ko 31880
lib/modules/4.18.0-2-amd64/kernel/drivers/cpufreq/pcc-cpufreq.ko 31892
lib/modules/4.18.0-2-amd64/kernel/drivers/input/evdev.ko 31888
lib/modules/4.18.0-2-amd64/kernel/drivers/char/tpm/tpm.ko 31880
run/udev/tags/seat/c226:0 31872
run/udev/tags/master-of-seat/c226:0 31871
run/udev/tags/seat/+drm:card0-DP-1 31867
......@@ -631,7 +631,7 @@ run/udev/tags/seat/+drm:card0-DP-2 31859
run/udev/tags/master-of-seat/+drm:card0-DP-2 31858
run/udev/tags/seat/+drm:card0-HDMI-A-1 31855
run/udev/tags/master-of-seat/+drm:card0-HDMI-A-1 31854
lib/modules/4.17.0-3-amd64/kernel/drivers/char/tpm/tpm_tis_core.ko 31848
lib/modules/4.18.0-2-amd64/kernel/drivers/char/tpm/tpm_tis_core.ko 31848
run/udev/tags/seat/+drm:card0-LVDS-1 31844
run/udev/tags/master-of-seat/+drm:card0-LVDS-1 31843
run/udev/tags/seat/+drm:card0-HDMI-A-2 31840
......@@ -646,15 +646,15 @@ bin/true 31812
lib/udev/lmt-udev 31811
lib/x86_64-linux-gnu/libdbus-1.so.3.14.15 31810
run/udev/tags/seat/c189:512 31806
lib/modules/4.17.0-3-amd64/kernel/drivers/char/tpm/tpm_tis.ko 31804
lib/modules/4.18.0-2-amd64/kernel/drivers/char/tpm/tpm_tis.ko 31804
run/udev/tags/seat/c189:256 31800
usr/sbin/laptop_mode 31798
lib/x86_64-linux-gnu/libsystemd.so.0.21.0 31796
lib/modules/4.17.0-3-amd64/kernel/sound/soundcore.ko 31795
lib/modules/4.18.0-2-amd64/kernel/sound/soundcore.ko 31795
lib/x86_64-linux-gnu/libapparmor.so.1.4.0 31794
usr/share/dbus-1/system.conf 31792
lib/modules/4.17.0-3-amd64/kernel/drivers/pci/hotplug/shpchp.ko 31791
lib/modules/4.17.0-3-amd64/kernel/net/wireless/cfg80211.ko 31783
lib/modules/4.18.0-2-amd64/kernel/drivers/pci/hotplug/shpchp.ko 31791
lib/modules/4.18.0-2-amd64/kernel/net/wireless/cfg80211.ko 31783
usr/share/dbus-1/system.d/org.freedesktop.hostname1.conf 31782
usr/share/dbus-1/system.d/org.freedesktop.locale1.conf 31781
usr/share/dbus-1/system.d/org.freedesktop.login1.conf 31780
......@@ -730,8 +730,8 @@ usr/share/dbus-1/system-services/org.freedesktop.resolve1.service 31693
usr/share/dbus-1/system-services/org.freedesktop.systemd1.service 31692
usr/share/dbus-1/system-services/org.freedesktop.timedate1.service 31691
usr/share/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service 31690
lib/modules/4.17.0-3-amd64/kernel/drivers/mfd/lpc_ich.ko 31689
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd.ko 31688
lib/modules/4.18.0-2-amd64/kernel/drivers/mfd/lpc_ich.ko 31689
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd.ko 31688
bin/uname 31686
usr/lib/accountsservice/accounts-daemon 31685
lib/systemd/systemd-logind 31684
......@@ -756,15 +756,15 @@ sbin/start-stop-daemon 31647
usr/sbin/rngd 31646
usr/bin/tail 31645
usr/local/lib/onion-grater 31643
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd-timer.ko 31642
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd-timer.ko 31642
bin/udevadm 31641
usr/share/tor/tor-service-defaults-torrc 31640
lib/modules/4.17.0-3-amd64/kernel/drivers/char/nvram.ko 31639
lib/modules/4.18.0-2-amd64/kernel/drivers/char/nvram.ko 31639
usr/local/bin/tails-get-bootinfo 31638
usr/local/lib/tails-set-wireless-devices-state 31635
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd-pcm.ko 31632
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd-pcm.ko 31632
etc/crontab 31630
lib/modules/4.17.0-3-amd64/kernel/drivers/platform/x86/thinkpad_acpi.ko 31628
lib/modules/4.18.0-2-amd64/kernel/drivers/platform/x86/thinkpad_acpi.ko 31628
run/systemd/generator.late/speech-dispatcher.service 31622
lib/systemd/systemd-backlight 31620
lib/systemd/system-preset/90-systemd.preset 31617
......@@ -775,7 +775,7 @@ usr/bin/env 31610
usr/share/gdm/generate-config 31608
usr/bin/eject 31605
usr/bin/logger 31604
lib/modules/4.17.0-3-amd64/kernel/sound/core/snd-hwdep.ko 31603
lib/modules/4.18.0-2-amd64/kernel/sound/core/snd-hwdep.ko 31603
bin/sleep 31602
usr/lib/python3.5/argparse.py 31601
usr/bin/basename 31597
......@@ -784,11 +784,11 @@ usr/share/laptop-mode-tools/modules/ac97-powersave 31595
usr/share/laptop-mode-tools/modules/battery-level-polling 31592
usr/local/sbin/udev-watchdog 31591
usr/bin/unmkinitramfs 31590
lib/modules/4.17.0-3-amd64/kernel/drivers/scsi/sg.ko 31589
lib/modules/4.17.0-3-amd64/kernel/drivers/platform/x86/wmi-bmof.ko 31588
lib/modules/4.17.0-3-amd64/kernel/sound/hda/snd-hda-core.ko 31587
lib/modules/4.18.0-2-amd64/kernel/drivers/scsi/sg.ko 31589
lib/modules/4.18.0-2-amd64/kernel/drivers/platform/x86/wmi-bmof.ko 31588
lib/modules/4.18.0-2-amd64/kernel/sound/hda/snd-hda-core.ko 31587
usr/lib/x86_64-linux-gnu/libdconf.so.1.0.0 31586
lib/modules/4.17.0-3-amd64/kernel/drivers/input/serio/serio_raw.ko 31585
lib/modules/4.18.0-2-amd64/kernel/drivers/input/serio/serio_raw.ko 31585
usr/share/laptop-mode-tools/modules/bluetooth 31574
run/udev/links/\x2frtc/c252:0 31570
usr/bin/getopt 31568
......@@ -801,7 +801,7 @@ usr/lib/python3.5/__pycache__/glob.cpython-35.pyc 31560
lib/live/mount/overlay/usr/lib/python3.5/__pycache__/fnmatch.cpython-35.pyc 31559
usr/lib/python3.5/__pycache__/fnmatch.cpython-35.pyc 31558
usr/lib/python3.5/ipaddress.py 31556
lib/modules/4.17.0-3-amd64/kernel/virt/lib/irqbypass.ko 31555
lib/modules/4.18.0-2-amd64/kernel/virt/lib/irqbypass.ko 31555
usr/share/laptop-mode-tools/modules/configuration-file-control 31554
usr/share/laptop-mode-tools/modules/cpufreq 31552
usr/share/laptop-mode-tools/modules/cpuhotplug 31551
......@@ -818,7 +818,7 @@ usr/share/laptop-mode-tools/modules/hdparm 31457
usr/share/laptop-mode-tools/modules/intel-hda-powersave 31425
run/udev/tags/seat/+input:input5 31418
run/udev/tags/seat/+input:input0 31399
lib/modules/4.17.0-3-amd64/kernel/arch/x86/kvm/kvm.ko 31391
lib/modules/4.18.0-2-amd64/kernel/arch/x86/kvm/kvm.ko 31391
usr/share/laptop-mode-tools/modules/intel-sata-powermgmt 31353
sbin/ethtool 31352
usr/share/laptop-mode-tools/modules/intel_pstate 31265
......@@ -897,14 +897,14 @@ usr/share/laptop-mode-tools/modules/sched-mc-power-savings 31148
usr/share/laptop-mode-tools/modules/sched-smt-power-savings 31147
sbin/on_ac_power 31146
bin/loginctl 31145
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-codec.ko 31144
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-codec.ko 31144
etc/hdparm.conf 31143
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-intel.ko 31142
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-intel.ko 31142
bin/kmod 31141
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-codec-generic.ko 31140
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-codec-generic.ko 31140
usr/lib/x86_64-linux-gnu/libgudev-1.0.so.0.2.0 31137
usr/share/laptop-mode-tools/modules/start-stop-programs 31136
lib/modules/4.17.0-3-amd64/kernel/sound/pci/hda/snd-hda-codec-conexant.ko 31135
lib/modules/4.18.0-2-amd64/kernel/sound/pci/hda/snd-hda-codec-conexant.ko 31135
run/udev/links/\x2fdisk\x2fby-id\x2fata-HITACHI_HTS723216L9SA60_100120FC1220NCJHDEVG-part1/b8:1 31134
run/udev/links/\x2fdisk\x2fby-id\x2fwwn-0x5000cca586e32f4c-part1/b8:1 31133
run/udev/links/\x2fdisk\x2fby-partuuid\x2f95fbd1e1-01/b8:1 31132
......@@ -947,8 +947,8 @@ usr/share/laptop-mode-tools/modules/wireless-power 31088
usr/lib/python3.5/calendar.py 31087
lib/systemd/system-shutdown/tails 31086
bin/cpio 31085
lib/modules/4.17.0-3-amd64/kernel/drivers/watchdog/iTCO_vendor_support.ko 31084
lib/modules/4.17.0-3-amd64/kernel/arch/x86/kvm/kvm-intel.ko 31082
lib/modules/4.18.0-2-amd64/kernel/drivers/watchdog/iTCO_vendor_support.ko 31084
lib/modules/4.18.0-2-amd64/kernel/arch/x86/kvm/kvm-intel.ko 31082
lib/systemd/systemd-shutdown 31081
sbin/iw 31080
usr/lib/python3.5/queue.py 31079
......@@ -990,7 +990,7 @@ usr/lib/python3/dist-packages/stem/descriptor/extrainfo_descriptor.py 31043
usr/lib/python3/dist-packages/stem/exit_policy.py 31042
usr/lib/x86_64-linux-gnu/libffi.so.6.0.4 31041
usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0.5000.3 31040
lib/modules/4.17.0-3-amd64/kernel/drivers/watchdog/iTCO_wdt.ko 31025
lib/modules/4.18.0-2-amd64/kernel/drivers/watchdog/iTCO_wdt.ko 31025
lib/systemd/system/sound.target 31011
usr/lib/x86_64-linux-gnu/gio/modules/giomodule.cache 30999
usr/sbin/alsactl 30998
......@@ -1006,7 +1006,7 @@ usr/lib/x86_64-linux-gnu/libpolkit-backend-1.so.0.0.0 30975
usr/lib/x86_64-linux-gnu/polkit-1/extensions/libnullbackend.so 30974
etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf 30973
etc/gdm3/daemon.conf 30972
lib/modules/4.17.0-3-amd64/kernel/drivers/hwmon/coretemp.ko 30971
lib/modules/4.18.0-2-amd64/kernel/drivers/hwmon/coretemp.ko 30971
usr/lib/python3/dist-packages/stem/util/tor_tools.py 30970
usr/lib/python3/dist-packages/stem/version.py 30969
usr/lib/python3/dist-packages/stem/descriptor/networkstatus.py 30968
......@@ -1032,7 +1032,7 @@ usr/lib/x86_64-linux-gnu/libX11.so.6.3.0 30944
usr/lib/python3/dist-packages/stem/response/events.py 30943
usr/lib/python3/dist-packages/yaml/__init__.py 30942
sbin/blockdev 30941
lib/modules/4.17.0-3-amd64/kernel/drivers/thermal/intel_powerclamp.ko 30939
lib/modules/4.18.0-2-amd64/kernel/drivers/thermal/intel_powerclamp.ko 30939
usr/lib/python3/dist-packages/yaml/error.py 30938
usr/lib/python3/dist-packages/yaml/tokens.py 30937
usr/lib/python3/dist-packages/yaml/events.py 30936
......@@ -3327,10 +3327,10 @@ usr/lib/x86_64-linux-gnu/perl5/5.24/Class/XSAccessor.pm 28381
usr/lib/x86_64-linux-gnu/perl5/5.24/Class/XSAccessor/Heavy.pm 28380
usr/lib/x86_64-linux-gnu/perl5/5.24/auto/Class/XSAccessor/XSAccessor.so 28355
lib/systemd/system/systemd-udev-settle.service 28346
lib/modules/4.17.0-3-amd64/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko 28330
lib/modules/4.18.0-2-amd64/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko 28330
usr/share/perl5/Moo/Role.pm 28323
usr/share/perl5/Role/Tiny.pm 28322
lib/modules/4.17.0-3-amd64/kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko 28318
lib/modules/4.18.0-2-amd64/kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko 28318
usr/share/perl5/GnuPG/HashInit.pm 28307
usr/share/perl5/Type/Utils.pm 28300
usr/share/perl5/Type/Library.pm 28299
......@@ -3348,7 +3348,7 @@ usr/share/perl/5.24.1/SelfLoader.pm 28275
usr/share/perl5/Types/Standard.pm 28271
usr/lib/x86_64-linux-gnu/perl5/5.24/Sub/Name.pm 28269
usr/lib/x86_64-linux-gnu/perl5/5.24/auto/Sub/Name/Name.so 28268
lib/modules/4.17.0-3-amd64/kernel/net/mac80211/mac80211.ko 28265
lib/modules/4.18.0-2-amd64/kernel/net/mac80211/mac80211.ko 28265
usr/share/perl5/Type/Coercion.pm 28263
usr/share/perl5/GnuPG/Interface.pm 28246
usr/share/perl/5.24.1/English.pm 28240
......@@ -3363,7 +3363,7 @@ usr/share/perl/5.24.1/autodie/Scope/GuardStack.pm 28221
usr/share/perl/5.24.1/autodie/Scope/Guard.pm 28220
usr/share/perl/5.24.1/Class/Struct.pm 28122
usr/share/perl/5.24.1/Math/BigInt.pm 28077
lib/modules/4.17.0-3-amd64/kernel/drivers/net/wireless/intel/iwlwifi/dvm/iwldvm.ko 28050
lib/modules/4.18.0-2-amd64/kernel/drivers/net/wireless/intel/iwlwifi/dvm/iwldvm.ko 28050
usr/local/lib/tails-spoof-mac 28039
usr/local/lib/tails-shell-library/hardware.sh 28038
usr/local/lib/tails-shell-library/log.sh 28037
......@@ -3372,7 +3372,7 @@ usr/share/perl/5.24.1/Math/BigInt/Calc.pm 28035
lib/crda/setregdomain 28033
lib/systemd/systemd-rfkill 28032
etc/default/crda 28031
lib/modules/4.17.0-3-amd64/kernel/crypto/arc4.ko 28029
lib/modules/4.18.0-2-amd64/kernel/crypto/arc4.ko 28029
usr/bin/macchanger 28027
usr/share/perl/5.24.1/integer.pm 28026
usr/share/macchanger/OUI.list 28025
......
--- a/usr/share/xul-ext/enigmail/install.rdf 2018-10-23 13:09:28.032000000 +0000
+++ b/usr/share/xul-ext/enigmail/install.rdf 2018-10-23 13:09:39.200000000 +0000
@@ -16,7 +16,7 @@
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>52.0</em:minVersion>
- <em:maxVersion>60.0</em:maxVersion>
+ <em:maxVersion>60.*</em:maxVersion>
</Description>
</em:targetApplication>
<em:targetApplication>
......@@ -4,7 +4,13 @@ tails (3.12) UNRELEASED; urgency=medium
-- Tails developers <tails@boum.org> Wed, 05 Sep 2018 16:51:53 +0000
tails (3.10) UNRELEASED; urgency=medium
tails (3.10.1) unstable; urgency=medium
* Declare that Enigmail is compatible with Thunderbird 60.*.
-- Tails developers <tails@boum.org> Tue, 23 Oct 2018 01:30:00 +0200
tails (3.10) unstable; urgency=medium
* Security fixes
- Harden sudo config to avoid potential future privilege escalation
......@@ -12,6 +18,7 @@ tails (3.10) UNRELEASED; urgency=medium
- Upgrade Linux to 4.18 and aufs to 4.18-20181008 (Closes: #15936).
- Upgrade the snapshot of the Debian archive to 2018100901 accordingly.
- Upgrade Tor Browser to 8.0.3-build1 (Closes: #16067).
- Upgrade Thunderbird to 60.2.1 (Closes: #16037).
* Bugfixes
- Fix installation of mesa/stretch-backports by installing libwayland*
......@@ -51,7 +58,7 @@ tails (3.10) UNRELEASED; urgency=medium
- Update test suite for updated button labels in confirmation dialogs
of the Tails installer (Closes: #11501).
-- Tails developers <tails@boum.org> Mon, 22 Oct 2018 15:50:55 +0200
-- Tails developers <tails@boum.org> Tue, 23 Oct 2018 01:30:00 +0200
tails (3.9.1) unstable; urgency=medium
......
......@@ -23,10 +23,13 @@ Discussions
[[Prepare a discussion|contribute/meetings#preparing-a-discussion]]
and add your topic here:
<!-- I'll miss the November meeting as well...
- [[!tails_ticket 15895 desc="#15895: Remove some of our predefined bookmarks"]]
sajolida: I'll be at Tor meeting on October 3, so please postpone this
discussion if I'm not at the meeting.
-->
Roles
=====
......
......@@ -98,7 +98,7 @@ Template
Releases
========
* \[[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|minor|emergency] release).
* \[[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|bugfix|emergency] release).
* Tails VERSION+1 is \[[scheduled for MONTH DAY|contribute/calendar]].
......
......@@ -7,7 +7,7 @@
Releases
========
* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|minor] release).
* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|bugfix] release).
* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
......
......@@ -7,7 +7,7 @@
Releases
========
* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|minor] release).
* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|bugfix] release).
* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
......
......@@ -7,7 +7,7 @@
Releases
========
* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|minor] release).
* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|bugfix] release).
* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
......
......@@ -63,6 +63,13 @@ This is how `/dev/sda1` is mounted:
The last stage executed before `/dev/sda1` is mounted is `init-premount`.
### Debugging
Useful kernel command-line parameters:
* `debug`: Prints every command executed during initramfs to `/run/initramfs/initramfs.debug`
* `break=premount`: Drops into a shell before executing the `init-premount` stage
## Distributing
XXX: impact on mirrors' storage space?
......
......@@ -488,7 +488,7 @@ msgstr "*Tails Upgrader*: intrigeri"
#. type: Bullet: ' - '
msgid "*Tails Verification*: sajolida, anonym"
msgstr ""
msgstr "*Tails Verification*: sajolida, anonym"
#. type: Bullet: ' - '
msgid "Test suite: anonym"
......@@ -624,23 +624,7 @@ msgstr ""
"[[Documentar el progreso|contribute/working_together/document_progress]]"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| " - Roles\n"
#| " - [[Accounting team|contribute/working_together/roles/accounting]]\n"
#| " - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
#| " - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
#| " - [[Help desk|contribute/working_together/roles/help_desk]]\n"
#| " - Sponsor deliverables:\n"
#| " - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
#| " - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
#| " - [[Release manager|contribute/working_together/roles/release_manager]]\n"
#| " - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
#| " - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
#| " - [[Technical writer|contribute/working_together/roles/technical_writer]]\n"
#| " - [[Test suite maintainers|contribute/working_together/roles/test_suite]]\n"
#| " - [[UX designer|contribute/working_together/roles/ux]]\n"
#| " - [[Reports sent to sponsors|contribute/reports]]\n"
#, no-wrap
msgid ""
" - Roles\n"
" - [[Accounting team|contribute/working_together/roles/accounting]]\n"
......@@ -661,18 +645,29 @@ msgid ""
" - [[Reports sent to sponsors|contribute/reports]]\n"
msgstr ""
" - Roles\n"
" - [[Equipo de contabilidad|contribute/working_together/roles/accounting]]\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
" - [[Equipo de contabilidad|contribute/working_together/roles/accounting]]"
"\n"
" - [[Foundations team|contribute/working_together/roles/foundations_team]]"
"\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
" - Sponsor deliverables:\n"
" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Team "
"manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]"
"\n"
" - "
"[[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Administradores de sistemas|contribute/working_together/roles/sysadmins]]\n"
" - [[Escritor técnico|contribute/working_together/roles/technical_writer]]\n"
" - [[Test suite maintainers|contribute/working_together/roles/test_suite]]\n"
" - [[UX designer|contribute/working_together/roles/ux]]\n"
" - [[Administrador/a de "
"sistemas|contribute/working_together/roles/sysadmins]]\n"
" - [[Escritor/a "
"técnico/a|contribute/working_together/roles/technical_writer]]\n"
" - [[Test suite maintainers|contribute/working_together/roles/test_suite]]"
"\n"
" - [[Diseñador/a UX|contribute/working_together/roles/ux]]\n"
" - [[Verification extension\n"
" maintainers|contribute/working_together/roles/verification_extension]]"
"\n"
" - [[Reportes enviados a los sponsors|contribute/reports]]\n"
#. type: Plain text
......
......@@ -57,7 +57,7 @@ release (`testing`):
Tails ISO build).
When building an ISO from the branch used to prepare the next
point-release (`stable`) we use the same time-based snapshots that
bugfix release (`stable`) we use the same time-based snapshots that
were used to prepare the latest Tails release, except:
* we use our latest snapshot of security.debian.org;
......
......@@ -363,16 +363,16 @@ In any case:
-m "Add dummy changelog entry for ${NEXT_PLANNED_MAJOR_VERSION:?}."
* increment the version number in stable's `debian/changelog` to match
the next point release, so that
the next bugfix release, so that
next builds from the `stable` branch do not use the APT suite meant
for the last release:
cd "${RELEASE_CHECKOUT}" && \
git checkout stable && \
dch --newversion "${NEXT_PLANNED_MINOR_VERSION:?}" \
dch --newversion "${NEXT_PLANNED_BUGFIX_VERSION:?}" \
"Dummy entry for next release." && \
git commit debian/changelog \
-m "Add dummy changelog entry for ${NEXT_PLANNED_MINOR_VERSION:?}."
-m "Add dummy changelog entry for ${NEXT_PLANNED_BUGFIX_VERSION:?}."
### Else, if you just released a RC
......
......@@ -1169,8 +1169,6 @@ The OpenSSH client is configured to use the Tor SOCKS proxy.
When a Tails release is out, Tails users are proposed to download and
apply a partial upgrade (that is, only what has changed between two
releases). See [[contribute/design/incremental_upgrades]] for details.
To start with, this upgrade mechanism may be only available for
point-releases.
### 3.6.22 Panel applets and GNOME Shell extensions
......@@ -1346,7 +1344,7 @@ Remaining applications, including the base system, will be upgraded
using Debian standard upgrade process, and generally based on the
latest Debian stable release so there are not many problems.
We intend to build and publish point releases (e.g.
We intend to build and publish bugfix releases (e.g.
[[0.6.1|news/version_0.6.1]]) in a timely manner when security issues
affect Tails. Such releases are based on the [[stable Git
branch|contribute/git]] and can thus also fix important — although not
......
......@@ -53,7 +53,7 @@ Test-BDD-Cucumber]], in the `features/frontend` directory of the `iuk`
## As a Tails developer
### When I prepare a point-release
### When I prepare a bugfix release
#### I should prepare an IUK
......
......@@ -27,7 +27,7 @@ you have something to contribute, please read our
up. In general you should base new branches on this one.
* `stable`: When a new major Tails release is out, we merge `devel`
into `stable` and use it to build minor releases (e.g. when there's
into `stable` and use it to build bugfix releases (e.g. when there's
a new Tor Browser (= Firefox ESR) release) and emergency releases
from. We only merge security fixes and bugfixes into this branch, so
new such branches should be based on `stable`.
......
......@@ -13,17 +13,14 @@
day of the release or go through the tickets marked as "Ready
for QA" and "Fix committed" on Redmine.
- If a release candidate was announced, read the call for testing
- Analyze the changes already made on the website and link to them:
- in testing for a major release: `git diff origin/master...origin/testing wiki/src/**/*.{mdwn,html}`
- in stable for a minor release: `git diff origin/master...origin/stable wiki/src/**/*.{mdwn,html}`
- Analyze the diff of packages
- in testing for a major release: `wget http://nightly.tails.boum.org/build_Tails_ISO_testing/lastSuccessful/archive/latest.iso.packages`
- in stable for a minor release: `wget http://nightly.tails.boum.org/build_Tails_ISO_stable/lastSuccessful/archive/latest.iso.packages`
- in stable for a bugfix release: `wget http://nightly.tails.boum.org/build_Tails_ISO_stable/lastSuccessful/archive/latest.iso.packages`
- `diff -u ~/Persistent/master/wiki/src/torrents/files/tails-amd64-*.packages latest.iso.packages | wdiff --diff-input --terminal --auto-pager`
- If an important application was updated to a new upstream release, read its Changelog to find relevant highlights:
- Tor: <https://blog.torproject.org/>
- Tor: <https://gitweb.torproject.org/tor.git/tree/ChangeLog>
- Tor Browser: <https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt?h=maint-7.0>
- Tor Browser: <https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-8.0>
- Firefox: <https://www.mozilla.org/en-US/firefox/52.0/releasenotes/>
- Thunderbird: <https://www.mozilla.org/en-US/thunderbird/notes/>
- Electrum: <https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES>
......
......@@ -48,8 +48,8 @@ the scripts snippets found on this page:
the 3.9 major release, then set this to 3.12 (3.9 is the next major
release, 3.10 and 3.11 are bugfix releases, 3.12 is a major
release).
* `NEXT_PLANNED_MINOR_VERSION`: set to the version number of the next
*minor* Tails release; if the next release is a point-release, use
* `NEXT_PLANNED_BUGFIX_VERSION`: set to the version number of the next
*bugfix* Tails release; if the next release is a bugfix release, use
that one; otherwise, use `${VERSION}.1`
* `MAJOR_RELEASE`: set to 1 if preparing a major release or a release
candidate for a major release, to 0 otherwise
......@@ -124,10 +124,10 @@ If we are at freeze time for a major release:
[[APT_repository/time-based_snapshots#bump-expiration-date-for-all-snapshots]]
Point-release
-------------
Bugfix release
--------------
If we are at freeze time for a point-release:
If we are at freeze time for a bugfix release:
1. Merge the `master` Git branch into `stable`:
......@@ -137,8 +137,8 @@ If we are at freeze time for a point-release:
listed in the `stable` branch's `config/APT_overlays.d/` into the `stable`
APT suite.
Common steps for point and major releases
-----------------------------------------
Common steps for bugfix and major releases
------------------------------------------
Reset the release branch's `config/base_branch`:
......@@ -163,7 +163,7 @@ Update included files
Upgrade bundled binary Debian packages
--------------------------------------
Skip this section if you are preparing a point-release.
Skip this section if you are preparing a bugfix release.
The goal here is to make sure the bundled binary Debian packages contain
up-to-date localization files, so:
......@@ -257,11 +257,11 @@ Major release
listed in the `testing` branch's `config/APT_overlays.d/` into the `testing`
custom APT suite.
Point-release
-------------
Bugfix release
--------------
<div class="note">
For point-releases, we generally do not put any RC out, so freeze time
For bugfix releases, we generally do not put any RC out, so freeze time
is the same as preparing the actual release. Hence, the following
steps have already been done above, and this section is a noop in the
general case.
......@@ -488,13 +488,14 @@ Sanity check
------------
Verify that the Tor Browser release used in Tails still is the most
recent. Also look if there's a new `-buildX` tag for the targeted
Tor Browser version in these Git repositories:
recent. Also look if there's a new `-buildX` tag (e.g.
`tor-browser-60.3.0esr-8.0-1-build1`) for the Firefox version the Tor
Browser we want to ship is based on in these Git repositories:
* <https://gitweb.torproject.org/builders/tor-browser-bundle.git>
* <https://git.torproject.org/builders/tor-browser-build.git>
* <https://gitweb.torproject.org/tor-browser.git>
A new tag may indicate that a new Tor Browser release is imminent.
A new tag may indicate that a new Tor Browser release or rebuild is imminent.
Better catch this before people spend time doing manual tests.
......@@ -761,7 +762,7 @@ Prepare upgrade-description files
--version "${VERSION:?}" \
--next-version "${NEXT_PLANNED_MAJOR_VERSION:?}" \
--next-version "${NEXT_PLANNED_MAJOR_VERSION:?}~rc1" \
--next-version "${NEXT_PLANNED_MINOR_VERSION:?}" \
--next-version "${NEXT_PLANNED_BUGFIX_VERSION:?}" \
--next-version "${VERSION:?}.1" \
--iso "${ISO_PATH:?}" \
--previous-version "${PREVIOUS_VERSION:?}" \
......@@ -1052,7 +1053,7 @@ Test that you can start downloading the ISO with a BitTorrent client.
ISO history
-----------
Push the released ISO to our Tails ISO history git-annex repo, so that
Push the released ISO and its build log to our Tails ISO history git-annex repo, so that
our isotesters can fetch it from there for their testing. How to do so
is described in our internal Git repo.
XXX: move this document to a repo that all RMs have access to.
......@@ -1269,6 +1270,9 @@ tracker. For a list of candidates, see:
* the "Fix committed" section on the *Release Manager View for ${VERSION:?}*
in Redmine.
Postpone to next release any remaining open issue for the version
you've just released.
Then, mark the just-released Redmine milestone as done: go to the
target version page, click *Edit*, and set *Status* to *Closed*.
......
......@@ -47,7 +47,7 @@ Postponing the final release causes problems for those who have
scheduled time for post-release user support, press work, etc..
Also, changing our mind (i.e. releasing a point-release instead of
a major one) => switching minor/major release schedule for the future
a major one) => switching bugfix/major release schedule for the future