diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-02-24 23:46:09 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-02-24 23:46:32 -0600 |
| commit | 1e16518f0ac7bb056043d42984d2915f288cfb94 (patch) | |
| tree | ff2c6249df4c6c71df5dc8528cac05a4ccd55e4c | |
| parent | 1ddf81ceeb970c550e0c14a22c9e1bef1d9026ac (diff) | |
| download | aports-1e16518f0ac7bb056043d42984d2915f288cfb94.tar.bz2 aports-1e16518f0ac7bb056043d42984d2915f288cfb94.tar.xz | |
main/linux-grsec: reenable ia32 emulation
| -rw-r--r-- | main/linux-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 8125efc2d9..40cda45527 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -142,4 +142,4 @@ md5sums="c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2 7693d1d32ed39346cc988e0f027e5890 patch-2.6.37.1.bz2 d888f15e966e2cbd62bf45c4907fe79b grsecurity-2.2.1-2.6.37.1-201102221638.patch 7825fa82fecc817d6e2dfd3bb0c52f37 kernelconfig.x86 -ebac0a8e3b2f7c063bf151dfb7a1b434 kernelconfig.x86_64" +b72e1345ceddbe2d0d9de35e342b336d kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index cbf1c2fcf2..e63003cdc3 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.37 Kernel Configuration -# Fri Feb 18 09:21:39 2011 +# Thu Feb 24 23:45:57 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -142,6 +142,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y +CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -213,6 +214,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLOCK_COMPAT=y # # IO Schedulers @@ -524,13 +526,18 @@ CONFIG_HOTPLUG_PCI_SHPC=m # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=m -# CONFIG_IA32_EMULATION is not set -# CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set +CONFIG_IA32_EMULATION=y +# CONFIG_IA32_AOUT is not set +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y # # Networking options @@ -4406,6 +4413,7 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # CONFIG_CUSE is not set |