Author: waldi
Date: Fri Mar 14 20:15:46 2008
New Revision: 10869

Log:
debian/config: Centralize Security options.


Modified:
   dists/trunk/linux-2.6/debian/config/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b

Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile    (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile    Fri Mar 14 
20:15:46 2008
@@ -907,10 +907,6 @@
 # CONFIG_PCCARD is not set
 
 ##
-## file: drivers/power/Kconfig
-##
-
-##
 ## file: drivers/rtc/Kconfig
 ##
 CONFIG_RTC_LIB=y
@@ -1627,13 +1623,6 @@
 ##
 ## file: security/Kconfig
 ##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 
 ##
 ## file: security/selinux/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta   (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta   Fri Mar 14 
20:15:46 2008
@@ -2409,17 +2409,6 @@
 CONFIG_NET_KEY=m
 
 ##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS 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
-
-##
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta   (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta   Fri Mar 14 
20:15:46 2008
@@ -2825,17 +2825,6 @@
 # CONFIG_NET_KEY_MIGRATE is not set
 
 ##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS 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
-
-##
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32    (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32    Fri Mar 14 
20:15:46 2008
@@ -952,16 +952,6 @@
 CONFIG_NET_KEY=y
 
 ##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
-
-##
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a       
(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a       Fri Mar 
14 20:15:46 2008
@@ -1434,15 +1434,6 @@
 CONFIG_XFRM_USER=y
 CONFIG_NET_KEY=y
 
-##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
 
 ##
 ## file: security/selinux/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b      
(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b      Fri Mar 
14 20:15:46 2008
@@ -1402,16 +1402,6 @@
 CONFIG_NET_KEY=y
 
 ##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
-
-##
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Fri Mar 14 
20:15:46 2008
@@ -2375,16 +2375,6 @@
 # CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_NET_KEY=m
 
-##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS 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
 
 ##
 ## file: security/selinux/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Fri Mar 14 
20:15:46 2008
@@ -2810,17 +2810,6 @@
 # CONFIG_NET_KEY_MIGRATE is not set
 
 ##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS 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
-
-##
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a     
(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a     Fri Mar 
14 20:15:46 2008
@@ -1488,16 +1488,6 @@
 CONFIG_NET_KEY=y
 
 ##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
-
-##
 ## file: security/selinux/Kconfig
 ##
 CONFIG_SECURITY_SELINUX=y

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b    
(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b    Fri Mar 
14 20:15:46 2008
@@ -1402,15 +1402,6 @@
 CONFIG_XFRM_USER=y
 CONFIG_NET_KEY=y
 
-##
-## file: security/Kconfig
-##
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
 
 ##
 ## file: security/selinux/Kconfig

_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

Reply via email to