Commit 6bc7104d authored by bertagaz's avatar bertagaz
Browse files

Merge remote-tracking branch 'origin/web/release-3.1'

parents 4bfba900 4346a94a
......@@ -34,6 +34,7 @@ STABLE_BRANCH_NAMES = ['stable', 'testing']
EXPORTED_VARIABLES = [
'MKSQUASHFS_OPTIONS',
'TAILS_BUILD_FAILURE_RESCUE',
'TAILS_DATE_OFFSET',
'TAILS_MERGE_BASE_BRANCH',
'TAILS_OFFLINE_MODE',
......@@ -161,7 +162,7 @@ def enough_free_host_memory_for_ram_build?
return false unless RbConfig::CONFIG['host_os'] =~ /linux/i
begin
usable_free_mem = `free`.split[16].to_i
usable_free_mem = `free`.split[12].to_i
usable_free_mem > VM_MEMORY_FOR_RAM_BUILDS * 1024
rescue
false
......@@ -169,7 +170,7 @@ def enough_free_host_memory_for_ram_build?
end
def free_vm_memory
capture_vagrant_ssh('free').first.chomp.split[16].to_i
capture_vagrant_ssh('free').first.chomp.split[12].to_i
end
def enough_free_vm_memory_for_ram_build?
......
......@@ -2,6 +2,11 @@ Package: b43-fwcutter
Pin: release o=Debian,n=sid
Pin-Priority: 999
Explanation: freeze exception (install version compatible with Thunderbird 45.x: #13530)
Package: enigmail
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: firmware-b43-installer
Pin: release o=Debian,n=sid
Pin-Priority: 999
......@@ -67,7 +72,7 @@ Pin-Priority: 990
Package: *
Pin: release o=TorProject,n=stretch
Pin-Priority: 989
Pin-Priority: 990
Package: *
Pin: origin live.debian.net
......
HTP_POOL_PAL="boum.org,espiv.net,db.debian.org,epic.org,mail.riseup.net,leap.se,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
HTP_POOL_NEUTRAL="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,www.centos.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
HTP_POOL_NEUTRAL="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,getfedora.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rackspace.com,www.sony.com"
......@@ -33,6 +33,11 @@ start_thunderbird() {
mkdir --mode=0700 -p "$TMPDIR"
export TMPDIR
# Clean the temporary directory: it's generally persistent, and then
# temporary files (including decrypted attachements) would otherwise
# be stored forever there (#13340).
rm -rf "${TMPDIR}"/*
unset SESSION_MANAGER
configure_default_incoming_protocol
......
http://torbrowser-archive.tails.boum.org/7.0.1-build1/
http://torbrowser-archive.tails.boum.org/7.0.4-build1/
35485eab1ece23e94de979e3a8f482d6c4ab5c1a4f4d249e317adac163559d32 tor-browser-linux64-7.0.1_ar.tar.xz
1a76ca4cc9c12eb5ff0137738513d03e07f7b741d9ba5874b299107c48d11c70 tor-browser-linux64-7.0.1_de.tar.xz
3aea998ea4aef7ead51bed9a9e9b767f447ce5eb0fd81f7b2009e974e3aca752 tor-browser-linux64-7.0.1_en-US.tar.xz
ce0f974c28b6131e2dfa51d3d669346fea575a65cde4a3245582d5cf686e7091 tor-browser-linux64-7.0.1_es-ES.tar.xz
da5e58f68d04b508a0867048eb239a659dcbcfd119a2bc17f8b2eac1165aea1c tor-browser-linux64-7.0.1_fa.tar.xz
f52a014e7f81597b59b37ff660b29679989c0b6fcb80f89403d6b495ec1e2621 tor-browser-linux64-7.0.1_fr.tar.xz
1c715ce4fb21979d33d520a31a697729e4a6028d2f29a5294569300819af92a4 tor-browser-linux64-7.0.1_it.tar.xz
a74174a4dbf986e5814ade67fd48e326bf27a5f56d9daee49d208b3a85069cb4 tor-browser-linux64-7.0.1_ja.tar.xz
5d04e1e043a57950728d78187f1ca658e87b744b603b4abb4378447420a508ee tor-browser-linux64-7.0.1_ko.tar.xz
b69bc518cb11dec13d3ea110896139316d4d40a4eebc379430819debf1d99c32 tor-browser-linux64-7.0.1_nl.tar.xz
fcc2100b1889d37d4e0c980aa2ab428cdb2b7709cd89445ef07dcba970b1e2ed tor-browser-linux64-7.0.1_pl.tar.xz
b738e6e3d92d86f5d3257032de3623815d361b769439e86c9c613f9932db9701 tor-browser-linux64-7.0.1_pt-BR.tar.xz
1a581dc787feaa438af867bda8351a1fcd25eb587e4718088120a150afd42e30 tor-browser-linux64-7.0.1_ru.tar.xz
6fce1fb085ec57ad87d6fc906a7983cb280c636f08811ed6178ea3ae317bc14c tor-browser-linux64-7.0.1_tr.tar.xz
2feb7cf3b0cd0126c52ef0dbbc542080ccec3937959cf89c43141be60797240a tor-browser-linux64-7.0.1_vi.tar.xz
7e7734296ae0cd36c3a9a42c55e9c037e7e9858431837b7a21c2e39e233e0101 tor-browser-linux64-7.0.1_zh-CN.tar.xz
5ea01a667f0c11e0dc94da77ee83e8c97589ac128f0204f086e37313f48f1f8f tor-browser-linux64-7.0.4_ar.tar.xz
befcdc8a1744844053bdc91a046eedcdfda94dd5abcc4457fc947cef171d38ed tor-browser-linux64-7.0.4_de.tar.xz
7d09fdf1dad4657de16556deecf497253f8564bdbe85a9e7fa00f97bb6351f9e tor-browser-linux64-7.0.4_en-US.tar.xz
78dd846f169b6c77ebdc14dd2ea651b7d48b8809eda99f5bc0d1ac93365e5747 tor-browser-linux64-7.0.4_es-ES.tar.xz
3e6ff11238cb55dd0288d8ab3e1d0c23dc292a002deee5d77f8e38d55858d1bd tor-browser-linux64-7.0.4_fa.tar.xz
96df00deb39ca005ab213b163bb1a7b3bea4250830efa2eeeafedde1d7d843fb tor-browser-linux64-7.0.4_fr.tar.xz
da35fb87b404bfcb0ba99c9dd946db66e2d74715bbf94d3acd66d678fad61191 tor-browser-linux64-7.0.4_it.tar.xz
f62e349ecd9d739ecf2f33418c3470e6e1e36cdc4290ee5a8231db3cffbf3092 tor-browser-linux64-7.0.4_ja.tar.xz
7b91f34f4390c60a91b23649769db40108cd8c93f20e6b61c5ace4419df5dda7 tor-browser-linux64-7.0.4_ko.tar.xz
a87cd08144d7ac49358e7c224e315728ef94b0b4643650965a6cca4d7344981f tor-browser-linux64-7.0.4_nl.tar.xz
8b78759c3da600aa194f01797df3cbed6c9bd273ccd01ea31f2655c76c164852 tor-browser-linux64-7.0.4_pl.tar.xz
ca372a192804284b893bd24311f157178cd1f1b4b5698bf1e6bbfe38274567c9 tor-browser-linux64-7.0.4_pt-BR.tar.xz
48a9091afc8419d1349035e741c56794a0aca781e396aae15f924252af0c4d14 tor-browser-linux64-7.0.4_ru.tar.xz
250d2ea1b24770a2729ecfa3f1750e49020a114bce7ceae5e8ccb8e40e9606d6 tor-browser-linux64-7.0.4_tr.tar.xz
80d2ac7fc9a6ea1cc21fe0276e36f901bcf3fd26ae45f39e8ff88e2ece6439bf tor-browser-linux64-7.0.4_vi.tar.xz
2633037a243bb02b14c7b8b28f145244f741fc4a87efe85edeb6a983cfc041bc tor-browser-linux64-7.0.4_zh-CN.tar.xz
tails (3.1) unstable; urgency=medium
* Security fixes
- Upgrade Tor Browser to 7.0.4-build1 (Closes: #13577).
- Upgrade Linux to 4.9.30-2+deb9u3.
- Upgrade libtiff to 4.0.8-2+deb9u1.
- Upgrade bind9 to 1:9.10.3.dfsg.P4-12.3+deb9u2.
- Upgrate evince to 3.22.1-3+deb9u1.
- Upgrade imagemagick 8:6.9.7.4+dfsg-11+deb9u1.
- Ensure Thunderbird cleans its temporary directory. (Closes: #13340).
* Minor improvements
- Patch gconf to produce reproducible XML output (refs: #12738). This is
the temporary solution for #12738 in Tails 3.1 which will be reverted
(and fixed permanently by removing gconf) in Tails 3.2.
- Apply Debian bts patch to cracklib to produce reproducible dictionnaries
(Closes: #12909).
- Upgrade to Debian 9.1 (Closes: #13178).
* Bugfixes
- Replace faulty URL in htpdate neutral pool (Closes: #13472).
- Keep installing a version of Enigmail compatible with Thunderbird 45.x
(Closes: #13530).
- Fix the time syncing and Tor notifications translations (Closes: #13437).
* Build system
- Upgrade the Vagrant basebox for building ISO images to Stretch
(Closes: #11738).
- Fix on-disk build by bumping Vagrant build VM memory to 768M
(Closes: #13480).
- Fix rescue build option by exporting TAILS_BUILD_FAILURE_RESCUE
(Closes: #13476).
* Test suite
- mark gnome screenshot scenario as fragile (refs: #13458)
- mark UEFI scenario as fragile (refs: #13459).
-- Tails developers <tails@boum.org> Sat, 05 Aug 2017 15:25:51 +0200
tails (3.0.1) unstable; urgency=medium
* Security fixes
......
@product
Feature: GNOME is well-integrated into Tails
#13458
@fragile
Scenario: A screenshot is taken when the PRINTSCREEN key is pressed
Given I have started Tails from DVD without network and logged in
And I wait 10 seconds
......
......@@ -48,6 +48,8 @@ Feature: Installing Tails to a USB drive
And the persistent Tor Browser directory does not exist
And there is no persistence partition on USB drive "__internal"
#13459
@fragile
Scenario: Booting Tails from a USB drive in UEFI mode
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
Then I power off the computer
......
......@@ -17,7 +17,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-07-14 15:30+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/"
"id/)\n"
......
......@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-07-15 05:33+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/"
"ko/)\n"
......
......@@ -36,15 +36,11 @@ apt-key add /tmp/tails.binary.gpg
echo "I: Add standard APT suites."
cat "/etc/apt/sources.list" | \
sed -e 's/jessie/jessie-updates/' \
> "/etc/apt/sources.list.d/jessie-updates.list"
sed -e 's/stretch/stretch-updates/' \
> "/etc/apt/sources.list.d/stretch-updates.list"
cat "/etc/apt/sources.list" | \
sed -e 's/jessie/jessie-backports/' \
> "/etc/apt/sources.list.d/jessie-backports.list"
echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${DEBIAN_SECURITY_SERIAL}/ jessie/updates main" \
> "/etc/apt/sources.list.d/jessie-security.list"
echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${DEBIAN_SECURITY_SERIAL}/ stretch/updates main" \
> "/etc/apt/sources.list.d/stretch-security.list"
echo "I: Adding our builder-jessie suite with live-build, pin it low."
echo "deb http://time-based.snapshots.deb.tails.boum.org/tails/${TAILS_SERIAL}/ builder-jessie main" > "/etc/apt/sources.list.d/tails.list"
......@@ -56,22 +52,13 @@ EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/live-build <<EOF
Package: live-build
Pin: release o=Tails,n=builder-jessie
Pin-Priority: 500
EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/discount <<EOF
Package: discount libmarkdown2 libmarkdown2-dev
Pin: release o=Tails,n=builder-jessie
Pin-Priority: 500
Pin-Priority: 999
EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/jessie-backports << EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/stretch-backports << EOF
Package: *
Pin: release n=jessie-backports
Pin: release n=stretch-backports
Pin-Priority: 100
Package: debootstrap
Pin: release n=jessie-backports
Pin-Priority: 991
EOF
apt-get update
......@@ -82,13 +69,9 @@ apt-get -y install ca-certificates curl grub2 openssh-server wget
echo "I: Configuring GRUB..."
sed -i 's,^GRUB_TIMEOUT=5,GRUB_TIMEOUT=1,g' /etc/default/grub
echo "I: Upgrading to the backported kernel..."
apt-get -y purge 'linux-image-*'
apt-get -y install -t "${DISTRIBUTION}-backports" "linux-image-${ARCHITECTURE}"
echo "I: Installing Tails build dependencies."
apt-get -y install \
debootstrap/jessie-backports \
debootstrap \
git \
dpkg-dev \
eatmydata \
......@@ -114,7 +97,6 @@ apt-get -y install \
libyaml-perl \
libyaml-syck-perl \
perlmagick \
wdg-html-validator \
psmisc
# Ensure we can use timedatectl
......
......@@ -3,20 +3,20 @@
# vi: set ft=ruby :
# Hostname of the virtual machine (must be in /etc/hosts)
VIRTUAL_MACHINE_HOSTNAME = 'vagrant-jessie'
VIRTUAL_MACHINE_HOSTNAME = 'vagrant-stretch'
# Approximate amount of extra space needed for builds
BUILD_SPACE_REQUIREMENT = 12.5*1024
BUILD_SPACE_REQUIREMENT = 12.25*1024
# Virtual machine memory size for on-disk builds
VM_MEMORY_FOR_DISK_BUILDS = 512
VM_MEMORY_FOR_DISK_BUILDS = 768
# Virtual machine memory size for in-memory builds
VM_MEMORY_FOR_RAM_BUILDS = VM_MEMORY_FOR_DISK_BUILDS + BUILD_SPACE_REQUIREMENT
# The builder VM's platform
ARCHITECTURE = "amd64"
DISTRIBUTION = "jessie"
DISTRIBUTION = "stretch"
# The name of the Vagrant box
def box_name
......
......@@ -46,7 +46,7 @@ fi
# Always set the latest serial for debian-security
stable_serial="$(grep -Po '\d{10}' /etc/apt/sources.list)"
security_serial="$(latest_serial debian-security)"
sed -i -e "s/${stable_serial}/${security_serial}/g" /etc/apt/sources.list.d/jessie-security.list
sed -i -e "s/${stable_serial}/${security_serial}/g" /etc/apt/sources.list.d/stretch-security.list
cat /etc/apt/sources.list /etc/apt/sources.list.d/*
# Upgrade if needed
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment