X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fvim;h=6d2f7e340bbdfa93b34b12352099ebfe1da05159;hb=addeeb1f79825fdf2e03c089d661686050b336d5;hp=8928dbd92ba6a6fc373240371c0592c4409b370c;hpb=2e053370ab64a3f516fc7f9e4897c5b48eae580d;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/vim b/lfs/vim
index 8928dbd92b..6d2f7e340b 100644
--- a/lfs/vim
+++ b/lfs/vim
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2020  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,12 +24,12 @@
 
 include Config
 
-VER        = 7.4
+VER        = 8.2
 
 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/vim74
+DIR_APP    = $(DIR_SRC)/vim82
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65
+$(DL_FILE)_MD5 = 2f3e6ab74d20eea2dc00cedc3f0ee4e8
 
 install : $(TARGET)
 
@@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim/vim-8.2_fix_gcc10_detection.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim/vim-8.2_fix_hardening_crash.patch
 	cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \