From 54a8932887a08e171e0f9f1d5733992fb1ac5a0b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 18 Sep 2014 13:46:51 +0000 Subject: main/linux-vanilla: sync with grsec - remove usbkbd and usbmouse - enable NFC we disable randomize_base on x86 as it seems to break module loading --- main/linux-vanilla/APKBUILD | 20 ++++++++++---------- main/linux-vanilla/kernelconfig.armhf | 4 ++-- main/linux-vanilla/kernelconfig.x86 | 32 +++++++++++++++++++++++++++----- main/linux-vanilla/kernelconfig.x86_64 | 29 ++++++++++++++++++++++++++--- 4 files changed, 65 insertions(+), 20 deletions(-) (limited to 'main') diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 25ab4bc642..ecbfcef1d4 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" @@ -163,19 +163,19 @@ dev() { md5sums="b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz 59d1fabcccea6a8a3fcf59d610205a6e fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch -d1c82061be3bd2025ad6b3ce1ce709ab kernelconfig.armhf -a4b4693bc22560d8490a387c5e37620f kernelconfig.x86 -428c840b406b7cec77524ebb0e9f4e71 kernelconfig.x86_64 +1774c140d4aeae98000e9c58aede9c9a kernelconfig.armhf +7bb7619eb82147f227e306513814f6ad kernelconfig.x86 +af7969a37c4c9e8ee2d0a2d7a4db8415 kernelconfig.x86_64 f00741b35127573c3cf085fc43f6e3f0 patch-3.14.18.xz" sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz e1377ef692929a37f1e638038b10e06a98502f28efc461e1948dcd67df1e7619 fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch -2a0fa05d05e6632413dfc2445fdaa3b910d60a261ce91a07bd870fb00b448634 kernelconfig.armhf -353983b658b675964cd5f5285a07b5f7fe3bf3aef6ec0c962f9063edbb82e57b kernelconfig.x86 -795e0dfb98ae64facf39d5346d009a3a13179cc6c76147d413bd8899f8d53233 kernelconfig.x86_64 +9463a34d234b53937764bc34e4059ca9ceda86b37a3c3e64de484e677128f6cd kernelconfig.armhf +af2e14fe58750d763e51bb0f9213c9bd352c78779cca034350cc91152d6c5e0f kernelconfig.x86 +c95476d135081756de2e8b4d45cf44671b01646a0940bb67b9fa399b1c7f0820 kernelconfig.x86_64 3723d8d91e1bba0ed57a4951e8089ebfaa21ac186c3b729b4d2bad2da3eaed9f patch-3.14.18.xz" sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz e8b5a96ddcf55ac9df7de506728a5308f9156086410edf6d354d7c69f6fb450222b25eb062e397889eeb9e5653c3f5110b0603003cca5d6706171b5559ddcd97 fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch -3a06eac4c5ccccc2201b8e1f437bd46f170c78a88db22a5a025a73b74f77873c3546b2e4e043efbe2673954bea06739d1d6d720cf20838a71de63d7cc41dbb1b kernelconfig.armhf -2ef8b5b32bcf250249d329fa8a9762eeb03b5c248ea6ac66b66953e06e1d9cbe29eeca2b6d541d18f2e2e93cd68a3e42d8d6e08af676096396b9139425437b38 kernelconfig.x86 -37c5dca79ad1179e9b3236f7f1419b929da9bf5528c2e8b9bdc6b2989326ed7e2f7b4535548629470aad6ff363047e8448b5f1e83aee845cc80b18aa9c76909c kernelconfig.x86_64 +ad6ab96880442393c21edd73f3405c78f62330b6f59a371e1bc667d3cbd041f831d731009e68be88e58656b0714b8d54ffb9220700575c2c330d23b2509947ff kernelconfig.armhf +eaa587ae6222737c7d1864d2fd3abfd0c5e811b70e3b9e49cc9db7142a769d1aa996d2f9551f97603163b75d0193bf2613d4302e1ccc82463182453795397f92 kernelconfig.x86 +2c82a3ad103d8ec6e1b3af52bfcd9b15cdac8025192a68fb5e351bf17461c0449bfb7422de4d7c05aa977801b28b041cd1a8f0c60eb751f630039146d45df6cc kernelconfig.x86_64 c7c5b281986819cb69592cc4c2b7c7d79f34aa86f21db1dd64b795dda79b5f9df95626dada5c8e0613c58d8d7979f37baf0a87cd458f340018ce61b42e4eb6c5 patch-3.14.18.xz" diff --git a/main/linux-vanilla/kernelconfig.armhf b/main/linux-vanilla/kernelconfig.armhf index 56b93d6d5c..1263f4cb00 100644 --- a/main/linux-vanilla/kernelconfig.armhf +++ b/main/linux-vanilla/kernelconfig.armhf @@ -3431,8 +3431,8 @@ CONFIG_USB_HIDDEV=y # # USB HID Boot Protocol drivers # -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set # # I2C HID support diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86 index 011eb8eee5..29c1d7682d 100644 --- a/main/linux-vanilla/kernelconfig.x86 +++ b/main/linux-vanilla/kernelconfig.x86 @@ -485,8 +485,7 @@ CONFIG_SCHED_HRTICK=y # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000 +# CONFIG_RANDOMIZE_BASE is not set CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y @@ -1385,7 +1384,29 @@ CONFIG_NET_9P_RDMA=m CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set -# CONFIG_NFC is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_NCI_SPI=y +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m # # Device Drivers @@ -4468,8 +4489,8 @@ CONFIG_USB_HIDDEV=y # # USB HID Boot Protocol drivers # -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set # # I2C HID support @@ -5793,6 +5814,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m diff --git a/main/linux-vanilla/kernelconfig.x86_64 b/main/linux-vanilla/kernelconfig.x86_64 index efce74545c..83b3a6f89a 100644 --- a/main/linux-vanilla/kernelconfig.x86_64 +++ b/main/linux-vanilla/kernelconfig.x86_64 @@ -1368,7 +1368,29 @@ CONFIG_NET_9P_RDMA=m CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set -# CONFIG_NFC is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_NCI_SPI=y +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m CONFIG_HAVE_BPF_JIT=y # @@ -4442,8 +4464,8 @@ CONFIG_USB_HIDDEV=y # # USB HID Boot Protocol drivers # -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set # # I2C HID support @@ -5811,6 +5833,7 @@ CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m -- cgit v1.2.3