X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fvim;h=0fa4bf8589e205f7b17237db2f6113d82e55343b;hb=HEAD;hp=8928dbd92ba6a6fc373240371c0592c4409b370c;hpb=30f68903d339fdb2e1a0b3ff62b6b770fee9ca36;p=ipfire-2.x.git

diff --git a/lfs/vim b/lfs/vim
index 8928dbd92b..f21142936b 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-2024  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,14 +24,18 @@
 
 include Config
 
-VER        = 7.4
+VER        = 9.1
 
 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/vim74
+DIR_APP    = $(DIR_SRC)/vim91
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# vim tries to build itself with FORTIFY_SOURCE=1 and is not very good at
+# filtering out any CFLAGS that might change that. So we do this ourselves.
+CFLAGS    := $(filter-out -Wp$(COMMA)-U_FORTIFY_SOURCE,$(CFLAGS))
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65
+$(DL_FILE)_BLAKE2 = 6145f1861be848c6a4d51c16a256a080cc6e71f66d45ac7c66b1462e7542c1a57ad2918406211604d8c5b5dfc54af80a543499b68de7a402105ee811c8681bbc
 
 install : $(TARGET)
 
@@ -48,10 +52,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -60,8 +64,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -70,6 +74,7 @@ $(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-9.1_fix_hardening_crash.patch
 	cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \