From b9ee44ab32cf34447c8d71daeb55cc2b8f160319 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 17 Jun 2012 23:55:43 +0200
Subject: [PATCH] No longer install apparmor policy by default
---
debian/changelog | 7 +++++++
debian/control | 4 ++--
debian/{tor.apparmor-profile => examples/apparmor-policy} | 0
debian/rules | 3 ---
debian/tor.dirs | 1 -
debian/tor.docs | 1 +
6 files changed, 10 insertions(+), 6 deletions(-)
rename debian/{tor.apparmor-profile => examples/apparmor-policy} (100%)
diff --git a/debian/changelog b/debian/changelog
index b3b413f7bc..ead4ba89cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
diff --git a/debian/control b/debian/control
index d5315c33b6..93175775e6 100644
--- a/debian/control
+++ b/debian/control
@@ -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.
diff --git a/debian/tor.apparmor-profile b/debian/examples/apparmor-policy
similarity index 100%
rename from debian/tor.apparmor-profile
rename to debian/examples/apparmor-policy
diff --git a/debian/rules b/debian/rules
index 79fd0bbc72..b8cf5c01fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/debian/tor.dirs b/debian/tor.dirs
index f4f6db7843..3c28695739 100644
--- a/debian/tor.dirs
+++ b/debian/tor.dirs
@@ -1,4 +1,3 @@
-etc/apparmor.d
etc/tor
var/lib/tor
var/log/tor
diff --git a/debian/tor.docs b/debian/tor.docs
index 42fd7b28b3..7f930b735e 100644
--- a/debian/tor.docs
+++ b/debian/tor.docs
@@ -2,3 +2,4 @@ debian/README.Debian
debian/README.polipo
debian/README.privoxy
contrib/tor-exit-notice.html
+debian/examples/apparmor-policy
--
GitLab