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
This commit is contained in:
parent
1f9d8bc7d7
commit
8e8f94fbbe
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue