summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-18 10:34:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-18 10:34:50 +0000
commit15b2178cbed7e365111fb59dded1817e8e63977f (patch)
tree303e006a125335a3f6e3aceaef7620d22264e525
parent206e1123063767ce0fe8b45159e2fc7f068a542c (diff)
downloadaports-15b2178cbed7e365111fb59dded1817e8e63977f.tar.bz2
aports-15b2178cbed7e365111fb59dded1817e8e63977f.tar.xz
Revert "main/linux-grsec: build fix for x86_64"
-rw-r--r--main/linux-grsec/APKBUILD2
-rw-r--r--main/linux-grsec/kernelconfig.x86_645
2 files changed, 3 insertions, 4 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index d4d1ec0af..b4726e69a 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -142,4 +142,4 @@ b3677121c4b5efcb8128c2000788d0aa patch-2.6.38.3.bz2
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
aa1b82da0cabfb41c5e6da5bddf60bab net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch
b88a5966a35d817b85586208100137b2 kernelconfig.x86
-f116ab9c5f14e7ce6d16c4c4985a36c9 kernelconfig.x86_64"
+29ec97e45b3669369144db98b90b131d kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index 8877618c6..30d637e2f 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.38.3 Kernel Configuration
-# Mon Apr 18 10:45:51 2011
+# Linux/x86_64 2.6.38.1 Kernel Configuration
+# Thu Mar 31 17:56:09 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -4893,7 +4893,6 @@ CONFIG_PAX_MPROTECT=y
# Address Space Layout Randomization
#
CONFIG_PAX_ASLR=y
-# CONFIG_PAX_RANDKSTACK is not set
CONFIG_PAX_RANDUSTACK=y
CONFIG_PAX_RANDMMAP=y