Drop sendEmail add-on

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

diff --git a/lfs/linux b/lfs/linux
index 195c49add5847de14a7e35d8b796ec03fc4bd6c6..be3af97bb429f51cd7d3054317f06762553c1c93 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.147
-ARM_PATCHES = 4.14.147-ipfire0
+VER         = 4.14.232
+ARM_PATCHES = 4.14.232-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,9 +34,6 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 88
-DEPS      = ""
-
 HEADERS_ARCH  = $(BUILD_PLATFORM)
 KERNEL_ARCH   = $(BUILD_ARCH)
 KERNEL_TARGET = bzImage
@@ -82,8 +79,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 93d7e6572edd81505a2c0db4ef7d807b
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = d5e8af09958e5b23f58d1954ede74d4a
+$(DL_FILE)_MD5                                 = f9dbc2f2656f30aef8394ac9d4ee88b3
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = a04b842733999abb818cabb0388572b8
 
 install : $(TARGET)
 
@@ -118,9 +115,6 @@ $(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/linux/linux-4.14-imq.diff
-
        # Layer7-patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-layer7.patch
 
@@ -146,12 +140,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
-       # Fix for netfilter nf_conntrack: resolve clash for matching conntracks
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.0-netfilter-conntrack-resolve-clash.patch
-
-ifeq "$(KCFG)" "-kirkwood"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
-endif
+       # Active try to add entropy if the kernel wait for it
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-random_try_to_actively_add_entropy.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.x-add_timer_setup_on_stack.patch
 
 ifeq "$(KCFG)" "-multi"
        # Apply Arm-multiarch kernel patches.
@@ -181,6 +172,9 @@ else
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
+       # Copy Module signing key configuration
+       cp -f $(DIR_SRC)/config/kernel/x509.genkey $(DIR_APP)/certs/x509.genkey
+
        # Remove modules folder if exists
        rm -rf /lib/modules/$(VER)-$(VERSUFIX)
 
@@ -222,6 +216,9 @@ endif
        cd $(DIR_APP) && cp -a --parents arch/$(HEADERS_ARCH)/include /lib/modules/$(VER)-$(VERSUFIX)/build
        cd $(DIR_APP) && cp -a include /lib/modules/$(VER)-$(VERSUFIX)/build/include
 
+       # Copy module signing key for off tree modules
+       cd $(DIR_APP) && cp -f certs/signing_key.* /lib/modules/$(VER)-$(VERSUFIX)/build/certs/
+
        # Install objtool
        cd $(DIR_APP) && cp -a tools/objtool/objtool \
                /lib/modules/$(VER)-$(VERSUFIX)/build/tools/objtool/ || :