From 8e8f94fbbe73c33f27db0a4d142e03ce99a6481d Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 14 Sep 2005 21:08:14 +0000 Subject: [PATCH] Move security settings to core config file. * debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/arm/config, debian/arch/hppa/config, debian/arch/i386/config, debian/arch/ia64/config, debian/arch/m68k/config, debian/arch/powerpc/config, debian/arch/s390/config, debian/arch/sparc/config: Remove security settings. * debian/arch/config: Add security settings. * debian/changelog: Update. svn path=/dists/trunk/linux-2.6/; revision=4206 --- debian/arch/alpha/config | 7 ------- debian/arch/amd64/config | 13 ------------- debian/arch/arm/config | 2 -- debian/arch/config | 14 ++++++++++++++ debian/arch/hppa/config | 8 -------- debian/arch/i386/config | 14 -------------- debian/arch/ia64/config | 8 -------- debian/arch/m68k/config | 2 -- debian/arch/powerpc/config | 14 -------------- debian/arch/s390/config | 6 ------ debian/arch/sparc/config | 2 -- debian/changelog | 2 +- 12 files changed, 15 insertions(+), 77 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index c090d8906..19a9aecf2 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -1709,12 +1709,5 @@ CONFIG_EARLY_PRINTK=y # 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 diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 770976e33..18d4cdda0 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -1640,19 +1640,6 @@ CONFIG_LOG_BUF_SHIFT=16 # 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 diff --git a/debian/arch/arm/config b/debian/arch/arm/config index 8f9c0b7a2..9936d4e4a 100644 --- a/debian/arch/arm/config +++ b/debian/arch/arm/config @@ -218,8 +218,6 @@ CONFIG_MSDOS_PARTITION=y # 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 diff --git a/debian/arch/config b/debian/arch/config index 0c9ea4967..fc1a5a4ac 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -387,3 +387,17 @@ CONFIG_PREEMPT_NONE=y # 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 diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index b1212f9ea..37fe96ccb 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -963,14 +963,6 @@ CONFIG_LOG_BUF_SHIFT=15 # 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index b6b1773c4..45ff10e82 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1896,20 +1896,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # 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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 49f6c299e..aa28624c1 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -1369,11 +1369,3 @@ CONFIG_IA64_PRINT_HAZARDS=y # 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 diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 2b911ae72..6e6830b0f 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -344,8 +344,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # 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 diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 6d5006d0a..b77d7be53 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -1326,20 +1326,6 @@ CONFIG_LOG_BUF_SHIFT=14 # 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 diff --git a/debian/arch/s390/config b/debian/arch/s390/config index af8e84586..9e67e9161 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -245,12 +245,6 @@ CONFIG_BSD_DISKLABEL=y # 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 diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index 4e8540ca2..eddb5e477 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -441,8 +441,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y # 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 diff --git a/debian/changelog b/debian/changelog index bd0c84010..986470de4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,7 +42,7 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low 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.