diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-15 10:03:34 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-16 06:29:56 +0000 |
| commit | 7554c18ebee7a6ead45cc74b248f86ac42100a07 (patch) | |
| tree | 74c86e503274daab6e472a4c56aa2dc833dcd6b4 /main/linux-grsec/kernelconfig.x86 | |
| parent | 0cdce5a0b47ed05c701a78ddd774d22da975851b (diff) | |
| download | aports-7554c18ebee7a6ead45cc74b248f86ac42100a07.tar.bz2 aports-7554c18ebee7a6ead45cc74b248f86ac42100a07.tar.xz | |
main/linux-grsec: upgrade to 3.8.7
this update disables constify plugin which now depends on kernexec
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 707b1834a..c14d186c6 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.5 Kernel Configuration +# Linux/i386 3.8.7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5287,7 +5287,10 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y @@ -5380,6 +5383,7 @@ CONFIG_DEBUG_NMI_SELFTEST=y # Grsecurity # CONFIG_ARCH_TRACK_EXEC_LIMIT=y +CONFIG_PAX_USERCOPY_SLABS=y CONFIG_GRKERNSEC=y # CONFIG_GRKERNSEC_CONFIG_AUTO is not set CONFIG_GRKERNSEC_CONFIG_CUSTOM=y @@ -5429,11 +5433,11 @@ CONFIG_PAX_RANDMMAP=y # # CONFIG_PAX_MEMORY_SANITIZE is not set # CONFIG_PAX_MEMORY_STACKLEAK is not set -# CONFIG_PAX_MEMORY_STRUCTLEAK is not set +CONFIG_PAX_MEMORY_STRUCTLEAK=y CONFIG_PAX_MEMORY_UDEREF=y CONFIG_PAX_REFCOUNT=y -CONFIG_PAX_CONSTIFY_PLUGIN=y -# CONFIG_PAX_USERCOPY is not set +CONFIG_PAX_USERCOPY=y +# CONFIG_PAX_USERCOPY_DEBUG is not set # CONFIG_PAX_SIZE_OVERFLOW is not set # CONFIG_PAX_LATENT_ENTROPY is not set |