Merge remote-tracking branch 'ms/modem-status' into next

[people/teissler/ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index 687de3634f6f6942cdb43f66d0364a3710efe618..948d056a68d3ed0da7ab0d2661970db765837a26 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.10.33
+VER        = 3.10.37
 
-RPI_PATCHES = linux-3.10.27-grsec-943b563
-GRS_PATCHES = grsecurity-2.9.1-3.10.33-ipfire1.patch.xz
+RPI_PATCHES = linux-3.10.34-grsec-dea8280
+GRS_PATCHES = grsecurity-2.9.1-3.10.37-ipfire1.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 38
+PAK_VER    = 42
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -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                         = 01865f9c129f3c7eee51e25b3781a364
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 8cf81f48408306d93ccee59b58af2e92
-$(GRS_PATCHES)_MD5                     = c99be0018e8bc55fb2e2b8f0ea9783d5
+$(DL_FILE)_MD5                         = a08a10ffc31b07d9422af1cd2baa3274
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 522683db031f7033b1b5dfe1b1f30e67
+$(GRS_PATCHES)_MD5                     = 7b0f44571974217d79dbcdf5d7e33976
 
 install : $(TARGET)
 
@@ -118,7 +118,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-ipp2p-0.8.2-ipfire.patch
 
        # Layer7-patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netfilter_layer7_2.22_kernel3.10-no_proc_interface.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-layer7-filter.patch
 
        # Grsecurity-patches
 ifneq "$(KCFG)" "-headers"
@@ -136,6 +136,7 @@ endif
 
        # Wlan Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
 
        # mISDN Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch