[kernel] r10740 - in dists/sid/linux-2.6/debian: . config

[Dann Frazier]

Author: dannf
Date: Fri Mar  7 17:33:26 2008
New Revision: 10740

Log:
revert r10739, pending discussion

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Mar  7 17:33:26 2008
@@ -44,12 +44,7 @@
     - NETFILTER: nf_conntrack_tcp: conntrack reopening fix
     - SPARC/SPARC64: Fix usage of .section .sched.text in assembler code.
 
-  [ dann frazier ]
-  * Disable CONFIG_SECURITY_FILE_CAPABILITIES - it causes SUID signaling
-    issues that haven't been resolved upstream (breaks submission of at
-    jobs, for example), and is still marked EXPERIMENTAL. (closes: #463669)
-
- -- dann frazier <dannf at debian.org>  Fri, 07 Mar 2008 10:08:54 -0700
+ -- Gordon Farquharson <gordonfarquharson at gmail.com>  Thu, 21 Feb 2008 21:00:48 -0700
 
 linux-2.6 (2.6.24-4) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	(original)
+++ dists/sid/linux-2.6/debian/config/config	Fri Mar  7 17:33:26 2008
@@ -1766,7 +1766,7 @@
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y