From dfde3a5736926775e97680a527bcbae9b482c23f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 22 Sep 2014 08:30:27 +0000 Subject: main/linux-grsec: enable NFC for x86 and x86_64 ref #3366 --- main/linux-grsec/APKBUILD | 14 +++++++------- main/linux-grsec/kernelconfig.x86 | 28 +++++++++++++++++++++++++--- main/linux-grsec/kernelconfig.x86_64 | 28 +++++++++++++++++++++++++--- 3 files changed, 57 insertions(+), 13 deletions(-) (limited to 'main') diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 12fb71cad..c834c05bf 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -169,22 +169,22 @@ f00741b35127573c3cf085fc43f6e3f0 patch-3.14.18.xz eb7a53b063df0e0018014049a08f5b40 grsecurity-3.0-3.14.18-201409141906.patch c6a4ae7e8ca6159e1631545515805216 fix-memory-map-for-PIE-applications.patch 1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch -64a4b16ee369bced29fce8dbffb46634 kernelconfig.x86 -0384fa2a27015ed4bc47f037d58e9122 kernelconfig.x86_64 +673f80f1d47c0a086782d74d97a4fca1 kernelconfig.x86 +b98f73c3b6b466140ad7bb3ffed7d5fe kernelconfig.x86_64 3d79d27ce4aea637042bb70055c35a3d kernelconfig.armhf" sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa linux-3.14.tar.xz 3723d8d91e1bba0ed57a4951e8089ebfaa21ac186c3b729b4d2bad2da3eaed9f patch-3.14.18.xz a9f82ac307226ea1726e7c7e904627e69ee8016985b73fd4cb8dec4f5768b222 grsecurity-3.0-3.14.18-201409141906.patch 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7 fix-memory-map-for-PIE-applications.patch 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch -2e557aee89550953f1a01fcf18595929f20c26f46788fcc41dac31f90bf5bb56 kernelconfig.x86 -ecaa7feaec291d753fe6c68e3d767d66ca930bf4d702cb68054240627c263bbf kernelconfig.x86_64 +da40c2648a5c9c7ee14c0bb8188d11e8ba95e86712f04869a509c27eeea5286e kernelconfig.x86 +998cce8502ce26642618e5372b8155f37cd52b8b50bf9a86152db3bacd10fdd1 kernelconfig.x86_64 a2dc0e30e1d1d691768543a17b51efccfc11ef17c04ac08f2b54c95f25dab75d kernelconfig.armhf" sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e linux-3.14.tar.xz c7c5b281986819cb69592cc4c2b7c7d79f34aa86f21db1dd64b795dda79b5f9df95626dada5c8e0613c58d8d7979f37baf0a87cd458f340018ce61b42e4eb6c5 patch-3.14.18.xz ff711fc291a3a795a1421936f0e3168ef8a6b92bcad21f9b7a1468945ee33cf9dcb3e56a5424be99af4cc660bd00e1770812ee2beb0fad9b34dd610558bd9cd9 grsecurity-3.0-3.14.18-201409141906.patch 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7 fix-memory-map-for-PIE-applications.patch 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch -b53c0cdb226c0fe48828ee47909e98ca423260f3102e30a9573e21cd26ffa9dca3e4139d042f361c49240ee2715f40a1964da9b3ae005dd76b136e7ce53294ef kernelconfig.x86 -e2c0bdd022402bf86d8fefb0d73aa953e475264cf6e6f532c020b496231e57f24417d564c31ec419e0f45733cb9f4cc7d4b4dcf578d3eebe834d326226325a3e kernelconfig.x86_64 +0afde4aad7f5b33768adbf60a5d0945f2aea75615227263051af09a63c519b9d58bea66c5f4f3d1e64f6d3d4d42b2b17bb44e2e09ac83b202757f7c9534783aa kernelconfig.x86 +9f84cfc2c04df2b1acd1649adb6a5f75aa6284bcc7ffe34410e87f870bb80b0003543194d6561d53acb53a504d8861eb8ca31a9fb87cdbbda1114fff8419cb70 kernelconfig.x86_64 f341d200c5797a3ec6ade4234739ceca6bd6a4e3fb19175baadd3bb0eb54a0b200a84723f0c48bd18ee0b1afa4714920f96601d73aa73f629a79b1e04df28dfa kernelconfig.armhf" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 55c4e12a2..2a8bec9dd 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.16 Kernel Configuration +# Linux/x86 3.14.18 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1383,7 +1383,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 @@ -5868,7 +5890,6 @@ CONFIG_GRKERNSEC_HARDEN_IPC=y # # Network Protections # -CONFIG_GRKERNSEC_RANDNET=y # CONFIG_GRKERNSEC_BLACKHOLE is not set CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y # CONFIG_GRKERNSEC_SOCKET is not set @@ -6074,6 +6095,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-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index b391478ca..4e9662208 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.16 Kernel Configuration +# Linux/x86 3.14.18 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1364,7 +1364,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 # @@ -5746,7 +5768,6 @@ CONFIG_GRKERNSEC_HARDEN_IPC=y # # Network Protections # -CONFIG_GRKERNSEC_RANDNET=y # CONFIG_GRKERNSEC_BLACKHOLE is not set CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y # CONFIG_GRKERNSEC_SOCKET is not set @@ -5964,6 +5985,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