From 8bfb842bf792846c127e038c27ba2c9519bdbea1 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 2 May 2013 14:48:58 +0000
Subject: main/linux-grsec: disable kernexec

didnt even boot
---
 main/linux-grsec/APKBUILD         | 8 ++++----
 main/linux-grsec/kernelconfig.x86 | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'main/linux-grsec')

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index a62cdffb2c..1505c83293 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=3.8.11
 _kernver=3.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -144,17 +144,17 @@ md5sums="1c738edfc54e7c65faeb90c436104e2f  linux-3.8.tar.xz
 76ec67882ad94b8ab43c70a46befca13  patch-3.8.11.xz
 c342846e7c9777833970010db7caeed4  grsecurity-2.9.1-3.8.11-201305011917.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-acbaf31e9aca6a45627c19477503a562  kernelconfig.x86
+6afee9a2fd53db15d84fd7b8a0438228  kernelconfig.x86
 39394a90e35d8d3bda64ffabb20b01be  kernelconfig.x86_64"
 sha256sums="e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b  linux-3.8.tar.xz
 4666f2ca152e454b090525efa79cfcacc81a3d82011e14c412f07edd45457a95  patch-3.8.11.xz
 4a9f1fac68c2da2ccb770307d55521f9a77f3b991b28482ae2294fa064875a99  grsecurity-2.9.1-3.8.11-201305011917.patch
 e2d2d1503f53572c6a2e21da729a13a430dd01f510405ffb3a33b29208860bde  0004-arp-flush-arp-cache-on-device-change.patch
-3ad656f7a6af32ee58c80cb9cc3f7531ca5cb895638ffc21b1522992394e3106  kernelconfig.x86
+7bc314449c8a444f594d5cf58150048ecb37123fb1c98f5e3adde6ef49ba6b3c  kernelconfig.x86
 dfad2f9e9a9dcc9d4d7568591ebdb81f01951a77c6ab8a539f29107eeb52dbbd  kernelconfig.x86_64"
 sha512sums="10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f  linux-3.8.tar.xz
 d2288c3110a6cc603621a85dacfa47ce764769e56e369dc9ddec722e4efc7ac642bf74ad431d2656ce34e32c3b3e95e8e2ff7f7e5475c0d0bde334badd640b4e  patch-3.8.11.xz
 fddd7473872b141700defd0fd2b917f78fc1b3102932075f13944377a9bcc1e00eb44b3fca226f62e2f5556c24201db5129b5bc15a75263b3e07f850084e912c  grsecurity-2.9.1-3.8.11-201305011917.patch
 b6fdf376009f0f0f3fa194cb11be97343e4d394cf5d3547de6cfca8ad619c5bd3f60719331fd8cfadc47f09d22be8376ba5f871b46b24887ea73fe47e233a54e  0004-arp-flush-arp-cache-on-device-change.patch
-9da750f041ef5bda7bd745d59b7bbe5a0ec625a55510789dfc54359b9023a3b853aa53abd9e907b5922175779977389b5c8f4ff0272faad423f4feb8390cd906  kernelconfig.x86
+33a479ef5cf7dc7da9511f99d90652e8a96a10211d5cbc464b0b824bb10f187ee6aa91abcd6273cf86161a60aff439d57a452680a473d1747d1e233b2255c3c6  kernelconfig.x86
 9542d12a7cc483f9f626238dbded4fb7dbf79a74fbd3cd4d0853152c894ed6a8955e5444139c3194d1046c8da0bf43d5eb5f2fd416f0986aa2e269af048e32dc  kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 5ec1318310..bda386966a 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -356,6 +356,7 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
 # CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_F00F_BUG=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
@@ -5286,7 +5287,10 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
@@ -5415,9 +5419,8 @@ CONFIG_PAX_EMUTRAMP=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 is not set
 CONFIG_PAX_KERNEXEC_PLUGIN_METHOD=""
-CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
 
 #
 # Address Space Layout Randomization
@@ -5434,7 +5437,6 @@ CONFIG_PAX_RANDMMAP=y
 CONFIG_PAX_MEMORY_STRUCTLEAK=y
 CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
-CONFIG_PAX_CONSTIFY_PLUGIN=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
 # CONFIG_PAX_SIZE_OVERFLOW is not set
-- 
cgit v1.2.3