Commit b9ee44ab authored Jun 17, 2012 by Peter Palfrader

No longer install apparmor policy by default

parent 8c3b7949

debian/changelog

+7 −0

Original line number	Diff line number	Diff line
		tor (0.2.3.17-beta-2) unstable; urgency=low

		* No longer install apparmor policy by default. It can be found in
		/usr/share/doc/tor if anybody is interested.

		-- Peter Palfrader <weasel@debian.org> Mon, 18 Jun 2012 00:05:24 +0200

		tor (0.2.3.17-beta-1) unstable; urgency=low

		* New upstream version.

debian/control

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ Source: tor
		Section: net
		Priority: optional
		Maintainer: Peter Palfrader <weasel@debian.org>
		Build-Depends: debhelper (>= 5), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), hardening-includes, asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor
		Build-Depends: debhelper (>= 5), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), hardening-includes, asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto
		Standards-Version: 3.8.1
		Homepage: https://www.torproject.org/
		Vcs-Git: git://git.torproject.org/debian/tor.git
		@@ -13,7 +13,7 @@ Architecture: any
		Depends: ${shlibs:Depends}, adduser, ${misc:Depends}, lsb-base
		Conflicts: libssl0.9.8 (<< 0.9.8g-9)
		Recommends: logrotate, tor-geoipdb, torsocks
		Suggests: mixmaster, xul-ext-torbutton, socat, tor-arm, polipo (>= 1) \| privoxy, apparmor
		Suggests: mixmaster, xul-ext-torbutton, socat, tor-arm, polipo (>= 1) \| privoxy
		Description: anonymizing overlay network for TCP
		Tor is a connection-based low-latency anonymous communication system which
		addresses many flaws in the original onion routing design.

debian/tor.apparmor-profile→debian/examples/apparmor-policy

+0 −0

File moved.

debian/rules

+0 −3

Original line number	Diff line number	Diff line
		@@ -151,9 +151,6 @@ install: build
		install -m 644 contrib/tor-tsocks.conf $(CURDIR)/debian/tor/etc/tor
		install -m 644 debian/tor-service-defaults-torrc $(CURDIR)/debian/tor/usr/share/tor

		install -m 644 debian/tor.apparmor-profile $(CURDIR)/debian/tor/etc/apparmor.d/usr.sbin.tor
		dh_apparmor --profile-name=usr.sbin.tor -ptor

		dh_link usr/share/man/man8/tor.8 usr/share/man/man5/torrc.5

		rm -f $(CURDIR)/debian/tor/usr/bin/tor-control.py

debian/tor.dirs

+0 −1

Original line number	Diff line number	Diff line
		etc/apparmor.d
		etc/tor
		var/lib/tor
		var/log/tor