From 9c0dcfd33ff2d5e77f58cf38bcf8c7f7ec32e638 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 18 Dec 2011 18:32:54 +0000
Subject: [PATCH] security: Enable APPARMOR (Closes: #598408)

svn path=/dists/trunk/linux-2.6/; revision=18395
---
 debian/changelog     | 1 +
 debian/config/config | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0f54c4cfc..944bbaf64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux-2.6 (3.2~rc5-1~experimental.1) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * [x86] et131x: Include driver in installer (Closes: #651440)
+  * security: Enable APPARMOR (Closes: #598408)
 
   [ Uwe Kleine-König ]
   * [amd64] Update rt featureset to 3.2-rc5-rt8
diff --git a/debian/config/config b/debian/config/config
index 4c1a6b92f..fa4118c12 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4650,7 +4650,8 @@ CONFIG_DEFAULT_SECURITY_DAC=y
 ##
 ## file: security/apparmor/Kconfig
 ##
-# CONFIG_SECURITY_APPARMOR is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 
 ##
 ## file: security/integrity/ima/Kconfig