From c548dc83c090e6cc44d7b3648f5540d33f2246c5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 17 Mar 2016 20:35:47 -0300
Subject: linux-libre-grsec{,-knock}: minor fix

* disable CONFIG_PAX_KERNEXEC
* disable implicit function declaration error since grsecurity patches conflicts against some RCN modules
---
 ...01-ARM-disable-implicit-function-declaration-error.patch | 13 +++++++++++++
 libre/linux-libre-grsec/PKGBUILD                            |  7 ++++++-
 libre/linux-libre-grsec/config.armv7h                       |  3 +--
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 libre/linux-libre-grsec/0001-ARM-disable-implicit-function-declaration-error.patch

(limited to 'libre')

diff --git a/libre/linux-libre-grsec/0001-ARM-disable-implicit-function-declaration-error.patch b/libre/linux-libre-grsec/0001-ARM-disable-implicit-function-declaration-error.patch
new file mode 100644
index 000000000..e02d20b01
--- /dev/null
+++ b/libre/linux-libre-grsec/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/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 795ce0de0..7f017ea67 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -53,6 +53,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'
@@ -76,13 +77,14 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             'SKIP'
             '8a911b8d635f2ab705b9f01f0301d9a08cff2ff9537172e02b1b8c5d4c050504'
             '23d15c88761c08f31c3e8a3c288033e7f0cd47d414d7b3880109638d8d6afebd'
-            '71ff01c06871dd92312f35a7ac2194708b2d1b783bdde0b585605f0d9d5c03f5'
+            '50808756ec1431b3163dd0579e901146229ec13356f73538b24db25a21bccb6a'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
             '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
             '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
             'SKIP'
+            '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
             'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
             '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
             '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -124,6 +126,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/libre/linux-libre-grsec/config.armv7h b/libre/linux-libre-grsec/config.armv7h
index 7fc325e77..013b02c6b 100644
--- a/libre/linux-libre-grsec/config.armv7h
+++ b/libre/linux-libre-grsec/config.armv7h
@@ -7479,8 +7479,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
-- 
cgit v1.2.3-54-g00ecf