Merge branch 'devel'

auto/build

@@ -68,7 +68,7 @@ BUILD_LOG="${BUILD_DEST_FILENAME}.buildlog"
 
 echo "Building $LB_BINARY_IMAGES image ${BUILD_BASENAME}..."
 set -o pipefail
-if time lb build noauto ${@} 2>&1 | tee "${BUILD_LOG}" ; then
+if time eatmydata lb build noauto ${@} 2>&1 | tee "${BUILD_LOG}" ; then
    echo "Image was successfully created"
    echo "Renaming generated files..."
    mv -i "${BUILD_FILENAME}.${BUILD_FILENAME_EXT}" "${BUILD_DEST_FILENAME}"

auto/config

@@ -17,6 +17,7 @@ $RUN_LB_CONFIG \
    --apt-recommends false \
    --backports false \
    --binary-images iso-hybrid \
+   --binary-indices none \
    --isohybrid-options "$AMNESIA_ISOHYBRID_OPTS" \
    --bootappend-live "${AMNESIA_APPEND}" \
    --bootstrap "cdebootstrap" \

build-wiki

 #!/bin/sh
 
-ikiwiki -setup wiki.setup -refresh ${@}
+ikiwiki -setup ikwiki.setup -refresh ${@}

config/chroot_local-hooks/98-remove_unwanted_files

+#!/bin/sh
+
+echo "Removing unwanted files"
+
+rm -rf \
+   /usr/share/inkscape/examples \
+   /usr/share/inkscape/tutorials
+

config/chroot_local-hooks/98-remove_unwanted_packages

@@ -33,7 +33,7 @@ apt-get --yes --purge autoremove
 ### Deinstall gnome-core and some of its new dependencies.
 
 # We do this last as we don't want apt-get autoremove to deinstall all
-# gnome-core dependencies.
+# gnome-core and gnome-utils dependencies.
 
 # - gnome-core itself
 apt-get --yes purge gnome-core
@@ -50,4 +50,5 @@ apt-get --yes purge \
 
 # - others
 apt-get --yes purge \
-   gnome-screensaver gnome-keyring gnome-user-guide
+   baobab gnome-dictionary gnome-screensaver gnome-screenshot gnome-keyring \
+   gnome-user-guide

config/chroot_local-includes/etc/NetworkManager/dispatcher.d/50-htp.sh

@@ -88,6 +88,7 @@ chmod 644 "${LOG}"
 . /etc/live/config.d/username
 
 export DISPLAY=':0.0'
+export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`"
 exec /bin/su -c /usr/local/bin/tails-htp-notify-user "${LIVE_USERNAME}" &
 
 

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

@@ -6,7 +6,7 @@ user_pref("extensions.firegpg.enable_gpgapi", false);
 user_pref("extensions.firegpg.gmail_enabled", false);
 user_pref("extensions.firegpg.gmail_enabled", false);
 user_pref("extensions.firegpg.gpg_version", "FIREGPG_VERSION");
-user_pref("extensions.firegpg.keyserver", "keys.indymedia.org");
+user_pref("extensions.firegpg.keyserver", "hkps://keys.indymedia.org");
 user_pref("extensions.firegpg.show_website", false);
 
 // Block read and write access to the history in non-Tor mode

debian/control

@@ -12,7 +12,7 @@ Vcs-Git: git://git.immerda.ch/amnesia.git
 Package: tails
 Architecture: all
 Depends: ${misc:Depends}, live-build (>= 2.0.3),
- syslinux (>= 2:4.01+dfsg-1), dpkg-dev, ikiwiki, po4a, gettext
+ syslinux (>= 2:4.01+dfsg-1), dpkg-dev, ikiwiki, po4a, gettext, eatmydata
 Description: a Tor-ified, amnesic Live System
  The (Amnesic) Incognito Live System is aimed at preserving its users' privacy:
    - any outgoing connection to the Internet is forced to go through