From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 19 Feb 2022 13:25:18 +0000 (+0000)
Subject: patch 8.2.4421: some installed files and directories have wrong permissions
X-Git-Tag: v8.2.4421
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=20563e0f848d88b025ae5d2b0601f8bc51944974;p=thirdparty%2Fvim.git

patch 8.2.4421: some installed files and directories have wrong permissions

Problem:    Some installed files and directories have wrong permissions.
Solution:   Adjust the Makefile and shell to set permissions. (closes #9793)
---

diff --git a/src/Makefile b/src/Makefile
index 3288c5b478..0874b0aefb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2140,7 +2140,7 @@ autoconf:
 # without changes.
 # This requires a "vim" executable with the +eval feature.
 cmdidxs: ex_cmds.h
-	vim --clean -N -X --not-a-term -u create_cmdidxs.vim -c quit
+	vim --clean -X --not-a-term -u create_cmdidxs.vim -c quit
 
 # Run vim script to generate the normal/visual mode command lookup table.
 # This only needs to be run when a new normal/visual mode command has been
@@ -2151,7 +2151,7 @@ cmdidxs: ex_cmds.h
 #   - run "make nvcmdidxs" to generate nv_cmdidxs.h
 nvcmdidxs: auto/config.mk nv_cmds.h
 	$(CC) -I$(srcdir) $(ALL_CFLAGS) create_nvcmdidxs.c -o create_nvcmdidxs
-	vim --clean -N -X --not-a-term -u create_nvcmdidxs.vim -c quit
+	vim --clean -X --not-a-term -u create_nvcmdidxs.vim -c quit
 	-rm -f create_nvcmdidxs
 
 # The normal command to compile a .c file to its .o file.
@@ -2499,8 +2499,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
 	cd $(DEST_PRINT); chmod $(FILEMOD) *.ps
 # install the colorscheme files
 	cd $(COLSOURCE); $(INSTALL_DATA_R) *.vim lists tools README.txt $(DEST_COL)
-	cd $(DEST_COL); chmod $(DIRMOD) tools
-	cd $(DEST_COL); chmod $(HELPMOD) *.vim README.txt tools/*.vim
+	cd $(DEST_COL); chmod $(DIRMOD) lists tools
+	cd $(DEST_COL); chmod $(HELPMOD) *.vim README.txt lists/*.vim tools/*.vim
 # install the syntax files
 	cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)
 	cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt
@@ -2519,7 +2519,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
 	cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
 # install the ftplugin files
 	cd $(FTPLUGSOURCE); $(INSTALL_DATA) *.vim README.txt logtalk.dict $(DEST_FTP)
-	cd $(DEST_FTP); chmod $(HELPMOD) *.vim README.txt
+	cd $(DEST_FTP); chmod $(HELPMOD) *.vim README.txt logtalk.dict
 # install the compiler files
 	cd $(COMPSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_COMP)
 	cd $(DEST_COMP); chmod $(HELPMOD) *.vim README.txt
@@ -3030,7 +3030,7 @@ pixmaps:
 # Update the synmenu.vim file with the latest Syntax menu.
 # This is only needed when runtime/makemenu.vim was changed.
 menu: ./vim ../runtime/makemenu.vim
-	./vim -u ../runtime/makemenu.vim
+	./vim --clean -X --not-a-term -u ../runtime/makemenu.vim
 
 # Start configure from scratch
 scrub scratch:
diff --git a/src/installman.sh b/src/installman.sh
index 00a33a2954..98bbb281ab 100755
--- a/src/installman.sh
+++ b/src/installman.sh
@@ -40,6 +40,7 @@ if test $what = "install" -o $what = "xxd"; then
    if test ! -d $destdir; then
       echo creating $destdir
       /bin/sh install-sh -c -d $destdir
+      chmod 755 $destdir
    fi
 fi
 
diff --git a/src/version.c b/src/version.c
index 709bf7e990..21fefbac4d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4421,
 /**/
     4420,
 /**/