diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-03-17 20:35:47 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-03-17 20:57:52 -0300 |
| commit | c548dc83c090e6cc44d7b3648f5540d33f2246c5 (patch) | |
| tree | 986f90f08910ff56ffd3f2c58d9297e1664d8134 /kernels | |
| parent | a6ec761d8b7bd5554c1ad156f66e871f85793d04 (diff) | |
| download | abslibre-c548dc83c090e6cc44d7b3648f5540d33f2246c5.tar.gz abslibre-c548dc83c090e6cc44d7b3648f5540d33f2246c5.tar.bz2 abslibre-c548dc83c090e6cc44d7b3648f5540d33f2246c5.zip | |
linux-libre-grsec{,-knock}: minor fix
* disable CONFIG_PAX_KERNEXEC
* disable implicit function declaration error since grsecurity patches conflicts against some RCN modules
Diffstat (limited to 'kernels')
3 files changed, 20 insertions, 3 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-ARM-disable-implicit-function-declaration-error.patch b/kernels/linux-libre-grsec-knock/0001-ARM-disable-implicit-function-declaration-error.patch new file mode 100644 index 000000000..e02d20b01 --- /dev/null +++ b/kernels/linux-libre-grsec-knock/0001-ARM-disable-implicit-function-declaration-error.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index b03f266..f3fadc9 100644 +--- a/Makefile ++++ b/Makefile +@@ -391,7 +391,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__ + + KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -fno-strict-aliasing -fno-common \ +- -Werror-implicit-function-declaration \ ++ -Wno-implicit-function-declaration \ + -Wno-format-security \ + -std=gnu89 + diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index 59562452c..94560ff1f 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -58,6 +58,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # armv7h patches "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch" "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig" + '0001-ARM-disable-implicit-function-declaration-error.patch' '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' '0003-SMILE-Plug-device-tree-file.patch' @@ -83,13 +84,14 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' '64bce353c6da5c852f4b3b6331ddf5386a037fd91190645fe8883863078fe6bc' '8b8b95e08dcfbda80f96574787b5f54773bc08587d7fccf14174a6d4aec7fcf8' - '4f8a32fdcff0ee401af5e3018ac4004ef2a1d469bdf72b61a0d9b6afeb7f418b' + 'cbd876f4a94317461d62adae169906668c3bf914c8f4497ef2eda97bf2e9d756' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc' '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808' '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319' 'SKIP' + '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382' 'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817' '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4' '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08' @@ -135,6 +137,9 @@ prepare() { # RCN patch (CM3 firmware deblobbed) git apply -v "${srcdir}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch" + # disable implicit function declaration error since grsecurity patches conflicts against some RCN modules + patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch" + # ALARM patches patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch" patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch" diff --git a/kernels/linux-libre-grsec-knock/config.armv7h b/kernels/linux-libre-grsec-knock/config.armv7h index 9904288e6..cb7da927f 100644 --- a/kernels/linux-libre-grsec-knock/config.armv7h +++ b/kernels/linux-libre-grsec-knock/config.armv7h @@ -7480,8 +7480,7 @@ CONFIG_PAX_PAGEEXEC=y CONFIG_PAX_MPROTECT=y # CONFIG_PAX_MPROTECT_COMPAT is not set # CONFIG_PAX_ELFRELOCS is not set -CONFIG_PAX_KERNEXEC=y -CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="" +# CONFIG_PAX_KERNEXEC is not set # # Address Space Layout Randomization |