[pkg-apparmor] [apparmor-profiles-extra] 01/08: Add support for installing tunables.

[Felix Geyer]

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

fgeyer pushed a commit to branch debfx/wip
in repository apparmor-profiles-extra.

commit ebe86a17259daaa93c3538897c4f19f40d956f9c
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Aug 29 20:50:45 2014 +0200

    Add support for installing tunables.
---
 debian/apparmor-profiles-extra.dirs                     | 1 +
 debian/rules                                            | 4 +++-
 debian/scripts/generate-apparmor-profiles-extra.install | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/apparmor-profiles-extra.dirs b/debian/apparmor-profiles-extra.dirs
index a490299..f792acd 100644
--- a/debian/apparmor-profiles-extra.dirs
+++ b/debian/apparmor-profiles-extra.dirs
@@ -1,3 +1,4 @@
 /etc/apparmor.d
 /etc/apparmor.d/local
 /etc/apparmor.d/abstractions
+/etc/apparmor.d/tunables
diff --git a/debian/rules b/debian/rules
index 3cfc34f..3ab92b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,8 @@
 
 PROFILES_DIR = $(CURDIR)/profiles
 ABSTRACTIONS_DIR = $(PROFILES_DIR)/abstractions
-PROFILES = $(filter-out $(ABSTRACTIONS_DIR)%,$(wildcard $(PROFILES_DIR)/*))
+TUNABLES_DIR = $(PROFILES_DIR)/tunables
+PROFILES = $(filter-out $(ABSTRACTIONS_DIR)% $(TUNABLES_DIR)%,$(wildcard $(PROFILES_DIR)/*))
 
 %:
 	dh $@
@@ -18,6 +19,7 @@ override_dh_install: debian/apparmor-profiles-extra.install
 	for profile in $(shell grep '^profiles/' $(CURDIR)/debian/apparmor-profiles-extra.install | \
 	                 awk '{print $$1}' | \
 	                 grep -v '^profiles/abstractions/' | \
+	                 grep -v '^profiles/tunables/' | \
 	                 cut -d/ -f2- | grep -v /); do \
 	   dh_apparmor --profile-name=$$profile -papparmor-profiles-extra; \
 	done
diff --git a/debian/scripts/generate-apparmor-profiles-extra.install b/debian/scripts/generate-apparmor-profiles-extra.install
index cf2168f..d817096 100755
--- a/debian/scripts/generate-apparmor-profiles-extra.install
+++ b/debian/scripts/generate-apparmor-profiles-extra.install
@@ -6,10 +6,13 @@ set -u
 WORK_DIR=$(readlink -f $(dirname $(dirname $0)/../../..))
 PROFILES_DIR="$WORK_DIR/profiles"
 ABSTRACTIONS_DIR="$PROFILES_DIR/abstractions"
+TUNABLES_DIR="$PROFILES_DIR/tunables"
 
 (
    cd "$PROFILES_DIR"
    find -maxdepth 1 -type f | sed -e 's,^\./\(.*\)$,profiles/\1 etc/apparmor.d/,' || true
    cd "$ABSTRACTIONS_DIR"
    find -maxdepth 1 -type f | sed -e 's,^\./\(.*\)$,profiles/abstractions/\1 etc/apparmor.d/abstractions/,' || true
+   cd "$TUNABLES_DIR"
+   find -maxdepth 1 -type f | sed -e 's,^\./\(.*\)$,profiles/tunables/\1 etc/apparmor.d/tunables/,' || true
 )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/apparmor-profiles-extra.git