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

[Maximilian Attems]

Author: maks
Date: Mon Jan  7 16:33:35 2008
New Revision: 10073

Log:
set SECURITY_FILE_CAPABILITIES


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	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan  7 16:33:35 2008
@@ -15,7 +15,8 @@
     SCSI_SRP_TGT_ATTRS, ADM8211, MTD_INTEL_VR_NOR, MTD_ALAUDA,
     MTD_ONENAND_2X_PROGRAM, MTD_ONENAND_SIM, DM_MULTIPATH_HP, FUJITSU_LAPTOP,
     QUOTA_NETLINK_INTERFACE, DM_UEVENT, SCSI_FC_TGT_ATTRS, SSB, BT_HCIUART_LL,
-    BT_HCIBTSDIO, MTD_OOPS, CGROUPS, MDIO_BITBANG, HIDRAW, P54, SDIO_UART.
+    BT_HCIBTSDIO, MTD_OOPS, CGROUPS, MDIO_BITBANG, HIDRAW, P54, SDIO_UART,
+    NETCONSOLE_DYNAMIC, SECURITY_FILE_CAPABILITIES.
   * Disable smbfs in topconfig, not supported upstream, use cifs.
   * Disable bcm43xx, deprecated by upstream. Enable B43 (needs v4 firmware)
     and B43LEGACY (needs v3 firmware).
@@ -57,7 +58,7 @@
   * [mips/mipsel] Remove QEMU flavour, as the Malta platform is now correctly
     emulated in QEMU.
 
- -- maximilian attems <maks at debian.org>  Mon, 07 Jan 2008 15:27:22 +0100
+ -- maximilian attems <maks at debian.org>  Mon, 07 Jan 2008 17:28:08 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Jan  7 16:33:35 2008
@@ -1736,6 +1736,7 @@
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_CAPABILITIES=y
+CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y