From 41a4d60744b88729bee8269953c5dbb988ea85e9 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Wed, 20 Sep 2006 14:08:01 +0000 Subject: [PATCH] arm: Disable CONFIG_AUDIT for now since it's broken. svn path=/dists/trunk/linux-2.6/; revision=7466 --- debian/arch/arm/config.footbridge | 9 +-------- debian/arch/arm/config.iop32x | 3 +-- debian/arch/arm/config.ixp4xx | 9 +-------- debian/arch/arm/config.rpc | 9 +-------- debian/arch/arm/config.s3c2410 | 9 +-------- debian/changelog | 1 + 6 files changed, 6 insertions(+), 34 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 4bd7ffa78..b049459a8 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -22,7 +22,7 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y @@ -1655,13 +1655,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -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 # # Cryptographic options diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index 04de3b4fd..86e9a5f2c 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -20,7 +20,7 @@ CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" @@ -1983,7 +1983,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 # # Cryptographic options diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 64294c805..74f19a76c 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -18,7 +18,7 @@ CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y @@ -1967,13 +1967,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -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 # # Cryptographic options diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 7e263545a..abe4043ec 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -23,7 +23,7 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_EMBEDDED is not set @@ -966,13 +966,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -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 # # Cryptographic options diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index e20658ca8..6f0d10a8e 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -21,7 +21,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_EMBEDDED is not set @@ -1071,13 +1071,6 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y -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 # # Cryptographic options diff --git a/debian/changelog b/debian/changelog index 4cbb64e37..5389c3fee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ linux-2.6 (2.6.18-1) UNRELEASED; urgency=low * mipsel/r5k-cobalt: Enable CONFIG_BONDING as a module. * arm/iop32x: Likewise. * arm/ixp4xx: Likewise. + * arm: Disable CONFIG_AUDIT for now since it's broken. [ Sven Luther ] * [powerpc] Enabled the -prep flavour. (Closes: #359025)