From 3f7f510591f5305b3a28960619313eb687d56ba6 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 15 Nov 2016 11:37:05 -0300
Subject: linux-libre-grsec*: minor fix

---
 kernels/linux-libre-grsec-xen/PKGBUILD      | 6 +++---
 kernels/linux-libre-grsec-xen/config.armv7h | 6 +++---
 kernels/linux-libre-grsec-xen/config.i686   | 7 +++----
 kernels/linux-libre-grsec-xen/config.x86_64 | 7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'kernels/linux-libre-grsec-xen')

diff --git a/kernels/linux-libre-grsec-xen/PKGBUILD b/kernels/linux-libre-grsec-xen/PKGBUILD
index 9c4443764..32fad86cf 100644
--- a/kernels/linux-libre-grsec-xen/PKGBUILD
+++ b/kernels/linux-libre-grsec-xen/PKGBUILD
@@ -79,9 +79,9 @@ sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a'
             'SKIP'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
             'SKIP'
-            '58e299a55ab8e7dca5191127067ba9f974bc79e2e455fe9ad12126f6dae23078'
-            'ab1399acf67ab5fb670ad4e3860425638eb4cace7f9f4e4fded9295b8d2d75ff'
-            '07ad06ddccbf872bb3fa14e9ba7258d1c0147c4706b29ff58830c46f7a926965'
+            'f3eab4b8522494815337717af286b3ac9b869031c1141df88c79141998f3a185'
+            '00d7f50599804e0a20397a3cef2a00f99dc1ed9772aef7aa734e181b5396114e'
+            '789ee27a8b8a0599d07efe0dc656a747215efcf57308227f346c21b16581e024'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3'
diff --git a/kernels/linux-libre-grsec-xen/config.armv7h b/kernels/linux-libre-grsec-xen/config.armv7h
index eb2e26a0f..027ddd998 100644
--- a/kernels/linux-libre-grsec-xen/config.armv7h
+++ b/kernels/linux-libre-grsec-xen/config.armv7h
@@ -7993,7 +7993,8 @@ CONFIG_PAX_REFCOUNT=y
 CONFIG_PAX_USERCOPY=y
 CONFIG_PAX_SIZE_OVERFLOW=y
 CONFIG_PAX_SIZE_OVERFLOW_EXTRA=y
-# CONFIG_PAX_INITIFY is not set
+CONFIG_PAX_INITIFY=y
+# CONFIG_PAX_INITIFY_VERBOSE is not set
 # CONFIG_PAX_LATENT_ENTROPY is not set
 
 #
@@ -8109,7 +8110,6 @@ CONFIG_GRKERNSEC_FLOODTIME=10
 CONFIG_GRKERNSEC_FLOODBURST=6
 CONFIG_KEYS=y
 CONFIG_PERSISTENT_KEYRINGS=y
-CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
@@ -8156,7 +8156,7 @@ CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
diff --git a/kernels/linux-libre-grsec-xen/config.i686 b/kernels/linux-libre-grsec-xen/config.i686
index 564adacea..8aaf0bd1f 100644
--- a/kernels/linux-libre-grsec-xen/config.i686
+++ b/kernels/linux-libre-grsec-xen/config.i686
@@ -7669,7 +7669,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -7878,8 +7877,9 @@ CONFIG_PAX_CONSTIFY_PLUGIN=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
 CONFIG_PAX_SIZE_OVERFLOW=y
 CONFIG_PAX_SIZE_OVERFLOW_EXTRA=y
-# CONFIG_PAX_INITIFY is not set
+CONFIG_PAX_INITIFY=y
 CONFIG_HAVE_PAX_INITIFY_INIT_EXIT=y
+# CONFIG_PAX_INITIFY_VERBOSE is not set
 # CONFIG_PAX_LATENT_ENTROPY is not set
 
 #
@@ -7997,7 +7997,6 @@ CONFIG_GRKERNSEC_FLOODTIME=10
 CONFIG_GRKERNSEC_FLOODBURST=6
 CONFIG_KEYS=y
 CONFIG_PERSISTENT_KEYRINGS=y
-CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_KEY_DH_OPERATIONS=y
@@ -8045,7 +8044,7 @@ CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_AKCIPHER2=y
diff --git a/kernels/linux-libre-grsec-xen/config.x86_64 b/kernels/linux-libre-grsec-xen/config.x86_64
index fc3bc8175..c4e404d9d 100644
--- a/kernels/linux-libre-grsec-xen/config.x86_64
+++ b/kernels/linux-libre-grsec-xen/config.x86_64
@@ -7325,7 +7325,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
@@ -7541,8 +7540,9 @@ CONFIG_PAX_CONSTIFY_PLUGIN=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
 CONFIG_PAX_SIZE_OVERFLOW=y
 CONFIG_PAX_SIZE_OVERFLOW_EXTRA=y
-# CONFIG_PAX_INITIFY is not set
+CONFIG_PAX_INITIFY=y
 CONFIG_HAVE_PAX_INITIFY_INIT_EXIT=y
+# CONFIG_PAX_INITIFY_VERBOSE is not set
 # CONFIG_PAX_LATENT_ENTROPY is not set
 CONFIG_PAX_RAP=y
 
@@ -7661,7 +7661,6 @@ CONFIG_GRKERNSEC_FLOODTIME=10
 CONFIG_GRKERNSEC_FLOODBURST=6
 CONFIG_KEYS=y
 CONFIG_PERSISTENT_KEYRINGS=y
-CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_KEY_DH_OPERATIONS=y
@@ -7709,7 +7708,7 @@ CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_AKCIPHER2=y
-- 
cgit v1.2.3