[kernel] r18395 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Sun Dec 18 18:32:54 2011
New Revision: 18395

Log:
security: Enable APPARMOR (Closes: #598408)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Dec 16 05:06:18 2011	(r18394)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec 18 18:32:54 2011	(r18395)
@@ -8,6 +8,7 @@
 
   [ 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

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Dec 16 05:06:18 2011	(r18394)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Dec 18 18:32:54 2011	(r18395)
@@ -4650,7 +4650,8 @@
 ##
 ## 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