Commit 7d113693 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'devel' into feature/wheezy

Conflicts:
	config/chroot_local-hooks/98-remove_unwanted_packages
	config/chroot_sources/torproject.chroot
parents f3f3f93b 41cd14e9
......@@ -235,146 +235,6 @@ Package: yelp
Pin: release o=Debian,a=stable
Pin-Priority: 1010
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: apt-listchanges
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: at
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: bsd-mailx
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: dc
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: debian-faq
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: doc-debian
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: doc-linux-text
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: exim4
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: exim4-base
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: exim4-config
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: exim4-daemon-light
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: ftp
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: locales
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: m4
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: mlocate
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: ncurses-term
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: nfs-common
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: portmap
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: procmail
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: python-apt
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: python-reportbug
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: reportbug
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: rpcbind
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: telnet
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: texinfo
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: time
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: w3m
Pin: release o=Debian
Pin-Priority: -1
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: wamerican
Pin: release o=Debian
Pin-Priority: -1
Explanation: weirdness in chroot_apt install-binary
Package: *
Pin: release o=chroot_local-packages
......
......@@ -23,9 +23,16 @@ apt-get --yes purge \
po-debconf \
virtualbox-guest-dkms
### Deinstall a few unwanted packages that were pulled by tasksel
### since they have Priority: standard.
apt-get --yes purge \
apt-listchanges at bsd-mailx dc debian-faq doc-debian doc-linux-text \
'^exim4*' ftp m4 mlocate ncurses-term nfs-common portmap procmail python-apt \
python-reportbug reportbug telnet texinfo time w3m wamerican
### Deinstall some other unwanted packages.
apt-get --yes purge \
aptitude live-build python2.6 python2.6-minimal tasksel tasksel-data
aptitude live-build python2.6 python2.6-minimal locales tasksel tasksel-data
### Deinstall dependencies of the just removed packages.
apt-get --yes --purge autoremove
......@@ -3,7 +3,7 @@ ProxyCommand none
Host *
ProxyCommand connect-proxy -S 127.0.0.1:9050 %h %p
ProxyCommand /usr/local/bin/connect-socks %h %p
Ciphers aes256-ctr,aes256-cbc,aes128-ctr,aes128-cbc,3des-cbc
MACs hmac-sha1,hmac-md5,hmac-ripemd160
......
#!/bin/sh
connect-proxy -s $*
SOCKS5_USER="${SOCKS5_USER:-}" \
SOCKS5_PASSWORD="${SOCKS5_PASSWORD:-}" \
connect-proxy -s $*
deb http://deb.torproject.org/torproject.org sid main
deb http://deb.torproject.org/torproject.org tor-0.2.4.x-wheezy main
......@@ -1044,6 +1044,14 @@ soft-blocks all other kinds of wireless devices (e.g. UWB, GPS, FM).
- [[!tails_gitweb config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-set-wireless-devices-state]]
### 3.6.20 OpenSSH
The OpenSSH client is configured to use the Tor SOCKS proxy, and to
prefer strong ciphers and MACs..
- [[!tails_gitweb config/chroot_local-includes/etc/ssh/ssh_config]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/connect-socks]]
## 3.7 Running Tails in virtual machines
### 3.7.1 Current support
......
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