diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2010-12-20 08:01:14 -0600 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-01-06 15:06:00 +0000 |
| commit | 5c7d74869bb3840e551387a14212d244401486b5 (patch) | |
| tree | ab41d0d7b74ab7b43d2845c4bb26fd7f620a4530 | |
| parent | cb11b51277a9c3247e032b7e823150e59318f691 (diff) | |
| download | alpine_aports-5c7d74869bb3840e551387a14212d244401486b5.tar.bz2 alpine_aports-5c7d74869bb3840e551387a14212d244401486b5.tar.xz alpine_aports-5c7d74869bb3840e551387a14212d244401486b5.zip | |
main/linux-grsec: enable CONFIG_IA32_EMULATION on x86_64.
(cherry picked from commit 300a9aa3b4a6fd394f41656474d27442141401be)
| -rw-r--r-- | main/linux-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index c51ca85c35..b6f4743690 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
| @@ -4,7 +4,7 @@ _flavor=grsec | |||
| 4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
| 5 | pkgver=2.6.35.9 | 5 | pkgver=2.6.35.9 |
| 6 | _kernver=2.6.35 | 6 | _kernver=2.6.35 |
| 7 | pkgrel=5 | 7 | pkgrel=6 |
| 8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
| 9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
| 10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 627e7c812d..b5ddf5f15c 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 | |||
| @@ -513,7 +513,7 @@ CONFIG_BINFMT_ELF=y | |||
| 513 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 513 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 514 | # CONFIG_HAVE_AOUT is not set | 514 | # CONFIG_HAVE_AOUT is not set |
| 515 | CONFIG_BINFMT_MISC=m | 515 | CONFIG_BINFMT_MISC=m |
| 516 | # CONFIG_IA32_EMULATION is not set | 516 | CONFIG_IA32_EMULATION=y |
| 517 | # CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set | 517 | # CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set |
| 518 | CONFIG_NET=y | 518 | CONFIG_NET=y |
| 519 | 519 | ||