Commit 74c82645 authored by anonym's avatar anonym

Merge remote-tracking branch 'origin/testing'

parents 009e72f1 e24e8c6a
......@@ -63,6 +63,8 @@ chmod go+rX config/chroot_local-includes/home
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/lib/live/mount
chmod -R go+rX config/chroot_local-includes/lib/systemd
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
......
......@@ -20,7 +20,7 @@ export LB_BOOTSTRAP_INCLUDE='eatmydata'
RUN_LB_CONFIG="lb config noauto"
# init config/ with defaults for the target distribution
$RUN_LB_CONFIG --distribution wheezy ${@}
$RUN_LB_CONFIG --distribution jessie ${@}
# set Amnesia's general options
$RUN_LB_CONFIG \
......
......@@ -13,7 +13,7 @@
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
# need to set block.events_dfl_poll_msecs
AMNESIA_APPEND="live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails"
AMNESIA_APPEND="live-media=removable apparmor=1 security=apparmor nopersistence noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails"
# Options passed to isohybrid
AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
......
......@@ -56,5 +56,5 @@ sed -i -e '/^include stdmenu\.cfg/a include tails.cfg' "${CFG_FILE}"
# no need to use absolute paths to find splash images
sed -e 's,/isolinux/,,' -i "${SYSLINUX_PATH}/stdmenu.cfg"
# remove useless files that break incremental upgrades on Wheezy
# remove useless files that break incremental upgrades
rm "${SYSLINUX_PATH}"/{exithelp,prompt}.cfg
This diff is collapsed.
Package: aircrack-ng
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: amd64-microcode
Pin: release o=Debian Backports,n=wheezy-backports
Package: apparmor-profiles-extra
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: b43-fwcutter
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: bilibop-common
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: bilibop-udev
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: cryptsetup
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: cryptsetup-bin
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: eatmydata
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: libeatmydata1
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: florence
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: gnupg-agent
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: gnupg2
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: hopenpgp-tools
Pin: release o=Debian,n=jessie
Pin-Priority: 999
Package: iproute2
Pin: origin o=Debian Backports,n=wheezy-backports
Pin-Priority: -1
Package: libffi6
Pin: release o=Debian,n=jessie
Pin-Priority: 999
Package: poedit
Pin: release o=Debian Backports,n=wheezy-backports
Package: electrum
Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: firmware-amd-graphics
......@@ -118,32 +66,8 @@ Package: firmware-zd1211
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: initramfs-tools
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: intel-microcode
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: iucode-tool
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: keyringer
Pin: release o=Debian,n=jessie
Pin-Priority: 999
Package: libcryptsetup4
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: libestr0
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: libotr5
Pin: release o=Debian Backports,n=wheezy-backports
Package: libnet-dbus-perl
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: linux-base
......@@ -210,84 +134,28 @@ Package: linux-kbuild-3.16
Pin: release o=Debian,n=jessie
Pin-Priority: 999
Package: mat
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: monkeysign
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Package: pidgin-otr
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: python-six
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: python-slowaes
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: python-ecdsa
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
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
Package: scdaemon
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: seahorse-nautilus
Pin: release o=Debian Backports,n=wheezy-backports
Package: python-electrum
Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: shared-mime-info
Pin: release o=Debian Backports,n=wheezy-backports
Package: ttdnsd
Pin: release o=TorProject,a=unstable
Pin-Priority: 999
Package: torsocks
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: virtualbox-guest-dkms
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
Package: virtualbox-guest-utils
Pin: release o=Debian Backports,n=wheezy-backports
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: virtualbox-guest-x11
Pin: release o=Debian Backports,n=wheezy-backports
Package: xserver-xorg-video-intel
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: ttdnsd
Pin: release o=TorProject,a=unstable
Package: xul-ext-torbirdy
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Explanation: weirdness in chroot_apt install-binary
......@@ -299,25 +167,17 @@ Package: *
Pin: origin deb.tails.boum.org
Pin-Priority: 1005
Package: *
Pin: release o=Debian,n=wheezy-updates
Pin-Priority: 990
Package: *
Pin: release o=Debian,n=jessie-updates
Pin-Priority: 500
Package: *
Pin: release o=Debian,n=wheezy
Pin-Priority: 990
Package: *
Pin: release o=TorProject,n=wheezy
Pin: release o=Debian,n=jessie
Pin-Priority: 990
Package: *
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 200
Pin: release o=TorProject,n=jessie
Pin-Priority: 990
Package: *
Pin: origin live.debian.net
......
#! /bin/sh
set -e
echo "Checking for .orig files"
DOT_ORIG_WHITELIST=$(cat <<EOF
/bin/hostname.orig
/etc/resolv.conf.orig
/lib/systemd/system/alsa-utils.service.orig
/sbin/start-stop-daemon.orig
EOF
)
DOT_ORIG_FILES=$(find / -type f -name *.orig | grep -v -F "$DOT_ORIG_WHITELIST" || :)
if [ -n "$DOT_ORIG_FILES" ]; then
echo "Some patches are fuzzy and leave .orig files around:" >&2
echo "$DOT_ORIG_FILES" >&2
exit 1
fi