X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=5d43087af647fc012373ed16492c6a7d9667edbd;hp=ca1b8cb5fd825857480ec16b8d39a4b9ac0b58fa;hb=be33adfb3d958259695d8b8ce2803181fbf78be2;hpb=385394fefaf5e8455ef114964d1813322b7ea938

diff --git a/lfs/linux b/lfs/linux
index ca1b8cb5f..5d43087af 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.10.20
+VER        = 3.10.23
 
-RPI_PATCHES = linux-3.10.10-c1af7c6
-GRS_PATCHES = grsecurity-2.9.1-3.10.20-ipfire1.patch.xz
+RPI_PATCHES = linux-3.10.10-grsec-c1af7c6
+GRS_PATCHES = grsecurity-2.9.1-3.10.23-ipfire1.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -74,9 +74,9 @@ $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz	= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 $(GRS_PATCHES)				= $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5				= 96031ef7d952a318cc13a95217a6939b
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= ef9274b3ff5d05daaaa4bdbe86ad00fc
-$(GRS_PATCHES)_MD5			= 85971c7eacaa1976c1b8aa0f7a071e09
+$(DL_FILE)_MD5				= 94cb4721ea83c0366b109258b3b1308c
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= f55981853573236069db5ad9fb7a4bd9
+$(GRS_PATCHES)_MD5			= 7a97383d2dd9dc85cc72af723e4734bb
 
 install : $(TARGET)
 
@@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -svf linux-$(VER) $(DIR_SRC)/linux
 
 	# Linux Intermediate Queueing Device
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq_kernel3.10.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq_kernel3.10.23.patch
 
 	# ipp2p 0.8.2-ipfire
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-ipp2p-0.8.2-ipfire.patch
@@ -122,11 +122,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Grsecurity-patches
 ifneq "$(KCFG)" "-headers"
-ifneq "$(KCFG)" "-rpi"
+#ifneq "$(KCFG)" "-rpi"
 	cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
 	cd $(DIR_APP) && rm localversion-grsec
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
-endif
+#endif
 endif
 
 	# Disable pcspeaker autoload