← Back to branch summary

~ubuntu-branches/ubuntu/raring/apparmor/raring

« back to all changes in this revision

Viewing changes to kernel-patches/2.6.20/patches/apparmor_security.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2007-03-23 16:42:01 UTC
  • Revision ID: james.westby@ubuntu.com-20070323164201-jkax6f0oku087b7l
Tags: upstream-2.0.1+510.dfsg
Import upstream version 2.0.1+510.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel-patches/2.6.20/patches/apparmor_security.patch
 
1
Index: linux-2.6.18/security/Makefile
 
2
===================================================================
 
3
--- linux-2.6.18.orig/security/Makefile
 
4
+++ linux-2.6.18/security/Makefile
 
5
@@ -4,6 +4,7 @@
 
6
 
 
7
 obj-$(CONFIG_KEYS)                     += keys/
 
8
 subdir-$(CONFIG_SECURITY_SELINUX)      += selinux
 
9
+obj-$(CONFIG_SECURITY_APPARMOR)                += commoncap.o apparmor/
 
10
 
 
11
 # if we don't select a security model, use the default capabilities
 
12
 ifneq ($(CONFIG_SECURITY),y)
 
13
--- linux-2.6.17.orig/security/Kconfig
 
14
+++ linux-2.6.17/security/Kconfig
 
15
@@ -106,6 +106,7 @@ config SECURITY_SECLVL
 
16
          If you are unsure how to answer this question, answer N.
 
17
 
 
18
 source security/selinux/Kconfig
 
19
+source security/apparmor/Kconfig
 
20
 
 
21
 endmenu
 
22