diff options
author | Ross Burton <ross@burtonini.com> | 2021-12-23 12:14:39 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-07 23:21:34 +0000 |
commit | 28e93e4d6d6e1229ff05332d44851602bde7c7b6 (patch) | |
tree | 5f01f50fef358ba9c606077a071031c975629161 /meta | |
parent | 8408aad5e76524bc368a3c98fc9368b5136a8975 (diff) | |
download | poky-28e93e4d6d6e1229ff05332d44851602bde7c7b6.tar.gz |
vim: upgrade to 8.2 patch 3752
There's a fairly constant flow of CVEs being fixed in Vim, which are
getting increasing non-trivial to backport.
Instead of trying to backport (and potentially introduce more bugs), or
just ignoring them entirely, upgrade vim to the latest patch.
(From OE-Core rev: a264cf6b5a16343a66d9e88115ec9f30e832b0c4)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 78a4796de27d710f97c336d288d797557a58694e)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
9 files changed, 28 insertions, 339 deletions
diff --git a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch index 63a7b78f12..2fc11dbdc2 100644 --- a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch +++ b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch | |||
@@ -16,11 +16,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
16 | src/Makefile | 14 ++++---------- | 16 | src/Makefile | 14 ++++---------- |
17 | 1 file changed, 4 insertions(+), 10 deletions(-) | 17 | 1 file changed, 4 insertions(+), 10 deletions(-) |
18 | 18 | ||
19 | diff --git a/src/Makefile b/src/Makefile | 19 | Index: git/src/Makefile |
20 | index f2fafa4dc..7148d4bd9 100644 | 20 | =================================================================== |
21 | --- a/src/Makefile | 21 | --- git.orig/src/Makefile |
22 | +++ b/src/Makefile | 22 | +++ git/src/Makefile |
23 | @@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk | 23 | @@ -3101,16 +3101,10 @@ auto/pathdef.c: Makefile auto/config.mk |
24 | -@echo '#include "vim.h"' >> $@ | 24 | -@echo '#include "vim.h"' >> $@ |
25 | -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ | 25 | -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ |
26 | -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ | 26 | -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ |
@@ -41,6 +41,3 @@ index f2fafa4dc..7148d4bd9 100644 | |||
41 | -@sh $(srcdir)/pathdef.sh | 41 | -@sh $(srcdir)/pathdef.sh |
42 | 42 | ||
43 | GUI_GTK_RES_INPUTS = \ | 43 | GUI_GTK_RES_INPUTS = \ |
44 | -- | ||
45 | 2.17.1 | ||
46 | |||
diff --git a/meta/recipes-support/vim/files/CVE-2021-3778.patch b/meta/recipes-support/vim/files/CVE-2021-3778.patch deleted file mode 100644 index 04ac413e56..0000000000 --- a/meta/recipes-support/vim/files/CVE-2021-3778.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 9ba62f1042513fcadcc4e8fdcee171db66ef1d69 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bram Moolenaar <Bram@vim.org> | ||
3 | Date: Fri, 24 Sep 2021 15:15:24 +0800 | ||
4 | Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8 | ||
5 | character | ||
6 | |||
7 | Problem: Reading beyond end of line with invalid utf-8 character. | ||
8 | Solution: Check for NUL when advancing. | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f] | ||
11 | CVE: CVE-2021-3778 | ||
12 | |||
13 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
14 | --- | ||
15 | src/regexp_nfa.c | 3 ++- | ||
16 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c | ||
19 | index fb512f961..2806408de 100644 | ||
20 | --- a/src/regexp_nfa.c | ||
21 | +++ b/src/regexp_nfa.c | ||
22 | @@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text) | ||
23 | match = FALSE; | ||
24 | break; | ||
25 | } | ||
26 | - len2 += MB_CHAR2LEN(c2); | ||
27 | + len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2) | ||
28 | + : MB_CHAR2LEN(c2); | ||
29 | } | ||
30 | if (match | ||
31 | // check that no composing char follows | ||
32 | -- | ||
33 | 2.17.1 | ||
34 | |||
diff --git a/meta/recipes-support/vim/files/CVE-2021-3872.patch b/meta/recipes-support/vim/files/CVE-2021-3872.patch deleted file mode 100644 index f0f30933fa..0000000000 --- a/meta/recipes-support/vim/files/CVE-2021-3872.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From 132d060ffbb9651f0d79bd0b6d80cab460235a99 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bram Moolenaar <Bram@vim.org> | ||
3 | Date: Fri, 12 Nov 2021 02:56:51 +0000 | ||
4 | Subject: [PATCH] patch 8.2.3487: illegal memory access if buffer name is very | ||
5 | long | ||
6 | |||
7 | Problem: Illegal memory access if buffer name is very long. | ||
8 | Solution: Make sure not to go over the end of the buffer. | ||
9 | |||
10 | CVE: CVE-2021-3872 | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/vim/vim/commit/826bfe4bbd7594188e3d74d2539d9707b1c6a14b] | ||
13 | |||
14 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
15 | --- | ||
16 | src/drawscreen.c | 10 +++++----- | ||
17 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
18 | |||
19 | diff --git a/src/drawscreen.c b/src/drawscreen.c | ||
20 | index 3a88ee979..9acb70552 100644 | ||
21 | --- a/src/drawscreen.c | ||
22 | +++ b/src/drawscreen.c | ||
23 | @@ -446,13 +446,13 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED) | ||
24 | *(p + len++) = ' '; | ||
25 | if (bt_help(wp->w_buffer)) | ||
26 | { | ||
27 | - STRCPY(p + len, _("[Help]")); | ||
28 | + vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Help]")); | ||
29 | len += (int)STRLEN(p + len); | ||
30 | } | ||
31 | #ifdef FEAT_QUICKFIX | ||
32 | if (wp->w_p_pvw) | ||
33 | { | ||
34 | - STRCPY(p + len, _("[Preview]")); | ||
35 | + vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Preview]")); | ||
36 | len += (int)STRLEN(p + len); | ||
37 | } | ||
38 | #endif | ||
39 | @@ -462,12 +462,12 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED) | ||
40 | #endif | ||
41 | ) | ||
42 | { | ||
43 | - STRCPY(p + len, "[+]"); | ||
44 | - len += 3; | ||
45 | + vim_snprintf((char *)p + len, MAXPATHL - len, "%s", "[+]"); | ||
46 | + len += (int)STRLEN(p + len); | ||
47 | } | ||
48 | if (wp->w_buffer->b_p_ro) | ||
49 | { | ||
50 | - STRCPY(p + len, _("[RO]")); | ||
51 | + vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[RO]")); | ||
52 | len += (int)STRLEN(p + len); | ||
53 | } | ||
54 | |||
55 | -- | ||
56 | 2.31.1 | ||
57 | |||
diff --git a/meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch b/meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch deleted file mode 100644 index 1cee759502..0000000000 --- a/meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch +++ /dev/null | |||
@@ -1,207 +0,0 @@ | |||
1 | From b7081e135a16091c93f6f5f7525a5c58fb7ca9f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bram Moolenaar <Bram@vim.org> | ||
3 | Date: Sat, 4 Sep 2021 18:47:28 +0200 | ||
4 | Subject: [PATCH] patch 8.2.3402: invalid memory access when using :retab with | ||
5 | large value | ||
6 | |||
7 | Problem: Invalid memory access when using :retab with large value. | ||
8 | Solution: Check the number is positive. | ||
9 | |||
10 | CVE: CVE-2021-3770 | ||
11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
12 | Upstream-Status: Backport [https://github.com/vim/vim/commit/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9] | ||
13 | --- | ||
14 | src/indent.c | 34 +++++++++++++++++++++------------- | ||
15 | src/option.c | 12 ++++++------ | ||
16 | src/optionstr.c | 4 ++-- | ||
17 | src/testdir/test_retab.vim | 3 +++ | ||
18 | src/version.c | 2 ++ | ||
19 | 5 files changed, 34 insertions(+), 21 deletions(-) | ||
20 | |||
21 | Index: git/src/indent.c | ||
22 | =================================================================== | ||
23 | --- git.orig/src/indent.c | ||
24 | +++ git/src/indent.c | ||
25 | @@ -18,18 +18,19 @@ | ||
26 | /* | ||
27 | * Set the integer values corresponding to the string setting of 'vartabstop'. | ||
28 | * "array" will be set, caller must free it if needed. | ||
29 | + * Return FAIL for an error. | ||
30 | */ | ||
31 | int | ||
32 | tabstop_set(char_u *var, int **array) | ||
33 | { | ||
34 | - int valcount = 1; | ||
35 | - int t; | ||
36 | - char_u *cp; | ||
37 | + int valcount = 1; | ||
38 | + int t; | ||
39 | + char_u *cp; | ||
40 | |||
41 | if (var[0] == NUL || (var[0] == '0' && var[1] == NUL)) | ||
42 | { | ||
43 | *array = NULL; | ||
44 | - return TRUE; | ||
45 | + return OK; | ||
46 | } | ||
47 | |||
48 | for (cp = var; *cp != NUL; ++cp) | ||
49 | @@ -43,8 +44,8 @@ tabstop_set(char_u *var, int **array) | ||
50 | if (cp != end) | ||
51 | emsg(_(e_positive)); | ||
52 | else | ||
53 | - emsg(_(e_invarg)); | ||
54 | - return FALSE; | ||
55 | + semsg(_(e_invarg2), cp); | ||
56 | + return FAIL; | ||
57 | } | ||
58 | } | ||
59 | |||
60 | @@ -55,26 +56,33 @@ tabstop_set(char_u *var, int **array) | ||
61 | ++valcount; | ||
62 | continue; | ||
63 | } | ||
64 | - emsg(_(e_invarg)); | ||
65 | - return FALSE; | ||
66 | + semsg(_(e_invarg2), var); | ||
67 | + return FAIL; | ||
68 | } | ||
69 | |||
70 | *array = ALLOC_MULT(int, valcount + 1); | ||
71 | if (*array == NULL) | ||
72 | - return FALSE; | ||
73 | + return FAIL; | ||
74 | (*array)[0] = valcount; | ||
75 | |||
76 | t = 1; | ||
77 | for (cp = var; *cp != NUL;) | ||
78 | { | ||
79 | - (*array)[t++] = atoi((char *)cp); | ||
80 | - while (*cp != NUL && *cp != ',') | ||
81 | + int n = atoi((char *)cp); | ||
82 | + | ||
83 | + if (n < 0 || n > 9999) | ||
84 | + { | ||
85 | + semsg(_(e_invarg2), cp); | ||
86 | + return FAIL; | ||
87 | + } | ||
88 | + (*array)[t++] = n; | ||
89 | + while (*cp != NUL && *cp != ',') | ||
90 | ++cp; | ||
91 | if (*cp != NUL) | ||
92 | ++cp; | ||
93 | } | ||
94 | |||
95 | - return TRUE; | ||
96 | + return OK; | ||
97 | } | ||
98 | |||
99 | /* | ||
100 | @@ -1556,7 +1564,7 @@ ex_retab(exarg_T *eap) | ||
101 | |||
102 | #ifdef FEAT_VARTABS | ||
103 | new_ts_str = eap->arg; | ||
104 | - if (!tabstop_set(eap->arg, &new_vts_array)) | ||
105 | + if (tabstop_set(eap->arg, &new_vts_array) == FAIL) | ||
106 | return; | ||
107 | while (vim_isdigit(*(eap->arg)) || *(eap->arg) == ',') | ||
108 | ++(eap->arg); | ||
109 | Index: git/src/option.c | ||
110 | =================================================================== | ||
111 | --- git.orig/src/option.c | ||
112 | +++ git/src/option.c | ||
113 | @@ -2292,9 +2292,9 @@ didset_options2(void) | ||
114 | #endif | ||
115 | #ifdef FEAT_VARTABS | ||
116 | vim_free(curbuf->b_p_vsts_array); | ||
117 | - tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); | ||
118 | + (void)tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); | ||
119 | vim_free(curbuf->b_p_vts_array); | ||
120 | - tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); | ||
121 | + (void)tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); | ||
122 | #endif | ||
123 | } | ||
124 | |||
125 | @@ -5756,7 +5756,7 @@ buf_copy_options(buf_T *buf, int flags) | ||
126 | buf->b_p_vsts = vim_strsave(p_vsts); | ||
127 | COPY_OPT_SCTX(buf, BV_VSTS); | ||
128 | if (p_vsts && p_vsts != empty_option) | ||
129 | - tabstop_set(p_vsts, &buf->b_p_vsts_array); | ||
130 | + (void)tabstop_set(p_vsts, &buf->b_p_vsts_array); | ||
131 | else | ||
132 | buf->b_p_vsts_array = 0; | ||
133 | buf->b_p_vsts_nopaste = p_vsts_nopaste | ||
134 | @@ -5914,7 +5914,7 @@ buf_copy_options(buf_T *buf, int flags) | ||
135 | buf->b_p_isk = save_p_isk; | ||
136 | #ifdef FEAT_VARTABS | ||
137 | if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) | ||
138 | - tabstop_set(p_vts, &buf->b_p_vts_array); | ||
139 | + (void)tabstop_set(p_vts, &buf->b_p_vts_array); | ||
140 | else | ||
141 | buf->b_p_vts_array = NULL; | ||
142 | #endif | ||
143 | @@ -5929,7 +5929,7 @@ buf_copy_options(buf_T *buf, int flags) | ||
144 | buf->b_p_vts = vim_strsave(p_vts); | ||
145 | COPY_OPT_SCTX(buf, BV_VTS); | ||
146 | if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) | ||
147 | - tabstop_set(p_vts, &buf->b_p_vts_array); | ||
148 | + (void)tabstop_set(p_vts, &buf->b_p_vts_array); | ||
149 | else | ||
150 | buf->b_p_vts_array = NULL; | ||
151 | #endif | ||
152 | @@ -6634,7 +6634,7 @@ paste_option_changed(void) | ||
153 | if (buf->b_p_vsts_array) | ||
154 | vim_free(buf->b_p_vsts_array); | ||
155 | if (buf->b_p_vsts && buf->b_p_vsts != empty_option) | ||
156 | - tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); | ||
157 | + (void)tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); | ||
158 | else | ||
159 | buf->b_p_vsts_array = 0; | ||
160 | #endif | ||
161 | Index: git/src/optionstr.c | ||
162 | =================================================================== | ||
163 | --- git.orig/src/optionstr.c | ||
164 | +++ git/src/optionstr.c | ||
165 | @@ -2166,7 +2166,7 @@ did_set_string_option( | ||
166 | if (errmsg == NULL) | ||
167 | { | ||
168 | int *oldarray = curbuf->b_p_vsts_array; | ||
169 | - if (tabstop_set(*varp, &(curbuf->b_p_vsts_array))) | ||
170 | + if (tabstop_set(*varp, &(curbuf->b_p_vsts_array)) == OK) | ||
171 | { | ||
172 | if (oldarray) | ||
173 | vim_free(oldarray); | ||
174 | @@ -2205,7 +2205,7 @@ did_set_string_option( | ||
175 | { | ||
176 | int *oldarray = curbuf->b_p_vts_array; | ||
177 | |||
178 | - if (tabstop_set(*varp, &(curbuf->b_p_vts_array))) | ||
179 | + if (tabstop_set(*varp, &(curbuf->b_p_vts_array)) == OK) | ||
180 | { | ||
181 | vim_free(oldarray); | ||
182 | #ifdef FEAT_FOLDING | ||
183 | Index: git/src/testdir/test_retab.vim | ||
184 | =================================================================== | ||
185 | --- git.orig/src/testdir/test_retab.vim | ||
186 | +++ git/src/testdir/test_retab.vim | ||
187 | @@ -74,4 +74,7 @@ endfunc | ||
188 | func Test_retab_error() | ||
189 | call assert_fails('retab -1', 'E487:') | ||
190 | call assert_fails('retab! -1', 'E487:') | ||
191 | + call assert_fails('ret -1000', 'E487:') | ||
192 | + call assert_fails('ret 10000', 'E475:') | ||
193 | + call assert_fails('ret 80000000000000000000', 'E475:') | ||
194 | endfunc | ||
195 | Index: git/src/version.c | ||
196 | =================================================================== | ||
197 | --- git.orig/src/version.c | ||
198 | +++ git/src/version.c | ||
199 | @@ -743,6 +743,8 @@ static char *(features[]) = | ||
200 | static int included_patches[] = | ||
201 | { /* Add new patch number below this line */ | ||
202 | /**/ | ||
203 | + 3402, | ||
204 | +/**/ | ||
205 | 0 | ||
206 | }; | ||
207 | |||
diff --git a/meta/recipes-support/vim/files/disable_acl_header_check.patch b/meta/recipes-support/vim/files/disable_acl_header_check.patch index 33089162b4..533138245d 100644 --- a/meta/recipes-support/vim/files/disable_acl_header_check.patch +++ b/meta/recipes-support/vim/files/disable_acl_header_check.patch | |||
@@ -13,11 +13,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
13 | src/configure.ac | 3 ++- | 13 | src/configure.ac | 3 ++- |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/configure.ac b/src/configure.ac | 16 | Index: git/src/configure.ac |
17 | index 2d409b3ca06a..dbcaf6140263 100644 | 17 | =================================================================== |
18 | --- a/src/configure.ac | 18 | --- git.orig/src/configure.ac |
19 | +++ b/src/configure.ac | 19 | +++ git/src/configure.ac |
20 | @@ -3257,7 +3257,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ | 20 | @@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin |
21 | sys/systeminfo.h locale.h sys/stream.h termios.h \ | 21 | sys/systeminfo.h locale.h sys/stream.h termios.h \ |
22 | libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ | 22 | libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ |
23 | utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ | 23 | utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ |
@@ -26,7 +26,7 @@ index 2d409b3ca06a..dbcaf6140263 100644 | |||
26 | sys/access.h sys/sysinfo.h wchar.h wctype.h) | 26 | sys/access.h sys/sysinfo.h wchar.h wctype.h) |
27 | 27 | ||
28 | dnl sys/ptem.h depends on sys/stream.h on Solaris | 28 | dnl sys/ptem.h depends on sys/stream.h on Solaris |
29 | @@ -3886,6 +3886,7 @@ AC_ARG_ENABLE(acl, | 29 | @@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl, |
30 | , [enable_acl="yes"]) | 30 | , [enable_acl="yes"]) |
31 | if test "$enable_acl" = "yes"; then | 31 | if test "$enable_acl" = "yes"; then |
32 | AC_MSG_RESULT(no) | 32 | AC_MSG_RESULT(no) |
@@ -34,6 +34,3 @@ index 2d409b3ca06a..dbcaf6140263 100644 | |||
34 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], | 34 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], |
35 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" | 35 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" |
36 | AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) | 36 | AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) |
37 | -- | ||
38 | 2.7.4 | ||
39 | |||
diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 05c2d803f6..9d6da80913 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch | |||
@@ -7,9 +7,11 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
9 | 9 | ||
10 | --- a/src/Makefile | 10 | Index: git/src/Makefile |
11 | +++ b/src/Makefile | 11 | =================================================================== |
12 | @@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ | 12 | --- git.orig/src/Makefile |
13 | +++ git/src/Makefile | ||
14 | @@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ | ||
13 | rm -rf $$cvs; \ | 15 | rm -rf $$cvs; \ |
14 | fi | 16 | fi |
15 | -chmod $(FILEMOD) $(DEST_TOOLS)/* | 17 | -chmod $(FILEMOD) $(DEST_TOOLS)/* |
diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch index 48dca44cad..1cb8fb442f 100644 --- a/meta/recipes-support/vim/files/racefix.patch +++ b/meta/recipes-support/vim/files/racefix.patch | |||
@@ -9,9 +9,9 @@ Index: git/src/po/Makefile | |||
9 | =================================================================== | 9 | =================================================================== |
10 | --- git.orig/src/po/Makefile | 10 | --- git.orig/src/po/Makefile |
11 | +++ git/src/po/Makefile | 11 | +++ git/src/po/Makefile |
12 | @@ -165,17 +165,16 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../ | 12 | @@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM |
13 | po/gvim.desktop.in po/vim.desktop.in | 13 | # Delete the temporary files |
14 | mv -f ../$(PACKAGE).po $(PACKAGE).pot | 14 | rm *.js |
15 | 15 | ||
16 | -vim.desktop: vim.desktop.in $(POFILES) | 16 | -vim.desktop: vim.desktop.in $(POFILES) |
17 | +LINGUAS: | 17 | +LINGUAS: |
diff --git a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch index 37914d4cd9..5284ba45b6 100644 --- a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch +++ b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
14 | src/configure.ac | 7 +++++++ | 14 | src/configure.ac | 7 +++++++ |
15 | 1 file changed, 7 insertions(+) | 15 | 1 file changed, 7 insertions(+) |
16 | 16 | ||
17 | diff --git a/src/configure.ac b/src/configure.ac | 17 | Index: git/src/configure.ac |
18 | index 0ee86ad..64736f0 100644 | 18 | =================================================================== |
19 | --- a/src/configure.ac | 19 | --- git.orig/src/configure.ac |
20 | +++ b/src/configure.ac | 20 | +++ git/src/configure.ac |
21 | @@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));], | 21 | @@ -3264,11 +3264,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [in |
22 | AC_MSG_RESULT(no)) | 22 | AC_MSG_RESULT(no)) |
23 | 23 | ||
24 | dnl Checks for header files. | 24 | dnl Checks for header files. |
@@ -37,6 +37,3 @@ index 0ee86ad..64736f0 100644 | |||
37 | 37 | ||
38 | AC_HEADER_DIRENT | 38 | AC_HEADER_DIRENT |
39 | 39 | ||
40 | -- | ||
41 | 2.7.4 | ||
42 | |||
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 864006192b..7174d818ff 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc | |||
@@ -8,8 +8,9 @@ BUGTRACKER = "https://github.com/vim/vim/issues" | |||
8 | DEPENDS = "ncurses gettext-native" | 8 | DEPENDS = "ncurses gettext-native" |
9 | # vimdiff doesn't like busybox diff | 9 | # vimdiff doesn't like busybox diff |
10 | RSUGGESTS_${PN} = "diffutils" | 10 | RSUGGESTS_${PN} = "diffutils" |
11 | |||
11 | LICENSE = "vim" | 12 | LICENSE = "vim" |
12 | LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" | 13 | LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=909f1394892b7e0f9c2a95306c0c552b" |
13 | 14 | ||
14 | SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ | 15 | SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ |
15 | file://disable_acl_header_check.patch \ | 16 | file://disable_acl_header_check.patch \ |
@@ -17,17 +18,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ | |||
17 | file://0001-src-Makefile-improve-reproducibility.patch \ | 18 | file://0001-src-Makefile-improve-reproducibility.patch \ |
18 | file://no-path-adjust.patch \ | 19 | file://no-path-adjust.patch \ |
19 | file://racefix.patch \ | 20 | file://racefix.patch \ |
20 | file://CVE-2021-3778.patch \ | ||
21 | file://CVE-2021-3796.patch \ | ||
22 | file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \ | ||
23 | file://CVE-2021-3903.patch \ | ||
24 | file://CVE-2021-3872.patch \ | ||
25 | file://CVE-2021-3875.patch \ | ||
26 | file://CVE-2021-3927.patch \ | ||
27 | file://CVE-2021-3928.patch \ | ||
28 | " | 21 | " |
29 | 22 | ||
30 | SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" | 23 | PV .= ".3752" |
24 | SRCREV = "8603be338ac810446f23c092f21bc6082f787519" | ||
31 | 25 | ||
32 | # Do not consider .z in x.y.z, as that is updated with every commit | 26 | # Do not consider .z in x.y.z, as that is updated with every commit |
33 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" |