Merge remote-tracking branch 'origin/master' into italian

auto/build

@@ -79,18 +79,13 @@ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/amnesi
 export MKSQUASHFS_OPTIONS
 
 # get git branch or tag so we can set the basename appropriately, i.e.:
-# * if we build from a tag:    tails-$ARCH-$TAG.iso
-# * if we build from a branch: tails-$ARCH-$BRANCH-$VERSION-$DATE.iso
-# * if Jenkins builds from a branch: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
+# * if we build from a tag: tails-$ARCH-$TAG.iso
+# * otherwise:              tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
 if GIT_REF="$(git symbolic-ref HEAD)"; then
     GIT_BRANCH="${GIT_REF#refs/heads/}"
     CLEAN_GIT_BRANCH=$(echo "$GIT_BRANCH" | sed 's,/,_,g')
-    if [ -n "$JENKINS_URL" ]; then
-        GIT_SHORT_ID="$(git rev-parse --short HEAD)"
-        BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
-    else
-        BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_TODAY}"
-    fi
+    GIT_SHORT_ID="$(git rev-parse --short HEAD)"
+    BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
 else
     GIT_CURRENT_COMMIT="$(git rev-parse HEAD)"
     if GIT_TAG="$(git describe --tags --exact-match ${GIT_CURRENT_COMMIT})"; then

config/chroot_apt/preferences

@@ -34,10 +34,6 @@ Package: libeatmydata1
 Pin: release o=Debian Backports,n=wheezy-backports
 Pin-Priority: 999
 
-Package: electrum
-Pin: release o=Debian Backports,n=wheezy-backports
-Pin-Priority: 999
-
 Package: florence
 Pin: release o=Debian Backports,n=wheezy-backports
 Pin-Priority: 999
@@ -242,10 +238,22 @@ Package: python-ecdsa
 Pin: release o=Debian Backports,n=wheezy-backports
 Pin-Priority: 999
 
-Package: python-electrum
+Package: python-qrcode
+Pin: release o=Debian Backports,n=wheezy-backports
+Pin-Priority: 999
+
+Package: python-requests
 Pin: release o=Debian Backports,n=wheezy-backports
 Pin-Priority: 999
 
+Package: python-urllib3
+Pin: release o=Debian Backports,n=wheezy-backports
+Pin-Priority: 999
+
+Package: python-pbkdf2
+Pin: release o=Debian,n=jessie
+Pin-Priority: 999
+
 Package: rsyslog
 Pin: release o=Debian Backports,n=wheezy-backports
 Pin-Priority: 999

config/chroot_local-includes/etc/skel/.config/gnome-panel/panel-default-layout.layout

@@ -20,11 +20,11 @@ toplevel-id=top-panel
 pack-index=1
 @instance-config/location='/usr/share/applications/tor-browser.desktop'
 
-[Object claws-launcher]
+[Object icedove-launcher]
 object-iid=PanelInternalFactory::Launcher
 toplevel-id=top-panel
 pack-index=2
-@instance-config/location='/usr/share/applications/claws-mail.desktop'
+@instance-config/location='/usr/share/applications/icedove.desktop'
 
 [Object pidgin-launcher]
 object-iid=PanelInternalFactory::Launcher

config/chroot_local-includes/etc/skel/.electrum/config

 {
-  'protocol': 's',
-  'auto_cycle': True,
-  'server': 'electrum.coinwallet.me:50002:s',
-  'proxy': {'host': 'localhost', 'mode': 'socks5', 'port': '9050'},
+    "proxy": "socks5:localhost:9050",
 }

config/chroot_local-includes/usr/local/bin/icedove

 #!/bin/sh
 
 set -e
-set -u
+
+. gettext.sh
+TEXTDOMAIN="tails"
+export TEXTDOMAIN
+
+CLAWSMAIL_DIR="${HOME}/.claws-mail"
 
 PROFILE="${HOME}/.icedove/profile.default"
 
