[kernel] r6925 - in dists/trunk/linux-2.6/debian: . arch/armeb

[Martin Michlmayr]

Author: tbm
Date: Thu Jun 29 15:43:22 2006
New Revision: 6925

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
   dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
   dists/trunk/linux-2.6/debian/changelog

Log:
leave CONFIG_SECURITY in, but still get rid of SE Linux


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.nslu2	Thu Jun 29 15:43:22 2006
@@ -1943,7 +1943,13 @@
 #
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY_ROOTPLUG is not set
+# CONFIG_SECURITY_SECLVL is not set
+# CONFIG_SECURITY_SELINUX is not set
 
 #
 # Cryptographic options

Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	Thu Jun 29 15:43:22 2006
@@ -1943,7 +1943,13 @@
 #
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY_ROOTPLUG is not set
+# CONFIG_SECURITY_SECLVL is not set
+# CONFIG_SECURITY_SELINUX is not set
 
 #
 # Cryptographic options

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jun 29 15:43:22 2006
@@ -16,7 +16,7 @@
   * [mipsel] Fix compilation error in dz serial driver.
   * [mipsel] Update configs.
   * [mipsel] Add a build fix for the Cobalt early console support.
-  * [arm/nslu2] Disable CONFIG_SECURITY for now so the kernel fits into flash.
+  * [arm/nslu2] Disable SE Linux support for now so the kernel fits into flash.
 
   [ Christian T. Steigies ]
   * [m68k] Update patches for 2.6.17.