From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 1 Dec 2008 06:55:26 +0000 (+0000)
Subject: Updated grsec patch.
X-Git-Tag: v3.0-alpha1~419^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c15bede20603b3ce890793a3ee34b59bb055dae4;p=ipfire-3.x.git

Updated grsec patch.
---

diff --git a/lfs/linux b/lfs/linux
index 1752ba64b..8acd038c3 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -39,7 +39,7 @@ LOCALVERSION = -ipfire1
 FULLVER    = $(VER)$(LOCALVERSION)
 
 # Patches
-GRSEC_PATCH    = grsecurity-2.1.12-$(VER)-200808171148.patch
+GRSEC_PATCH    = grsecurity-2.1.12-$(VER)-200811291903.patch
 OCF_PATCH      = ocf-linux-26-20080917.patch
 REISER4_PATCH  = reiser4-for-$(VER).patch
 SQUASHFS_PATCH = $(THISAPP)-squashfs3.4-1.patch
@@ -87,12 +87,10 @@ $(OBJECT) :
 	#
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(SQUASHFS_PATCH)
 
-ifeq "$(PAX)" "1"
 	### GrSecurity
 	#
-	#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(GRSEC_PATCH)
-	#rm -f $(DIR_APP)/localversion-grsec
-endif
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(GRSEC_PATCH)
+	rm -f $(DIR_APP)/localversion-grsec
 
 ifeq "$(STAGE)" "toolchain"
 	install -dv $(TOOLS_DIR)/include