samba: Link against avahi

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

diff --git a/lfs/linux b/lfs/linux
index 1d706b4a1c26f76ab7e493f4db6a4acd085473bd..1d708a4ce4007584024f63fb064f658c4d27136d 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.184
-ARM_PATCHES = 4.14.184-ipfire0
+VER         = 4.14.198
+ARM_PATCHES = 4.14.198-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -79,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                                 = 8d6e90aa90d2ae927f27404cb7674f28
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = e7a545581a7bd2333eaf271fba1aeadd
+$(DL_FILE)_MD5                                 = 9bf8f170f93283549cba55df5247b7b8
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 84b7afe9148e02568777ae0338da3844
 
 install : $(TARGET)
 
@@ -144,9 +144,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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)" "-kirkwood"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
-endif
+       # Patch CVE-2020-14386
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_cve-2020-14386_net_packet_fix_overflow_in_tpacket_rcv.patch
 
 ifeq "$(KCFG)" "-multi"
        # Apply Arm-multiarch kernel patches.