aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-06-16 06:20:00 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-06-16 06:25:04 +0000
commited714ed787db82d7d4476a919e6c9cadd2d44bab (patch)
treeb6b4ed32516d757bcd12d5883c193e456e7e719a /main/linux-vanilla
parentcaae13b4f202e062583aeb352800dd442111cbad (diff)
downloadaports-ed714ed787db82d7d4476a919e6c9cadd2d44bab.tar.bz2
aports-ed714ed787db82d7d4476a919e6c9cadd2d44bab.tar.xz
main/linux-vanilla: enable Elantec PS/2 mouse and SECCOMP
Diffstat (limited to 'main/linux-vanilla')
-rw-r--r--main/linux-vanilla/APKBUILD14
-rw-r--r--main/linux-vanilla/kernelconfig.x864
-rw-r--r--main/linux-vanilla/kernelconfig.x86_644
3 files changed, 11 insertions, 11 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 76883ce6d6..e47b0450b7 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -164,18 +164,18 @@ dev() {
md5sums="b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz
59d1fabcccea6a8a3fcf59d610205a6e fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
d1009777f78193d6a19466981241379e kernelconfig.armhf
-247d69151ee44a1c6ffd87a5fb3be580 kernelconfig.x86
-d6850f7c4625935152de8be5a183cae5 kernelconfig.x86_64
+9a66c485289889cc84aa2130b6b55337 kernelconfig.x86
+4158e3a19b998421992351d1db34f583 kernelconfig.x86_64
068b814830b45c232340db534bc06e04 patch-3.14.6.xz"
sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz
e1377ef692929a37f1e638038b10e06a98502f28efc461e1948dcd67df1e7619 fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
0a1a42d5309bfe197af9c7fd91f87aaa0a4fc03d67da77645501f39a702354a4 kernelconfig.armhf
-fbe08bb8b31f08937ba4416098181ba26e20ad7270c0164f9315622b388f7c2f kernelconfig.x86
-b0431c1064eb446bbd3fdf03e39c2f2e1a1de434d622c664aa663e6763ad5ddf kernelconfig.x86_64
+53bc9c0f515e8c5ab9d11af2be3d5be21f61c8f7b5e29ed23c8c72185e3566d5 kernelconfig.x86
+7af37998b21eafc193e38ddfc773a0216dfc172818403cf5b3c39e7fbbcf70a6 kernelconfig.x86_64
b8de86f64a62ec1f5d62ef7b0caf302546be0d397e7c7d29e4b1e260220462d7 patch-3.14.6.xz"
sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz
e8b5a96ddcf55ac9df7de506728a5308f9156086410edf6d354d7c69f6fb450222b25eb062e397889eeb9e5653c3f5110b0603003cca5d6706171b5559ddcd97 fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
39863223f41722b8a592580142d23c149ae92432a4c1613b93fb91f5302a2d69bf097f726d48483bf197baf96283966e3f2fc0394682b2cf22afa32c83dafce9 kernelconfig.armhf
-8b906d1308b127093dd2f659de665c894b659186f4fc931de6e8a78f5553ad390c2f1dfd4fd0357aec3c02425edeedc5e8ef0aa4f64c826fe015003c34a3a550 kernelconfig.x86
-1490bb8052cce3ea579ce849c018cb6b53aee0ea2426e958394129b75d5b59d3969c9ed8289e0b43bef062c40bd5e913da04c677f10bdf4d955bff439a4e84e1 kernelconfig.x86_64
+e45c48b4706e822596b23b6d5f33552ccbd2573221a01f78ddb892e7353632558df787be712572a7eabed542b6662673229cf84475e5ebd8679ffbfd64c41d42 kernelconfig.x86
+1d315aaeacb5a609d958a7bba647d2a9dcc751d172f53b03b818b73beaddce1b21978924c162109cfce5c4d939e74ab20f9621371d258eaf0062d6c3900a75b5 kernelconfig.x86_64
ba8784eb4968b639704e225cbd0455768a3d381ade19d37e0cc06cc00606cc9706163b27441f32b1de4a6f71d44b14004e931ea3f9a2d86c20e35dc881e6d451 patch-3.14.6.xz"
diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86
index 1a376d982e..3731e4cabb 100644
--- a/main/linux-vanilla/kernelconfig.x86
+++ b/main/linux-vanilla/kernelconfig.x86
@@ -471,7 +471,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
CONFIG_X86_SMAP=y
# CONFIG_EFI is not set
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_300=y
@@ -2711,7 +2711,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_CYPRESS=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_ELANTECH=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_SERIAL=m
diff --git a/main/linux-vanilla/kernelconfig.x86_64 b/main/linux-vanilla/kernelconfig.x86_64
index b197afff5c..86bb82dd58 100644
--- a/main/linux-vanilla/kernelconfig.x86_64
+++ b/main/linux-vanilla/kernelconfig.x86_64
@@ -459,7 +459,7 @@ CONFIG_ARCH_RANDOM=y
CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_300=y
@@ -2699,7 +2699,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_CYPRESS=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_ELANTECH=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_SERIAL=m