Merge branch 'devel' into feature/wheezy

Conflicts:
	config/chroot_apt/apt.conf
	config/chroot_apt/preferences
	config/chroot_local-includes/etc/apt/apt.conf.d/00defaultrelease

auto/build

@@ -42,6 +42,7 @@ chmod    0440  config/chroot_local-includes/etc/sudoers.d/*
 chmod    go+rX config/chroot_local-includes/lib
 chmod    go+rX config/chroot_local-includes/lib/live
 chmod -R go+rx config/chroot_local-includes/lib/live/config
+chmod    go+rX config/chroot_local-includes/live
 chmod -R go+rX config/chroot_local-includes/usr
 chmod -R go+rx config/chroot_local-includes/usr/local/bin
 chmod -R go+rx config/chroot_local-includes/usr/local/sbin

auto/config

@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
    --memtest none \
    --packages-lists="standard" \
    --tasks="standard" \
-   --linux-packages="linux-image-3.2.0-4" \
+   --linux-packages="linux-image-3.9-1" \
    --syslinux-menu vesamenu \
    --syslinux-splash data/splash.png \
    --syslinux-timeout 4 \

config/amnesia

@@ -34,4 +34,4 @@ AMNESIA_DEV_EMAIL="amnesia@boum.org"
 AMNESIA_DEV_KEYID="BE2CD9C1"
 
 # Supported languages (displayed in this order by the syslinux menu)
-AMNESIA_SUPPORTED_LANGUAGES="ar zh en fa fr de it pt ru es vi"
+AMNESIA_SUPPORTED_LANGUAGES="ar zh en fa fr de it pt ru es vi sv"

config/chroot_apt/preferences

@@ -13,17 +13,166 @@ Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: barry-util
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
+Package: firmware-atheros
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-b43-installer
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-b43legacy-installer
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-brcm80211
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-ipw2x00
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-iwlwifi
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-libertas
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-linux
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-linux-free
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-linux-nonfree
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-ralink
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: firmware-realtek
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: zd1211-firmware
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: initramfs-tools
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: klibc-utils
+Pin: release o=Debian,n=wheezy
+Pin-Priority: 999
+
+Package: libklibc
+Pin: release o=Debian,n=wheezy
+Pin-Priority: 999
+
+Package: console-setup
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: console-setup-linux
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: keyboard-configuration
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-base
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-486
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-686-pae
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-amd64
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.9-1-common
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.9-1-486
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.9-1-686-pae
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.9-1-amd64
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-486
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-686-pae
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-amd64
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-3.9-1-486
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-3.9-1-686-pae
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-3.9-1-amd64
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-kbuild-3.9
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: tor
+Pin: origin deb.torproject.org
+Pin-Priority: 999
+
+Package: tor-geoipdb
+Pin: origin deb.torproject.org
+Pin-Priority: 999
+
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: gcc-4.6
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
+Pin-Priority: 1010
+
+Explanation: override deb.tails.boum.org's Squeeze -specific package.
+Package: gcc-4.7
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: libbarry0
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Package: xul-ext-foxyproxy-standard
@@ -32,42 +181,45 @@ Pin-Priority: 999
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: libmetacity-private0
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: metacity
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: metacity-common
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: msn-pecan
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: plymouth
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
-Explanation: override deb.tails.boum.org's Squeeze -specific package.
-Package: virtualbox-*
-Pin: release o=Debian,a=testing
-Pin-Priority: 1010
+Package: xul-ext-https-everywhere
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: xul-ext-noscript
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
-Package: xul-ext-adblock-plus
-Pin: release o=Debian,a=testing
+Package: virtualbox-*
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: override deb.tails.boum.org's Squeeze -specific package.
 Package: yelp
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=stable
 Pin-Priority: 1010
 
 Explanation: Unwanted package that tasksel would pull since they have Priority: standard.

config/chroot_local-hooks/09-remove_pidgin_mxit_support

@@ -3,7 +3,7 @@
 set -e
 
 # Remove pidgin's (libpurple's) mxit support, until CVE-2013-0272 and
-# CVE-2013-0271 are fixed in Debian stable.
+# CVE-2013-0271 are fixed in the version of Debian Tails is built upon.
 
 echo "removing pidgin mxit support"
 

config/chroot_local-hooks/09-remove_pidgin_sametime_support

@@ -3,7 +3,7 @@
 set -e
 
 # Remove pidgin's (libpurple's) sametime support, until CVE-2013-0273
-# is fixed in Debian stable.
+# is fixed in the version of Debian Tails is built upon.
 
 echo "removing pidgin sametime support"
 

config/chroot_local-hooks/14-generate-iceweasel-profile

@@ -4,7 +4,7 @@
 
 set -e
 apt-get --yes install xvfb
-xvfb-run iceweasel -CreateProfile default
+TOR_SOCKS_HOST='127.0.0.1' TOR_SOCKS_PORT='9063' xvfb-run iceweasel -CreateProfile default
 mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default
 sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini
 mv ~/.mozilla /etc/skel

config/chroot_local-hooks/52-update-rc.d

@@ -8,6 +8,7 @@ tails-kexec
 tails-reconfigure-kexec
 tails-reconfigure-memlockd
 tails-sdmem-on-media-removal
+tails-set-wireless-devices-state
 "
 
 PATCHED_INITSCRIPTS="

config/chroot_local-hooks/56-disable-live-config-hooks

+#! /bin/sh
+
+set -e
+
+# workaround live-config bug (LIVE_NOCONFIGS is not taken into account)
+touch /var/lib/live/config/policykit
+touch /var/lib/live/config/sudo

config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js

@@ -48,10 +48,20 @@ pref("browser.safebrowsing.malware.enabled", false);
 pref("browser.display.max_font_attempts", 10);
 pref("browser.display.max_font_count", 5);
 pref("gfx.downloadable_fonts.fallback_delay", -1);
+pref("general.appname.override", "Netscape");
+pref("general.appversion.override", "5.0 (Windows)");
+pref("general.buildID.override", "0");
+pref("general.useragent.locale", "en-US");
+pref("general.oscpu.override", "Windows NT 6.1");
+pref("general.platform.override", "Win32");
+pref("general.productSub.override", "20100101");
 pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0");
+pref("general.useragent.vendor", "");
+pref("general.useragent.vendorSub", "");
 pref("dom.enable_performance", false);
 pref("plugin.expose_full_path", false);
-pref("browser.startup.homepage_override.mstone", "ignore");
+pref("browser.startup.homepage_override.buildID", "20110325121920");
+pref("browser.startup.homepage_override.mstone", "rv:2.0");
 pref("browser.zoom.siteSpecific", false);
 
 // Third party stuff
@@ -69,25 +79,6 @@ pref("network.protocol-handler.external.mailto", false);
 pref("network.protocol-handler.external.news", false);
 pref("network.protocol-handler.external.nntp", false);
 pref("network.protocol-handler.external.snews", false)
-pref("network.protocol-handler.warn-external.mailto", true);
-pref("network.protocol-handler.warn-external.news", true);
-pref("network.protocol-handler.warn-external.nntp", true);
-pref("network.protocol-handler.warn-external.snews", true);
-
-// Network and performance
-pref("network.http.pipelining", true);
-pref("network.http.pipelining.aggressive", true);
-pref("network.http.pipelining.maxrequests", 12);
-pref("network.http.pipelining.ssl", true);
-pref("network.http.proxy.pipelining", true);
-pref("security.ssl.enable_false_start", true);
-pref("network.http.keep-alive.timeout", 20);
-pref("network.http.connection-retry-timeout", 0);
-pref("network.http.max-persistent-connections-per-proxy", 256);
-pref("network.http.pipelining.reschedule-timeout", 15000);
-pref("network.http.pipelining.read-timeout", 60000);
-// Quoting TBB: 'Hacked pref: Now means "Attempt to pipeline at least this many requests together"'
-pref("network.http.pipelining.max-optimistic-requests", 3);
 
 // Extension support
 pref("xpinstall.whitelist.add", "");
@@ -95,45 +86,27 @@ pref("xpinstall.whitelist.add.103", "");
 
 // Unsorted prefs
 pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
-pref("browser.cache.disk.capacity", 0);
-pref("browser.chrome.favicons", false);
 pref("browser.chrome.site_icons", false);
-pref("browser.chrome.image_icons.max_size", 0);
-pref("browser.download.manager.closeWhenDone", true);
 pref("browser.history_expire_days", 0);
 pref("browser.history_expire_days.mirror", 0);
 pref("browser.microsummary.updateGenerators", false);
 pref("browser.safebrowsing.remoteLookups", false);
-pref("browser.search.update", false);
 pref("browser.sessionstore.enabled", false);
-pref("dom.event.contextmenu.enabled", false);
-pref("dom.storage.enabled", false);
 pref("extensions.shownSelectionUI", true);
 pref("extensions.update.autoUpdateDefault", false);
-pref("extensions.update.enabled", false);
 pref("extensions.update.notifyUser", false);
-pref("layout.css.report_errors", false);
 pref("network.cookie.prefsMigrated", true);
-pref("network.protocol-handler.warn-external.file", true);
-pref("network.proxy.failover_timeout", 0);
-pref("layout.spellcheckDefault", 0);
-pref("network.dns.disableIPv6", true);
 pref("pref.privacy.disable_button.cookie_exceptions", false);
 pref("pref.privacy.disable_button.view_cookies", false);
 pref("pref.privacy.disable_button.view_passwords", false);
-pref("privacy.item.cookies", true);
 pref("privacy.item.offlineApps", true);
 pref("privacy.item.passwords", true);
 pref("privacy.sanitize.didShutdownSanitize", true);
 pref("privacy.sanitize.promptOnSanitize", false);
-pref("privacy.sanitize.sanitizeOnShutdown", true);
 pref("security.disable_button.openCertManager", false);
 pref("security.enable_java", false);
 pref("security.enable_ssl2", false);
 pref("security.enable_ssl3", true);
 pref("security.enable_tls", true);
-pref("security.xpconnect.plugin.unrestricted", false);
-pref("security.warn_leaving_secure", true);
-pref("security.warn_submit_insecure", true);
 pref("signon.prefillForms", false);
 pref("spellchecker.dictionary", "en_US");

config/chroot_local-includes/etc/iceweasel/profile/user.js

 user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
 user_pref("capability.policy.maonoscript.sites", "about: about:addons about:blank about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
 user_pref("extensions.adblockplus.correctTypos", false);
-user_pref("extensions.adblockplus.currentVersion", "2.0.3");
+user_pref("extensions.adblockplus.currentVersion", "2.1");
 user_pref("extensions.adblockplus.savestats", false);
 user_pref("extensions.adblockplus.showinaddonbar", false);
 user_pref("extensions.adblockplus.showintoolbar", false);
@@ -61,6 +61,26 @@ user_pref("network.proxy.socks_port", 9063);
 user_pref("network.proxy.socks_remote_dns", true);
 user_pref("network.proxy.socks_version", 5);
 user_pref("network.proxy.type", 1);
+user_pref("network.protocol-handler.warn-external.mailto", true);
+user_pref("network.protocol-handler.warn-external.news", true);
+user_pref("network.protocol-handler.warn-external.nntp", true);
+user_pref("network.protocol-handler.warn-external.snews", true);
+user_pref("network.protocol-handler.warn-external.file", true);
+
+// Network and performance
+user_pref("network.http.pipelining", true);
+user_pref("network.http.pipelining.aggressive", true);
+user_pref("network.http.pipelining.maxrequests", 12);
+user_pref("network.http.pipelining.ssl", true);
+user_pref("network.http.proxy.pipelining", true);
+user_pref("security.ssl.enable_false_start", true);
+user_pref("network.http.keep-alive.timeout", 20);
+user_pref("network.http.connection-retry-timeout", 0);
+user_pref("network.http.max-persistent-connections-per-proxy", 256);
+user_pref("network.http.pipelining.reschedule-timeout", 15000);
+user_pref("network.http.pipelining.read-timeout", 60000);
+// Quoting TBB: 'Hacked pref: Now means "Attempt to pipeline at least this many requests together"'
+user_pref("network.http.pipelining.max-optimistic-requests", 3);
 
 // Fingerprinting
 user_pref("webgl.min_capability_mode", true);
@@ -70,8 +90,19 @@ user_pref("webgl.disable-extensions", true);
 user_pref("extensions.autoDisableScopes", 0);
 
 // Other non-Torbutton prefs
+user_pref("browser.cache.disk.capacity", 0);
+user_pref("browser.chrome.favicons", false);
+user_pref("browser.chrome.image_icons.max_size", 0);
+user_pref("browser.download.manager.closeWhenDone", true);
+user_pref("browser.search.update", false);
+user_pref("dom.event.contextmenu.enabled", false);
 user_pref("extensions.foxyproxy.last-version", "99999.99");
 user_pref("extensions.foxyproxy.socks_remote_dns", true);
+user_pref("extensions.update.enabled", false);
+user_pref("layout.css.report_errors", false);
+user_pref("layout.spellcheckDefault", 0);
+user_pref("network.dns.disableIPv6", true);
+user_pref("network.proxy.failover_timeout", 0);
 user_pref("noscript.ABE.enabled", false);
 user_pref("noscript.ABE.notify", false);
 user_pref("noscript.ABE.wanIpAsLocal", false);
@@ -102,4 +133,9 @@ user_pref("noscript.STS.enabled", false);
 user_pref("noscript.subscription.lastCheck", -142148139);
 user_pref("noscript.temp", "");
 user_pref("noscript.untrusted", "google-analytics.com");
+user_pref("privacy.item.cookies", true);
+user_pref("privacy.sanitize.sanitizeOnShutdown", true);
+user_pref("security.xpconnect.plugin.unrestricted", false);
+user_pref("security.warn_leaving_secure", true);
+user_pref("security.warn_submit_insecure", true);
 user_pref("torbrowser.version", "Tails");

config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state

+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:		tails-set-wireless-devices-state
+# Required-Start:	mountkernfs $local_fs udev
+# Required-Stop:	
+# Default-Start:        2 3 4 5
+# Default-Stop:		
+# Short-Description:    Set proper default state on wireless devices
+# Description:          Set proper default state on wireless devices
+### END INIT INFO
+
+case "$1" in
+   start)
+      /usr/local/sbin/tails-set-wireless-devices-state &
+      ;;
+   *)
+      echo "Usage: $0 start" >&2
+      exit 3
+      ;;
+esac
+exit 0

config/chroot_local-includes/etc/skel/.gnupg/gpg.conf

 keyserver hkps://hkps.pool.sks-keyservers.net
 keyserver-options ca-cert-file=/etc/ssl/certs/sks-keyservers.netCA.pem
-keyserver-options http-proxy=http://127.0.0.1:8118/
+keyserver-options http-proxy=http://127.0.0.1:8118/ no-honor-keyserver-url
 
 personal-digest-preferences SHA512,SHA384,SHA256
 cert-digest-algo SHA512
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
 
 use-agent
+no-auto-key-locate

config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop

@@ -7,4 +7,5 @@ Terminal=false
 Exec=torsocks whisperback
 Icon=/usr/share/pixmaps/whisperback.svg
 Name[fr_FR]=Faire un rapport de Bug
-Name[de_DE]=Einen Bug melden
\ No newline at end of file
+Name[de_DE]=Einen Bug melden
+Name[sv]=Bugg-anmälan

config/chroot_local-includes/etc/skel/Desktop/TAILS documentation.desktop

@@ -8,3 +8,4 @@ Exec=/usr/local/bin/tails-documentation getting_started
 Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
 Name[fr_FR]=Documentation de Tails
 Name[de_DE]=Dokumentation Tails
+Name[sv]=Tails dokumentation

config/chroot_local-includes/lib/live/image

-/live/mount/medium
\ No newline at end of file

config/chroot_local-includes/live

-lib/live
\ No newline at end of file