[Pkg-privacy-commits] [vidalia] 104/160: Install AppArmor profile.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit 20ef4a5bccb5590b8576b5e83bc81d6f869cbe13
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Jun 10 02:17:42 2012 +0200

    Install AppArmor profile.
---
 debian/apparmor-profile | 17 +++++++++++++++++
 debian/control          |  2 +-
 debian/rules            |  3 +++
 debian/vidalia.dirs     |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/apparmor-profile b/debian/apparmor-profile
new file mode 100644
index 0000000..b6db055
--- /dev/null
+++ b/debian/apparmor-profile
@@ -0,0 +1,17 @@
+#include <tunables/global>
+
+/usr/bin/vidalia {
+  #include <abstractions/kde>
+  #include <abstractions/nameservice>
+
+  /usr/lib/** mr,
+
+  owner @{HOME}/.vidalia/ r,
+  owner @{HOME}/.vidalia/** rwmk,
+
+  /{var/,}run/tor/control rw,
+  /{var/,}run/tor/control.authcookie r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.vidalia>
+}
diff --git a/debian/control b/debian/control
index 66edd80..1923ebd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Ulises Vitulli <dererk at debian.org>
 Uploaders: Vern Sun <s5unty at gmail.com>
-Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
+Build-Depends: debhelper (>= 6.0.7~), dh-apparmor, autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
 Standards-Version: 3.9.2.0
 Homepage: https://www.torproject.org/projects/vidalia
 Vcs-Git: git://git.debian.org/collab-maint/vidalia.git/
diff --git a/debian/rules b/debian/rules
index a5649bb..3a9050f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,10 +57,13 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs usr/share/pixmaps
+	cp debian/apparmor-profile debian/vidalia/etc/apparmor.d/usr.bin.vidalia
+	dh_apparmor --profile-name=usr.bin.vidalia -pvidalia
 	# Install the package
 	cd debian/build; \
 		make install DESTDIR=$(CURDIR)/debian/vidalia
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
diff --git a/debian/vidalia.dirs b/debian/vidalia.dirs
new file mode 100644
index 0000000..79a7ef3
--- /dev/null
+++ b/debian/vidalia.dirs
@@ -0,0 +1 @@
+etc/apparmor.d

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git