From 2b2ee64abd1456bfc0a9c5e8898fd7470e17b3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A1=90=E5=B0=8F=E5=93=A5?= Date: Sat, 12 Jun 2021 18:04:06 +0800 Subject: [PATCH 1/4] add gcc to BuildRequires --- vim.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index 58b7f29..a2aa538 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ Name: vim Epoch: 2 Version: 8.2 -Release: 6 +Release: 7 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org @@ -37,7 +37,7 @@ Patch0014: backport-Fix-build-failuers-with-perl-5.32.patch Patch9000: bugfix-rm-modify-info-version.patch -BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators +BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file BuildRequires: desktop-file-utils >= 0.2.93 %if %{_with_selinux__} @@ -422,6 +422,12 @@ popd %{_mandir}/man1/evim.* %changelog +* Sat Jun 12 2021 shixuantong - 2:8.2-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add gcc to BuildRequires + * Mon Nov 2 2020 wangjie -2:8.2-6 - Type:NA - ID:NA -- Gitee From 080a3919b18b880545825cdc792e0faac9c6e25c Mon Sep 17 00:00:00 2001 From: shixuantong Date: Sat, 7 Aug 2021 09:52:44 +0800 Subject: [PATCH 2/4] fix configure does not recognize gcc 10.0 and later --- ...oes-not-recognize-gcc-10.0-and-later.patch | 49 +++++++++++++++++++ vim.spec | 9 +++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 backport-Configure-does-not-recognize-gcc-10.0-and-later.patch diff --git a/backport-Configure-does-not-recognize-gcc-10.0-and-later.patch b/backport-Configure-does-not-recognize-gcc-10.0-and-later.patch new file mode 100644 index 0000000..c366e24 --- /dev/null +++ b/backport-Configure-does-not-recognize-gcc-10.0-and-later.patch @@ -0,0 +1,49 @@ +From 7077892a7918845a00ce8d7833b43cc6cbed2081 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Wed, 5 Feb 2020 20:44:24 +0100 +Subject: [PATCH] patch 8.2.0213: configure does not recognize gcc 10.0 and + later + +Problem: Configure does not recognize gcc 10.0 and later. +Solution: Adjust the pattern matching the version number. (Sergei + Trofimovich, closes #5580) +--- + src/auto/configure | 2 +- + src/configure.ac | 4 ++-- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/auto/configure b/src/auto/configure +index 1b5094e972b2..59f3e68d63cf 100755 +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -14762,7 +14762,7 @@ DEPEND_CFLAGS_FILTER= + if test "$GCC" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 + $as_echo_n "checking for GCC 3 or later... " >&6; } +- gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'` ++ gccmajor=`echo "$gccversion" | sed -e 's/^\([0-9]\+\)\..*$/\1/g'` + if test "$gccmajor" -gt "2"; then + DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +diff --git a/src/configure.ac b/src/configure.ac +index a098da82ec84..bf10eac5511b 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -2195,7 +2195,7 @@ else + fi + + dnl On my HPUX system the X include dir is found, but the lib dir not. +- dnl This is a desparate try to fix this. ++ dnl This is a desperate try to fix this. + + if test -d "$x_includes" && test ! -d "$x_libraries"; then + x_libraries=`echo "$x_includes" | sed s/include/lib/` +@@ -4447,7 +4447,7 @@ dnl the number before the version number. + DEPEND_CFLAGS_FILTER= + if test "$GCC" = yes; then + AC_MSG_CHECKING(for GCC 3 or later) +- gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'` ++ gccmajor=`echo "$gccversion" | sed -e 's/^\([[0-9]]\+\)\..*$/\1/g'` + if test "$gccmajor" -gt "2"; then + DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" + AC_MSG_RESULT(yes) diff --git a/vim.spec b/vim.spec index a2aa538..aefdfb5 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ Name: vim Epoch: 2 Version: 8.2 -Release: 7 +Release: 8 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org @@ -34,6 +34,7 @@ Patch0011: vim-8.0-copy-paste.patch Patch0012: vim-python3-tests.patch Patch0013: Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch Patch0014: backport-Fix-build-failuers-with-perl-5.32.patch +Patch6000: backport-Configure-does-not-recognize-gcc-10.0-and-later.patch Patch9000: bugfix-rm-modify-info-version.patch @@ -422,6 +423,12 @@ popd %{_mandir}/man1/evim.* %changelog +* Sat Aug 07 2021 shixuantong - 2:8.2-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix configure does not recognize gcc 10.0 and later + * Sat Jun 12 2021 shixuantong - 2:8.2-7 - Type:bugfix - ID:NA -- Gitee From f454076112f4a05d02e2c220d5f3ba693313636f Mon Sep 17 00:00:00 2001 From: shixuantong Date: Tue, 10 Aug 2021 10:42:15 +0800 Subject: [PATCH 3/4] fix signal stack size is wrong with latest glibc 2.34 --- ...ignal-stack-size-is-wrong-with-lates.patch | 132 ++++++++++++++++++ vim.spec | 9 +- 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch diff --git a/backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch b/backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch new file mode 100644 index 0000000..19b2bff --- /dev/null +++ b/backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch @@ -0,0 +1,132 @@ +From 0e62a6742bca186624e97e2121c98ada30e009a0 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Thu, 25 Feb 2021 17:17:56 +0100 +Subject: [PATCH 4236/5000] patch 8.2.2550: signal stack size is wrong with + latest glibc 2.34 + +Problem: Signal stack size is wrong with latest glibc 2.34. +Solution: Use sysconf(_SC_SIGSTKSZ) if available. (Zdenek Dohnal, closes + #7895) +--- + src/auto/configure | 24 ++++++++++++++++++++++++ + src/config.h.in | 3 +++ + src/configure.ac | 9 +++++++++ + src/os_unix.c | 14 +++++++++++++- + 4 files changed, 49 insertions(+), 1 deletion(-) + +diff --git a/src/auto/configure b/src/auto/configure +index 250e5ae..8183499 100755 +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -13943,6 +13943,30 @@ $as_echo "not usable" >&6; } + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _SC_SIGSTKSZ via sysconf()" >&5 ++$as_echo_n "checking for _SC_SIGSTKSZ via sysconf()... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ (void)sysconf(_SC_SIGSTKSZ); ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCONF_SIGSTKSZ 1" >>confdefs.h ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 ++$as_echo "not usable" >&6; } ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +diff --git a/src/config.h.in b/src/config.h.in +index b114480..5d01e2c 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -496,3 +496,6 @@ + + /* Define to inline symbol or empty */ + #undef inline ++ ++/* Define if _SC_SIGSTKSZ is available via sysconf() */ ++#undef HAVE_SYSCONF_SIGSTKSZ +diff --git a/src/configure.ac b/src/configure.ac +index 58bfa19..798e9b8 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -4105,6 +4105,15 @@ AC_TRY_COMPILE( + AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYSCONF), + AC_MSG_RESULT(not usable)) + ++dnl check if we have _SC_SIGSTKSZ via sysconf() ++AC_MSG_CHECKING(for _SC_SIGSTKSZ via sysconf()) ++AC_TRY_COMPILE( ++[#include ], ++[ (void)sysconf(_SC_SIGSTKSZ); ++ ], ++ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYSCONF_SIGSTKSZ), ++ AC_MSG_RESULT(not usable)) ++ + AC_CHECK_SIZEOF([int]) + AC_CHECK_SIZEOF([long]) + AC_CHECK_SIZEOF([time_t]) +diff --git a/src/os_unix.c b/src/os_unix.c +index 1edc7e6..1c80799 100644 +--- a/src/os_unix.c ++++ b/src/os_unix.c +@@ -783,7 +783,7 @@ mch_stackcheck(char *p) + * completely full. + */ + +-#ifndef SIGSTKSZ ++#if !defined SIGSTKSZ && !defined(HAVE_SYSCONF_SIGSTKSZ) + # define SIGSTKSZ 8000 // just a guess of how much stack is needed... + #endif + +@@ -806,13 +806,21 @@ init_signal_stack(void) + # else + sigstk.ss_sp = signal_stack; + # endif ++# ifdef HAVE_SYSCONF_SIGSTKSZ ++ sigstk.ss_size = sysconf(_SC_SIGSTKSZ); ++# else + sigstk.ss_size = SIGSTKSZ; ++# endif + sigstk.ss_flags = 0; + (void)sigaltstack(&sigstk, NULL); + # else + sigstk.ss_sp = signal_stack; + if (stack_grows_downwards) ++# ifdef HAVE_SYSCONF_SIGSTKSZ ++ sigstk.ss_sp += sysconf(_SC_SIGSTKSZ) - 1; ++# else + sigstk.ss_sp += SIGSTKSZ - 1; ++# endif + sigstk.ss_onstack = 0; + (void)sigstack(&sigstk, NULL); + # endif +@@ -3261,7 +3269,11 @@ mch_early_init(void) + * Ignore any errors. + */ + #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK) ++# ifdef HAVE_SYSCONF_SIGSTKSZ ++ signal_stack = alloc(sysconf(_SC_SIGSTKSZ)); ++# else + signal_stack = alloc(SIGSTKSZ); ++# endif + init_signal_stack(); + #endif + } +-- +1.8.3.1 + diff --git a/vim.spec b/vim.spec index aefdfb5..d457584 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ Name: vim Epoch: 2 Version: 8.2 -Release: 8 +Release: 9 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org @@ -35,6 +35,7 @@ Patch0012: vim-python3-tests.patch Patch0013: Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch Patch0014: backport-Fix-build-failuers-with-perl-5.32.patch Patch6000: backport-Configure-does-not-recognize-gcc-10.0-and-later.patch +Patch6001: backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch Patch9000: bugfix-rm-modify-info-version.patch @@ -423,6 +424,12 @@ popd %{_mandir}/man1/evim.* %changelog +* Tue Aug 10 2021 shixuantong - 2:8.2-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix signal stack size is wrong with latest glibc 2.34 + * Sat Aug 07 2021 shixuantong - 2:8.2-8 - Type:bugfix - ID:NA -- Gitee From f0595f54b570aef533ec27adffae6e3ae6c2911c Mon Sep 17 00:00:00 2001 From: shixuantong Date: Sat, 11 Sep 2021 08:08:14 +0800 Subject: [PATCH 4/4] fix CVE-2021-3770 --- backport-CVE-2021-3770.patch | 206 ++++++++++++++++++ ...leak-for-retab-with-invalid-argument.patch | 66 ++++++ vim.spec | 10 +- 3 files changed, 281 insertions(+), 1 deletion(-) create mode 100644 backport-CVE-2021-3770.patch create mode 100644 backport-memory-leak-for-retab-with-invalid-argument.patch diff --git a/backport-CVE-2021-3770.patch b/backport-CVE-2021-3770.patch new file mode 100644 index 0000000..781cfa4 --- /dev/null +++ b/backport-CVE-2021-3770.patch @@ -0,0 +1,206 @@ +From b7081e135a16091c93f6f5f7525a5c58fb7ca9f9 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Sat, 4 Sep 2021 18:47:28 +0200 +Subject: [PATCH] patch 8.2.3402: invalid memory access when using :retab with + large value + +Problem: Invalid memory access when using :retab with large value. +Solution: Check the number is positive. +--- + src/indent.c | 34 +++++++++++++++++++++------------- + src/option.c | 12 ++++++------ + src/optionstr.c | 4 ++-- + src/testdir/test_retab.vim | 3 +++ + src/version.c | 2 ++ + 5 files changed, 34 insertions(+), 21 deletions(-) + +diff --git a/src/indent.c b/src/indent.c +index 32f1e12..7e196c2 100644 +--- a/src/indent.c ++++ b/src/indent.c +@@ -18,18 +18,19 @@ + /* + * Set the integer values corresponding to the string setting of 'vartabstop'. + * "array" will be set, caller must free it if needed. ++ * Return FAIL for an error. + */ + int + tabstop_set(char_u *var, int **array) + { +- int valcount = 1; +- int t; +- char_u *cp; ++ int valcount = 1; ++ int t; ++ char_u *cp; + + if (var[0] == NUL || (var[0] == '0' && var[1] == NUL)) + { + *array = NULL; +- return TRUE; ++ return OK; + } + + for (cp = var; *cp != NUL; ++cp) +@@ -43,8 +44,8 @@ tabstop_set(char_u *var, int **array) + if (cp != end) + emsg(_(e_positive)); + else +- emsg(_(e_invarg)); +- return FALSE; ++ semsg(_(e_invarg2), cp); ++ return FAIL; + } + } + +@@ -55,26 +56,33 @@ tabstop_set(char_u *var, int **array) + ++valcount; + continue; + } +- emsg(_(e_invarg)); +- return FALSE; ++ semsg(_(e_invarg2), var); ++ return FAIL; + } + + *array = ALLOC_MULT(int, valcount + 1); + if (*array == NULL) +- return FALSE; ++ return FAIL; + (*array)[0] = valcount; + + t = 1; + for (cp = var; *cp != NUL;) + { +- (*array)[t++] = atoi((char *)cp); +- while (*cp != NUL && *cp != ',') ++ int n = atoi((char *)cp); ++ ++ if (n < 0 || n > 9999) ++ { ++ semsg(_(e_invarg2), cp); ++ return FAIL; ++ } ++ (*array)[t++] = n; ++ while (*cp != NUL && *cp != ',') + ++cp; + if (*cp != NUL) + ++cp; + } + +- return TRUE; ++ return OK; + } + + /* +@@ -1556,7 +1564,7 @@ ex_retab(exarg_T *eap) + + #ifdef FEAT_VARTABS + new_ts_str = eap->arg; +- if (!tabstop_set(eap->arg, &new_vts_array)) ++ if (tabstop_set(eap->arg, &new_vts_array) == FAIL) + return; + while (vim_isdigit(*(eap->arg)) || *(eap->arg) == ',') + ++(eap->arg); +diff --git a/src/option.c b/src/option.c +index 5c99c69..e9598d6 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2292,9 +2292,9 @@ didset_options2(void) + #endif + #ifdef FEAT_VARTABS + vim_free(curbuf->b_p_vsts_array); +- tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); ++ (void)tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); + vim_free(curbuf->b_p_vts_array); +- tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); ++ (void)tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); + #endif + } + +@@ -5756,7 +5756,7 @@ buf_copy_options(buf_T *buf, int flags) + buf->b_p_vsts = vim_strsave(p_vsts); + COPY_OPT_SCTX(buf, BV_VSTS); + if (p_vsts && p_vsts != empty_option) +- tabstop_set(p_vsts, &buf->b_p_vsts_array); ++ (void)tabstop_set(p_vsts, &buf->b_p_vsts_array); + else + buf->b_p_vsts_array = 0; + buf->b_p_vsts_nopaste = p_vsts_nopaste +@@ -5914,7 +5914,7 @@ buf_copy_options(buf_T *buf, int flags) + buf->b_p_isk = save_p_isk; + #ifdef FEAT_VARTABS + if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) +- tabstop_set(p_vts, &buf->b_p_vts_array); ++ (void)tabstop_set(p_vts, &buf->b_p_vts_array); + else + buf->b_p_vts_array = NULL; + #endif +@@ -5929,7 +5929,7 @@ buf_copy_options(buf_T *buf, int flags) + buf->b_p_vts = vim_strsave(p_vts); + COPY_OPT_SCTX(buf, BV_VTS); + if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) +- tabstop_set(p_vts, &buf->b_p_vts_array); ++ (void)tabstop_set(p_vts, &buf->b_p_vts_array); + else + buf->b_p_vts_array = NULL; + #endif +@@ -6634,7 +6634,7 @@ paste_option_changed(void) + if (buf->b_p_vsts_array) + vim_free(buf->b_p_vsts_array); + if (buf->b_p_vsts && buf->b_p_vsts != empty_option) +- tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); ++ (void)tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); + else + buf->b_p_vsts_array = 0; + #endif +diff --git a/src/optionstr.c b/src/optionstr.c +index 98e90a4..383babe 100644 +--- a/src/optionstr.c ++++ b/src/optionstr.c +@@ -2166,7 +2166,7 @@ did_set_string_option( + if (errmsg == NULL) + { + int *oldarray = curbuf->b_p_vsts_array; +- if (tabstop_set(*varp, &(curbuf->b_p_vsts_array))) ++ if (tabstop_set(*varp, &(curbuf->b_p_vsts_array)) == OK) + { + if (oldarray) + vim_free(oldarray); +@@ -2205,7 +2205,7 @@ did_set_string_option( + { + int *oldarray = curbuf->b_p_vts_array; + +- if (tabstop_set(*varp, &(curbuf->b_p_vts_array))) ++ if (tabstop_set(*varp, &(curbuf->b_p_vts_array)) == OK) + { + vim_free(oldarray); + #ifdef FEAT_FOLDING +diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim +index f11a32b..e7b8946 100644 +--- a/src/testdir/test_retab.vim ++++ b/src/testdir/test_retab.vim +@@ -74,4 +74,7 @@ endfunc + func Test_retab_error() + call assert_fails('retab -1', 'E487:') + call assert_fails('retab! -1', 'E487:') ++ call assert_fails('ret -1000', 'E487:') ++ call assert_fails('ret 10000', 'E475:') ++ call assert_fails('ret 80000000000000000000', 'E475:') + endfunc +diff --git a/src/version.c b/src/version.c +index 3ef6259..8912f62 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -743,6 +743,8 @@ static char *(features[]) = + static int included_patches[] = + { /* Add new patch number below this line */ + /**/ ++ 3402, ++/**/ + 0 + }; + +-- +1.8.3.1 + diff --git a/backport-memory-leak-for-retab-with-invalid-argument.patch b/backport-memory-leak-for-retab-with-invalid-argument.patch new file mode 100644 index 0000000..fa19957 --- /dev/null +++ b/backport-memory-leak-for-retab-with-invalid-argument.patch @@ -0,0 +1,66 @@ +From 2ddb89f8a94425cda1e5491efc80c1ccccb6e08e Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Sat, 4 Sep 2021 21:20:41 +0200 +Subject: [PATCH] patch 8.2.3403: memory leak for :retab with invalid argument + +Problem: Memory leak for :retab with invalid argument. +Solution: Free the memory. Make error messages consistent. +--- + src/indent.c | 13 +++++++++++-- + src/version.c | 2 ++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/indent.c b/src/indent.c +index 7e196c2..7d04373 100644 +--- a/src/indent.c ++++ b/src/indent.c +@@ -70,9 +70,12 @@ tabstop_set(char_u *var, int **array) + { + int n = atoi((char *)cp); + ++ // Catch negative values, overflow and ridiculous big values. + if (n < 0 || n > 9999) + { + semsg(_(e_invarg2), cp); ++ vim_free(*array); ++ *array = NULL; + return FAIL; + } + (*array)[t++] = n; +@@ -1580,12 +1583,18 @@ ex_retab(exarg_T *eap) + else + new_ts_str = vim_strnsave(new_ts_str, eap->arg - new_ts_str); + #else +- new_ts = getdigits(&(eap->arg)); +- if (new_ts < 0) ++ ptr = eap->arg; ++ new_ts = getdigits(&ptr); ++ if (new_ts < 0 && *eap->arg == '-') + { + emsg(_(e_positive)); + return; + } ++ if (new_ts < 0 || new_ts > 9999) ++ { ++ semsg(_(e_invarg2), eap->arg); ++ return; ++ } + if (new_ts == 0) + new_ts = curbuf->b_p_ts; + #endif +diff --git a/src/version.c b/src/version.c +index 8912f62..f8e4561 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -743,6 +743,8 @@ static char *(features[]) = + static int included_patches[] = + { /* Add new patch number below this line */ + /**/ ++ 3403, ++/**/ + 3402, + /**/ + 0 +-- +1.8.3.1 + diff --git a/vim.spec b/vim.spec index d457584..a1ef4ea 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ Name: vim Epoch: 2 Version: 8.2 -Release: 9 +Release: 10 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim and MIT URL: http://www.vim.org @@ -36,6 +36,8 @@ Patch0013: Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch Patch0014: backport-Fix-build-failuers-with-perl-5.32.patch Patch6000: backport-Configure-does-not-recognize-gcc-10.0-and-later.patch Patch6001: backport-8.2.2550-signal-stack-size-is-wrong-with-lates.patch +Patch6002: backport-CVE-2021-3770.patch +Patch6003: backport-memory-leak-for-retab-with-invalid-argument.patch Patch9000: bugfix-rm-modify-info-version.patch @@ -424,6 +426,12 @@ popd %{_mandir}/man1/evim.* %changelog +* Sat Sep 11 2021 shixuantong - 2:8.2-10 +- Type:CVE +- ID:NA +- SUG:NA +- DESC:fix CVE-2021-3770 + * Tue Aug 10 2021 shixuantong - 2:8.2-9 - Type:bugfix - ID:NA -- Gitee