+claws_mail_config_is_persistent() {
+    [ "$(findmnt --noheadings --output SOURCE --target "${CLAWSMAIL_DIR}")" = "/dev/mapper/TailsData_unlocked[/claws-mail]" ]
+}
+
+warn_about_claws_mail_persistence() {
+    local dialog_msg="<b><big>`gettext \"The <b>Claws Mail</b> persistence feature is activated.\"`</big></b>
+
+`gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Icedove</b>.\"`"
+
+    local launch="`gettext \"_Launch\"`"
+    local exit="`gettext \"_Exit\"`"
+    # Since zenity can't set the default button to cancel, we switch the
+    # labels and interpret the return value as its negation.
+    if zenity --question --title "" --ok-label "${exit}" \
+       --cancel-label "${launch}" --text "${dialog_msg}"; then
+        return 1
+    fi
+}
+
 start_icedove() {
    # Give Icedove its own temp directory, similar rationale to a1fd1f0f & #9558.
     TMPDIR="${PROFILE}/tmp"
@@ -21,4 +45,8 @@ start_icedove() {
     /usr/bin/icedove --class "Icedove" -profile "${PROFILE}" "${@}"
 }
 
+if claws_mail_config_is_persistent && [ -f "${CLAWSMAIL_DIR}/accountrc" ]; then
+   warn_about_claws_mail_persistence || exit 0
+fi
+
 start_icedove "${@}"

config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt

-http://torbrowser-archive.tails.boum.org/5.0.4/
+http://torbrowser-archive.tails.boum.org/5.0.6/

config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt

-c4d38b8a0d42f19f4883f2ecc58bcc0ae2f1abe6d707442821ddc2de844fc0a6  tor-browser-linux32-5.0.4_ar.tar.xz
-ff441589c7a01f051092430405fdd1bccb61f6dcc0a3191018c427297acc30a9  tor-browser-linux32-5.0.4_de.tar.xz
-3d0fd640693c91ddc9ffce744695b9a46e4cfc4b4aecd5d57b9044c1fa335c0f  tor-browser-linux32-5.0.4_en-US.tar.xz
-e70fd621f9fcec94b1c015d041031e73df2f0c84eba024a26adb39168ee50ad1  tor-browser-linux32-5.0.4_es-ES.tar.xz
-4dd0ed35bcafde800fc0f87ec3d7b66b74d743e4fe95693d880efce1cf4d7611  tor-browser-linux32-5.0.4_fa.tar.xz
-5402d358075782db6419bd7af014e158a06926be216a6ac603dbec3074828dbe  tor-browser-linux32-5.0.4_fr.tar.xz
-6d274dcc6ae4ee7b3da062fb1ad3266efb50f917e75f18d9c48b4c1431a84f9d  tor-browser-linux32-5.0.4_it.tar.xz
-69a5f26328a4ae43d2132434700d422583919068e2da9863dc14355ff78bc8da  tor-browser-linux32-5.0.4_ko.tar.xz
-a666205eccb8f745ed1ce5d80df5a61c2c9f555e807c37f018294caef52d0a99  tor-browser-linux32-5.0.4_nl.tar.xz
-a5b8e423b28742f7c0bf8eb94739131820eec4a54a1b42ea3ed346a8ce3603b4  tor-browser-linux32-5.0.4_pl.tar.xz
-19c65d9c8ec0cb56c3afa7d97a076a0f7b891503e77c484381e0c03bd69e3307  tor-browser-linux32-5.0.4_pt-PT.tar.xz
-c635438b8dbaef18da891f6b298f61a31babe6925a0e208fae390b9d995498d6  tor-browser-linux32-5.0.4_ru.tar.xz
-c3597cbfdfb625f3f9135b629b8713cb9fcdfd49a93bffbfe5d5aa0cd3cb2775  tor-browser-linux32-5.0.4_tr.tar.xz
-adb8bc1db36490e07c0302e22bf0a5252dbda44d107c214e6205bd5bdce31560  tor-browser-linux32-5.0.4_vi.tar.xz
-aff2788ef059cef86c12cfa0a83e5857cb38b876d4d05a9915a05f0f03130d92  tor-browser-linux32-5.0.4_zh-CN.tar.xz
+935f0b1ccda7752b05101ca05304e0e0932d7f420e75949b329e148254149ef1  tor-browser-linux32-5.0.6_ar.tar.xz
+a9939b9f23c1246408173924432dc7ad19815659c4f30b34d4dcc6d15fc98b0d  tor-browser-linux32-5.0.6_de.tar.xz
+d06b0a05a5491a7a519ffacf7c775bcce36f61ab26262915d13dc8de4372b5e0  tor-browser-linux32-5.0.6_en-US.tar.xz
+1f282b088b959faf7b9af06ca101ac2aed206bb0d554f1a0442c56bf9295711f  tor-browser-linux32-5.0.6_es-ES.tar.xz
+1533301f5c9b87becbae09c709671f56a078ea17a0e81c6e00b737d5ec9542c0  tor-browser-linux32-5.0.6_fa.tar.xz
+00b86427270b81990fa849205c8b78ca0b4bc257d2b48b76d4abc6e53b42ae00  tor-browser-linux32-5.0.6_fr.tar.xz
+31fcba4c8d3224f74db282350aa5663683bd0b1e93be4cced46bc2bcba15ef97  tor-browser-linux32-5.0.6_it.tar.xz
+ec5448c96b2dd6e5ee489f910473cbf42580bffdc6711bbbcc7caa21ba4a5410  tor-browser-linux32-5.0.6_ko.tar.xz
+03927f9cb12a8aeb25aaa74e7285bb3c587ade3250c7b9e11e4dd7d56374024c  tor-browser-linux32-5.0.6_nl.tar.xz
+980bb8414285acb49aedcc50471478742e8eb842b94f7009344d4a23abd04021  tor-browser-linux32-5.0.6_pl.tar.xz
+8d5e6bf621be343ca7fd097e6b0dcd5669d206c7820baca3803639cd22061abb  tor-browser-linux32-5.0.6_pt-PT.tar.xz
+8bdec5227204f7dcbcc8312d80090f1524e0e33b51fbdac3f2eb30ae47397071  tor-browser-linux32-5.0.6_ru.tar.xz
+60162e0ec72e4d2b93b727f064b55d11d24d1fc3afc429a6b11bf37cc4459c85  tor-browser-linux32-5.0.6_tr.tar.xz
+39e7a0e2281a9277d7a65303b1c60589bae58cd268276cefd247ed879781346f  tor-browser-linux32-5.0.6_vi.tar.xz
+ceb2366a13eb3916efdfda883d12762e9c7f6caeba41f05078730f132c6efa16  tor-browser-linux32-5.0.6_zh-CN.tar.xz

config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch

-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 7e68a08..2f40271 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
+--- /tmp/torbrowser-launcher-0.2.1/apparmor/torbrowser.Browser.firefox	2015-11-19 13:21:34.000000000 +0100
++++ apparmor/torbrowser.Browser.firefox	2015-11-19 13:19:30.680460539 +0100
 @@ -1,13 +1,15 @@
  # Last modified
  #include <tunables/global>
@@ -59,15 +57,15 @@ index 7e68a08..2f40271 100644
 -  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/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/*.so{,.[0-9]*} mr,
--  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,
--  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}Downloads/ rw,
--  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}Downloads/** rwk,
+-  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/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,
+-  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/Downloads/ rw,
+-  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/Downloads/** rwk,
 +  /usr/local/lib/tor-browser/ r,
 +  /usr/local/lib/tor-browser/** r,
 +  /usr/local/lib/tor-browser/*.so{,.6} mr,

config/chroot_local-patches/apparmor-adjust-tor-profile.diff

---- a/etc/apparmor.d/system_tor	2015-