aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-04-18 09:05:11 +0000
committerTimo Teräs <timo.teras@iki.fi>2014-04-18 09:05:27 +0000
commit101e205cf5be84ddea510a6b8b4f067951f9361e (patch)
treee7b07922723196579f406fe518e6819cada7fc57
parent9544460de3b7282c473654a2a67586c6645a05c1 (diff)
downloadaports-101e205cf5be84ddea510a6b8b4f067951f9361e.tar.bz2
aports-101e205cf5be84ddea510a6b8b4f067951f9361e.tar.xz
main/linux-grsec: enable kuser_helpers on arm
needed by v8, openjdk7, and probably all VMs
-rw-r--r--main/linux-grsec/APKBUILD6
-rw-r--r--main/linux-grsec/kernelconfig.armhf5
2 files changed, 6 insertions, 5 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index daf9543aa5..7ffd6c6bbf 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -173,7 +173,7 @@ f5c7e4f1dc67f8560e4b9bbe75726d13 platform-introduce-OF-style-modalias-support-f
1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch
37865a61f0319c558d05568f34fa11e7 kernelconfig.x86
3949ef829d102d36255ff92ff76936d2 kernelconfig.x86_64
-6ea461c60077b09aa75040f7672c7250 kernelconfig.armhf"
+131aca2e67f1fdce1844ce23c924172a kernelconfig.armhf"
sha256sums="4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 linux-3.13.tar.xz
c323d141f02b349ac5b37c744e0689c98dc698be81c7c974b182983b8073b03d patch-3.13.10.xz
dd622dc23662c40d747efb1a7fb5ac8975f5e6d133f4c04af71aa87f5e722aef grsecurity-3.0-3.13.10-201404141717.patch
@@ -182,7 +182,7 @@ e90bb651da4ff16df25565e44ca70e26367bbcbf9d27962c796c6afd5eecea96 platform-intro
21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch
f8297eb16cfbe48d5202072e21fa16ebac95de26c8cfa8ec5a66610504af2f81 kernelconfig.x86
fd55e28d9baf330d6593453da592bcc03779694e7c3fb496fec47cdad1d7bcaa kernelconfig.x86_64
-c1e583baa6694643f85b8df0924cc7c4fac0f6eef963969615e6e642db0f969a kernelconfig.armhf"
+3fd9b79a871556ea10d7a0ac9fe364d616e0521e29a22da51bd7b54186c1d486 kernelconfig.armhf"
sha512sums="1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 linux-3.13.tar.xz
74d45d35db23915c3a0b3cb73a42e002e84d8c23f1415114004d5315ab8f25d9432882a5b4c2e59ed8b99035045cae9ad972e328d0b46495ebd7c333c831d9cc patch-3.13.10.xz
f79fcce8adf4720fde752cbfceddf8e7cd8a00e985b94d99d168a1dd3788a349a3948c123e28feb51bc7a876d9f038475c6f00d7c37996b373e19ce7a21e8ce4 grsecurity-3.0-3.13.10-201404141717.patch
@@ -191,4 +191,4 @@ f79fcce8adf4720fde752cbfceddf8e7cd8a00e985b94d99d168a1dd3788a349a3948c123e28feb5
87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch
852e46d89f9a445a1c5400f1dbbdefc93667f68a58a1b4ecc7dcad4cb125e1c3d11971ca8f33ef04a0c5a117293b3012c8a758c68edf7f0a300a80a81e686d64 kernelconfig.x86
16083f764d700959dfc066e524554011743b9ea4e6ca0db1c73b22e36cd0a6ca0dffd293fb758ea50f0a930e26b149a27e27e58728b500bb7f5b81f7b973d1cf kernelconfig.x86_64
-4797e9a125d496704c6e3aa6f9799c47d253409fa501e5f9c1d83e782b426413cd76d434dee5a12f90b0e0575a7177e3442ecc1fe297e8de0bca8395f00b6e61 kernelconfig.armhf"
+48d82a906009a1eba5885d63d3495fa0b6edd2fd693ac7a3a9de289137a02ae2206440e741aa16157ddc2236b49f00ee286b22a242f04b4c7a3935de36b06673 kernelconfig.armhf"
diff --git a/main/linux-grsec/kernelconfig.armhf b/main/linux-grsec/kernelconfig.armhf
index e263c6d398..f4a7f5c9f0 100644
--- a/main/linux-grsec/kernelconfig.armhf
+++ b/main/linux-grsec/kernelconfig.armhf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.13.7 Kernel Configuration
+# Linux/arm 3.13.10 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_MIGHT_HAVE_PCI=y
@@ -456,6 +456,7 @@ CONFIG_SWP_EMULATE=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_KUSER_HELPERS=y
CONFIG_OUTER_CACHE=y
CONFIG_OUTER_CACHE_SYNC=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
@@ -4519,7 +4520,7 @@ CONFIG_GRKERNSEC_BRUTE=y
# CONFIG_GRKERNSEC_HIDESYM is not set
# CONFIG_GRKERNSEC_RANDSTRUCT is not set
# CONFIG_GRKERNSEC_KERN_LOCKOUT is not set
-# CONFIG_GRKERNSEC_OLD_ARM_USERLAND is not set
+CONFIG_GRKERNSEC_OLD_ARM_USERLAND=y
#
# Role Based Access Control Options