[kernel] r7577 - in dists/trunk/linux-2.6/debian: . arch/arm arch/armeb arch/mipsel

[maximilian attems]

Author: maks-guest
Date: Thu Oct  5 15:03:41 2006
New Revision: 7577

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
   dists/trunk/linux-2.6/debian/changelog

Log:
unify CONFIG_SECURITY_SECLVL


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	Thu Oct  5 15:03:41 2006
@@ -1965,7 +1965,6 @@
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
-# CONFIG_SECURITY_SECLVL 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 Oct  5 15:03:41 2006
@@ -1919,7 +1919,6 @@
 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
 
 #

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02	Thu Oct  5 15:03:41 2006
@@ -1107,7 +1107,6 @@
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04	Thu Oct  5 15:03:41 2006
@@ -1109,7 +1109,6 @@
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Oct  5 15:03:41 2006
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
+linux-2.6 (2.6.18-3) unstable; urgency=low
 
   [ Bastian Blank ]
   * Fix home of patch apply script.
@@ -11,7 +11,11 @@
   * Activate CONFIG_NET_CLS_* globaly. (Closes: #389918)
   * Make CONFIG_EFI_VARS modular on i386. (Closes: #381951)
   * Activate CONFIG_SCSI_ARCMSR on amd64, powerpc, sparc too.
- -- Frederik Schüler <fs at debian.org>  Mon,  2 Oct 2006 15:17:27 +0200
+
+  [ maximilian attems ]
+  * [mipsel] Disable CONFIG_SECURITY_SECLVL on DECstations too.
+
+ -- maximilian attems <maks at sternwelten.at>  Thu,  5 Oct 2006 17:03:10 +0200
 
 linux-2.6 (2.6.18-2) unstable; urgency=low