disable b0rked lsm modules

svn path=/dists/trunk/linux-2.6/; revision=6439

15 files changed, 8 insertions, 24 deletions

diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge
index 87a0f530bc70..8bfbe72d4b43 100644
--- a/debian/arch/arm/config.footbridge
+++ b/debian/arch/arm/config.footbridge
@@ -1487,8 +1487,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index e049e26ab64c..528f35a2a997 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -1251,7 +1251,6 @@ CONFIG_SECURITY=y
 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
diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2
index fdf5c0d1b983..03752d8ebfa2 100644
--- a/debian/arch/arm/config.nslu2
+++ b/debian/arch/arm/config.nslu2
@@ -1486,8 +1486,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc
index f0bb08ef73f7..5376b1ce472a 100644
--- a/debian/arch/arm/config.rpc
+++ b/debian/arch/arm/config.rpc
@@ -973,7 +973,6 @@ CONFIG_SECURITY=y
 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
diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410
index 8101bb9acf38..91059209b5cb 100644
--- a/debian/arch/arm/config.s3c2410
+++ b/debian/arch/arm/config.s3c2410
@@ -1037,7 +1037,6 @@ CONFIG_SECURITY=y
 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
diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2
index 7e84de814173..a5472eb97e73 100644
--- a/debian/arch/armeb/config.nslu2
+++ b/debian/arch/armeb/config.nslu2
@@ -1486,8 +1486,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/config b/debian/arch/config
index ae0e97fe76a0..faa83db76b86 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -318,8 +318,8 @@ CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
+# CONFIG_SECURITY_ROOTPLUG is not set
+# CONFIG_SECURITY_SECLVL is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/arch/mips/config.r4k-ip22
index d12fd04e417b..cd8b9c86921c 100644
--- a/debian/arch/mips/config.r4k-ip22
+++ b/debian/arch/mips/config.r4k-ip22
@@ -1341,7 +1341,6 @@ CONFIG_SECURITY=y
 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
diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32
index 4bc55ed4ab28..cb08a8a69ce1 100644
--- a/debian/arch/mips/config.r5k-ip32
+++ b/debian/arch/mips/config.r5k-ip32
@@ -1461,7 +1461,6 @@ CONFIG_SECURITY=y
 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
diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a
index ea3567c88cce..f9ade03046cb 100644
--- a/debian/arch/mips/config.sb1-bcm91250a
+++ b/debian/arch/mips/config.sb1-bcm91250a
@@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b
index 15badc17d85c..973b5d03c40b 100644
--- a/debian/arch/mips/config.sb1a-bcm91480b
+++ b/debian/arch/mips/config.sb1a-bcm91480b
@@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt
index b722a7654fa6..809f8840b364 100644
--- a/debian/arch/mipsel/config.r5k-cobalt
+++ b/debian/arch/mipsel/config.r5k-cobalt
@@ -1574,8 +1574,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a
index 18f182a74332..32cbb63e5354 100644
--- a/debian/arch/mipsel/config.sb1-bcm91250a
+++ b/debian/arch/mipsel/config.sb1-bcm91250a
@@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b
index ac228384c790..47c644a67202 100644
--- a/debian/arch/mipsel/config.sb1a-bcm91480b
+++ b/debian/arch/mipsel/config.sb1a-bcm91480b
@@ -1794,8 +1794,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=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
diff --git a/debian/changelog b/debian/changelog
index 3f8f1b2977d7..8098d35f831f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   *
 
- -- Bastian Blank <waldi@debian.org>  Fri, 14 Apr 2006 17:52:48 +0200
+  [ maximilian attems ]
+  * Disable broken and known unsecure LSM modules: CONFIG_SECURITY_SECLVL,
+    CONFIG_SECURITY_ROOTPLUG. Upstream plans to remove them for 2.6.18
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 18 Apr 2006 02:09:27 +0200
 
 linux-2.6 (2.6.16-7) UNRELEASED; urgency=low