r4208 - in people/waldi/linux-2.6: . debian debian/arch debian/arch/alpha debian/arch/amd64 debian/arch/arm debian/arch/hppa debian/arch/i386 debian/arch/ia64 debian/arch/m68k debian/arch/powerpc debian/arch/s390 debian/arch/sparc

[Bastian Blank]

Author: waldi
Date: 2005-09-14 21:13:43 +0000 (Wed, 14 Sep 2005)
New Revision: 4208

Modified:
   people/waldi/linux-2.6/
   people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc
   people/waldi/linux-2.6/debian/arch/alpha/config
   people/waldi/linux-2.6/debian/arch/amd64/Makefile.inc
   people/waldi/linux-2.6/debian/arch/amd64/config
   people/waldi/linux-2.6/debian/arch/arm/Makefile.inc
   people/waldi/linux-2.6/debian/arch/arm/config
   people/waldi/linux-2.6/debian/arch/config
   people/waldi/linux-2.6/debian/arch/hppa/Makefile.inc
   people/waldi/linux-2.6/debian/arch/hppa/config
   people/waldi/linux-2.6/debian/arch/i386/Makefile.inc
   people/waldi/linux-2.6/debian/arch/i386/config
   people/waldi/linux-2.6/debian/arch/ia64/Makefile.inc
   people/waldi/linux-2.6/debian/arch/ia64/config
   people/waldi/linux-2.6/debian/arch/m68k/config
   people/waldi/linux-2.6/debian/arch/powerpc/config
   people/waldi/linux-2.6/debian/arch/s390/config
   people/waldi/linux-2.6/debian/arch/sparc/config
   people/waldi/linux-2.6/debian/changelog
Log:
Merge /dists/trunk/linux-2.6.



Property changes on: people/waldi/linux-2.6
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/dists/trunk/linux-2.6:4201
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/dists/trunk/linux-2.6:4207

Modified: people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1,4 +1,3 @@
 #
 # Variables 
 #
-initrd_modules := kernel/security/capability.ko

Modified: people/waldi/linux-2.6/debian/arch/alpha/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/alpha/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1709,12 +1709,5 @@
 # CONFIG_DEBUG_RWLOCK is not set
 # CONFIG_DEBUG_SEMAPHORE is not set
 CONFIG_ALPHA_LEGACY_START_ADDRESS=y
-# CONFIG_KEYS is not set
-CONFIG_SECURITY=y
-# CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
-# CONFIG_SECURITY_SELINUX is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=m

Modified: people/waldi/linux-2.6/debian/arch/amd64/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/Makefile.inc	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/amd64/Makefile.inc	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1,6 +1,5 @@
 #
 # Variables 
 #
-initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
 headers_dirs = x86_64
 

Modified: people/waldi/linux-2.6/debian/arch/amd64/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/amd64/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1640,19 +1640,6 @@
 # CONFIG_INIT_DEBUG is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_KPROBES is not set
-# CONFIG_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_REED_SOLOMON=m

Modified: people/waldi/linux-2.6/debian/arch/arm/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/arm/Makefile.inc	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/arm/Makefile.inc	2005-09-14 21:13:43 UTC (rev 4208)
@@ -3,4 +3,3 @@
 #
 include_common_config := no
 default_config := footbridge
-#initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko

Modified: people/waldi/linux-2.6/debian/arch/arm/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/arm/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -218,8 +218,6 @@
 # CONFIG_PROFILING is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 # CONFIG_CRYPTO is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set

Modified: people/waldi/linux-2.6/debian/arch/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -387,3 +387,17 @@
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_BKL is not set
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
+CONFIG_SECURITY_CAPABILITIES=y
+CONFIG_SECURITY_ROOTPLUG=m
+CONFIG_SECURITY_SECLVL=m
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

Modified: people/waldi/linux-2.6/debian/arch/hppa/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/Makefile.inc	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/hppa/Makefile.inc	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1,4 +1,3 @@
 #
 # Variables 
 #
-initrd_modules := kernel/security/capability.ko

Modified: people/waldi/linux-2.6/debian/arch/hppa/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/hppa/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -963,14 +963,6 @@
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_IOREMAP is not set
 # CONFIG_DEBUG_FS is not set
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SECLVL=m
-# CONFIG_SECURITY_SELINUX is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m

Modified: people/waldi/linux-2.6/debian/arch/i386/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/i386/Makefile.inc	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/i386/Makefile.inc	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1,4 +1,3 @@
 #
 # Variables 
 #
-initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko

Modified: people/waldi/linux-2.6/debian/arch/i386/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/i386/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1896,20 +1896,6 @@
 # CONFIG_4KSTACKS is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-# CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y

Modified: people/waldi/linux-2.6/debian/arch/ia64/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/Makefile.inc	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/ia64/Makefile.inc	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1,4 +1,3 @@
 #
 # Variables 
 #
-initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko

Modified: people/waldi/linux-2.6/debian/arch/ia64/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/ia64/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1369,11 +1369,3 @@
 # CONFIG_IA64_DEBUG_CMPXCHG is not set
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=m
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
-# CONFIG_SECURITY_SELINUX is not set

Modified: people/waldi/linux-2.6/debian/arch/m68k/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/m68k/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -344,8 +344,6 @@
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 CONFIG_CRC_CCITT=m
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y

Modified: people/waldi/linux-2.6/debian/arch/powerpc/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -1326,20 +1326,6 @@
 # CONFIG_XMON is not set
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BOOTX_TEXT=y
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SECLVL=m
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_KEXEC=y
 CONFIG_PMAC_MEDIABAY=y
 # CONFIG_HZ_100 is not set

Modified: people/waldi/linux-2.6/debian/arch/s390/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/s390/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/s390/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -245,12 +245,6 @@
 # CONFIG_PROFILING is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_KEYS is not set
-CONFIG_SECURITY=y
-# CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_SECLVL is not set
-# CONFIG_SECURITY_SELINUX is not set
 CONFIG_CRYPTO_SHA1_Z990=m
 CONFIG_CRYPTO_DES_Z990=m
 # CONFIG_CRC_CCITT is not set

Modified: people/waldi/linux-2.6/debian/arch/sparc/config
===================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/arch/sparc/config	2005-09-14 21:13:43 UTC (rev 4208)
@@ -441,8 +441,6 @@
 # CONFIG_WATCHDOG is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_IP_ROUTE_VERBOSE=y

Modified: people/waldi/linux-2.6/debian/changelog
===================================================================
--- people/waldi/linux-2.6/debian/changelog	2005-09-14 21:12:04 UTC (rev 4207)
+++ people/waldi/linux-2.6/debian/changelog	2005-09-14 21:13:43 UTC (rev 4208)
@@ -42,7 +42,7 @@
     be installed at a time to avoid file conflicts. (closes: #320042)
 
   [ Bastian Blank ]
-  * Move audit and preempt settings to core config file.
+  * Move audit, preempt and security settings to core config file.
   * Fix powerpc configuration.
   * Add debian version information to kernel version string.
   * Drop coreutils | fileutils dependencies.